X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelelco-v0.2%2Fao_lco.c;h=12a247bf05dfaa59d2d74a6c39a671ae6b993d4e;hb=ec2d758844202108b446e6b12ec1da8812ceb265;hp=e8d16ca93cfdaf24b0c9a237b2f407571bb0899e;hpb=15063cbb8f76bffea71575d295ca87b7ceca36d8;p=fw%2Faltos

diff --git a/src/telelco-v0.2/ao_lco.c b/src/telelco-v0.2/ao_lco.c
index e8d16ca9..12a247bf 100644
--- a/src/telelco-v0.2/ao_lco.c
+++ b/src/telelco-v0.2/ao_lco.c
@@ -37,7 +37,6 @@ static uint8_t	ao_lco_debug;
 #define AO_LCO_BOX_DIGIT_10	2
 
 static uint8_t	ao_lco_min_box, ao_lco_max_box;
-static uint8_t	ao_lco_mutex;
 static uint8_t	ao_lco_pad;
 static uint8_t	ao_lco_box;
 static uint8_t	ao_lco_armed;
@@ -252,18 +251,22 @@ ao_lco_search(void)
 {
 	uint16_t	tick_offset;
 	int8_t		r;
+	int8_t		try;
 	uint8_t		box;
 
 	ao_lco_box_reset_present();
 	for (box = 0; box < AO_PAD_MAX_BOXES; box++) {
 		if ((box % 10) == 0)
 			ao_lco_set_box(box);
-		tick_offset = 0;
-		r = ao_lco_query(box, &ao_pad_query, &tick_offset);
-		PRINTD("box %d result %d\n", box, r);
-		if (r == AO_RADIO_CMAC_OK) {
-			ao_lco_box_set_present(box);
-			ao_delay(AO_MS_TO_TICKS(30));
+		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);
+			if (r == AO_RADIO_CMAC_OK) {
+				ao_lco_box_set_present(box);
+				ao_delay(AO_MS_TO_TICKS(30));
+				break;
+			}
 		}
 	}
 	if (ao_lco_min_box <= ao_lco_max_box)
@@ -281,12 +284,9 @@ static void
 ao_lco_igniter_status(void)
 {
 	uint8_t		c;
-	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|AO_LED_AMBER);
@@ -369,9 +369,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);
 	}
 }