Merge remote-tracking branch 'origin/micropeak-logging'

diff --combined src/drivers/ao_cc1120.c
index 35be54a46ffffa89e7e1b385d01d0b486c8e9a44,d9b2e5bfb64891926bacb23db5d13e6f31ec3184..8068740f91782483e6f83329a4f439d2c778b5a5
--- 1/src/drivers/ao_cc1120.c
--- 2/src/drivers/ao_cc1120.c
+++ b/src/drivers/ao_cc1120.c
@@@ -834,8 -834,8 +834,8 @@@ ao_radio_rx_isr(void
  {
        uint8_t d;
  
-       d = stm_spi2.dr;
-       stm_spi2.dr = 0;
+       d = AO_CC1120_SPI.dr;
+       AO_CC1120_SPI.dr = 0;
        if (rx_ignore == 0) {
                if (rx_data_cur >= rx_data_count)
                        ao_exti_disable(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
@@@ -862,7 -862,6 +862,7 @@@ ao_radio_rx_wait(void
        do {
                if (ao_radio_mcu_wake)
                        ao_radio_check_marc_status();
 +              ao_alarm(AO_MS_TO_TICKS(100));
                ao_arch_block_interrupts();
                rx_waiting = 1;
                while (rx_data_cur - rx_data_consumed < AO_FEC_DECODE_BLOCK &&
@@@ -874,7 -873,6 +874,7 @@@
                }
                rx_waiting = 0;
                ao_arch_release_interrupts();
 +              ao_clear_alarm();
        } while (ao_radio_mcu_wake);
        if (ao_radio_abort)
                return 0;
@@@ -924,10 -922,10 +924,10 @@@ ao_radio_recv(__xdata void *d, uint8_t 
        ao_radio_wake = 0;
        ao_radio_mcu_wake = 0;
  
-       stm_spi2.cr2 = 0;
+       AO_CC1120_SPI.cr2 = 0;
  
        /* clear any RXNE */
-       (void) stm_spi2.dr;
+       (void) AO_CC1120_SPI.dr;
  
        /* Have the radio signal when the preamble quality goes high */
        ao_radio_reg_write(AO_CC1120_INT_GPIO_IOCFG, CC1120_IOCFG_GPIO_CFG_PQT_REACHED);