Merge branch 'master' into devel

8 years ago · e8fb0854c2
parent 4fbe10e867 22e3e66a89
commit e8fb0854c2
9 changed files with 14 additions and 6 deletions
--- a/SerialPort.cpp
+++ b/SerialPort.cpp
@ -71,9 +71,9 @@ const uint8_t MMDVM_DEBUG4       = 0xF4U;
 const uint8_t MMDVM_DEBUG5       = 0xF5U;

 #if defined(ADF7021_N_VER)
-#define DESCRIPTION              "ZUMspot ADF7021N v1.0.1 20170826 (DStar/DMR/YSF/P25)"
+#define DESCRIPTION              "ZUMspot ADF7021N v1.0.2 20171023 (DStar/DMR/YSF/P25)"
 #else
-#define DESCRIPTION              "ZUMspot ADF7021 v1.0.1 20170826 (DStar/DMR/YSF/P25)"
+#define DESCRIPTION              "ZUMspot ADF7021 v1.0.2 20171023 (DStar/DMR/YSF/P25)"
 #endif

 #if defined(GITVERSION)
--- a/configs/ZUMspot_Libre.h
+++ b/configs/ZUMspot_Libre.h
@ -24,6 +24,8 @@
 // #define PI_HAT_7021_REV_03
 // 2) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103:
 #define ADF7021_CARRIER_BOARD
+// 3) MMDVM_HS_Hat revisions 1.1 and 1.2 (DB9MAT & DF2ET)
+// #define MMDVM_HS_HAT_REV12

 // Enable ADF7021 support:
 #define ENABLE_ADF7021
--- a/configs/ZUMspot_RPi.h
+++ b/configs/ZUMspot_RPi.h
@ -24,6 +24,8 @@
 #define PI_HAT_7021_REV_03
 // 2) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103:
 // #define ADF7021_CARRIER_BOARD
+// 3) MMDVM_HS_Hat revisions 1.1 and 1.2 (DB9MAT & DF2ET)
+// #define MMDVM_HS_HAT_REV12

 // Enable ADF7021 support:
 #define ENABLE_ADF7021
--- a/configs/ZUMspot_USB.h
+++ b/configs/ZUMspot_USB.h
@ -24,6 +24,8 @@
 #define PI_HAT_7021_REV_03
 // 2) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103:
 // #define ADF7021_CARRIER_BOARD
+// 3) MMDVM_HS_Hat revisions 1.1 and 1.2 (DB9MAT & DF2ET)
+// #define MMDVM_HS_HAT_REV12

 // Enable ADF7021 support:
 #define ENABLE_ADF7021
--- a/configs/ZUMspot_duplex.h
+++ b/configs/ZUMspot_duplex.h
@ -24,6 +24,8 @@
 // #define PI_HAT_7021_REV_03
 // 2) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103:
 #define ADF7021_CARRIER_BOARD
+// 3) MMDVM_HS_Hat revisions 1.1 and 1.2 (DB9MAT & DF2ET)
+// #define MMDVM_HS_HAT_REV12

 // Enable ADF7021 support:
 #define ENABLE_ADF7021
--- a/scripts/install_fw_duplex.sh
+++ b/scripts/install_fw_duplex.sh
@ -17,7 +17,7 @@
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 # Configure latest version
-FW_VERSION="v1.0.1"
+FW_VERSION="v1.0.2"

 # Change USB-serial port name ONLY in macOS
 MAC_DEV_USB_SER="/dev/cu.usbmodem1441"
--- a/scripts/install_fw_librekit.sh
+++ b/scripts/install_fw_librekit.sh
@ -17,7 +17,7 @@
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 # Configure latest version
-FW_VERSION="v1.0.1"
+FW_VERSION="v1.0.2"

 # Change USB-serial port name ONLY in macOS
 MAC_DEV_USB_SER="/dev/cu.usbmodem1441"
--- a/scripts/install_fw_rpi.sh
+++ b/scripts/install_fw_rpi.sh
@ -17,7 +17,7 @@
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 # Configure latest version
-FW_VERSION="v1.0.1"
+FW_VERSION="v1.0.2"

 # Change USB-serial port name ONLY in macOS
 MAC_DEV_USB_SER="/dev/cu.usbmodem1441"
--- a/scripts/install_fw_usb.sh
+++ b/scripts/install_fw_usb.sh
@ -17,7 +17,7 @@
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 # Configure latest version
-FW_VERSION="v1.0.1"
+FW_VERSION="v1.0.2"

 # Change USB-serial port name ONLY in macOS
 MAC_DEV_USB_SER="/dev/cu.usbmodem1441"