X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelefiretwo-v0.1%2Fao_pins.h;h=baf051a45d0a4f6fa72ed2d72e31031ac32835c9;hb=52e9443d540aa5d3f29576a0440149b1b0f9c359;hp=dedd0fad3ece4345d47e0c35f665518a6965e739;hpb=99642f9c4f89aa5577376a9cd118e7cff26e2762;p=fw%2Faltos diff --git a/src/telefiretwo-v0.1/ao_pins.h b/src/telefiretwo-v0.1/ao_pins.h index dedd0fad..baf051a4 100644 --- a/src/telefiretwo-v0.1/ao_pins.h +++ b/src/telefiretwo-v0.1/ao_pins.h @@ -110,7 +110,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) @@ -142,7 +141,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 (0x3 << 3) #define LEDS_AVAILABLE (LED_PORT_0_MASK|LED_PORT_1_MASK) @@ -211,7 +210,7 @@ struct ao_adc { }; #define AO_ADC_DUMP(p) \ - printf ("tick: %5u 0: %5d 1: %5d pyro: %5d batt %5d\n", \ + printf ("tick: %5lu 0: %5d 1: %5d pyro: %5d batt %5d\n", \ (p)->tick, \ (p)->adc.sense[0], \ (p)->adc.sense[1], \