Re-order config values. Change frequency to cal
[fw/altos] / src / ao_radio.c
index 76fa3e5dc497eb5f6913ca15e3fce8354cd8b2ff..4dea6dce242934f7dd8f6e7d19b461133db125c8 100644 (file)
  * RX filter:  93.75 kHz
  */
 
-/*
- * For 434.550MHz, the frequency value is:
- *
- * 434.550e6 / (24e6 / 2**16) = 1186611.2
- */
-
-#define FREQ_CONTROL   1186611
-
 /*
  * For IF freq of 140.62kHz, the IF value is:
  *
@@ -124,10 +116,6 @@ static __code uint8_t radio_setup[] = {
        RF_PA_TABLE1_OFF,       RF_POWER,
        RF_PA_TABLE0_OFF,       RF_POWER,
 
-       RF_FREQ2_OFF,           (FREQ_CONTROL >> 16) & 0xff,
-       RF_FREQ1_OFF,           (FREQ_CONTROL >> 8) & 0xff,
-       RF_FREQ0_OFF,           (FREQ_CONTROL >> 0) & 0xff,
-
        RF_FSCTRL1_OFF,         (IF_FREQ_CONTROL << RF_FSCTRL1_FREQ_IF_SHIFT),
        RF_FSCTRL0_OFF,         (0 << RF_FSCTRL0_FREQOFF_SHIFT),
 
@@ -222,7 +210,7 @@ static __code uint8_t rdf_setup[] = {
        RF_DEVIATN_OFF,         ((RDF_DEVIATION_E << RF_DEVIATN_DEVIATION_E_SHIFT) |
                                 (RDF_DEVIATION_M << RF_DEVIATN_DEVIATION_M_SHIFT)),
 
-       /* packet length */
+       /* packet length is set in-line */
        RF_PKTCTRL1_OFF,        ((1 << PKTCTRL1_PQT_SHIFT)|
                                 PKTCTRL1_ADR_CHK_NONE),
        RF_PKTCTRL0_OFF,        (RF_PKTCTRL0_PKT_FORMAT_NORMAL|
@@ -255,11 +243,76 @@ static __code uint8_t telemetry_setup[] = {
                                 RF_PKTCTRL0_LENGTH_CONFIG_FIXED),
 };
 
+static __code uint8_t packet_setup[] = {
+       RF_MDMCFG4_OFF,         ((CHANBW_E << RF_MDMCFG4_CHANBW_E_SHIFT) |
+                                (CHANBW_M << RF_MDMCFG4_CHANBW_M_SHIFT) |
+                                (DRATE_E << RF_MDMCFG4_DRATE_E_SHIFT)),
+       RF_MDMCFG3_OFF,         (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_MDMCFG1_OFF,         (RF_MDMCFG1_FEC_EN |
+                                RF_MDMCFG1_NUM_PREAMBLE_4 |
+                                (2 << RF_MDMCFG1_CHANSPC_E_SHIFT)),
+
+       RF_DEVIATN_OFF,         ((DEVIATION_E << RF_DEVIATN_DEVIATION_E_SHIFT) |
+                                (DEVIATION_M << RF_DEVIATN_DEVIATION_M_SHIFT)),
+
+       /* max packet length */
+       RF_PKTLEN_OFF,          sizeof (struct ao_packet),
+       RF_PKTCTRL1_OFF,        ((1 << PKTCTRL1_PQT_SHIFT)|
+                                PKTCTRL1_APPEND_STATUS|
+                                PKTCTRL1_ADR_CHK_NONE),
+       RF_PKTCTRL0_OFF,        (RF_PKTCTRL0_WHITE_DATA|
+                                RF_PKTCTRL0_PKT_FORMAT_NORMAL|
+                                RF_PKTCTRL0_CRC_EN|
+                                RF_PKTCTRL0_LENGTH_CONFIG_FIXED),
+};
+
 __xdata uint8_t        ao_radio_dma;
 __xdata uint8_t ao_radio_dma_done;
+__xdata uint8_t ao_radio_done;
 __xdata uint8_t ao_radio_mutex;
 
-static void
+void
+ao_radio_general_isr(void) interrupt 16
+{
+       S1CON &= ~0x03;
+       if (RFIF & RFIF_IM_TIMEOUT) {
+               ao_dma_abort(ao_radio_dma);
+               RFIF &= ~ RFIF_IM_TIMEOUT;
+       } else if (RFIF & RFIF_IM_DONE) {
+               ao_radio_done = 1;
+               ao_wakeup(&ao_radio_done);
+               RFIF &= ~RFIF_IM_DONE;
+       }
+}
+
+void
+ao_radio_set_telemetry(void)
+{
+       uint8_t i;
+       for (i = 0; i < sizeof (telemetry_setup); i += 2)
+               RF[telemetry_setup[i]] = telemetry_setup[i+1];
+}
+
+void
+ao_radio_set_packet(void)
+{
+       uint8_t i;
+       for (i = 0; i < sizeof (packet_setup); i += 2)
+               RF[packet_setup[i]] = packet_setup[i+1];
+}
+
+void
+ao_radio_set_rdf(void)
+{
+       uint8_t i;
+       for (i = 0; i < sizeof (rdf_setup); i += 2)
+               RF[rdf_setup[i]] = rdf_setup[i+1];
+}
+
+void
 ao_radio_idle(void)
 {
        if (RF_MARCSTATE != RF_MARCSTATE_IDLE)
@@ -271,13 +324,25 @@ ao_radio_idle(void)
        }
 }
 
-void
-ao_radio_send(__xdata struct ao_telemetry *telemetry) __reentrant
+static void
+ao_radio_get(void)
 {
        ao_config_get();
        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);
+}
+
+#define ao_radio_put() ao_mutex_put(&ao_radio_mutex)
+
+void
+ao_radio_send(__xdata struct ao_telemetry *telemetry) __reentrant
+{
+       ao_radio_get();
+       ao_radio_done = 0;
        ao_dma_set_transfer(ao_radio_dma,
                            telemetry,
                            &RFDXADDR,
@@ -290,18 +355,15 @@ ao_radio_send(__xdata struct ao_telemetry *telemetry) __reentrant
                            DMA_CFG1_PRIORITY_HIGH);
        ao_dma_start(ao_radio_dma);
        RFST = RFST_STX;
-       __critical while (!ao_radio_dma_done)
-               ao_sleep(&ao_radio_dma_done);
-       ao_mutex_put(&ao_radio_mutex);
+       __critical while (!ao_radio_done)
+               ao_sleep(&ao_radio_done);
+       ao_radio_put();
 }
 
-void
+uint8_t
 ao_radio_recv(__xdata struct ao_radio_recv *radio) __reentrant
 {
-       ao_config_get();
-       ao_mutex_get(&ao_radio_mutex);
-       ao_radio_idle();
-       RF_CHANNR = ao_config.radio_channel;
+       ao_radio_get();
        ao_dma_set_transfer(ao_radio_dma,
                            &RFDXADDR,
                            radio,
@@ -316,7 +378,8 @@ ao_radio_recv(__xdata struct ao_radio_recv *radio) __reentrant
        RFST = RFST_SRX;
        __critical while (!ao_radio_dma_done)
                ao_sleep(&ao_radio_dma_done);
-       ao_mutex_put(&ao_radio_mutex);
+       ao_radio_put();
+       return (ao_radio_dma_done & AO_DMA_DONE);
 }
 
 __xdata ao_radio_rdf_running;
@@ -327,8 +390,8 @@ ao_radio_rdf(int ms)
 {
        uint8_t i;
        uint8_t pkt_len;
-       ao_mutex_get(&ao_radio_mutex);
-       ao_radio_idle();
+
+       ao_radio_get();
        ao_radio_rdf_running = 1;
        for (i = 0; i < sizeof (rdf_setup); i += 2)
                RF[rdf_setup[i]] = rdf_setup[i+1];
@@ -362,26 +425,56 @@ ao_radio_rdf(int ms)
                ao_sleep(&ao_radio_dma_done);
        ao_radio_rdf_running = 0;
        ao_radio_idle();
-       for (i = 0; i < sizeof (rdf_setup); i += 2)
+       for (i = 0; i < sizeof (telemetry_setup); i += 2)
                RF[telemetry_setup[i]] = telemetry_setup[i+1];
-       ao_mutex_put(&ao_radio_mutex);
+       ao_radio_put();
+}
+
+void
+ao_radio_abort(void)
+{
+       ao_dma_abort(ao_radio_dma);
+       ao_radio_idle();
 }
 
 void
 ao_radio_rdf_abort(void)
 {
-       if (ao_radio_rdf_running) {
-               ao_dma_abort(ao_radio_dma);
-               ao_radio_idle();
-       }
+       if (ao_radio_rdf_running)
+               ao_radio_abort();
 }
 
+
+/* Output carrier */
+void
+ao_radio_test(void)
+{
+       ao_packet_slave_stop();
+       ao_radio_get();
+       printf ("Hit a character to stop..."); flush();
+       RFST = RFST_STX;
+       getchar();
+       ao_radio_idle();
+       ao_radio_put();
+       putchar('\n');
+}
+
+__code struct ao_cmds ao_radio_cmds[] = {
+       { 'C',  ao_radio_test,  "C                                  Radio carrier test" },
+       { 0,    ao_radio_test,  NULL },
+};
+
 void
 ao_radio_init(void)
 {
        uint8_t i;
        for (i = 0; i < sizeof (radio_setup); i += 2)
                RF[radio_setup[i]] = radio_setup[i+1];
+       ao_radio_set_telemetry();
        ao_radio_dma_done = 1;
        ao_radio_dma = ao_dma_alloc(&ao_radio_dma_done);
+       RFIF = 0;
+       RFIM = RFIM_IM_TIMEOUT|RFIM_IM_DONE;
+       IEN2 |= IEN2_RFIE;
+       ao_cmd_register(&ao_radio_cmds[0]);
 }