From 100ee70a3869eaab713f6659e39120bf63fd4835 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 13 Oct 2016 17:55:37 +0100 Subject: [PATCH] Add the ZUM V1.2 pin layout. --- Config.h | 3 +++ IO.cpp | 17 +++++++++++++++-- mmdvmmenu.sh | 21 ++++++++++++--------- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/Config.h b/Config.h index d61abce..ea02eec 100644 --- a/Config.h +++ b/Config.h @@ -40,6 +40,9 @@ // 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 SP8NTH board // #define ARDUINO_DUE_NTH diff --git a/IO.cpp b/IO.cpp index 4ea26c0..69226ba 100644 --- a/IO.cpp +++ b/IO.cpp @@ -62,11 +62,24 @@ const uint16_t DC_OFFSET = 2048U; #define PIN_DMR 8 #define PIN_YSF 7 #define PIN_P25 6 -#define ADC_CHER_Chan (1<<13) // ADC on Due pin A11 - Due AD13 - (1 << 13) (PB20) +#define ADC_CHER_Chan (1<<13) // ADC on Due pin A11 - Due AD13 - (1 << 13) #define ADC_ISR_EOC_Chan ADC_ISR_EOC13 #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 @@ -81,7 +94,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, or ARDUINO_DUE_NTH need to be defined" +#error "Either ARDUINO_DUE_PAPA, ARDUINO_DUE_ZUM_V10, ARDUINO_DUE_ZUM_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 87b113c..101209f 100755 --- a/mmdvmmenu.sh +++ b/mmdvmmenu.sh @@ -67,10 +67,11 @@ 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 and V1.2 - (8) Use layout for SP8NTH board - (9) Use modem as display driver - (A) Return to Default + (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 (Q)uit --------------------------------------------------------------- @@ -83,11 +84,13 @@ 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/#define ARDUINO_DUE_ZUM_V10/' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Layout for ZUM board V1.0 and V1.2 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 ;; + "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 ;; "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" ;;