Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / drivers / ao_lco.h

diff --git a/src/drivers/ao_lco.h b/src/drivers/ao_lco.h
index cdc19d3d76837a7d7627d5dd250eb431005733cf..65e9a8c9cb76c4a70a6650eb7145a75682056885 100644 (file)
--- 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
@@ -39,7 +39,7 @@ 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;           /* armed mode active */
 extern uint8_t ao_lco_firing;          /* fire button pressed */
@@ -48,7 +48,7 @@ extern struct ao_pad_query    ao_pad_query;   /* Last received QUERY from pad */
 
 #define AO_LCO_PAD_VOLTAGE     0               /* Pad number to show box voltage */
 
-extern uint8_t ao_lco_min_box, ao_lco_max_box;
+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,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);
@@ -107,12 +107,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