X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Fao_led_stm.c;h=ed4ec1610de3dde8e645725d851231a4b1051671;hb=HEAD;hp=7dcbb661b8a65899860d895025fa8639c99e22e8;hpb=0686a7b8aec524d81bda4c572549a3a068ce0eed;p=fw%2Faltos diff --git a/src/stm/ao_led_stm.c b/src/stm/ao_led_stm.c index 7dcbb661..aa59391b 100644 --- a/src/stm/ao_led_stm.c +++ b/src/stm/ao_led_stm.c @@ -61,33 +61,15 @@ ao_led_off(AO_LED_TYPE colors) void ao_led_set(AO_LED_TYPE colors) { - AO_LED_TYPE on = colors & LEDS_AVAILABLE; - AO_LED_TYPE off = ~colors & LEDS_AVAILABLE; + AO_LED_TYPE on = colors & (AO_LED_TYPE) LEDS_AVAILABLE; + AO_LED_TYPE off = (AO_LED_TYPE) (~colors & (AO_LED_TYPE) LEDS_AVAILABLE); ao_led_off(off); ao_led_on(on); } void -ao_led_toggle(AO_LED_TYPE colors) -{ -#ifdef LED_PORT - LED_PORT->odr ^= (colors & LEDS_AVAILABLE); -#else -#ifdef LED_PORT_0 - LED_PORT_0->odr ^= ((colors & LEDS_AVAILABLE) & LED_PORT_0_MASK) << LED_PORT_0_SHIFT; -#endif -#ifdef LED_PORT_1 - LED_PORT_1->odr ^= ((colors & LEDS_AVAILABLE) & LED_PORT_1_MASK) << LED_PORT_1_SHIFT; -#endif -#ifdef LED_PORT_2 - LED_PORT_2->odr ^= ((colors & LEDS_AVAILABLE) & LED_PORT_2_MASK) << LED_PORT_2_SHIFT; -#endif -#endif -} - -void -ao_led_for(AO_LED_TYPE colors, AO_LED_TYPE ticks) +ao_led_for(AO_LED_TYPE colors, AO_TICK_TYPE ticks) { ao_led_on(colors); ao_delay(ticks); @@ -106,7 +88,7 @@ ao_led_init(void) #ifdef LED_PORT stm_rcc.ahbenr |= (1 << LED_PORT_ENABLE); - LED_PORT->odr &= ~LEDS_AVAILABLE; + LED_PORT->odr &= ~(uint32_t) LEDS_AVAILABLE; #else #ifdef LED_PORT_0 stm_rcc.ahbenr |= (1 << LED_PORT_0_ENABLE);