altos/telefire: Radio status (no data, weak data, good data) on LEDs

Instead of blinking RX/TX, report the radio status on the telefire
nodes, just like telelco does. This makes the LEDs on telefire
*exactly the same* as the LEDs on telelco, which seems like a good idea.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c
index e205f99b5e26a1b360cac76a6f821dd305e565a9..62ae68e98d976dcdabee72103ce32300ad355e21 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_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
 
 
 #define DEBUG  1
 


@@ -135,6 +136,12 @@ ao_pad_monitor(void)
                        query.arm_status = AO_PAD_ARM_STATUS_UNKNOWN;
                        arm_beep_time = 0;
                }
                        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];
 
                for (c = 0; c < AO_PAD_NUM; c++) {
                        int16_t         sense = packet->adc.sense[c];


@@ -171,9 +178,10 @@ ao_pad_monitor(void)
                        query.igniter_status[c] = status;
                }
                if (cur != prev) {
                        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;
                }
 
                        prev = cur;
                }
 


@@ -238,15 +246,15 @@ ao_pad(void)
 
        ao_pad_box = 0;
        ao_led_set(0);
 
        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);
        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;
                if (ret != AO_RADIO_CMAC_OK)
                        continue;

+               ao_pad_packet_time = ao_time();

                
                ao_pad_box = ao_pad_read_box();
 
                
                ao_pad_box = ao_pad_read_box();
 

diff --git a/src/telefire-v0.2/ao_pins.h b/src/telefire-v0.2/ao_pins.h
index f40507221d8b0563ce25dbef593a9ebb10975893..96e6b066081e47801310c428f644efe86ad700da 100644 (file)
--- a/src/telefire-v0.2/ao_pins.h
+++ b/src/telefire-v0.2/ao_pins.h
@@ -40,13 +40,10 @@
 
 #define AO_LED_CONTINUITY(c)   (1 << (c))
 #define AO_LED_CONTINUITY_MASK (0xf)
 
 #define AO_LED_CONTINUITY(c)   (1 << (c))
 #define AO_LED_CONTINUITY_MASK (0xf)

-#define AO_LED_RX              0x10
-#define AO_LED_TX              0x20
-#define AO_LED_ARMED           0x40
-#define AO_LED_POWER           0x80
-
-#define AO_LED_RED             AO_LED_TX
-#define AO_LED_GREEN           AO_LED_RX
+#define AO_LED_ARMED           0x10
+#define AO_LED_RED             0x20
+#define AO_LED_AMBER           0x40
+#define AO_LED_GREEN           0x80

 
 #define LEDS_AVAILABLE         (0xff)
 #define HAS_EXTERNAL_TEMP      0
 
 #define LEDS_AVAILABLE         (0xff)
 #define HAS_EXTERNAL_TEMP      0