From e304f5cce26c6d7a80eba8eb74ea6021548cbd8f Mon Sep 17 00:00:00 2001 From: Cort Buffington Date: Tue, 21 Jul 2020 08:19:18 -0500 Subject: [PATCH 1/2] Added pin assignment for FM mode LED (WA0EDA) --- IO.cpp | 6 +++--- pins/pins_f4_stm32eda.h | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/IO.cpp b/IO.cpp index c36b6a9..f14dfcd 100644 --- a/IO.cpp +++ b/IO.cpp @@ -152,8 +152,8 @@ void CIO::selfTest() } #if defined(MODE_LEDS) - setDStarInt(true); - setDMRInt(false); + setDStarInt(false); + setDMRInt(true); setYSFInt(false); setP25Int(false); setNXDNInt(false); @@ -161,7 +161,7 @@ void CIO::selfTest() setFMInt(false); delayInt(250); - setDMRInt(true); + setDStarInt(true); delayInt(250); setYSFInt(true); diff --git a/pins/pins_f4_stm32eda.h b/pins/pins_f4_stm32eda.h index 039de73..ea3ae75 100644 --- a/pins/pins_f4_stm32eda.h +++ b/pins/pins_f4_stm32eda.h @@ -33,6 +33,7 @@ DSTAR PB6 output DMR PB5 output YSF PB7 output POCSAG PC10 output +FM PC11 output RX PB0 analog input RSSI PB1 analog input @@ -82,6 +83,10 @@ EXT_CLK PA15 input #define PORT_POCSAG GPIOC #define RCC_Per_POCSAG RCC_AHB1Periph_GPIOC +#define PIN_FM GPIO_Pin_11 +#define PORT_FM GPIOC +#define RCC_Per_FM RCC_AHB1Periph_GPIOC + #define PIN_EXT_CLK GPIO_Pin_15 #define SRC_EXT_CLK GPIO_PinSource15 #define PORT_EXT_CLK GPIOA From a2978d9e9184f7ae48fa1053826c4799b8b4ed81 Mon Sep 17 00:00:00 2001 From: Cort Buffington Date: Tue, 21 Jul 2020 08:27:02 -0500 Subject: [PATCH 2/2] Removed a local change to not contaminate the repo --- IO.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IO.cpp b/IO.cpp index f14dfcd..c36b6a9 100644 --- a/IO.cpp +++ b/IO.cpp @@ -152,8 +152,8 @@ void CIO::selfTest() } #if defined(MODE_LEDS) - setDStarInt(false); - setDMRInt(true); + setDStarInt(true); + setDMRInt(false); setYSFInt(false); setP25Int(false); setNXDNInt(false); @@ -161,7 +161,7 @@ void CIO::selfTest() setFMInt(false); delayInt(250); - setDStarInt(true); + setDMRInt(true); delayInt(250); setYSFInt(true);