projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telefire: Add cast to AO_LED_CONTINUITY to eliminate -Wconversion warning
[fw/altos]
/
src
/
telegps-v2.0
/
ao_pins.h
diff --git
a/src/telegps-v2.0/ao_pins.h
b/src/telegps-v2.0/ao_pins.h
index 87b49934d51b082299590bd26b818919e3ac9fe4..7c8c5c3cf5ab313aca129f6c28f43328d7c78a7a 100644
(file)
--- a/
src/telegps-v2.0/ao_pins.h
+++ b/
src/telegps-v2.0/ao_pins.h
@@
-33,11
+33,11
@@
#define IS_FLASH_LOADER 0
#define HAS_BEEP 0
#define IS_FLASH_LOADER 0
#define HAS_BEEP 0
-#define AO_HSE
32
000000
+#define AO_HSE
16
000000
#define AO_RCC_CFGR_PLLMUL STM_RCC_CFGR_PLLMUL_3
#define AO_RCC_CFGR_PLLMUL STM_RCC_CFGR_PLLMUL_3
-#define AO_RCC_CFGR2_PLLDIV STM_RCC_CFGR2_PREDIV_
2
+#define AO_RCC_CFGR2_PLLDIV STM_RCC_CFGR2_PREDIV_
1
#define AO_PLLMUL 3
#define AO_PLLMUL 3
-#define AO_PLLDIV
2
+#define AO_PLLDIV
1
/* HCLK = 48MHz */
#define AO_AHB_PRESCALER 1
/* HCLK = 48MHz */
#define AO_AHB_PRESCALER 1
@@
-50,6
+50,9
@@
#define HAS_USB 1
#define AO_USB_DIRECTIO 0
#define AO_PA11_PA12_RMP 1
#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
#define IS_FLASH_LOADER 0
@@
-84,7
+87,7
@@
struct ao_adc {
};
#define AO_ADC_DUMP(p) \
};
#define AO_ADC_DUMP(p) \
- printf("tick: %5u batt: %5d\n", \
+ printf("tick: %5
l
u batt: %5d\n", \
(p)->tick, \
(p)->adc.v_batt)
(p)->tick, \
(p)->adc.v_batt)
@@
-103,13
+106,15
@@
struct ao_adc {
#define AO_M25_SPI_BUS AO_SPI_1_PA5_PA6_PA7
/* Serial */
#define AO_M25_SPI_BUS AO_SPI_1_PA5_PA6_PA7
/* Serial */
-#define HAS_SERIAL_1
1
+#define HAS_SERIAL_1
0
#define SERIAL_1_PB6_PB7 1
#define USE_SERIAL_1_STDIN 0
#define SERIAL_1_PB6_PB7 1
#define USE_SERIAL_1_STDIN 0
-#define HAS_SERIAL_2 1
+#define HAS_SERIAL_2 1
#define SERIAL_2_PA2_PA3 1
#define USE_SERIAL_2_STDIN 0
#define SERIAL_2_PA2_PA3 1
#define USE_SERIAL_2_STDIN 0
+#define USE_SERIAL_2_FLOW 0
+#define USE_SERIAL_2_SW_FLOW 0
#define ao_gps_getchar ao_serial2_getchar
#define ao_gps_putchar ao_serial2_putchar
#define ao_gps_getchar ao_serial2_getchar
#define ao_gps_putchar ao_serial2_putchar
@@
-131,6
+136,7
@@
struct ao_adc {
#define AO_CONFIG_DEFAULT_APRS_INTERVAL 0
#define AO_CONFIG_DEFAULT_RADIO_POWER 0xc0
#define AO_CONFIG_DEFAULT_APRS_INTERVAL 0
#define AO_CONFIG_DEFAULT_RADIO_POWER 0xc0
+#define AO_LOG_FORMAT AO_LOG_FORMAT_TELEGPS
/*
* GPS
/*
* GPS
@@
-152,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_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
#define AO_CC1200_INT_PORT (&stm_gpioa)
#define AO_CC1200_INT_PIN 4