altos/telefire,telelco: Add HAS_RADIO_RATE to launch system software

This lets us set the rate to a lower value to improve range. 9600 baud
works great; 2400 baud makes the initial search take a long time.

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

diff --git a/src/drivers/ao_lco_func.c b/src/drivers/ao_lco_func.c
index 9e64283696eaf3c25c68510764e57c79750ca1f4..32c00068a58d9d89b0a5c29358458afc6c332c1d 100644 (file)
--- a/src/drivers/ao_lco_func.c
+++ b/src/drivers/ao_lco_func.c
@@ -28,7 +28,21 @@ ao_lco_query(uint16_t box, struct ao_pad_query *query, uint16_t *tick_offset)
 {
        int8_t          r;
        uint16_t        sent_time;
+       uint16_t        timeout = AO_MS_TO_TICKS(10);
 
+#if HAS_RADIO_RATE
+       switch (ao_config.radio_rate) {
+       case AO_RADIO_RATE_38400:
+       default:
+               break;
+       case AO_RADIO_RATE_9600:
+               timeout = AO_MS_TO_TICKS(20);
+               break;
+       case AO_RADIO_RATE_2400:
+               timeout = AO_MS_TO_TICKS(80);
+               break;
+       }
+#endif
        ao_mutex_get(&ao_lco_mutex);
        command.tick = ao_time() - *tick_offset;
        command.box = box;
@@ -36,7 +50,7 @@ ao_lco_query(uint16_t box, struct ao_pad_query *query, uint16_t *tick_offset)
        command.channels = 0;
        ao_radio_cmac_send(&command, sizeof (command));
        sent_time = ao_time();
-       r = ao_radio_cmac_recv(query, sizeof (*query), AO_MS_TO_TICKS(10));
+       r = ao_radio_cmac_recv(query, sizeof (*query), timeout);
        if (r == AO_RADIO_CMAC_OK)
                *tick_offset = sent_time - query->tick;
        ao_mutex_put(&ao_lco_mutex);

diff --git a/src/telefire-v0.2/ao_pins.h b/src/telefire-v0.2/ao_pins.h
index 9e6631ce246131d767c88c63059d17385773bd10..ef2d4822087e9f59157513890f9e0ea418fd4239 100644 (file)
--- a/src/telefire-v0.2/ao_pins.h
+++ b/src/telefire-v0.2/ao_pins.h
@@ -19,6 +19,7 @@
 #define _AO_PINS_H_
 
 #define HAS_RADIO              1
+#define HAS_RADIO_RATE         1
 #define HAS_TELEMETRY          0
 
 #define HAS_FLIGHT             0

diff --git a/src/telelco-v0.2/ao_lco.c b/src/telelco-v0.2/ao_lco.c
index b3f5bb169cab5bf7a8a573672c1baf87d37f7991..4b5f7a9bbec58205ff7bf24d4a881563fad42f61 100644 (file)
--- a/src/telelco-v0.2/ao_lco.c
+++ b/src/telelco-v0.2/ao_lco.c
@@ -258,7 +258,7 @@ ao_lco_search(void)
        for (box = 0; box < AO_PAD_MAX_BOXES; box++) {
                if ((box % 10) == 0)
                        ao_lco_set_box(box);
-               for (try = 0; try < 5; try++) {
+               for (try = 0; try < 3; try++) {
                        tick_offset = 0;
                        r = ao_lco_query(box, &ao_pad_query, &tick_offset);
                        PRINTD("box %d result %d\n", box, r);

diff --git a/src/telelco-v0.2/ao_pins.h b/src/telelco-v0.2/ao_pins.h
index a6fd4ff8fc2c681412025d8a03795c4fd5dfb434..da790b142e9b0990f1566bc30c2e87e157e816ea 100644 (file)
--- a/src/telelco-v0.2/ao_pins.h
+++ b/src/telelco-v0.2/ao_pins.h
@@ -48,6 +48,7 @@
 #define HAS_USB                        1
 #define HAS_BEEP               1
 #define HAS_RADIO              1
+#define HAS_RADIO_RATE         1
 #define HAS_TELEMETRY          0
 #define HAS_AES                        1