altos/cc1200: Adjust bit-sync configuration

[fw/altos] / src / drivers / ao_pad.c

diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c
index e205f99b5e26a1b360cac76a6f821dd305e565a9..dc2c83fe0cf3c668668dfbf354cbae020d14533f 100644 (file)
--- a/src/drivers/ao_pad.c
+++ b/src/drivers/ao_pad.c
@@ -27,6 +27,7 @@ static __pdata uint8_t        ao_pad_armed;
 static __pdata uint16_t        ao_pad_arm_time;
 static __pdata uint8_t ao_pad_box;
 static __xdata uint8_t ao_pad_disabled;
+static __pdata uint16_t        ao_pad_packet_time;
 
 #define DEBUG  1
 
@@ -135,6 +136,12 @@ ao_pad_monitor(void)
                        query.arm_status = AO_PAD_ARM_STATUS_UNKNOWN;
                        arm_beep_time = 0;
                }
+               if ((ao_time() - ao_pad_packet_time) > AO_SEC_TO_TICKS(2))
+                       cur |= AO_LED_RED;
+               else if (ao_radio_cmac_rssi < -90)
+                       cur |= AO_LED_AMBER;
+               else
+                       cur |= AO_LED_GREEN;
 
                for (c = 0; c < AO_PAD_NUM; c++) {
                        int16_t         sense = packet->adc.sense[c];
@@ -146,11 +153,11 @@ ao_pad_monitor(void)
                         *
                         *              v_pyro \
                         *      100k            igniter
-                        *              output /        
+                        *              output /
                         *      100k           \
                         *              sense   relay
-                        *      27k            / 
-                        *              gnd ---   
+                        *      27k            /
+                        *              gnd ---
                         *
                         *      If the relay is closed, then sense will be 0
                         *      If no igniter is present, then sense will be v_pyro * 27k/227k = pyro * 127 / 227 ~= pyro/2
@@ -171,9 +178,10 @@ ao_pad_monitor(void)
                        query.igniter_status[c] = status;
                }
                if (cur != prev) {
-                       PRINTD("change leds from %02x to %02x mask %02x\n",
-                              prev, cur, AO_LED_CONTINUITY_MASK|AO_LED_ARMED);
-                       ao_led_set_mask(cur, AO_LED_CONTINUITY_MASK | AO_LED_ARMED);
+                       PRINTD("change leds from %02x to %02x\n",
+                              prev, cur);
+                       FLUSHD();
+                       ao_led_set(cur);
                        prev = cur;
                }
 
@@ -238,15 +246,15 @@ ao_pad(void)
 
        ao_pad_box = 0;
        ao_led_set(0);
-       ao_led_on(AO_LED_POWER);
        for (;;) {
                FLUSHD();
                while (ao_pad_disabled)
                        ao_sleep(&ao_pad_disabled);
                ret = ao_radio_cmac_recv(&command, sizeof (command), 0);
-               PRINTD ("cmac_recv %d\n", ret);
+               PRINTD ("cmac_recv %d %d\n", ret, ao_radio_cmac_rssi);
                if (ret != AO_RADIO_CMAC_OK)
                        continue;
+               ao_pad_packet_time = ao_time();
                
                ao_pad_box = ao_pad_read_box();
 
@@ -354,14 +362,26 @@ ao_pad_test(void)
 void
 ao_pad_manual(void)
 {
+       uint8_t ignite;
+       int     repeat;
        ao_cmd_white();
        if (!ao_match_word("DoIt"))
                return;
        ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
-       ao_pad_ignite = 1 << ao_cmd_lex_i;
-       ao_wakeup(&ao_pad_ignite);
+       ignite = 1 << ao_cmd_lex_i;
+       ao_cmd_decimal();
+       if (ao_cmd_status != ao_cmd_success) {
+               repeat = 1;
+               ao_cmd_status = ao_cmd_success;
+       } else
+               repeat = ao_cmd_lex_i;
+       while (repeat-- > 0) {
+               ao_pad_ignite = ignite;
+               ao_wakeup(&ao_pad_ignite);
+               ao_delay(AO_PAD_FIRE_TIME>>1);
+       }
 }
 
 static __xdata struct ao_task ao_pad_task;