X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcc1111%2Fao_radio.c;h=2071c47a432cae2c4f8d3c628fea19e8578a9c34;hb=fb60d87b02c0fc83a0b4268212f0b6b740c984e3;hp=75f241d4d2391e3664181fc3a0b230919e283e89;hpb=1c344b760776cd5d8c0297d8db9bf02687381b4e;p=fw%2Faltos

diff --git a/src/cc1111/ao_radio.c b/src/cc1111/ao_radio.c
index 75f241d4..2071c47a 100644
--- a/src/cc1111/ao_radio.c
+++ b/src/cc1111/ao_radio.c
@@ -200,7 +200,7 @@ static __code uint8_t rdf_setup[] = {
 	RF_MDMCFG3_OFF,		(RDF_DRATE_M << RF_MDMCFG3_DRATE_M_SHIFT),
 	RF_MDMCFG2_OFF,		(RF_MDMCFG2_DEM_DCFILT_OFF |
 				 RF_MDMCFG2_MOD_FORMAT_GFSK |
-				 RF_MDMCFG2_SYNC_MODE_15_16_THRES),
+				 RF_MDMCFG2_SYNC_MODE_NONE),
 	RF_MDMCFG1_OFF,		(RF_MDMCFG1_FEC_DIS |
 				 RF_MDMCFG1_NUM_PREAMBLE_2 |
 				 (2 << RF_MDMCFG1_CHANSPC_E_SHIFT)),
@@ -260,7 +260,7 @@ ao_radio_general_isr(void) __interrupt 16
 	}
 }
 
-void
+static void
 ao_radio_set_packet(void)
 {
 	uint8_t	i;
@@ -268,7 +268,7 @@ ao_radio_set_packet(void)
 		RF[fixed_pkt_setup[i]] = fixed_pkt_setup[i+1];
 }
 
-void
+static void
 ao_radio_idle(void)
 {
 	if (RF_MARCSTATE != RF_MARCSTATE_IDLE)
@@ -280,13 +280,15 @@ ao_radio_idle(void)
 	}
 }
 
-void
+#define ao_radio_put() ao_mutex_put(&ao_radio_mutex)
+
+static void
 ao_radio_get(uint8_t len)
 {
 	ao_config_get();
 	ao_mutex_get(&ao_radio_mutex);
 	ao_radio_idle();
-	RF_CHANNR = ao_config.radio_channel;
+	RF_CHANNR = 0;
 	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);
@@ -364,29 +366,22 @@ ao_radio_recv_abort(void)
 	ao_wakeup(&ao_radio_dma_done);
 }
 
-__xdata ao_radio_rdf_value = 0x55;
+__code ao_radio_rdf_value = 0x55;
 
-void
-ao_radio_rdf(uint8_t pkt_len)
+static void
+ao_radio_rdf_start(void)
 {
 	uint8_t i;
-
 	ao_radio_abort = 0;
-	ao_radio_get(pkt_len);
+	ao_radio_get(AO_RADIO_RDF_LEN);
 	ao_radio_done = 0;
 	for (i = 0; i < sizeof (rdf_setup); i += 2)
 		RF[rdf_setup[i]] = rdf_setup[i+1];
+}
 
-	ao_dma_set_transfer(ao_radio_dma,
-			    &ao_radio_rdf_value,
-			    &RFDXADDR,
-			    pkt_len,
-			    DMA_CFG0_WORDSIZE_8 |
-			    DMA_CFG0_TMODE_SINGLE |
-			    DMA_CFG0_TRIGGER_RADIO,
-			    DMA_CFG1_SRCINC_0 |
-			    DMA_CFG1_DESTINC_0 |
-			    DMA_CFG1_PRIORITY_HIGH);
+static void
+ao_radio_rdf_run(void)
+{
 	ao_dma_start(ao_radio_dma);
 	RFST = RFST_STX;
 	__critical while (!ao_radio_done && !ao_radio_abort)
@@ -399,6 +394,70 @@ ao_radio_rdf(uint8_t pkt_len)
 	ao_radio_put();
 }
 
+void
+ao_radio_rdf(void)
+{
+	ao_radio_rdf_start();
+
+	ao_dma_set_transfer(ao_radio_dma,
+			    CODE_TO_XDATA(&ao_radio_rdf_value),
+			    &RFDXADDR,
+			    AO_RADIO_RDF_LEN,
+			    DMA_CFG0_WORDSIZE_8 |
+			    DMA_CFG0_TMODE_SINGLE |
+			    DMA_CFG0_TRIGGER_RADIO,
+			    DMA_CFG1_SRCINC_0 |
+			    DMA_CFG1_DESTINC_0 |
+			    DMA_CFG1_PRIORITY_HIGH);
+	ao_radio_rdf_run();
+}
+
+#define PA	0x00
+#define BE	0x55
+
+#define CONT_PAUSE_8	PA, PA, PA, PA, PA, PA, PA, PA
+#define CONT_PAUSE_16	CONT_PAUSE_8, CONT_PAUSE_8
+#define CONT_PAUSE_24	CONT_PAUSE_16, CONT_PAUSE_8
+
+#define CONT_BEEP_8	BE, BE, BE, BE, BE, BE, BE, BE
+
+#if AO_RADIO_CONT_PAUSE_LEN == 24
+#define CONT_PAUSE	CONT_PAUSE_24
+#endif
+
+#if AO_RADIO_CONT_TONE_LEN == 8
+#define CONT_BEEP		CONT_BEEP_8
+#define CONT_PAUSE_SHORT	CONT_PAUSE_8
+#endif
+
+#define CONT_ADDR(c)	CODE_TO_XDATA(&ao_radio_cont[(3-(c)) * (AO_RADIO_CONT_PAUSE_LEN + AO_RADIO_CONT_TONE_LEN)])
+
+__code uint8_t ao_radio_cont[] = {
+	CONT_PAUSE, CONT_BEEP,
+	CONT_PAUSE, CONT_BEEP,
+	CONT_PAUSE, CONT_BEEP,
+	CONT_PAUSE, CONT_PAUSE_SHORT,
+	CONT_PAUSE, CONT_PAUSE_SHORT,
+	CONT_PAUSE,
+};
+
+void
+ao_radio_continuity(uint8_t c)
+{
+	ao_radio_rdf_start();
+	ao_dma_set_transfer(ao_radio_dma,
+			    CONT_ADDR(c),
+			    &RFDXADDR,
+			    AO_RADIO_CONT_TOTAL_LEN,
+			    DMA_CFG0_WORDSIZE_8 |
+			    DMA_CFG0_TMODE_SINGLE |
+			    DMA_CFG0_TRIGGER_RADIO,
+			    DMA_CFG1_SRCINC_1 |
+			    DMA_CFG1_DESTINC_0 |
+			    DMA_CFG1_PRIORITY_HIGH);
+	ao_radio_rdf_run();
+}
+
 void
 ao_radio_rdf_abort(void)
 {
@@ -421,7 +480,7 @@ ao_radio_test(void)
 	mode++;
 	if ((mode & 2) && !radio_on) {
 #if HAS_MONITOR
-		ao_set_monitor(0);
+		ao_monitor_disable();
 #endif
 #if PACKET_HAS_SLAVE
 		ao_packet_slave_stop();
@@ -439,6 +498,9 @@ ao_radio_test(void)
 		ao_radio_idle();
 		ao_radio_put();
 		radio_on = 0;
+#if HAS_MONITOR
+		ao_monitor_enable();
+#endif
 	}
 }