X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftelefireone-v1.0%2Fao_pins.h;h=0d8a206ced3a4baa77a566dab2217857d04ad50e;hb=52e9443d540aa5d3f29576a0440149b1b0f9c359;hp=cd8eb65861d3b4b7d8bc460a3fa489524c1246fd;hpb=2e468bfbf9f430b6a3970283d818ea4405ccfc5b;p=fw%2Faltos diff --git a/src/telefireone-v1.0/ao_pins.h b/src/telefireone-v1.0/ao_pins.h index cd8eb658..0d8a206c 100644 --- a/src/telefireone-v1.0/ao_pins.h +++ b/src/telefireone-v1.0/ao_pins.h @@ -123,7 +123,6 @@ #define AO_CC1200_SPI_CS_PIN 7 #define AO_CC1200_SPI_BUS AO_SPI_2_PB13_PB14_PB15 #define AO_CC1200_SPI stm_spi2 -#define AO_CC1200_SPI_SPEED AO_SPI_SPEED_FAST #define AO_CC1200_INT_PORT (&stm_gpiob) #define AO_CC1200_INT_PIN (11) @@ -154,7 +153,7 @@ #define LED_PIN_ARMED 5 #define AO_LED_ARMED (1 << LED_PIN_ARMED) -#define AO_LED_CONTINUITY(c) (1 << (4 - (c))) +#define AO_LED_CONTINUITY(c) ((AO_LED_TYPE) (1 << (4 - (c)))) #define AO_LED_CONTINUITY_MASK (0x1 << 4) #define LEDS_AVAILABLE (LED_PORT_0_MASK|LED_PORT_1_MASK) @@ -232,7 +231,7 @@ struct ao_adc { }; #define AO_ADC_DUMP(p) \ - printf ("tick: %5u 0: %5d pyro: %5d batt %5d thrust %5d pressure %5d\n", \ + printf ("tick: %5lu 0: %5d pyro: %5d batt %5d thrust %5d pressure %5d\n", \ (p)->tick, \ (p)->adc.sense[0], \ (p)->adc.pyro, \