X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_lco.h;h=50ed068acb2477040fc5630269b181c6db879a7a;hb=f9e319f5a97df8c0950ec7531d0889cf60e53783;hp=3b123793d7ff4d8327e4d837e2ee8dddc7df1867;hpb=ad947ec3f313bbd1295af5dc64f1af9ec09bfe27;p=fw%2Faltos

diff --git a/src/drivers/ao_lco.h b/src/drivers/ao_lco.h
index 3b123793..50ed068a 100644
--- a/src/drivers/ao_lco.h
+++ b/src/drivers/ao_lco.h
@@ -29,7 +29,7 @@
 
 #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
@@ -46,9 +46,42 @@ extern uint8_t	ao_lco_firing;		/* fire button pressed */
 
 extern struct ao_pad_query	ao_pad_query;	/* Last received QUERY from pad */
 
+#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 */
+# ifdef AO_LCO_HAS_CONTRAST
+#  define AO_LCO_CONTRAST	-1
+#  define AO_LCO_BOX_FIRST	AO_LCO_CONTRAST
+# else
+#  define AO_LCO_BOX_FIRST	AO_LCO_LCO_VOLTAGE
+# endif
+#endif
 #define AO_LCO_PAD_VOLTAGE	0		/* Pad number to show box voltage */
 
-extern uint8_t	ao_lco_min_box, ao_lco_max_box;
+static inline bool
+ao_lco_box_pseudo(int16_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
+#ifdef AO_LCO_CONTRAST
+	case AO_LCO_CONTRAST:
+		return true;
+#endif
+	default:
+		return false;
+	}
+}
+
+extern int16_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,10 +100,10 @@ void
 ao_lco_update(void);
 
 uint8_t
-ao_lco_pad_present(uint8_t box, uint8_t pad);
+ao_lco_pad_present(int16_t box, uint8_t pad);
 
 uint8_t
-ao_lco_pad_first(uint8_t box);
+ao_lco_pad_first(int16_t box);
 
 void
 ao_lco_set_pad(uint8_t new_pad);
@@ -79,7 +112,10 @@ void
 ao_lco_step_pad(int8_t dir);
 
 void
-ao_lco_set_box(uint16_t new_box);
+ao_lco_set_box(int16_t new_box);
+
+void
+ao_lco_step_box(int8_t dir);
 
 void
 ao_lco_set_armed(uint8_t armed);
@@ -87,6 +123,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);
 
@@ -130,7 +169,7 @@ void
 ao_lco_show_pad(uint8_t pad);
 
 void
-ao_lco_show_box(uint16_t box);
+ao_lco_show_box(int16_t box);
 
 void
 ao_lco_show(void);
@@ -139,6 +178,30 @@ void
 ao_lco_init(void);
 
 uint8_t
-ao_lco_box_present(uint16_t box);
+ao_lco_box_present(int16_t box);
+
+#ifdef AO_LCO_HAS_CONTRAST
+void
+ao_lco_set_contrast(int16_t contrast);
+
+int16_t
+ao_lco_get_contrast(void);
+#endif
+
+#ifdef AO_LCO_SEARCH_API
+
+void
+ao_lco_search_start(void);
+
+void
+ao_lco_search_box_check(int16_t box);
+
+void
+ao_lco_search_box_present(int16_t box);
+
+void
+ao_lco_search_done(void);
+
+#endif /* AO_LCO_SEARCH_API */
 
 #endif /* _AO_LCO_H_ */