X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_radio.c;h=00816b33bdef4c9e784834c84c12d07a0ca3c6c9;hp=b5a67b99d025d9801cb5b5a87a2ad61c72511ea6;hb=41e5be32819d305c8268e6f992be91411ea13435;hpb=3f0bc801fd08a613c681504f0d1f9374486a2487

diff --git a/src/ao_radio.c b/src/ao_radio.c
index b5a67b99..00816b33 100644
--- a/src/ao_radio.c
+++ b/src/ao_radio.c
@@ -161,8 +161,6 @@ static __code uint8_t radio_setup[] = {
 	RF_SYNC0_OFF,		0x91,
 
 	/* max packet length */
-	RF_PKTLEN_OFF,		sizeof (struct ao_telemetry),
-
 	RF_PKTCTRL1_OFF,	((1 << PKTCTRL1_PQT_SHIFT)|
 				 PKTCTRL1_APPEND_STATUS|
 				 PKTCTRL1_ADR_CHK_NONE),
@@ -233,7 +231,6 @@ static __code uint8_t fixed_pkt_setup[] = {
 				 (DEVIATION_M << RF_DEVIATN_DEVIATION_M_SHIFT)),
 
 	/* max packet length -- now set inline */
-	// RF_PKTLEN_OFF,		sizeof (struct ao_telemetry),
 	RF_PKTCTRL1_OFF,	((1 << PKTCTRL1_PQT_SHIFT)|
 				 PKTCTRL1_APPEND_STATUS|
 				 PKTCTRL1_ADR_CHK_NONE),
@@ -290,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;
 }
 
@@ -435,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;