From 8e5e06de30f82d18d712ad9839c088dbe506b89b Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sun, 2 Jun 2019 12:47:32 -0400 Subject: [PATCH] Remove unused DEV_USB_SER from scripts --- scripts/install_fw_d2rg_mmdvmhs.sh | 6 +----- scripts/install_fw_duplex_gpio.sh | 7 +------ scripts/install_fw_gen_gpio.sh | 7 +------ scripts/install_fw_hsdualhat-12mhz.sh | 7 +------ scripts/install_fw_hsdualhat.sh | 7 +------ scripts/install_fw_hshat-12mhz.sh | 7 +------ scripts/install_fw_hshat.sh | 7 +------ scripts/install_fw_nanodv_npi.sh | 7 +------ scripts/install_fw_nanohs.sh | 7 +------ scripts/install_fw_rpi.sh | 7 +------ 10 files changed, 10 insertions(+), 59 deletions(-) diff --git a/scripts/install_fw_d2rg_mmdvmhs.sh b/scripts/install_fw_d2rg_mmdvmhs.sh index 93b9362..33da9f4 100755 --- a/scripts/install_fw_d2rg_mmdvmhs.sh +++ b/scripts/install_fw_d2rg_mmdvmhs.sh @@ -18,9 +18,6 @@ # Configure latest version FW_VERSION="v1.4.17" - -# Change USB-serial port name ONLY in macOS -MAC_DEV_USB_SER="/dev/cu.usbmodem14401" # Download latest firmware for D2RG MMDVM_HS curl -OL https://github.com/juribeparada/MMDVM_HS/releases/download/$FW_VERSION/d2rg_mmdvm_hs.bin @@ -32,7 +29,6 @@ fi # Configure vars depending on OS if [ $(uname -s) == "Linux" ]; then - DEV_USB_SER="/dev/ttyACM0" if [ $(uname -m) == "x86_64" ]; then echo "Linux 64-bit detected" DFU_RST="./STM32F10X_Lib/utils/linux64/upload-reset" @@ -62,7 +58,6 @@ fi if [ $(uname -s) == "Darwin" ]; then echo "macOS detected" - DEV_USB_SER=$MAC_DEV_USB_SER DFU_RST="./STM32F10X_Lib/utils/macosx/upload-reset" DFU_UTIL="./STM32F10X_Lib/utils/macosx/dfu-util" ST_FLASH="./STM32F10X_Lib/utils/macosx/st-flash" @@ -73,5 +68,6 @@ fi sudo killall MMDVMHost >/dev/null 2>&1 # Upload the firmware +# Note: /dev/ttySC0 should be enabled, see: https://github.com/bg3mdo/D2RG_MMDVM_HS_ambe_uart_service eval sudo $STM32FLASH -v -w d2rg_mmdvm_hs.bin -g 0x0 -R -i 23,-22,22:-23,22 /dev/ttySC0 diff --git a/scripts/install_fw_duplex_gpio.sh b/scripts/install_fw_duplex_gpio.sh index 04f7199..8c8cbcf 100755 --- a/scripts/install_fw_duplex_gpio.sh +++ b/scripts/install_fw_duplex_gpio.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2017,2018 by Andy Uribe CA6JAU +# Copyright (C) 2017,2018,2019 by Andy Uribe CA6JAU # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,9 +18,6 @@ # Configure latest version FW_VERSION="v1.4.17" - -# Change USB-serial port name ONLY in macOS -MAC_DEV_USB_SER="/dev/cu.usbmodem14401" # Download latest firmware for Generic Duplex GPIO curl -OL https://github.com/juribeparada/MMDVM_HS/releases/download/$FW_VERSION/generic_duplex_gpio_fw.bin @@ -32,7 +29,6 @@ fi # Configure vars depending on OS if [ $(uname -s) == "Linux" ]; then - DEV_USB_SER="/dev/ttyACM0" if [ $(uname -m) == "x86_64" ]; then echo "Linux 64-bit detected" DFU_RST="./STM32F10X_Lib/utils/linux64/upload-reset" @@ -62,7 +58,6 @@ fi if [ $(uname -s) == "Darwin" ]; then echo "macOS detected" - DEV_USB_SER=$MAC_DEV_USB_SER DFU_RST="./STM32F10X_Lib/utils/macosx/upload-reset" DFU_UTIL="./STM32F10X_Lib/utils/macosx/dfu-util" ST_FLASH="./STM32F10X_Lib/utils/macosx/st-flash" diff --git a/scripts/install_fw_gen_gpio.sh b/scripts/install_fw_gen_gpio.sh index 023e97b..e0779e7 100755 --- a/scripts/install_fw_gen_gpio.sh +++ b/scripts/install_fw_gen_gpio.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2017,2018 by Andy Uribe CA6JAU +# Copyright (C) 2017,2018,2019 by Andy Uribe CA6JAU # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,9 +18,6 @@ # Configure latest version FW_VERSION="v1.4.17" - -# Change USB-serial port name ONLY in macOS -MAC_DEV_USB_SER="/dev/cu.usbmodem14401" # Download latest firmware for Generic Simplex GPIO curl -OL https://github.com/juribeparada/MMDVM_HS/releases/download/$FW_VERSION/generic_gpio_fw.bin @@ -32,7 +29,6 @@ fi # Configure vars depending on OS if [ $(uname -s) == "Linux" ]; then - DEV_USB_SER="/dev/ttyACM0" if [ $(uname -m) == "x86_64" ]; then echo "Linux 64-bit detected" DFU_RST="./STM32F10X_Lib/utils/linux64/upload-reset" @@ -62,7 +58,6 @@ fi if [ $(uname -s) == "Darwin" ]; then echo "macOS detected" - DEV_USB_SER=$MAC_DEV_USB_SER DFU_RST="./STM32F10X_Lib/utils/macosx/upload-reset" DFU_UTIL="./STM32F10X_Lib/utils/macosx/dfu-util" ST_FLASH="./STM32F10X_Lib/utils/macosx/st-flash" diff --git a/scripts/install_fw_hsdualhat-12mhz.sh b/scripts/install_fw_hsdualhat-12mhz.sh index 0a4f2fd..5bcc132 100755 --- a/scripts/install_fw_hsdualhat-12mhz.sh +++ b/scripts/install_fw_hsdualhat-12mhz.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2017,2018 by Andy Uribe CA6JAU, Florian Wolters DF2ET +# Copyright (C) 2017,2018,2019 by Andy Uribe CA6JAU, Florian Wolters DF2ET # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,9 +18,6 @@ # Configure latest version FW_VERSION="v1.4.17" - -# Change USB-serial port name ONLY in macOS -MAC_DEV_USB_SER="/dev/cu.usbmodem14401" # Download latest firmware for MMDVM_HS_Hat curl -OL https://github.com/juribeparada/MMDVM_HS/releases/download/$FW_VERSION/mmdvm_hs_dual_hat_fw-12mhz.bin @@ -32,7 +29,6 @@ fi # Configure vars depending on OS if [ $(uname -s) == "Linux" ]; then - DEV_USB_SER="/dev/ttyACM0" if [ $(uname -m) == "x86_64" ]; then echo "Linux 64-bit detected" DFU_RST="./STM32F10X_Lib/utils/linux64/upload-reset" @@ -62,7 +58,6 @@ fi if [ $(uname -s) == "Darwin" ]; then echo "macOS detected" - DEV_USB_SER=$MAC_DEV_USB_SER DFU_RST="./STM32F10X_Lib/utils/macosx/upload-reset" DFU_UTIL="./STM32F10X_Lib/utils/macosx/dfu-util" ST_FLASH="./STM32F10X_Lib/utils/macosx/st-flash" diff --git a/scripts/install_fw_hsdualhat.sh b/scripts/install_fw_hsdualhat.sh index 9090aca..a967630 100755 --- a/scripts/install_fw_hsdualhat.sh +++ b/scripts/install_fw_hsdualhat.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2017,2018 by Andy Uribe CA6JAU, Florian Wolters DF2ET +# Copyright (C) 2017,2018,2019 by Andy Uribe CA6JAU, Florian Wolters DF2ET # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,9 +18,6 @@ # Configure latest version FW_VERSION="v1.4.17" - -# Change USB-serial port name ONLY in macOS -MAC_DEV_USB_SER="/dev/cu.usbmodem14401" # Download latest firmware for MMDVM_HS_Hat curl -OL https://github.com/juribeparada/MMDVM_HS/releases/download/$FW_VERSION/mmdvm_hs_dual_hat_fw.bin @@ -32,7 +29,6 @@ fi # Configure vars depending on OS if [ $(uname -s) == "Linux" ]; then - DEV_USB_SER="/dev/ttyACM0" if [ $(uname -m) == "x86_64" ]; then echo "Linux 64-bit detected" DFU_RST="./STM32F10X_Lib/utils/linux64/upload-reset" @@ -62,7 +58,6 @@ fi if [ $(uname -s) == "Darwin" ]; then echo "macOS detected" - DEV_USB_SER=$MAC_DEV_USB_SER DFU_RST="./STM32F10X_Lib/utils/macosx/upload-reset" DFU_UTIL="./STM32F10X_Lib/utils/macosx/dfu-util" ST_FLASH="./STM32F10X_Lib/utils/macosx/st-flash" diff --git a/scripts/install_fw_hshat-12mhz.sh b/scripts/install_fw_hshat-12mhz.sh index 735d08d..ad1e280 100755 --- a/scripts/install_fw_hshat-12mhz.sh +++ b/scripts/install_fw_hshat-12mhz.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2017,2018 by Andy Uribe CA6JAU, Florian Wolters DF2ET +# Copyright (C) 2017,2018,2019 by Andy Uribe CA6JAU, Florian Wolters DF2ET # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,9 +18,6 @@ # Configure latest version FW_VERSION="v1.4.17" - -# Change USB-serial port name ONLY in macOS -MAC_DEV_USB_SER="/dev/cu.usbmodem14401" # Download latest firmware for MMDVM_HS_Hat with 12.288 MHz TCXO curl -OL https://github.com/juribeparada/MMDVM_HS/releases/download/$FW_VERSION/mmdvm_hs_hat_fw-12mhz.bin @@ -32,7 +29,6 @@ fi # Configure vars depending on OS if [ $(uname -s) == "Linux" ]; then - DEV_USB_SER="/dev/ttyACM0" if [ $(uname -m) == "x86_64" ]; then echo "Linux 64-bit detected" DFU_RST="./STM32F10X_Lib/utils/linux64/upload-reset" @@ -62,7 +58,6 @@ fi if [ $(uname -s) == "Darwin" ]; then echo "macOS detected" - DEV_USB_SER=$MAC_DEV_USB_SER DFU_RST="./STM32F10X_Lib/utils/macosx/upload-reset" DFU_UTIL="./STM32F10X_Lib/utils/macosx/dfu-util" ST_FLASH="./STM32F10X_Lib/utils/macosx/st-flash" diff --git a/scripts/install_fw_hshat.sh b/scripts/install_fw_hshat.sh index c8f2b61..76ae591 100755 --- a/scripts/install_fw_hshat.sh +++ b/scripts/install_fw_hshat.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2017,2018 by Andy Uribe CA6JAU +# Copyright (C) 2017,2018,2019 by Andy Uribe CA6JAU # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,9 +18,6 @@ # Configure latest version FW_VERSION="v1.4.17" - -# Change USB-serial port name ONLY in macOS -MAC_DEV_USB_SER="/dev/cu.usbmodem14401" # Download latest firmware for MMDVM_HS_Hat curl -OL https://github.com/juribeparada/MMDVM_HS/releases/download/$FW_VERSION/mmdvm_hs_hat_fw.bin @@ -32,7 +29,6 @@ fi # Configure vars depending on OS if [ $(uname -s) == "Linux" ]; then - DEV_USB_SER="/dev/ttyACM0" if [ $(uname -m) == "x86_64" ]; then echo "Linux 64-bit detected" DFU_RST="./STM32F10X_Lib/utils/linux64/upload-reset" @@ -62,7 +58,6 @@ fi if [ $(uname -s) == "Darwin" ]; then echo "macOS detected" - DEV_USB_SER=$MAC_DEV_USB_SER DFU_RST="./STM32F10X_Lib/utils/macosx/upload-reset" DFU_UTIL="./STM32F10X_Lib/utils/macosx/dfu-util" ST_FLASH="./STM32F10X_Lib/utils/macosx/st-flash" diff --git a/scripts/install_fw_nanodv_npi.sh b/scripts/install_fw_nanodv_npi.sh index 2c4ac23..895cef1 100755 --- a/scripts/install_fw_nanodv_npi.sh +++ b/scripts/install_fw_nanodv_npi.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2018 by Andy Uribe CA6JAU +# Copyright (C) 2018,2019 by Andy Uribe CA6JAU # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,9 +18,6 @@ # Configure latest version FW_VERSION="v1.4.17" - -# Change USB-serial port name ONLY in macOS -MAC_DEV_USB_SER="/dev/cu.usbmodem14401" # Download latest firmware for Nano DV curl -OL https://github.com/juribeparada/MMDVM_HS/releases/download/$FW_VERSION/nanodv_npi_fw.bin @@ -32,7 +29,6 @@ fi # Configure vars depending on OS if [ $(uname -s) == "Linux" ]; then - DEV_USB_SER="/dev/ttyACM0" if [ $(uname -m) == "x86_64" ]; then echo "Linux 64-bit detected" DFU_RST="./STM32F10X_Lib/utils/linux64/upload-reset" @@ -62,7 +58,6 @@ fi if [ $(uname -s) == "Darwin" ]; then echo "macOS detected" - DEV_USB_SER=$MAC_DEV_USB_SER DFU_RST="./STM32F10X_Lib/utils/macosx/upload-reset" DFU_UTIL="./STM32F10X_Lib/utils/macosx/dfu-util" ST_FLASH="./STM32F10X_Lib/utils/macosx/st-flash" diff --git a/scripts/install_fw_nanohs.sh b/scripts/install_fw_nanohs.sh index 2168a03..d650f57 100755 --- a/scripts/install_fw_nanohs.sh +++ b/scripts/install_fw_nanohs.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2018 by Andy Uribe CA6JAU +# Copyright (C) 2018,2019 by Andy Uribe CA6JAU # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,9 +18,6 @@ # Configure latest version FW_VERSION="v1.4.17" - -# Change USB-serial port name ONLY in macOS -MAC_DEV_USB_SER="/dev/cu.usbmodem14401" # Download latest firmware for Nano hotSPOT curl -OL https://github.com/juribeparada/MMDVM_HS/releases/download/$FW_VERSION/nano_hotspot_fw.bin @@ -32,7 +29,6 @@ fi # Configure vars depending on OS if [ $(uname -s) == "Linux" ]; then - DEV_USB_SER="/dev/ttyACM0" if [ $(uname -m) == "x86_64" ]; then echo "Linux 64-bit detected" DFU_RST="./STM32F10X_Lib/utils/linux64/upload-reset" @@ -62,7 +58,6 @@ fi if [ $(uname -s) == "Darwin" ]; then echo "macOS detected" - DEV_USB_SER=$MAC_DEV_USB_SER DFU_RST="./STM32F10X_Lib/utils/macosx/upload-reset" DFU_UTIL="./STM32F10X_Lib/utils/macosx/dfu-util" ST_FLASH="./STM32F10X_Lib/utils/macosx/st-flash" diff --git a/scripts/install_fw_rpi.sh b/scripts/install_fw_rpi.sh index 042f260..6b160f5 100755 --- a/scripts/install_fw_rpi.sh +++ b/scripts/install_fw_rpi.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2017,2018 by Andy Uribe CA6JAU +# Copyright (C) 2017,2018,2019 by Andy Uribe CA6JAU # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,9 +18,6 @@ # Configure latest version FW_VERSION="v1.4.17" - -# Change USB-serial port name ONLY in macOS -MAC_DEV_USB_SER="/dev/cu.usbmodem14401" # Download latest firmware for ZUMspot RPi (GPIO) curl -OL https://github.com/juribeparada/MMDVM_HS/releases/download/$FW_VERSION/zumspot_rpi_fw.bin @@ -32,7 +29,6 @@ fi # Configure vars depending on OS if [ $(uname -s) == "Linux" ]; then - DEV_USB_SER="/dev/ttyACM0" if [ $(uname -m) == "x86_64" ]; then echo "Linux 64-bit detected" DFU_RST="./STM32F10X_Lib/utils/linux64/upload-reset" @@ -62,7 +58,6 @@ fi if [ $(uname -s) == "Darwin" ]; then echo "macOS detected" - DEV_USB_SER=$MAC_DEV_USB_SER DFU_RST="./STM32F10X_Lib/utils/macosx/upload-reset" DFU_UTIL="./STM32F10X_Lib/utils/macosx/dfu-util" ST_FLASH="./STM32F10X_Lib/utils/macosx/st-flash"