X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelelco-v2.0%2Fao_lco_v2.c;h=78849bc9b43bc00f551a70133aef6fbdcd66327a;hb=92bbfacb64568b3b6d132ba23e17dc57da582626;hp=daecf380260a2e82e277e6091a267921c5d06c5f;hpb=2cdb1f30c49ba460b0850d23ba9c85e0336af290;p=fw%2Faltos

diff --git a/src/telelco-v2.0/ao_lco_v2.c b/src/telelco-v2.0/ao_lco_v2.c
index daecf380..78849bc9 100644
--- a/src/telelco-v2.0/ao_lco_v2.c
+++ b/src/telelco-v2.0/ao_lco_v2.c
@@ -33,6 +33,9 @@
 
 /* UI values */
 static uint8_t	ao_lco_select_mode;
+static uint8_t	ao_lco_event_debug;
+
+#define PRINTE(...) do { if (!ao_lco_debug && !ao_lco_event_debug) break; printf ("\r%5lu %s: ", (unsigned long) ao_tick_count, __func__); printf(__VA_ARGS__); flush(); } while(0)
 #define AO_LCO_SELECT_PAD	0
 #define AO_LCO_SELECT_BOX	1
 
@@ -42,7 +45,7 @@ void
 ao_lco_show_pad(uint8_t pad)
 {
 	ao_mutex_get(&ao_lco_display_mutex);
-	ao_seven_segment_set(AO_LCO_PAD_DIGIT, pad | (ao_lco_drag_race << 4));
+	ao_seven_segment_set(AO_LCO_PAD_DIGIT, (uint8_t) (pad | (ao_lco_drag_race << 4)));
 	ao_mutex_put(&ao_lco_display_mutex);
 }
 
@@ -67,8 +70,8 @@ void
 ao_lco_show_box(uint16_t box)
 {
 	ao_mutex_get(&ao_lco_display_mutex);
-	ao_seven_segment_set(AO_LCO_BOX_DIGIT_1, box % 10 | (ao_lco_drag_race << 4));
-	ao_seven_segment_set(AO_LCO_BOX_DIGIT_10, box / 10 | (ao_lco_drag_race << 4));
+	ao_seven_segment_set(AO_LCO_BOX_DIGIT_1, (uint8_t) (box % 10 | (ao_lco_drag_race << 4)));
+	ao_seven_segment_set(AO_LCO_BOX_DIGIT_10, (uint8_t) (box / 10 | (ao_lco_drag_race << 4)));
 	ao_mutex_put(&ao_lco_display_mutex);
 }
 
@@ -78,9 +81,9 @@ ao_lco_show_voltage(uint16_t decivolts)
 	uint8_t	tens, ones, tenths;
 
 	PRINTD("voltage %d\n", decivolts);
-	tenths = decivolts % 10;
-	ones = (decivolts / 10) % 10;
-	tens = (decivolts / 100) % 10;
+	tenths = (uint8_t) (decivolts % 10);
+	ones = (uint8_t) ((decivolts / 10) % 10);
+	tens = (uint8_t) ((decivolts / 100) % 10);
 	ao_mutex_get(&ao_lco_display_mutex);
 	ao_seven_segment_set(AO_LCO_PAD_DIGIT, tenths);
 	ao_seven_segment_set(AO_LCO_BOX_DIGIT_1, ones | 0x10);
@@ -132,7 +135,7 @@ ao_lco_set_select(void)
 static void
 ao_lco_step_box(int8_t dir)
 {
-	int16_t new_box = ao_lco_box;
+	int32_t new_box = (int32_t) ao_lco_box;
 
 	do {
 		new_box += dir;
@@ -142,8 +145,8 @@ ao_lco_step_box(int8_t dir)
 			new_box = ao_lco_max_box;
 		if (new_box == ao_lco_box)
 			break;
-	} while (!ao_lco_box_present(new_box));
-	ao_lco_set_box(new_box);
+	} while (!ao_lco_box_present((uint16_t) new_box));
+	ao_lco_set_box((uint16_t) new_box);
 }
 
 static struct ao_task	ao_lco_drag_task;
@@ -151,18 +154,18 @@ static struct ao_task	ao_lco_drag_task;
 static void
 ao_lco_drag_monitor(void)
 {
-	uint16_t	delay = ~0;
-	uint16_t	now;
+	AO_TICK_TYPE	delay = ~0UL;
+	AO_TICK_TYPE	now;
 
 	ao_beep_for(AO_BEEP_MID, AO_MS_TO_TICKS(200));
 	for (;;) {
-		PRINTD("Drag monitor count %d delay %d\n", ao_lco_drag_beep_count, delay);
-		if (delay == (uint16_t) ~0)
+		PRINTD("Drag monitor count %d delay %lu\n", ao_lco_drag_beep_count, (unsigned long) delay);
+		if (delay == (AO_TICK_TYPE) ~0)
 			ao_sleep(&ao_lco_drag_beep_count);
 		else
 			ao_sleep_for(&ao_lco_drag_beep_count, delay);
 
-		delay = ~0;
+		delay = ~0UL;
 		now = ao_time();
 		delay = ao_lco_drag_warn_check(now, delay);
 		delay = ao_lco_drag_beep_check(now, delay);
@@ -176,8 +179,8 @@ ao_lco_input(void)
 
 	for (;;) {
 		ao_event_get(&event);
-		PRINTD("event type %d unit %d value %d\n",
-		       event.type, event.unit, event.value);
+		PRINTE("event type %d unit %d value %ld\n",
+		       event.type, event.unit, (long) event.value);
 		switch (event.type) {
 		case AO_EVENT_QUADRATURE:
 			switch (event.unit) {
@@ -200,12 +203,12 @@ ao_lco_input(void)
 		case AO_EVENT_BUTTON:
 			switch (event.unit) {
 			case AO_BUTTON_ARM:
-				ao_lco_set_armed(event.value);
+				ao_lco_set_armed((uint8_t) event.value);
 				ao_lco_set_select();
 				break;
 			case AO_BUTTON_FIRE:
 				if (ao_lco_armed)
-					ao_lco_set_firing(event.value);
+					ao_lco_set_firing((uint8_t) event.value);
 				break;
 			case AO_BUTTON_DRAG_SELECT:
 				if (event.value)
@@ -236,7 +239,7 @@ ao_lco_input(void)
  * visually inspect the system for correct operation
  */
 static void
-ao_lco_display_test()
+ao_lco_display_test(void)
 {
 	ao_mutex_get(&ao_lco_display_mutex);
 	ao_seven_segment_set(AO_LCO_PAD_DIGIT, 8 | 0x10);
@@ -256,7 +259,7 @@ ao_lco_batt_voltage(void)
 
 	ao_adc_single_get(&packet);
 	decivolt = ao_battery_decivolt(packet.v_batt);
-	ao_lco_show_voltage(decivolt);
+	ao_lco_show_voltage((uint16_t) decivolt);
 	ao_delay(AO_MS_TO_TICKS(1000));
 }
 
@@ -279,17 +282,20 @@ ao_lco_main(void)
 }
 
 #if DEBUG
-void
+static void
 ao_lco_set_debug(void)
 {
-	uint16_t r = ao_cmd_decimal();
-	if (ao_cmd_status == ao_cmd_success)
-		ao_lco_debug = r != 0;
+	uint32_t r = ao_cmd_decimal();
+	if (ao_cmd_status == ao_cmd_success){
+		ao_lco_debug = r & 1;
+		ao_lco_event_debug = (r & 2) >> 1;
+	}
 }
 
 const struct ao_cmds ao_lco_cmds[] = {
 	{ ao_lco_set_debug,	"D <0 off, 1 on>\0Debug" },
 	{ ao_lco_search,	"s\0Search for pad boxes" },
+	{ ao_lco_pretend,	"p\0Pretend there are lots of pad boxes" },
 	{ 0, NULL }
 };
 #endif