X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_lco.h;h=8f77a8e8e7732fd4d8e1012e1f4ddb3054742a70;hb=1b8bc4e4aadd367c40d33afefb526f1c60c7d118;hp=d5aace0df79f0d1abed1a3c652f072cbc399ace3;hpb=c48d4b60da8b23bf358e6c14d7332d3a360c2d2f;p=fw%2Faltos

diff --git a/src/drivers/ao_lco.h b/src/drivers/ao_lco.h
index d5aace0d..8f77a8e8 100644
--- a/src/drivers/ao_lco.h
+++ b/src/drivers/ao_lco.h
@@ -21,34 +21,58 @@
 
 #include <ao_lco_func.h>
 
+#ifndef AO_LCO_DRAG
+#define AO_LCO_DRAG	1
+#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
-
+#ifdef AO_LCO_DRAG_RACE_BOX
+#define AO_LCO_BOX_DRAG		0		/* Box number to enable drag race mode (old LCO bits) */
+#define AO_LCO_BOX_FIRST	AO_LCO_BOX_DRAG
+#else
+#define AO_LCO_LCO_VOLTAGE	0		/* Box number to show LCO voltage */
+#define AO_LCO_BOX_FIRST	AO_LCO_LCO_VOLTAGE
+#endif
 #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];
+static inline bool
+ao_lco_box_pseudo(uint16_t box)
+{
+	switch (box) {
+#ifdef AO_LCO_LCO_VOLTAGE
+	case AO_LCO_LCO_VOLTAGE:
+		return true;
+#endif
+#ifdef AO_LCO_DRAG_RACE_BOX
+	case AO_LCO_BOX_DRAG:
+		return true;
+#endif
+	default:
+		return false;
+	}
+}
+
+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)
@@ -67,20 +91,32 @@ 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);
 
 void
 ao_lco_step_pad(int8_t dir);
 
+void
+ao_lco_set_box(uint16_t new_box);
+
+void
+ao_lco_step_box(int8_t dir);
+
 void
 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);
 
@@ -101,12 +137,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
@@ -121,16 +157,13 @@ ao_lco_arm_warn(void);
  */
 
 void
-ao_lco_set_pad(uint8_t pad);
-
-void
-ao_lco_set_box(uint16_t box);
+ao_lco_show_pad(uint8_t pad);
 
 void
-ao_lco_set_voltage(uint16_t decivolts);
+ao_lco_show_box(uint16_t box);
 
 void
-ao_lco_set_display(void);
+ao_lco_show(void);
 
 void
 ao_lco_init(void);
@@ -138,4 +171,20 @@ ao_lco_init(void);
 uint8_t
 ao_lco_box_present(uint16_t box);
 
+#ifdef AO_LCO_SEARCH_API
+
+void
+ao_lco_search_start(void);
+
+void
+ao_lco_search_box_check(uint16_t box);
+
+void
+ao_lco_search_box_present(uint16_t box);
+
+void
+ao_lco_search_done(void);
+
+#endif /* AO_LCO_SEARCH_API */
+
 #endif /* _AO_LCO_H_ */