Merge branch 'M17_AX25_FM' into I2C

This commit is contained in:
Jonathan Naylor 2020-11-20 10:37:49 +00:00
commit 757c3ce0d5
2 changed files with 7 additions and 3 deletions

View File

@ -19,7 +19,7 @@
#if !defined(VERSION_H)
#define VERSION_H
#define VERSION "20201118"
#define VERSION "20201120"
#endif

View File

@ -33,6 +33,7 @@ DSTAR PB6 output
DMR PB5 output
YSF PB7 output
POCSAG PC10 output
FM PB14 output
RX PB0 analog input
RSSI PB1 analog input
@ -45,7 +46,6 @@ EXT_CLK PA15 input
#define PORT_COS GPIOB
#define RCC_Per_COS RCC_AHB1Periph_GPIOB
#define PIN_PTT GPIO_Pin_12
#define PORT_PTT GPIOB
#define RCC_Per_PTT RCC_AHB1Periph_GPIOB
@ -82,6 +82,10 @@ EXT_CLK PA15 input
#define PORT_POCSAG GPIOC
#define RCC_Per_POCSAG RCC_AHB1Periph_GPIOC
#define PIN_FM GPIO_Pin_14
#define PORT_FM GPIOB
#define RCC_Per_FM RCC_AHB1Periph_GPIOB
#define PIN_EXT_CLK GPIO_Pin_15
#define SRC_EXT_CLK GPIO_PinSource15
#define PORT_EXT_CLK GPIOA
@ -99,4 +103,4 @@ EXT_CLK PA15 input
#define PIN_TX GPIO_Pin_4
#define PIN_TX_CH DAC_Channel_1
#endif
#endif