Superminaren
/
MMDVM
mirror of https://github.com/g4klx/MMDVM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'FM' into FM_Ext

This commit is contained in:
Jonathan Naylor 2020-05-11 13:36:38 +01:00
parent 4a5a260c28 c54c13c146
commit 1836ba928e
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IOSTM.cpp
View File

@ -547,6 +547,7 @@ YSF PC7 output
P25 PC8 output P25 PC8 output
NXDN PC9 output NXDN PC9 output
POCSAG PA8 output POCSAG PA8 output
FM PA11 output
MDSTAR PC1 output MDSTAR PC1 output
MDMR PC2 output MDMR PC2 output
@ -554,6 +555,7 @@ MYSF PC3 output
MP25 PC4 output MP25 PC4 output
MNXDN PC10 output MNXDN PC10 output
MPOCSAG PC11 output MPOCSAG PC11 output
MFM PC13 output
RX PA0 analog input RX PA0 analog input
RSSI PA7 analog input RSSI PA7 analog input
@ -590,6 +592,10 @@ EXT_CLK PA15 input
#define PORT_POCSAG GPIOA #define PORT_POCSAG GPIOA
#define RCC_Per_POCSAG RCC_AHB1Periph_GPIOA #define RCC_Per_POCSAG RCC_AHB1Periph_GPIOA
#define PIN_FM GPIO_Pin_11
#define PORT_FM GPIOA
#define RCC_Per_FM RCC_AHB1Periph_GPIOA
#define PIN_DSTAR GPIO_Pin_15 #define PIN_DSTAR GPIO_Pin_15
#define PORT_DSTAR GPIOB #define PORT_DSTAR GPIOB
#define RCC_Per_DSTAR RCC_AHB1Periph_GPIOB #define RCC_Per_DSTAR RCC_AHB1Periph_GPIOB
@ -626,6 +632,10 @@ EXT_CLK PA15 input
#define PIN_MPOCSAG GPIO_Pin_11 #define PIN_MPOCSAG GPIO_Pin_11
#define PORT_MPOCSAG GPIOC #define PORT_MPOCSAG GPIOC
#define RCC_Per_MPOCSAG RCC_AHB1Periph_GPIOC #define RCC_Per_MPOCSAG RCC_AHB1Periph_GPIOC
#define PIN_MFM GPIO_Pin_13
#define PORT_MFM GPIOC
#define RCC_Per_MFM RCC_AHB1Periph_GPIOC
#endif #endif
#define PIN_EXT_CLK GPIO_Pin_15 #define PIN_EXT_CLK GPIO_Pin_15

2
SerialPort.cpp
View File

@ -104,7 +104,7 @@ const uint8_t MMDVM_DEBUG5 = 0xF5U;
#define HW_TYPE "MMDVM" #define HW_TYPE "MMDVM"
#endif #endif
#define DESCRIPTION "20200508 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)" #define DESCRIPTION "20200510 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)"
#if defined(GITVERSION) #if defined(GITVERSION)
#define concat(h, a, b, c) h " " a " " b " GitID #" c "" #define concat(h, a, b, c) h " " a " " b " GitID #" c ""