From c399f81d83120b828599aee7ab2a4c2447488fe3 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Sun, 16 Oct 2016 15:59:53 +0100
Subject: [PATCH] Remove the ZUM V1.2 config option, and add to V1.0.

---
 Config.h     |  7 ++-----
 IO.cpp       | 17 ++---------------
 mmdvmmenu.sh | 33 +++++++++++++++------------------
 3 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/Config.h b/Config.h
index ea02eec..c7b73cd 100644
--- a/Config.h
+++ b/Config.h
@@ -37,11 +37,8 @@
 // For the original Arduino Due pin layout
 // #define  ARDUINO_DUE_PAPA
 
-// For the ZUM Board V1.0 pin layout
-#define  ARDUINO_DUE_ZUM_V10
-
-// For the ZUM Board V1.2 pin layout
-// #define  ARDUINO_DUE_ZUM_V12
+// For the ZUM V1.0 and V1.2 boards pin layout
+#define  ARDUINO_DUE_ZUM_V10_V12
 
 // For the SP8NTH board
 // #define  ARDUINO_DUE_NTH
diff --git a/IO.cpp b/IO.cpp
index 69226ba..8dcbb22 100644
--- a/IO.cpp
+++ b/IO.cpp
@@ -54,7 +54,7 @@ const uint16_t DC_OFFSET = 2048U;
 #define ADC_CDR_Chan           7
 #define DACC_MR_USER_SEL_Chan  DACC_MR_USER_SEL_CHANNEL0 // DAC on Due DAC0
 #define DACC_CHER_Chan         DACC_CHER_CH0
-#elif defined(ARDUINO_DUE_ZUM_V10)
+#elif defined(ARDUINO_DUE_ZUM_V10_V12)
 #define PIN_COS                52
 #define PIN_PTT                23
 #define PIN_COSLED             22
@@ -67,19 +67,6 @@ const uint16_t DC_OFFSET = 2048U;
 #define ADC_CDR_Chan           13
 #define DACC_MR_USER_SEL_Chan  DACC_MR_USER_SEL_CHANNEL1 // DAC on Due DAC1
 #define DACC_CHER_Chan         DACC_CHER_CH1
-#elif defined(ARDUINO_DUE_ZUM_V12)
-#define PIN_COS                52
-#define PIN_PTT                23
-#define PIN_COSLED             22
-#define PIN_DSTAR              9
-#define PIN_DMR                8
-#define PIN_YSF                7
-#define PIN_P25                6
-#define ADC_CHER_Chan          (1<<10)                // ADC on Due pin A8 - Due AD10 - (1 << 10)
-#define ADC_ISR_EOC_Chan       ADC_ISR_EOC10
-#define ADC_CDR_Chan           10
-#define DACC_MR_USER_SEL_Chan  DACC_MR_USER_SEL_CHANNEL1 // DAC on Due DAC1
-#define DACC_CHER_Chan         DACC_CHER_CH1
 #elif defined(ARDUINO_DUE_NTH)
 #define PIN_COS                A7
 #define PIN_PTT                A8
@@ -94,7 +81,7 @@ const uint16_t DC_OFFSET = 2048U;
 #define DACC_MR_USER_SEL_Chan  DACC_MR_USER_SEL_CHANNEL0 // DAC on Due DAC0
 #define DACC_CHER_Chan         DACC_CHER_CH0
 #else
-#error "Either ARDUINO_DUE_PAPA, ARDUINO_DUE_ZUM_V10, ARDUINO_DUE_ZUM_V12, or ARDUINO_DUE_NTH need to be defined"
+#error "Either ARDUINO_DUE_PAPA, ARDUINO_DUE_ZUM_V10_V12, or ARDUINO_DUE_NTH need to be defined"
 #endif
 #elif defined(__MBED__)
 // A generic MBED platform
diff --git a/mmdvmmenu.sh b/mmdvmmenu.sh
index 101209f..61c38a3 100755
--- a/mmdvmmenu.sh
+++ b/mmdvmmenu.sh
@@ -67,30 +67,27 @@ do
     (4) Use the COS to lockout the modem
     (5) Use pins to output the current mode
     (6) Use layout for the PAPA board
-    (7) Use layout for ZUM board V1.0
-    (8) Use layout for ZUM board V1.2
-    (9) Use layout for SP8NTH board
-    (A) Use modem as display driver
-    (B) Return to Default
+    (7) Use layout for ZUM V1.0 and V1.2 boards
+    (8) Use layout for SP8NTH board
+    (9) Use modem as display driver
+    (A) Return to Default
 
                          (Q)uit
     ---------------------------------------------------------------
 EOF
     read -n1 -s
     case "$REPLY" in
-    "1")  sed -e 's/\/\/ #define EXTERNAL_OSC 12000000/#define EXTERNAL_OSC 12000000/' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "12.0 MHz clock enabled";;
-    "2")  sed -e 's/\/\/ #define EXTERNAL_OSC 14400000/#define EXTERNAL_OSC 14400000/' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "14.4 MHz clock enabled";;
-    "3")  sed -e 's/\/\/ #define EXTERNAL_OSC 19200000/#define EXTERNAL_OSC 19200000/' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "19.2 MHz clock enabled";;
-    "4")  sed -e 's/\/\/ #define USE_COS_AS_LOCKOUT /#define USE_COS_AS_LOCKOUT/'      $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "COS as Lockout enabled";;
-    "5")  sed -e 's/\/\/ #define ARDUINO_MODE_PINS/#define ARDUINO_MODE_PINS/'         $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Mode pins Enabled";;
-    "6")  sed -e 's/\/\/ #define ARDUINO_DUE_PAPA/#define  ARDUINO_DUE_PAPA/'          $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Layout for the PAPA board enabled";;
-    "7")  sed -e 's/\/\/ #define ARDUINO_DUE_ZUM_V10/#define ARDUINO_DUE_ZUM_V10/'     $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Layout for ZUM board V1.0 enabled";;
-    "8")  sed -e 's/\/\/ #define ARDUINO_DUE_ZUM_V12/#define ARDUINO_DUE_ZUM_V12/'     $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Layout for ZUM board V1.2 enabled";;
-    "9")  sed -e 's/\/\/ #define ARDUINO_DUE_NTH/#define ARDUINO_DUE_NTH/'             $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Layout for SP8NTH board enabled";;
-    "A")  sed -e 's/\/\/ #define SERIAL_REPEATER/#define SERIAL_REPEATER/'             $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Modem display driver enabled";;
-    "a")  sed -e 's/\/\/ #define SERIAL_REPEATER/#define SERIAL_REPEATER/'             $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Modem display driver enabled";;
-    "B")  mv -f $confbak $conf ;;
-    "b")  mv -f $confbak $conf ;;
+    "1")  sed -e 's/\/\/ #define EXTERNAL_OSC 12000000/#define EXTERNAL_OSC 12000000/'     $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "12.0 MHz clock enabled";;
+    "2")  sed -e 's/\/\/ #define EXTERNAL_OSC 14400000/#define EXTERNAL_OSC 14400000/'     $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "14.4 MHz clock enabled";;
+    "3")  sed -e 's/\/\/ #define EXTERNAL_OSC 19200000/#define EXTERNAL_OSC 19200000/'     $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "19.2 MHz clock enabled";;
+    "4")  sed -e 's/\/\/ #define USE_COS_AS_LOCKOUT /#define USE_COS_AS_LOCKOUT/'          $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "COS as Lockout enabled";;
+    "5")  sed -e 's/\/\/ #define ARDUINO_MODE_PINS/#define ARDUINO_MODE_PINS/'             $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Mode pins Enabled";;
+    "6")  sed -e 's/\/\/ #define ARDUINO_DUE_PAPA/#define  ARDUINO_DUE_PAPA/'              $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Layout for the PAPA board enabled";;
+    "7")  sed -e 's/\/\/ #define ARDUINO_DUE_ZUM_V10_V12/#define ARDUINO_DUE_ZUM_V10_V12/' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Layout for ZUM V1.0 and V1.2 boards enabled";;
+    "8")  sed -e 's/\/\/ #define ARDUINO_DUE_NTH/#define ARDUINO_DUE_NTH/'                 $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Layout for SP8NTH board enabled";;
+    "9")  sed -e 's/\/\/ #define SERIAL_REPEATER/#define SERIAL_REPEATER/'                 $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Modem display driver enabled";;
+    "A")  mv -f $confbak $conf ;;
+    "a")  mv -f $confbak $conf ;;
     "Q")  echo "If any changes are made you need to (re-)upload the firmware to MMDVM" && exit;;
     "q")  echo "If any changes are made you need to (re-)upload the firmware to MMDVM" && exit;;
      * )  echo "invalid option"     ;;