Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox

[fw/altos] / src / ao_radio.c

diff --git a/src/ao_radio.c b/src/ao_radio.c
index c7c8dc8d7620bc69883bac47d76b4e004adba569..3fb4afd7d4831d87c556a201634655e70ba95b3c 100644 (file)
--- a/src/ao_radio.c
+++ b/src/ao_radio.c
@@ -28,14 +28,6 @@
  * 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),
 
@@ -287,7 +275,7 @@ __xdata uint8_t ao_radio_done;
 __xdata uint8_t ao_radio_mutex;
 
 void
-ao_radio_general_isr(void) interrupt 16
+ao_radio_general_isr(void) __interrupt 16
 {
        S1CON &= ~0x03;
        if (RFIF & RFIF_IM_TIMEOUT) {
@@ -329,21 +317,31 @@ ao_radio_idle(void)
 {
        if (RF_MARCSTATE != RF_MARCSTATE_IDLE)
        {
-               RFST = RFST_SIDLE;
                do {
+                       RFST = RFST_SIDLE;
                        ao_yield();
                } while (RF_MARCSTATE != RF_MARCSTATE_IDLE);
        }
 }
 
 void
-ao_radio_send(__xdata struct ao_telemetry *telemetry) __reentrant
+ao_radio_get(void)
 {
        ao_config_get();
        ao_mutex_get(&ao_radio_mutex);
        ao_radio_idle();
-       ao_radio_done = 0;
        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);
+}
+
+
+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,
@@ -358,16 +356,13 @@ ao_radio_send(__xdata struct ao_telemetry *telemetry) __reentrant
        RFST = RFST_STX;
        __critical while (!ao_radio_done)
                ao_sleep(&ao_radio_done);
-       ao_mutex_put(&ao_radio_mutex);
+       ao_radio_put();
 }
 
 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,
@@ -382,7 +377,7 @@ 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);
 }
 
@@ -394,8 +389,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];
@@ -431,7 +426,7 @@ ao_radio_rdf(int ms)
        ao_radio_idle();
        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
@@ -448,23 +443,37 @@ ao_radio_rdf_abort(void)
                ao_radio_abort();
 }
 
+
 /* Output carrier */
 void
 ao_radio_test(void)
 {
-       ao_config_get();
-       ao_mutex_get(&ao_radio_mutex);
-       ao_radio_idle();
-       printf ("Hit a character to stop..."); flush();
-       RFST = RFST_STX;
-       getchar();
-       ao_radio_idle();
-       ao_mutex_put(&ao_radio_mutex);
-       putchar('\n');
+       uint8_t mode = 2;
+       ao_cmd_white();
+       if (ao_cmd_lex_c != '\n') {
+               ao_cmd_decimal();
+               mode = (uint8_t) ao_cmd_lex_u32;
+       }
+       mode++;
+       if (mode & 2) {
+               ao_set_monitor(0);
+               ao_packet_slave_stop();
+               ao_radio_get();
+               RFST = RFST_STX;
+       }
+       if (mode == 3) {
+               printf ("Hit a character to stop..."); flush();
+               getchar();
+               putchar('\n');
+       }
+       if (mode & 1) {
+               ao_radio_idle();
+               ao_radio_put();
+       }
 }
 
 __code struct ao_cmds ao_radio_cmds[] = {
-       { 'C',  ao_radio_test,  "C                                  Radio carrier test" },
+       { 'C',  ao_radio_test,  "C <1 start, 0 stop, none both>     Radio carrier test" },
        { 0,    ao_radio_test,  NULL },
 };