From f3943a7888bdf83606e08060fe5ba2b9f8d159f1 Mon Sep 17 00:00:00 2001 From: Shawn Chain Date: Wed, 13 May 2020 16:27:12 +0800 Subject: [PATCH 1/2] fix wrong macro name for LED/MODE pin --- IOSTM.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IOSTM.cpp b/IOSTM.cpp index 20636a0..53625ff 100644 --- a/IOSTM.cpp +++ b/IOSTM.cpp @@ -426,7 +426,7 @@ void CIO::setNXDNInt(bool on) void CIO::setPOCSAGInt(bool on) { #if defined(MODE_LEDS) -#if defined(USE_ALTERNATE_FM_LEDS) +#if defined(USE_ALTERNATE_POCSAG_LEDS) GPIO_WriteBit(PORT_DSTAR, PIN_DSTAR, on ? Bit_SET : Bit_RESET); GPIO_WriteBit(PORT_DMR, PIN_DMR, on ? Bit_SET : Bit_RESET); #else @@ -435,7 +435,7 @@ void CIO::setPOCSAGInt(bool on) #endif #if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT)) -#if defined(USE_ALTERNATE_FM_LEDS) +#if defined(USE_ALTERNATE_POCSAG_LEDS) GPIO_WriteBit(PORT_MDSTAR, PIN_MDSTAR, on ? Bit_SET : Bit_RESET); GPIO_WriteBit(PORT_MDMR, PIN_MDMR, on ? Bit_SET : Bit_RESET); #else From 703ed2628d66187be2f37f94bde59818c2bdbe18 Mon Sep 17 00:00:00 2001 From: Shawn Chain Date: Wed, 13 May 2020 16:28:05 +0800 Subject: [PATCH 2/2] Init FM led/mode GPIO pin --- IOSTM.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/IOSTM.cpp b/IOSTM.cpp index 53625ff..3abe89b 100644 --- a/IOSTM.cpp +++ b/IOSTM.cpp @@ -113,6 +113,15 @@ void CIO::initInt() GPIO_InitStruct.GPIO_Mode = GPIO_Mode_OUT; GPIO_Init(PORT_POCSAG, &GPIO_InitStruct); #endif + +#if !defined(USE_ALTERNATE_FM_LEDS) + // FM pin + RCC_AHB1PeriphClockCmd(RCC_Per_FM, ENABLE); + GPIO_InitStruct.GPIO_Pin = PIN_FM; + GPIO_InitStruct.GPIO_Mode = GPIO_Mode_OUT; + GPIO_Init(PORT_FM, &GPIO_InitStruct); +#endif + #endif #if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT)) @@ -155,6 +164,15 @@ void CIO::initInt() GPIO_InitStruct.GPIO_Mode = GPIO_Mode_OUT; GPIO_Init(PORT_MPOCSAG, &GPIO_InitStruct); #endif + +#if !defined(USE_ALTERNATE_FM_LEDS) + // FM mode pin + RCC_AHB1PeriphClockCmd(RCC_Per_MFM, ENABLE); + GPIO_InitStruct.GPIO_Pin = PIN_MFM; + GPIO_InitStruct.GPIO_Mode = GPIO_Mode_OUT; + GPIO_Init(PORT_MFM, &GPIO_InitStruct); +#endif + #endif }