X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_lco.c;h=2cb885cfc336996f7b5a3e56e4686ed48ed26c8a;hb=HEAD;hp=e892c8c045d3ad584edfc87c5149750f4935f7bf;hpb=ad9d6677231ccbfa09a528387f306f5364f9d608;p=fw%2Faltos diff --git a/src/drivers/ao_lco.c b/src/drivers/ao_lco.c index e892c8c0..f6bd630d 100644 --- a/src/drivers/ao_lco.c +++ b/src/drivers/ao_lco.c @@ -34,19 +34,17 @@ #define AO_LCO_DRAG_RACE_START_TIME AO_SEC_TO_TICKS(5) #define AO_LCO_DRAG_RACE_STOP_TIME AO_SEC_TO_TICKS(2) -#define AO_LCO_BOX_DRAG 0x1000 - /* UI values */ -static uint16_t ao_lco_fire_tick; +static AO_TICK_TYPE ao_lco_fire_tick; static uint8_t ao_lco_fire_down; static uint8_t ao_lco_display_mutex; void -ao_lco_show_pad(uint8_t pad) +ao_lco_show_pad(int8_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); } @@ -68,15 +66,15 @@ ao_lco_show_pad(uint8_t pad) (0 << 6)) void -ao_lco_show_box(uint16_t box) +ao_lco_show_box(int16_t box) { ao_mutex_get(&ao_lco_display_mutex); if (box == AO_LCO_BOX_DRAG) { - ao_seven_segment_direct(AO_LCO_BOX_DIGIT_10, SEVEN_SEGMENT_d | (ao_lco_drag_race << 7)); - ao_seven_segment_direct(AO_LCO_BOX_DIGIT_1, SEVEN_SEGMENT_r | (ao_lco_drag_race << 7)); + ao_seven_segment_direct(AO_LCO_BOX_DIGIT_10, (uint8_t) (SEVEN_SEGMENT_d | (ao_lco_drag_race << 7))); + ao_seven_segment_direct(AO_LCO_BOX_DIGIT_1, (uint8_t) (SEVEN_SEGMENT_r | (ao_lco_drag_race << 7))); } else { - 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); } @@ -86,9 +84,9 @@ ao_lco_show_voltage(uint16_t decivolts) { uint8_t tens, ones, tenths; - 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); @@ -103,31 +101,20 @@ ao_lco_show(void) ao_lco_show_voltage(ao_pad_query.battery); } else { if (ao_lco_box == AO_LCO_BOX_DRAG) - ao_lco_show_pad(ao_lco_drag_race); + ao_lco_show_pad((int8_t) ao_lco_drag_race); else ao_lco_show_pad(ao_lco_pad); ao_lco_show_box(ao_lco_box); } } -uint8_t -ao_lco_box_present(uint16_t box) -{ - if (box == AO_LCO_BOX_DRAG) - return 1; - - if (box >= AO_PAD_MAX_BOXES) - return 0; - return (ao_lco_box_mask[AO_LCO_MASK_ID(box)] >> AO_LCO_MASK_SHIFT(box)) & 1; -} - static struct ao_task ao_lco_drag_task; static uint8_t ao_lco_drag_active; -static uint16_t -ao_lco_drag_button_check(uint16_t now, uint16_t delay) +static AO_TICK_TYPE +ao_lco_drag_button_check(AO_TICK_TYPE now, AO_TICK_TYPE delay) { - uint16_t button_delay = ~0; + AO_TICK_TYPE button_delay = ~0UL; /* * Check to see if the button has been held down long enough @@ -135,14 +122,14 @@ ao_lco_drag_button_check(uint16_t now, uint16_t delay) */ if (ao_lco_fire_down) { if (ao_lco_drag_race) { - if ((int16_t) (now - ao_lco_fire_tick) >= AO_LCO_DRAG_RACE_STOP_TIME) { + if ((AO_TICK_SIGNED) (now - ao_lco_fire_tick) >= (AO_TICK_SIGNED) AO_LCO_DRAG_RACE_STOP_TIME) { ao_lco_drag_disable(); ao_lco_fire_down = 0; } else button_delay = ao_lco_fire_tick + AO_LCO_DRAG_RACE_STOP_TIME - now; } else { - if ((int16_t) (now - ao_lco_fire_tick) >= AO_LCO_DRAG_RACE_START_TIME) { + if ((AO_TICK_SIGNED) (now - ao_lco_fire_tick) >= (AO_TICK_SIGNED) AO_LCO_DRAG_RACE_START_TIME) { ao_lco_drag_enable(); ao_lco_fire_down = 0; } @@ -158,19 +145,19 @@ ao_lco_drag_button_check(uint16_t now, uint16_t delay) 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 active %d delay %d\n", - ao_lco_drag_beep_count, ao_lco_drag_active, delay); - if (delay == (uint16_t) ~0) + PRINTD("Drag monitor count %d active %d delay %lu\n", + ao_lco_drag_beep_count, ao_lco_drag_active, (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; if (!ao_lco_drag_active) continue; @@ -181,35 +168,12 @@ ao_lco_drag_monitor(void) /* check to see if there's anything left to do here */ if (!ao_lco_fire_down && !ao_lco_drag_race && !ao_lco_drag_beep_count) { - delay = ~0; + delay = ~0UL; ao_lco_drag_active = 0; } } } -static void -ao_lco_step_box(int8_t dir) -{ - int16_t new_box = ao_lco_box; - do { - if (new_box == AO_LCO_BOX_DRAG) { - if (dir < 0) - new_box = ao_lco_max_box; - else - new_box = ao_lco_min_box; - } else { - new_box += dir; - if (new_box > ao_lco_max_box) - new_box = AO_LCO_BOX_DRAG; - else if (new_box < ao_lco_min_box) - new_box = AO_LCO_BOX_DRAG; - } - if (new_box == ao_lco_box) - break; - } while (!ao_lco_box_present(new_box)); - ao_lco_set_box(new_box); -} - static void ao_lco_input(void) { @@ -217,8 +181,8 @@ ao_lco_input(void) for (;;) { ao_event_get(&event); - PRINTD("event type %d unit %d value %d\n", - event.type, event.unit, event.value); + PRINTD("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) { @@ -235,12 +199,12 @@ ao_lco_input(void) 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); break; case AO_BUTTON_FIRE: if (ao_lco_armed) { ao_lco_fire_down = 0; - ao_lco_set_firing(event.value); + ao_lco_set_firing((uint8_t) event.value); } else { if (event.value) { if (ao_lco_box == AO_LCO_BOX_DRAG) { @@ -269,7 +233,7 @@ ao_lco_input(void) * 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); @@ -290,7 +254,7 @@ ao_lco_batt_voltage(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)); } #endif @@ -316,15 +280,15 @@ ao_lco_main(void) } #if DEBUG -void +static void ao_lco_set_debug(void) { - ao_cmd_decimal(); + uint32_t r = ao_cmd_decimal(); if (ao_cmd_status == ao_cmd_success) - ao_lco_debug = ao_cmd_lex_i != 0; + ao_lco_debug = r != 0; } -__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" }, { 0, NULL }