/* 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
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);
}
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);
}
-void
+static void
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);
}
void
-ao_lco_show_display(void)
+ao_lco_show(void)
{
if (ao_lco_pad == AO_LCO_PAD_VOLTAGE) {
ao_lco_show_voltage(ao_pad_query.battery);
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;
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;
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);
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) {
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)
* 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);
ao_seven_segment_set(AO_LCO_BOX_DIGIT_1, 8 | 0x10);
ao_seven_segment_set(AO_LCO_BOX_DIGIT_10, 8 | 0x10);
ao_mutex_put(&ao_lco_display_mutex);
- ao_led_on(LEDS_AVAILABLE);
+ ao_led_on(AO_LEDS_AVAILABLE);
ao_delay(AO_MS_TO_TICKS(1000));
- ao_led_off(LEDS_AVAILABLE);
+ ao_led_off(AO_LEDS_AVAILABLE);
}
static 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));
}
}
#if DEBUG
-void
+static void
ao_lco_set_debug(void)
{
- ao_cmd_decimal();
- if (ao_cmd_status == ao_cmd_success)
- ao_lco_debug = ao_cmd_lex_i != 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;
+ }
}
-__code struct ao_cmds ao_lco_cmds[] = {
+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