From 01873f7588f1204df30906191f1719a8d5782ee3 Mon Sep 17 00:00:00 2001
From: Andy CA6JAU <juribeparada@gmail.com>
Date: Wed, 26 Jul 2017 00:49:22 -0400
Subject: [PATCH] Cleaning Config.h

---
 ADF7021.h     | 22 +++++++++++++++++++---
 Config.h      | 31 +++++++------------------------
 Globals.h     |  3 +++
 IOArduino.cpp | 27 +++------------------------
 IOSTM.cpp     |  3 +++
 5 files changed, 35 insertions(+), 51 deletions(-)

diff --git a/ADF7021.h b/ADF7021.h
index e0e3295..6880613 100644
--- a/ADF7021.h
+++ b/ADF7021.h
@@ -36,13 +36,29 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf
 */
 
 /***** Test modes ****/
-// Enable SWD pin to access the demodulator output signal
-// See application note AN-852 and ADF7021 datasheet, page 60
+
+// Enable SWD pin to access the demodulator output signal:
+// (See application note AN-852 and ADF7021 datasheet, page 60)
 // #define TEST_DAC
 
-// Transmit the carrier frequency
+// Transmit the carrier frequency:
 // #define TEST_TX
 
+/*********************/
+
+// Disable TX Raised Cosine filter for 4FSK modulation in ADF7021:
+// #define ADF7021_DISABLE_RC_4FSK
+
+// Support for ADF7021-N version: 
+// #define ADF7021_N_VER
+
+// Enable AFC support for DMR, YSF and P25 (experimental):
+// (AFC is already enabled by default in D-Star)
+// #define ADF7021_ENABLE_4FSK_AFC
+
+// Configure AFC with positive initial frequency offset:
+// #define ADF7021_AFC_POS
+
 /****** Support for 14.7456 MHz TCXO (modified RF7021SE boards) ******/
 #if defined(ADF7021_14_7456)
 
diff --git a/Config.h b/Config.h
index c8ee4eb..acaf05b 100644
--- a/Config.h
+++ b/Config.h
@@ -19,46 +19,29 @@
 #if !defined(CONFIG_H)
 #define  CONFIG_H
 
-// Select one board (STM32F103 based boards):
-// 1) Initial release of ZUMspot RPi:
-// #define PI_HAT_7021_REV_02
-// 2) ZUMspot USB and ZUMspot RPi HAT:
+// Select one board (STM32F103 based boards)
+// 1) ZUMspot USB and ZUMspot RPi:
 // #define PI_HAT_7021_REV_03
-// 3) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103
+// 2) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103:
 #define ADF7021_CARRIER_BOARD
 
 // Enable ADF7021 support:
 #define ENABLE_ADF7021
 
-// Support for ADF7021-N version 
-// #define ADF7021_N_VER
-
-// Enable duplex mode with dual ADF7021
+// Enable full duplex support with dual ADF7021:
 // #define DUPLEX
 
-// Bidirectional Data pin (Enable Standard TX/RX Data Interface of ADF7021):
-#define BIDIR_DATA_PIN
-
-// TCXO of the ADF7021:
+// TCXO of the ADF7021
 // For 14.7456 MHz:
 #define ADF7021_14_7456
 // For 12.2880 MHz:
 // #define ADF7021_12_2880
 
-// Enable AFC support for DMR, YSF and P25 (experimental)
-// AFC is already enabled by default in D-Star
-// #define ADF7021_ENABLE_4FSK_AFC
-// Configure AFC with positive initial frequency offset
-// #define ADF7021_AFC_POS
-
-// Disable TX Raised Cosine filter for 4FSK modulation in ADF7021
-// #define ADF7021_DISABLE_RC_4FSK
-
 // Host communication selection:
 // #define STM32_USART1_HOST
 #define STM32_USB_HOST
 
-// Enable mode detection
+// Enable mode detection:
 #define ENABLE_SCAN_MODE
 
 // Send RSSI value:
@@ -70,7 +53,7 @@
 // Enable Nextion LCD serial port repeater on USART1 (Do not use with STM32_USART1_HOST enabled):
 // #define SERIAL_REPEATER_USART1
 
-// Enable P25 Wide modulation
+// Enable P25 Wide modulation:
 // #define ENABLE_P25_WIDE
 
 #endif
diff --git a/Globals.h b/Globals.h
index b23af82..baec6dc 100644
--- a/Globals.h
+++ b/Globals.h
@@ -39,6 +39,9 @@ const uint8_t  MARK_SLOT1 = 0x08U;
 const uint8_t  MARK_SLOT2 = 0x04U;
 const uint8_t  MARK_NONE  = 0x00U;
 
+// Bidirectional Data pin (Enable Standard TX/RX Data Interface of ADF7021):
+#define BIDIR_DATA_PIN
+
 #include "IO.h"
 #include "SerialPort.h"
 #include "DMRDMORX.h"
diff --git a/IOArduino.cpp b/IOArduino.cpp
index e6a0c6c..0ee64cd 100644
--- a/IOArduino.cpp
+++ b/IOArduino.cpp
@@ -28,26 +28,7 @@
 
 // STM32F1 pin definitions, using STM32duino
 
-#if defined(PI_HAT_7021_REV_02)
-
-#define PIN_SCLK       PB4
-#define PIN_SREAD      PB5
-#define PIN_SDATA      PB6
-#define PIN_SLE        PB7
-#define PIN_CE         PC14
-#define PIN_RXD        PB3
-#define PIN_TXD        PA15
-#define PIN_CLKOUT     PA14
-#define PIN_LED        PC13
-#define PIN_DEB        PA11
-#define PIN_DSTAR_LED  PB14
-#define PIN_DMR_LED    PB15
-#define PIN_YSF_LED    PA13
-#define PIN_P25_LED    PA12
-#define PIN_PTT_LED    PB12
-#define PIN_COS_LED    PB13
-
-#elif defined(PI_HAT_7021_REV_03)
+#if defined(PI_HAT_7021_REV_03)
 
 #define PIN_SCLK       PB5
 #define PIN_SREAD      PB6
@@ -92,7 +73,7 @@
 #define PIN_COS_LED    PB15
 
 #else
-#error "Either PI_HAT_7021_REV_02, PI_HAT_7021_REV_03 or ADF7021_CARRIER_BOARD need to be defined"
+#error "Either PI_HAT_7021_REV_03 or ADF7021_CARRIER_BOARD need to be defined"
 #endif
 
 #elif defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)
@@ -163,9 +144,7 @@ void CIO::Init()
 {
 #if defined (__STM32F1__)
 
-#if defined(PI_HAT_7021_REV_02)
-  afio_cfg_debug_ports(AFIO_DEBUG_NONE);
-#elif defined(PI_HAT_7021_REV_03) || defined(ADF7021_CARRIER_BOARD)
+#if defined(PI_HAT_7021_REV_03) || defined(ADF7021_CARRIER_BOARD)
   afio_cfg_debug_ports(AFIO_DEBUG_SW_ONLY);
 #endif
 
diff --git a/IOSTM.cpp b/IOSTM.cpp
index 6c3a156..15ee353 100644
--- a/IOSTM.cpp
+++ b/IOSTM.cpp
@@ -21,6 +21,9 @@
 
 #include "Config.h"
 
+// Select initial release of ZUMspot RPi:
+// #define PI_HAT_7021_REV_02
+
 #if defined(STM32F10X_MD)
 
 #include "Globals.h"