From 428d36da90c5d8b73469b2e3a0ea1d9d4c47d083 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 29 Aug 2018 09:49:53 +0200 Subject: [PATCH] Rename F7Hat to (MMDVM_)RPT_Hat --- IOSTM.cpp | 5 +++-- Makefile | 16 ++++++++-------- SerialSTM.cpp | 12 ++++++------ 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/IOSTM.cpp b/IOSTM.cpp index 0ce6903d..13a68eea 100644 --- a/IOSTM.cpp +++ b/IOSTM.cpp @@ -419,9 +419,9 @@ EXT_CLK PA15 input #define PIN_TX GPIO_Pin_4 #define PIN_TX_CH DAC_Channel_1 -#elif defined(STM32F722_F7HAT) +#elif defined(STM32F722_RPT_HAT) /* -Pin definitions for MMDVM-F7Hat Pi-Hat F0DEI DB9MAT DF2ET board: +Pin definitions for MMDVM_RPT_Hat Pi-Hat F0DEI DB9MAT DF2ET board: PTT PB14 output COSLED PB13 output @@ -514,6 +514,7 @@ EXT_CLK PA15 input #define PORT_MPOCSAG GPIOC #define RCC_Per_MPOCSAG RCC_AHB1Periph_GPIOC #endif + #define PIN_EXT_CLK GPIO_Pin_15 #define SRC_EXT_CLK GPIO_PinSource15 #define PORT_EXT_CLK GPIOA diff --git a/Makefile b/Makefile index 433dc9bc..ddb3b36e 100644 --- a/Makefile +++ b/Makefile @@ -128,8 +128,8 @@ DEFS_NUCLEO_F767=-DUSE_HAL_DRIVER -DSTM32F767xx -DSTM32F7XX -DSTM32F7_NUCLEO -DH DEFS_PI_F722=-DUSE_HAL_DRIVER -DSTM32F722xx -DSTM32F7XX -DSTM32F722_PI -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE # MMDVM-F7M F0DEI board: DEFS_F7M=-DUSE_HAL_DRIVER -DSTM32F722xx -DSTM32F7XX -DSTM32F722_F7M -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE -# MMDVM-F7-Hat F0DEI, DB9MAT, DF2ET board: -DEFS_F7HAT=-DUSE_HAL_DRIVER -DSTM32F722xx -DSTM32F7XX -DSTM32F722_F7HAT -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE +# MMDVM_RPT_Hat F0DEI, DB9MAT, DF2ET board: +DEFS_RPT_HAT=-DUSE_HAL_DRIVER -DSTM32F722xx -DSTM32F7XX -DSTM32F722_RPT_HAT -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE # STM32F4 DVM board: DEFS_DVM=-DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F446xx -DSTM32F4_DVM -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE @@ -179,11 +179,11 @@ f7m: CXXFLAGS+=$(CXXFLAGS_F7) $(DEFS_F7M) f7m: LDFLAGS+=$(LDFLAGS_F722) f7m: release_f7 -f7hat: GitVersion.h -f7hat: CFLAGS+=$(CFLAGS_F7) $(DEFS_F7HAT) -f7hat: CXXFLAGS+=$(CXXFLAGS_F7) $(DEFS_F7HAT) -f7hat: LDFLAGS+=$(LDFLAGS_F722) -f7hat: release_f7 +rpt_hat: GitVersion.h +rpt_hat: CFLAGS+=$(CFLAGS_F7) $(DEFS_RPT_HAT) +rpt_hat: CXXFLAGS+=$(CXXFLAGS_F7) $(DEFS_RPT_HAT) +rpt_hat: LDFLAGS+=$(LDFLAGS_F722) +rpt_hat: release_f7 nucleo: GitVersion.h nucleo: CFLAGS+=$(CFLAGS_F4) $(DEFS_NUCLEO) @@ -345,7 +345,7 @@ ifneq ($(wildcard /usr/bin/stm32flash),) endif deploy-f7m: deploy-pi-f7 -deploy-f7hat: deploy-pi-f7 +deploy-rpt_hat: deploy-pi-f7 # Export the current git version if the index file exists, else 000... GitVersion.h: diff --git a/SerialSTM.cpp b/SerialSTM.cpp index f6d26f83..df4ae672 100644 --- a/SerialSTM.cpp +++ b/SerialSTM.cpp @@ -50,7 +50,7 @@ extern "C" { } /* ************* USART1 ***************** */ -#if defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_F7M) || defined(STM32F722_PI) || defined(STM32F722_F7HAT) || defined(STM32F4_DVM) || (defined(STM32F4_NUCLEO) && defined(STM32F4_NUCLEO_ARDUINO_HEADER)) +#if defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_F7M) || defined(STM32F722_PI) || defined(STM32F722_RPT_HAT) || defined(STM32F4_DVM) || (defined(STM32F4_NUCLEO) && defined(STM32F4_NUCLEO_ARDUINO_HEADER)) volatile uint8_t TXSerialfifo1[TX_SERIAL_FIFO_SIZE]; volatile uint8_t RXSerialfifo1[RX_SERIAL_FIFO_SIZE]; @@ -841,7 +841,7 @@ void CSerialPort::beginInt(uint8_t n, int speed) case 1U: #if defined(STM32F4_DISCOVERY) || defined(STM32F7_NUCLEO) InitUSART3(speed); - #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI) || defined(STM32F722_F7M) || defined(STM32F722_F7HAT) || defined(STM32F4_DVM) + #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI) || defined(STM32F722_F7M) || defined(STM32F722_RPT_HAT) || defined(STM32F4_DVM) InitUSART1(speed); #elif defined(STM32F4_NUCLEO) InitUSART2(speed); @@ -865,7 +865,7 @@ int CSerialPort::availableInt(uint8_t n) case 1U: #if defined(STM32F4_DISCOVERY) || defined(STM32F7_NUCLEO) return AvailUSART3(); - #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI) || defined(STM32F722_F7M) || defined(STM32F722_F7HAT) || defined(STM32F4_DVM) + #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI) || defined(STM32F722_F7M) || defined(STM32F722_RPT_HAT) || defined(STM32F4_DVM) return AvailUSART1(); #elif defined(STM32F4_NUCLEO) return AvailUSART2(); @@ -887,7 +887,7 @@ int CSerialPort::availableForWriteInt(uint8_t n) case 1U: #if defined(STM32F4_DISCOVERY) || defined(STM32F7_NUCLEO) return AvailForWriteUSART3(); - #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI) || defined(STM32F722_F7M) || defined(STM32F722_F7HAT) || defined(STM32F4_DVM) + #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI) || defined(STM32F722_F7M) || defined(STM32F722_RPT_HAT) || defined(STM32F4_DVM) return AvailForWriteUSART1(); #elif defined(STM32F4_NUCLEO) return AvailForWriteUSART2(); @@ -909,7 +909,7 @@ uint8_t CSerialPort::readInt(uint8_t n) case 1U: #if defined(STM32F4_DISCOVERY) || defined(STM32F7_NUCLEO) return ReadUSART3(); - #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI) || defined(STM32F722_F7M) || defined(STM32F722_F7HAT) || defined(STM32F4_DVM) + #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI) || defined(STM32F722_F7M) || defined(STM32F722_RPT_HAT) || defined(STM32F4_DVM) return ReadUSART1(); #elif defined(STM32F4_NUCLEO) return ReadUSART2(); @@ -933,7 +933,7 @@ void CSerialPort::writeInt(uint8_t n, const uint8_t* data, uint16_t length, bool WriteUSART3(data, length); if (flush) TXSerialFlush3(); - #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI) || defined(STM32F722_F7M) || defined(STM32F722_F7HAT) || defined(STM32F4_DVM) + #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI) || defined(STM32F722_F7M) || defined(STM32F722_RPT_HAT) || defined(STM32F4_DVM) WriteUSART1(data, length); if (flush) TXSerialFlush1();