From d38ae029fe48b1fca48412d1b3fa7cf8e6161bb7 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 29 Jun 2016 12:21:27 +0200 Subject: [PATCH 1/6] Removal of sudo and some minor code cleanups --- mmdvmmenu.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mmdvmmenu.sh b/mmdvmmenu.sh index 390919b..b272e3f 100644 --- a/mmdvmmenu.sh +++ b/mmdvmmenu.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/bash ############################################################################### # @@ -57,25 +57,25 @@ do clear cat< $conf.tmp && mv -f $conf.tmp $conf && echo "12.0 MHZ CLock Enabled";; - "2") sudo sed -e 's/\/\/ #define EXTERNAL_OSC 14/ #define EXTERNAL_OSC 14/g' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "14.4 MHZ CLock Enabled";; - "3") sudo sed -e 's/\/\/ #define EXTERNAL_OSC 19/ #define EXTERNAL_OSC 19/g' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "19.2 MHZ CLock Enabled";; - "4") sudo sed -e 's/\/\/ #define USE/ #define USE/g' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "COS As Lockout Enabled";; - "5") sudo sed -e 's/\/\/ #define ARDUINO_MODE/ #define ARDUINO_MODE/g' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Mode Pins Enabled";; - "6") MV -f $confbak $conf ;; + "1") sed -e 's/\/\/ #define EXTERNAL_OSC 12/ #define EXTERNAL_OSC 12/g' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "12.0 MHZ CLock Enabled";; + "2") sed -e 's/\/\/ #define EXTERNAL_OSC 14/ #define EXTERNAL_OSC 14/g' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "14.4 MHZ CLock Enabled";; + "3") sed -e 's/\/\/ #define EXTERNAL_OSC 19/ #define EXTERNAL_OSC 19/g' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "19.2 MHZ CLock Enabled";; + "4") sed -e 's/\/\/ #define USE/ #define USE/g' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "COS As Lockout Enabled";; + "5") sed -e 's/\/\/ #define ARDUINO_MODE/ #define ARDUINO_MODE/g' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Mode Pins Enabled";; + "6") mv -f $confbak $conf ;; "Q") echo "If any changes are made you need to upload to MMDVM" && exit;; "q") echo "If any changes are made you need to upload to MMDVM" && exit;; * ) echo "invalid option" ;; From d15e5532ae1bdeb8b621c863094d8ec1fdaf5d76 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 29 Jun 2016 12:22:18 +0200 Subject: [PATCH 2/6] Make mmdvmmenu.sh executable --- mmdvmmenu.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 mmdvmmenu.sh diff --git a/mmdvmmenu.sh b/mmdvmmenu.sh old mode 100644 new mode 100755 From 2b148904af95f9c6bac28074a4bb6518366fd780 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 29 Jun 2016 12:31:46 +0200 Subject: [PATCH 3/6] Typo correction --- mmdvmmenu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmdvmmenu.sh b/mmdvmmenu.sh index b272e3f..7d53760 100755 --- a/mmdvmmenu.sh +++ b/mmdvmmenu.sh @@ -61,7 +61,7 @@ do -------------------------------------------------------------- Please enter your choice: - (1) Enable 12.0 MHZ CLock (4) Use the COS to lockout the modem + (1) Enable 12.0 MHZ Clock (4) Use the COS to lockout the modem (2) Enable 14.4 MHz Clock (5) Use pins to output the current mode (3) Enable 19.2 MHz Clock (6) Return to Default From 70df22ef8157a351b3eef78c15a08b528d3fb430 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 29 Jun 2016 12:40:45 +0200 Subject: [PATCH 4/6] Make sed commands more specific --- mmdvmmenu.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/mmdvmmenu.sh b/mmdvmmenu.sh index 7d53760..fb61f58 100755 --- a/mmdvmmenu.sh +++ b/mmdvmmenu.sh @@ -10,23 +10,23 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ############################################################################### # -# On a Linux based system, such as a Raspberry Pi, this script will perform -# Modafacation to the Config.c file for most options. It makes a Back up when +# On a Linux based system, such as a Raspberry Pi, this script will perform +# Modafacation to the Config.c file for most options. It makes a Back up when # you staet the script if none is present. You must recompile and load firmwhare # on Due if changes are made. -# +# ############################################################################### # # CONFIGURATION @@ -44,7 +44,7 @@ confbak=Config.h.bak -# Check for backup file and make one if not present +# Check for backup file and make one if not present if [ ! -f $confbak ];then @@ -70,14 +70,14 @@ do EOF read -n1 -s case "$REPLY" in - "1") sed -e 's/\/\/ #define EXTERNAL_OSC 12/ #define EXTERNAL_OSC 12/g' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "12.0 MHZ CLock Enabled";; - "2") sed -e 's/\/\/ #define EXTERNAL_OSC 14/ #define EXTERNAL_OSC 14/g' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "14.4 MHZ CLock Enabled";; - "3") sed -e 's/\/\/ #define EXTERNAL_OSC 19/ #define EXTERNAL_OSC 19/g' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "19.2 MHZ CLock Enabled";; - "4") sed -e 's/\/\/ #define USE/ #define USE/g' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "COS As Lockout Enabled";; - "5") sed -e 's/\/\/ #define ARDUINO_MODE/ #define ARDUINO_MODE/g' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Mode Pins Enabled";; + "1") sed -e 's/\/\/ #define EXTERNAL_OSC 12000000/#define EXTERNAL_OSC 12000000/g' $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/g' $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/g' $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/g' $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/g' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Mode Pins Enabled";; "6") mv -f $confbak $conf ;; - "Q") echo "If any changes are made you need to upload to MMDVM" && exit;; - "q") echo "If any changes are made you need to upload to MMDVM" && exit;; + "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" ;; esac sleep 1 From 701732a72437bef07afd993b9e552088fdcd46ec Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 29 Jun 2016 12:46:47 +0200 Subject: [PATCH 5/6] Add options to change board layout --- mmdvmmenu.sh | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/mmdvmmenu.sh b/mmdvmmenu.sh index fb61f58..556e5b7 100755 --- a/mmdvmmenu.sh +++ b/mmdvmmenu.sh @@ -61,21 +61,30 @@ do -------------------------------------------------------------- Please enter your choice: - (1) Enable 12.0 MHZ Clock (4) Use the COS to lockout the modem - (2) Enable 14.4 MHz Clock (5) Use pins to output the current mode - (3) Enable 19.2 MHz Clock (6) Return to Default + (1) Enable 12.0 MHZ Clock + (2) Enable 14.4 MHz Clock + (3) Enable 19.2 MHz Clock + (4) Use the COS to lockout the modem + (5) Use pins to output the current mode + (6) Use original Arduino Due layout + (7) Use new Arduino Due layout + (8) Use layout for SP8NTH board + (9) Return to Default (Q)uit --------------------------------------------------------------- EOF read -n1 -s case "$REPLY" in - "1") sed -e 's/\/\/ #define EXTERNAL_OSC 12000000/#define EXTERNAL_OSC 12000000/g' $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/g' $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/g' $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/g' $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/g' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Mode Pins Enabled";; - "6") 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 "Original Arduino Due layout enabled";; + "7") sed -e 's/\/\/ #define ARDUINO_DUE_ZUM/#define ARDUINO_DUE_ZUM/' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "New Arduino Due layout 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") 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" ;; From abfb777c696a3af6fea0b4f72019c913aa8b6b47 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 29 Jun 2016 12:48:11 +0200 Subject: [PATCH 6/6] Some typo correction --- mmdvmmenu.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mmdvmmenu.sh b/mmdvmmenu.sh index 556e5b7..9434669 100755 --- a/mmdvmmenu.sh +++ b/mmdvmmenu.sh @@ -76,11 +76,11 @@ do 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";; + "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 "Original Arduino Due layout enabled";; "7") sed -e 's/\/\/ #define ARDUINO_DUE_ZUM/#define ARDUINO_DUE_ZUM/' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "New Arduino Due layout 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";;