X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_lco.h;h=03c810be49fe7f0bfe6a9210323ff342735ad93d;hb=edbe6cca1e6b68bcc90064cd70529a9f9b0f9632;hp=c1b101d2335ecc35e6b9c4de687e1d03ec48e928;hpb=3b53a69e47816ee987a409b05a6b0b47891ca816;p=fw%2Faltos

diff --git a/src/drivers/ao_lco.h b/src/drivers/ao_lco.h
index c1b101d2..03c810be 100644
--- a/src/drivers/ao_lco.h
+++ b/src/drivers/ao_lco.h
@@ -25,38 +25,30 @@
 #define AO_LCO_DRAG	1
 #endif
 
-#if AO_LCO_DRAG
-#define AO_LCO_BOX_DRAG		0x1000
-#endif
-
 #define DEBUG	1
 
 #if DEBUG
 extern uint8_t	ao_lco_debug;
-#define PRINTD(...) do { if (!ao_lco_debug) break; printf ("\r%5u %s: ", ao_tick_count, __func__); printf(__VA_ARGS__); flush(); } while(0)
+#define PRINTD(...) do { if (!ao_lco_debug) break; printf ("\r%5lu %s: ", (unsigned long) ao_tick_count, __func__); printf(__VA_ARGS__); flush(); } while(0)
 #else
 #define PRINTD(...) 
 #endif
 
-extern uint8_t	ao_lco_drag_race;	/* TRUE when drag race mode enabled */
+#if AO_LCO_DRAG
+extern uint8_t	ao_lco_drag_race;	/* true when drag race mode enabled */
+#endif
+
 extern uint8_t	ao_lco_pad;		/* Currently selected pad */
-extern int16_t	ao_lco_box;		/* Currently selected box */
+extern uint16_t	ao_lco_box;		/* Currently selected box */
 
-extern uint8_t	ao_lco_armed;
-extern uint8_t	ao_lco_firing;
+extern uint8_t	ao_lco_armed;		/* armed mode active */
+extern uint8_t	ao_lco_firing;		/* fire button pressed */
 
 extern struct ao_pad_query	ao_pad_query;	/* Last received QUERY from pad */
 
-#define AO_LCO_VALID_LAST	1
-#define AO_LCO_VALID_EVER	2
-
 #define AO_LCO_PAD_VOLTAGE	0		/* Pad number to show box voltage */
 
-extern uint8_t	ao_lco_min_box, ao_lco_max_box;
-extern uint8_t	ao_lco_selected[AO_PAD_MAX_BOXES];
-extern uint8_t	ao_lco_valid[AO_PAD_MAX_BOXES];
-extern uint8_t	ao_lco_channels[AO_PAD_MAX_BOXES];
-extern uint16_t	ao_lco_tick_offset[AO_PAD_MAX_BOXES];
+extern uint16_t	ao_lco_min_box, ao_lco_max_box;
 
 #define AO_LCO_MASK_SIZE(n)	(((n) + 7) >> 3)
 #define AO_LCO_MASK_ID(n)	((n) >> 3)
@@ -75,10 +67,10 @@ void
 ao_lco_update(void);
 
 uint8_t
-ao_lco_pad_present(uint8_t box, uint8_t pad);
+ao_lco_pad_present(uint16_t box, uint8_t pad);
 
 uint8_t
-ao_lco_pad_first(uint8_t box);
+ao_lco_pad_first(uint16_t box);
 
 void
 ao_lco_set_pad(uint8_t new_pad);
@@ -95,6 +87,9 @@ ao_lco_set_armed(uint8_t armed);
 void
 ao_lco_set_firing(uint8_t firing);
 
+void
+ao_lco_pretend(void);
+
 void
 ao_lco_toggle_drag(void);
 
@@ -115,12 +110,12 @@ void
 ao_lco_drag_disable(void);
 
 /* Handle drag beeps, return new delay */
-uint16_t
-ao_lco_drag_beep_check(uint16_t now, uint16_t delay);
+AO_TICK_TYPE
+ao_lco_drag_beep_check(AO_TICK_TYPE now, AO_TICK_TYPE delay);
 
 /* Check if it's time to beep during drag race. Return new delay */
-uint16_t
-ao_lco_drag_warn_check(uint16_t now, uint16_t delay);
+AO_TICK_TYPE
+ao_lco_drag_warn_check(AO_TICK_TYPE now, AO_TICK_TYPE delay);
 
 /* Request 'beeps' additional drag race beeps */
 void
@@ -141,10 +136,7 @@ void
 ao_lco_show_box(uint16_t box);
 
 void
-ao_lco_show_voltage(uint16_t decivolts);
-
-void
-ao_lco_show_display(void);
+ao_lco_show(void);
 
 void
 ao_lco_init(void);