altos: Send serial/flight to companion board

[fw/altos] / src / ao_radio.c

diff --git a/src/ao_radio.c b/src/ao_radio.c
index 01974ba1b3b61e73018dc37ae23bba9386e64c46..00816b33bdef4c9e784834c84c12d07a0ca3c6c9 100644 (file)
--- a/src/ao_radio.c
+++ b/src/ao_radio.c
@@ -287,9 +287,9 @@ ao_radio_get(uint8_t len)
        ao_mutex_get(&ao_radio_mutex);
        ao_radio_idle();
        RF_CHANNR = ao_config.radio_channel;
-       RF_FREQ2 = (uint8_t) (ao_config.radio_cal >> 16);
-       RF_FREQ1 = (uint8_t) (ao_config.radio_cal >> 8);
-       RF_FREQ0 = (uint8_t) (ao_config.radio_cal);
+       RF_FREQ2 = (uint8_t) (ao_config.radio_setting >> 16);
+       RF_FREQ1 = (uint8_t) (ao_config.radio_setting >> 8);
+       RF_FREQ0 = (uint8_t) (ao_config.radio_setting);
        RF_PKTLEN = len;
 }
 
@@ -432,8 +432,12 @@ ao_radio_test(void)
        }
        mode++;
        if ((mode & 2) && !radio_on) {
+#if HAS_MONITOR
                ao_set_monitor(0);
+#endif
+#if PACKET_HAS_SLAVE
                ao_packet_slave_stop();
+#endif
                ao_radio_get(0xff);
                RFST = RFST_STX;
                radio_on = 1;