altoslib: fix computation of TeleGPS battery voltage

[fw/altos] / src / telelco-v0.1 / ao_lco.c

diff --git a/src/telelco-v0.1/ao_lco.c b/src/telelco-v0.1/ao_lco.c
index df7f865ba81e06734f54831b123c51419188a8d6..649bf5864504e999e0016d1f51a624a75cf99d68 100644 (file)
--- a/src/telelco-v0.1/ao_lco.c
+++ b/src/telelco-v0.1/ao_lco.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -43,6 +44,7 @@ static uint8_t        ao_lco_box;
 static uint8_t ao_lco_armed;
 static uint8_t ao_lco_firing;
 static uint8_t ao_lco_valid;
+static uint8_t ao_lco_got_channels;
 static uint16_t        ao_lco_tick_offset;
 
 static struct ao_pad_query     ao_pad_query;
@@ -77,7 +79,7 @@ ao_lco_box_present(uint8_t box)
 static uint8_t
 ao_lco_pad_present(uint8_t pad)
 {
-       if (!ao_lco_valid || !ao_pad_query.channels)
+       if (!ao_lco_got_channels || !ao_pad_query.channels)
                return pad == 0;
        if (pad >= AO_PAD_MAX_CHANNELS)
                return 0;
@@ -151,7 +153,7 @@ ao_lco_input(void)
                                        ao_quadrature_count[AO_QUADRATURE_PAD] = new_box;
                                        if (ao_lco_box != new_box) {
                                                ao_lco_box = new_box;
-                                               ao_lco_valid = 0;
+                                               ao_lco_got_channels = 0;
                                                ao_lco_set_box();
                                        }
                                }
@@ -213,13 +215,15 @@ ao_lco_update(void)
 
        r = ao_lco_query(ao_lco_box, &ao_pad_query, &ao_lco_tick_offset);
        if (r == AO_RADIO_CMAC_OK) {
-               c = ao_lco_valid;
+               c = ao_lco_got_channels;
+               ao_lco_got_channels = 1;
                ao_lco_valid = 1;
                if (!c) {
                        ao_lco_pad = ao_lco_pad_first();
                        ao_lco_set_pad();
                }
-       }
+       } else
+               ao_lco_valid = 0;
 
 #if 0
        PRINTD("lco_query success arm_status %d i0 %d i1 %d i2 %d i3 %d\n",
@@ -266,6 +270,7 @@ ao_lco_search(void)
        else
                ao_lco_min_box = ao_lco_max_box = ao_lco_box = 0;
        ao_lco_valid = 0;
+       ao_lco_got_channels = 0;
        ao_lco_pad = 0;
 }
 
@@ -276,9 +281,7 @@ ao_lco_igniter_status(void)
        uint16_t        delay;
 
        for (;;) {
-//             ao_alarm(delay);
                ao_sleep(&ao_pad_query);
-//             ao_clear_alarm();
                if (!ao_lco_valid) {
                        ao_led_on(AO_LED_RED);
                        ao_led_off(AO_LED_GREEN);
@@ -360,9 +363,7 @@ ao_lco_monitor(void)
                        delay = AO_MS_TO_TICKS(100);
                else
                        delay = AO_SEC_TO_TICKS(1);
-               ao_alarm(delay);
-               ao_sleep(&ao_lco_armed);
-               ao_clear_alarm();
+               ao_sleep_for(&ao_lco_armed, delay);
        }
 }