From d78777bdc260d0f2a0f34fa4ebb357b3f09c2bc0 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sun, 22 Oct 2017 23:22:21 -0300 Subject: [PATCH 1/4] Updating README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 843e845..021e714 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ VHF (144-148 MHz) support for ZUMSpot is added by an external 18 nH inductor bet Dual ADF7021 for full duplex operation (#define DUPLEX in Config.h) will work only with a big RX/TX frequency separation (5 MHz or more in UHF band for example) and proper antenna filtering. At the moment #define ADF7021_CARRIER_BOARD (Config.h) with STM32F103 platform is supported. Please see [BUILD.md](BUILD.md) for pinout details. -If you can't decode any 4FSK modulation (DMR, YSF and P25) with your ZUMspot, the common solution is to adjust RX frequency offset (RXOffset) in your MMDVM.ini file. Please try with steps of +-100 Hz until you get low BER. If you don't have test equipment, the only procedure is trial and error. In some cases TXOffset adjustment is also required for proper radio decoding. +If you can't decode any 4FSK modulation (DMR, YSF and P25) with your ZUMspot, the common solution is to adjust RX frequency offset (RXOffset) in your MMDVM.ini file. Please try with steps of +-100 Hz until you get low BER. If you don't have test equipment, the only procedure is trial and error. In some cases TXOffset adjustment is also required for proper radio decoding. If you have test equipment, enable TEST_TX feature (see "Hidden functions" in [BUILD.md](BUILD.md) document). # Quick start From bf4d3fe0213714ea3e089bb75bd7976344187326 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Mon, 23 Oct 2017 00:07:56 -0300 Subject: [PATCH 2/4] Fix ADF7021 output power --- IO.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IO.cpp b/IO.cpp index f94ea4f..15f32af 100644 --- a/IO.cpp +++ b/IO.cpp @@ -263,7 +263,7 @@ bool CIO::hasRXOverflow() uint8_t CIO::setFreq(uint32_t frequency_rx, uint32_t frequency_tx) { // power level - m_power = 0x20; + m_power = 0xFF; if( !( ((frequency_rx >= VHF1_MIN)&&(frequency_rx < VHF1_MAX)) || ((frequency_tx >= VHF1_MIN)&&(frequency_tx < VHF1_MAX)) || \ ((frequency_rx >= UHF1_MIN)&&(frequency_rx < UHF1_MAX)) || ((frequency_tx >= UHF1_MIN)&&(frequency_tx < UHF1_MAX)) || \ From 74f9bcf33d124872c56261ed0b14f6d2675ad316 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Mon, 23 Oct 2017 00:20:17 -0300 Subject: [PATCH 3/4] Preparing release v1.0.2 --- SerialPort.cpp | 4 ++-- scripts/install_fw_duplex.sh | 2 +- scripts/install_fw_librekit.sh | 2 +- scripts/install_fw_rpi.sh | 2 +- scripts/install_fw_usb.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SerialPort.cpp b/SerialPort.cpp index 8d4e709..8be1cb1 100644 --- 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) diff --git a/scripts/install_fw_duplex.sh b/scripts/install_fw_duplex.sh index 96053c4..5c09313 100755 --- 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" diff --git a/scripts/install_fw_librekit.sh b/scripts/install_fw_librekit.sh index e4e3e0c..5b15e22 100755 --- 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" diff --git a/scripts/install_fw_rpi.sh b/scripts/install_fw_rpi.sh index 6e63a44..e5b0b21 100755 --- 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" diff --git a/scripts/install_fw_usb.sh b/scripts/install_fw_usb.sh index fc02dd0..0c64096 100755 --- 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" From 22e3e66a8995cad74170f45835f66c25138aa518 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Mon, 23 Oct 2017 00:22:20 -0300 Subject: [PATCH 4/4] Updating configs --- configs/ZUMspot_Libre.h | 2 ++ configs/ZUMspot_RPi.h | 2 ++ configs/ZUMspot_USB.h | 2 ++ configs/ZUMspot_duplex.h | 2 ++ 4 files changed, 8 insertions(+) diff --git a/configs/ZUMspot_Libre.h b/configs/ZUMspot_Libre.h index f7b8d62..4e7142d 100644 --- 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 diff --git a/configs/ZUMspot_RPi.h b/configs/ZUMspot_RPi.h index 0d26f22..45e1952 100644 --- 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 diff --git a/configs/ZUMspot_USB.h b/configs/ZUMspot_USB.h index 41b9d26..5e6d098 100644 --- 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 diff --git a/configs/ZUMspot_duplex.h b/configs/ZUMspot_duplex.h index 86a234f..d04bbf0 100644 --- 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