X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelegps-v2.0%2Fao_pins.h;h=7c8c5c3cf5ab313aca129f6c28f43328d7c78a7a;hb=11d6e27bfd94ce58b702bfd0889f064ce1ef5a48;hp=49f51a9c30c570d0fb194ecb72bc121e5671f495;hpb=63eeaada85cb9ddccb0fa9b2d751cc8f46399d9c;p=fw%2Faltos diff --git a/src/telegps-v2.0/ao_pins.h b/src/telegps-v2.0/ao_pins.h index 49f51a9c..7c8c5c3c 100644 --- a/src/telegps-v2.0/ao_pins.h +++ b/src/telegps-v2.0/ao_pins.h @@ -50,6 +50,9 @@ #define HAS_USB 1 #define AO_USB_DIRECTIO 0 #define AO_PA11_PA12_RMP 1 +#define HAS_USB_CONNECT 1 +#define AO_USB_CONNECT_PORT (&stm_gpiob) +#define AO_USB_CONNECT_PIN 3 #define IS_FLASH_LOADER 0 @@ -84,7 +87,7 @@ struct ao_adc { }; #define AO_ADC_DUMP(p) \ - printf("tick: %5u batt: %5d\n", \ + printf("tick: %5lu batt: %5d\n", \ (p)->tick, \ (p)->adc.v_batt) @@ -133,6 +136,7 @@ struct ao_adc { #define AO_CONFIG_DEFAULT_APRS_INTERVAL 0 #define AO_CONFIG_DEFAULT_RADIO_POWER 0xc0 +#define AO_LOG_FORMAT AO_LOG_FORMAT_TELEGPS /* * GPS @@ -154,7 +158,6 @@ struct ao_adc { #define AO_CC1200_SPI_CS_PIN 1 #define AO_CC1200_SPI_BUS AO_SPI_1_PA5_PA6_PA7 #define AO_CC1200_SPI stm_spi1 -#define AO_CC1200_SPI_SPEED AO_SPI_SPEED_6MHz #define AO_CC1200_INT_PORT (&stm_gpioa) #define AO_CC1200_INT_PIN 4