X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelegps-v2.0%2Fao_pins.h;h=a2e812fa51f5570762b07d0e1c8b16004ea0c9b1;hb=98ea690cc7514f43254f3a6c72668c11820f657c;hp=059fc9fa9dd18e5536ea76e905bda03290bcc164;hpb=7ace97885c4924de049ff20a40fd9ec234b6577b;p=fw%2Faltos

diff --git a/src/telegps-v2.0/ao_pins.h b/src/telegps-v2.0/ao_pins.h
index 059fc9fa..a2e812fa 100644
--- 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 AO_HSE                  32000000
+#define AO_HSE                  16000000
 #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_PLLDIV               2
+#define AO_PLLDIV               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_CONNECT			1
+#define AO_USB_CONNECT_PORT		(&stm_gpiob)
+#define AO_USB_CONNECT_PIN		3
 
 #define IS_FLASH_LOADER 0
 
@@ -102,14 +105,20 @@ struct ao_adc {
 #define AO_M25_SPI_CS_MASK      (1 << 0)
 #define AO_M25_SPI_BUS          AO_SPI_1_PA5_PA6_PA7
 
-#define HAS_SERIAL_1		1
+/* Serial */
+#define HAS_SERIAL_1		0
 #define SERIAL_1_PB6_PB7	1
 #define USE_SERIAL_1_STDIN	0
 
-#define ao_gps_getchar		ao_serial1_getchar
-#define ao_gps_putchar		ao_serial1_putchar
-#define ao_gps_set_speed	ao_serial1_set_speed
-#define ao_gps_fifo		(ao_usart_rx_fifo)
+#define HAS_SERIAL_2	       	1
+#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_set_speed	ao_serial2_set_speed
 
 #define HAS_EEPROM		1
 #define USE_INTERNAL_FLASH	0
@@ -127,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
@@ -145,22 +155,17 @@ struct ao_adc {
 
 #define AO_FEC_DEBUG            0
 #define AO_CC1200_SPI_CS_PORT   (&stm_gpioa)
-#define AO_CC1200_SPI_CS_PIN    5
+#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_MCU_WAKEUP_PORT       (&stm_gpioa)
-#define AO_CC1200_MCU_WAKEUP_PIN        (0)
 
 #define AO_CC1200_INT_GPIO      2
 #define AO_CC1200_INT_GPIO_IOCFG        CC1200_IOCFG2
 
-#define AO_CC1200_MARC_GPIO     3
-#define AO_CC1200_MARC_GPIO_IOCFG       CC1200_IOCFG3
-
 #define HAS_BOOT_RADIO          0
 
 #endif /* _AO_PINS_H_ */