From e0ea81bbc942fab89d1baccbd386bc7c297a40a5 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 31 Oct 2016 19:18:03 +0000 Subject: [PATCH] REplace the ZUM V1.2 definitions with V1.0.1 --- Config.h | 6 +++--- IO.cpp | 4 ++-- mmdvmmenu.sh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Config.h b/Config.h index 0947fb2..3eb0ed4 100644 --- a/Config.h +++ b/Config.h @@ -44,8 +44,8 @@ // For the original Arduino Due pin layout // #define ARDUINO_DUE_PAPA -// For the ZUM V1.0 and V1.2 boards pin layout -#define ARDUINO_DUE_ZUM_V10_V12 +// For the ZUM V1.0 and V1.0.1 boards pin layout +#define ARDUINO_DUE_ZUM_V10 // For the SP8NTH board // #define ARDUINO_DUE_NTH @@ -59,7 +59,7 @@ // #define SEND_RSSI_DATA // Use the modem as a serial repeater for Nextion displays -#define SERIAL_REPEATER +// #define SERIAL_REPEATER #endif diff --git a/IO.cpp b/IO.cpp index 531b492..1599592 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_V12) +#elif defined(ARDUINO_DUE_ZUM_V10) #define PIN_COS 52 #define PIN_PTT 23 #define PIN_COSLED 22 @@ -81,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_V12, or ARDUINO_DUE_NTH need to be defined" +#error "Either ARDUINO_DUE_PAPA, ARDUINO_DUE_ZUM_V10, or ARDUINO_DUE_NTH need to be defined" #endif #else #error "Unknown hardware type" diff --git a/mmdvmmenu.sh b/mmdvmmenu.sh index 0fa8b5d..5ed9413 100755 --- a/mmdvmmenu.sh +++ b/mmdvmmenu.sh @@ -67,7 +67,7 @@ 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 V1.0 and V1.2 boards + (7) Use layout for ZUM V1.0 and V1.0.1 boards (8) Use layout for SP8NTH board (9) Use modem as display driver (A) Return to Default @@ -83,7 +83,7 @@ EOF "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";; + "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 V1.0 and V1.0.1 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 ;;