__xdata uint8_t ao_radio_abort;
__xdata uint8_t ao_radio_mutex;
+#if PACKET_HAS_MASTER || HAS_AES
+#define NEED_RADIO_RSSI 1
+#endif
+
+#ifndef NEED_RADIO_RSSI
+#define NEED_RADIO_RSSI 0
+#endif
+
+#if NEED_RADIO_RSSI
+__xdata int8_t ao_radio_rssi;
+#endif
+
void
ao_radio_general_isr(void) __interrupt 16
{
if (!ao_radio_dma_done) {
ao_dma_abort(ao_radio_dma);
ao_radio_idle();
+#if NEED_RADIO_RSSI
+ ao_radio_rssi = 0;
+#endif
}
+#if NEED_RADIO_RSSI
+ else
+ ao_radio_rssi = AO_RSSI_FROM_RADIO(((uint8_t *)packet)[size - 1]);
+#endif
ao_radio_put();
return ao_radio_dma_done;
}
extern __xdata uint8_t ao_radio_dma;
+extern __xdata int8_t ao_radio_rssi;
+
#ifdef PKT_APPEND_STATUS_1_CRC_OK
#define AO_RADIO_STATUS_CRC_OK PKT_APPEND_STATUS_1_CRC_OK
#else
#if PACKET_HAS_MASTER
/* ao_packet_master.c */
-extern __xdata uint8_t ao_packet_last_rssi;
+extern __xdata int8_t ao_packet_last_rssi;
void
ao_packet_master_init(void);
return AO_RADIO_CMAC_TIMEOUT;
}
- ao_radio_cmac_rssi = (int8_t) (((int8_t) cmac_data[len + AO_CMAC_KEY_LEN]) >> 1) - 74;
+ ao_radio_cmac_rssi = ao_radio_rssi;
if (!(cmac_data[len + AO_CMAC_KEY_LEN +1] & AO_RADIO_STATUS_CRC_OK))
return AO_RADIO_CMAC_CRC_ERROR;
int8_t
ao_radio_cmac_recv(__xdata void *packet, uint8_t len, uint16_t timeout) __reentrant
{
- uint8_t i;
+ int8_t i;
if (len > AO_CMAC_MAX_LEN)
return AO_RADIO_CMAC_LEN_ERROR;
ao_mutex_get(&ao_radio_cmac_mutex);
static uint8_t ao_radio_marc_status; /* Last read MARC status value */
static uint8_t ao_radio_tx_finished; /* MARC status indicates TX finished */
+int8_t ao_radio_rssi; /* Last received RSSI value */
+
#define CC1120_DEBUG AO_FEC_DEBUG
#define CC1120_TRACE 0
static uint32_t last_radio_setting;
ao_mutex_get(&ao_radio_mutex);
+
if (!ao_radio_configured)
ao_radio_setup();
if (ao_config.radio_setting != last_radio_setting) {
{
uint8_t len;
uint16_t i;
- uint8_t rssi;
+ uint8_t radio_rssi = 0;
+ uint8_t rssi0;
uint8_t ret;
static int been_here = 0;
ao_radio_burst_read_stop();
abort:
- ao_radio_strobe(CC1120_SIDLE);
-
/* Convert from 'real' rssi to cc1111-style values */
- rssi = AO_RADIO_FROM_RSSI(ao_radio_reg_read(CC1120_RSSI1));
+ rssi0 = ao_radio_reg_read(CC1120_RSSI0);
+ if (rssi0 & 1) {
+ int8_t rssi = ao_radio_reg_read(CC1120_RSSI1);
+ ao_radio_rssi = rssi;
+
+ /* Bound it to the representable range */
+ if (rssi > -11)
+ rssi = -11;
+ radio_rssi = AO_RADIO_FROM_RSSI (rssi);
+ }
+
+ ao_radio_strobe(CC1120_SIDLE);
ao_radio_put();
/* Store the received RSSI value; the crc-OK byte is already done */
- ((uint8_t *) d)[size] = (uint8_t) rssi;
+ ((uint8_t *) d)[size] = radio_rssi;
#if AO_PROFILE
rx_last_done_tick = rx_done_tick;
#if PACKET_HAS_MASTER
__xdata uint8_t ao_packet_master_sleeping;
-__xdata uint8_t ao_packet_last_rssi;
#endif
void
if (!(ao_rx_packet.status & AO_RADIO_STATUS_CRC_OK))
return 0;
-#if PACKET_HAS_MASTER
- ao_packet_last_rssi = ao_rx_packet.rssi;
-#endif
/* Accept packets with matching call signs, or any packet if
* our callsign hasn't been configured
*/
static void
ao_packet_signal(void)
{
- printf ("RSSI: %d\n", AO_RSSI_FROM_RADIO(ao_packet_last_rssi));
+ printf ("RSSI: %d\n", ao_radio_rssi);
}
__code struct ao_cmds ao_packet_master_cmds[] = {