From 9147f68d28ef91839a70ced3d11709920b2e4aab Mon Sep 17 00:00:00 2001 From: phl0 Date: Sat, 24 Feb 2018 12:56:19 +0100 Subject: [PATCH 1/9] Add config option for Dual Hat --- Config.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Config.h b/Config.h index cade0eb..c42ddaf 100644 --- a/Config.h +++ b/Config.h @@ -26,7 +26,9 @@ #define LIBRE_KIT_ADF7021 // 3) MMDVM_HS_Hat revisions 1.1, 1.2 and 1.4 (DB9MAT & DF2ET) // #define MMDVM_HS_HAT_REV12 -// 4) Nano hotSPOT (BI7JTA) +// 4) MMDVM_HS_Dual_Hat revisions 1.0 (DB9MAT & DF2ET & DO7EN) +// #define MMDVM_HS_DUAL_HAT_REV10 +// 5) Nano hotSPOT (BI7JTA) // #define NANO_HOTSPOT // Enable ADF7021 support: From 33681d749bfb44b273293397329e9242cfe3235b Mon Sep 17 00:00:00 2001 From: phl0 Date: Sat, 24 Feb 2018 12:57:49 +0100 Subject: [PATCH 2/9] Add build instructions --- BUILD.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BUILD.md b/BUILD.md index 834fe63..a1af057 100644 --- a/BUILD.md +++ b/BUILD.md @@ -544,6 +544,8 @@ modified RF7021SE and Blue Pill STM32F103). - #define MMDVM_HS_HAT_REV12: enable this option if you have a MMDVM_HS_Hat board for RPi. +- #define MMDVM_HS_DUAL_HAT_REV10: enable this option if you have a MMDVM_HS_Dual_Hat board for RPi/USB. + - #define NANO_HOTSPOT: enable this option if you have a Nano hotSPOT (BI7JTA). - #define ENABLE_ADF7021: add support for ADF7021 (all boards, enabled by default). From f832ac0a556bc8c58d0230129e1234cf21402a43 Mon Sep 17 00:00:00 2001 From: phl0 Date: Sat, 24 Feb 2018 13:02:21 +0100 Subject: [PATCH 3/9] Add code for MMDVM_HS_Dual_Hat --- IOArduino.cpp | 6 +++--- IOSTM.cpp | 12 ++++++------ version.h | 2 ++ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/IOArduino.cpp b/IOArduino.cpp index d31a3c1..f63a34b 100644 --- a/IOArduino.cpp +++ b/IOArduino.cpp @@ -51,7 +51,7 @@ #define PIN_PTT_LED PB14 #define PIN_COS_LED PB15 -#elif defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(NANO_HOTSPOT) +#elif defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(MMDVM_HS_DUAL_HAT_REV10) || defined(NANO_HOTSPOT) #define PIN_SCLK PB5 #define PIN_SREAD PB7 @@ -75,7 +75,7 @@ #define PIN_COS_LED PB15 #else -#error "Either ZUMSPOT_ADF7021, LIBRE_KIT_ADF7021, MMDVM_HS_HAT_REV12 or NANO_HOTSPOT need to be defined" +#error "Either ZUMSPOT_ADF7021, LIBRE_KIT_ADF7021, MMDVM_HS_HAT_REV12, MMDVM_HS_DUAL_HAT_REV10 or NANO_HOTSPOT need to be defined" #endif #elif defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__) @@ -148,7 +148,7 @@ void CIO::Init() { #if defined (__STM32F1__) -#if defined(ZUMSPOT_ADF7021) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(NANO_HOTSPOT) +#if defined(ZUMSPOT_ADF7021) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(MMDVM_HS_DUAL_HAT_REV10) || defined(NANO_HOTSPOT) afio_cfg_debug_ports(AFIO_DEBUG_SW_ONLY); #endif diff --git a/IOSTM.cpp b/IOSTM.cpp index d2bd437..17e4c73 100644 --- a/IOSTM.cpp +++ b/IOSTM.cpp @@ -152,7 +152,7 @@ #define PIN_COS_LED GPIO_Pin_15 #define PORT_COS_LED GPIOB -#elif defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(NANO_HOTSPOT) +#elif defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(MMDVM_HS_DUAL_HAT_REV10) || defined(NANO_HOTSPOT) #define PIN_SCLK GPIO_Pin_5 #define PORT_SCLK GPIOB @@ -225,7 +225,7 @@ #define PORT_COS_LED GPIOB #else -#error "Either PI_HAT_7021_REV_02, ZUMSPOT_ADF7021, LIBRE_KIT_ADF7021, MMDVM_HS_HAT_REV12 or NANO_HOTSPOT need to be defined" +#error "Either PI_HAT_7021_REV_02, ZUMSPOT_ADF7021, LIBRE_KIT_ADF7021, MMDVM_HS_HAT_REV12, MMDVM_HS_DUAL_HAT_REV10 or NANO_HOTSPOT need to be defined" #endif extern "C" { @@ -247,7 +247,7 @@ extern "C" { } #endif -#elif defined(ZUMSPOT_ADF7021) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(NANO_HOTSPOT) +#elif defined(ZUMSPOT_ADF7021) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(MMDVM_HS_DUAL_HAT_REV10) || defined(NANO_HOTSPOT) #if defined(BIDIR_DATA_PIN) void EXTI3_IRQHandler(void) { @@ -284,7 +284,7 @@ void CIO::Init() #if defined(PI_HAT_7021_REV_02) GPIO_PinRemapConfig(GPIO_Remap_SWJ_Disable, ENABLE); -#elif defined(ZUMSPOT_ADF7021) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(NANO_HOTSPOT) +#elif defined(ZUMSPOT_ADF7021) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(MMDVM_HS_DUAL_HAT_REV10) || defined(NANO_HOTSPOT) GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE); #endif @@ -454,7 +454,7 @@ void CIO::Init() EXTI_InitStructure.EXTI_Line = EXTI_Line14; #endif -#elif defined(ZUMSPOT_ADF7021) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(NANO_HOTSPOT) +#elif defined(ZUMSPOT_ADF7021) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(MMDVM_HS_DUAL_HAT_REV10) || defined(NANO_HOTSPOT) #if defined(BIDIR_DATA_PIN) // Connect EXTI3 Line @@ -502,7 +502,7 @@ void CIO::startInt() NVIC_InitStructure.NVIC_IRQChannel = EXTI15_10_IRQn; -#elif defined(ZUMSPOT_ADF7021) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(NANO_HOTSPOT) +#elif defined(ZUMSPOT_ADF7021) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(MMDVM_HS_DUAL_HAT_REV10) || defined(NANO_HOTSPOT) #if defined(BIDIR_DATA_PIN) // Enable and set EXTI3 Interrupt diff --git a/version.h b/version.h index ccc5845..179a83f 100644 --- a/version.h +++ b/version.h @@ -31,6 +31,8 @@ #define BOARD_INFO "ZUMspot" #elif defined(MMDVM_HS_HAT_REV12) #define BOARD_INFO "MMDVM_HS_Hat" +#elif defined(MMDVM_HS_DUAL_HAT_REV10) +#define BOARD_INFO "MMDVM_HS_Dual_Hat" #elif defined(NANO_HOTSPOT) #define BOARD_INFO "Nano_hotSPOT" #else From 74ccfbb9259fc5612e6461de0317f8eb048b0756 Mon Sep 17 00:00:00 2001 From: phl0 Date: Sat, 24 Feb 2018 13:07:20 +0100 Subject: [PATCH 4/9] Add make option --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index ff3c608..0fca467 100644 --- a/Makefile +++ b/Makefile @@ -411,6 +411,8 @@ endif mmdvm_hs_hat: zumspot-pi +mmdvm_hs_dual_hat: zumspot-pi + dfu: ifdef devser $(DFU_RST) $(devser) 750 From 3ad4299e038e286ef3fc3cd26c7727401187a1cf Mon Sep 17 00:00:00 2001 From: phl0 Date: Sun, 25 Feb 2018 17:23:12 +0100 Subject: [PATCH 5/9] Add config template for MMDVM_HS_Dual_Hat --- Config.h | 12 +++---- configs/MMDVM_HS_Dual_Hat.h | 71 +++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 configs/MMDVM_HS_Dual_Hat.h diff --git a/Config.h b/Config.h index c42ddaf..d7304e7 100644 --- a/Config.h +++ b/Config.h @@ -23,11 +23,11 @@ // 1) ZUMspot RPi or ZUMspot USB: // #define ZUMSPOT_ADF7021 // 2) Libre Kit board or any homebrew hotspot with modified RF7021SE and Blue Pill STM32F103: -#define LIBRE_KIT_ADF7021 +// #define LIBRE_KIT_ADF7021 // 3) MMDVM_HS_Hat revisions 1.1, 1.2 and 1.4 (DB9MAT & DF2ET) // #define MMDVM_HS_HAT_REV12 // 4) MMDVM_HS_Dual_Hat revisions 1.0 (DB9MAT & DF2ET & DO7EN) -// #define MMDVM_HS_DUAL_HAT_REV10 +#define MMDVM_HS_DUAL_HAT_REV10 // 5) Nano hotSPOT (BI7JTA) // #define NANO_HOTSPOT @@ -35,7 +35,7 @@ #define ENABLE_ADF7021 // Enable full duplex support with dual ADF7021 (valid for homebrew hotspots only): -// #define DUPLEX +#define DUPLEX // TCXO of the ADF7021 // For 14.7456 MHz: @@ -44,14 +44,14 @@ // #define ADF7021_12_2880 // Host communication selection: -// #define STM32_USART1_HOST -#define STM32_USB_HOST +#define STM32_USART1_HOST +// #define STM32_USB_HOST // Enable mode detection: #define ENABLE_SCAN_MODE // Send RSSI value: -// #define SEND_RSSI_DATA +#define SEND_RSSI_DATA // Enable Nextion LCD serial port repeater on USART2 (ZUMspot Libre Kit and ZUMspot RPi): #define SERIAL_REPEATER diff --git a/configs/MMDVM_HS_Dual_Hat.h b/configs/MMDVM_HS_Dual_Hat.h new file mode 100644 index 0000000..d7304e7 --- /dev/null +++ b/configs/MMDVM_HS_Dual_Hat.h @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2017,2018 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 + * 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. + */ + +#if !defined(CONFIG_H) +#define CONFIG_H + +// Select one board (STM32F103 based boards) +// 1) ZUMspot RPi or ZUMspot USB: +// #define ZUMSPOT_ADF7021 +// 2) Libre Kit board or any homebrew hotspot with modified RF7021SE and Blue Pill STM32F103: +// #define LIBRE_KIT_ADF7021 +// 3) MMDVM_HS_Hat revisions 1.1, 1.2 and 1.4 (DB9MAT & DF2ET) +// #define MMDVM_HS_HAT_REV12 +// 4) MMDVM_HS_Dual_Hat revisions 1.0 (DB9MAT & DF2ET & DO7EN) +#define MMDVM_HS_DUAL_HAT_REV10 +// 5) Nano hotSPOT (BI7JTA) +// #define NANO_HOTSPOT + +// Enable ADF7021 support: +#define ENABLE_ADF7021 + +// Enable full duplex support with dual ADF7021 (valid for homebrew hotspots only): +#define DUPLEX + +// TCXO of the ADF7021 +// For 14.7456 MHz: +#define ADF7021_14_7456 +// For 12.2880 MHz: +// #define ADF7021_12_2880 + +// Host communication selection: +#define STM32_USART1_HOST +// #define STM32_USB_HOST + +// Enable mode detection: +#define ENABLE_SCAN_MODE + +// Send RSSI value: +#define SEND_RSSI_DATA + +// Enable Nextion LCD serial port repeater on USART2 (ZUMspot Libre Kit and ZUMspot RPi): +#define SERIAL_REPEATER + +// Enable Nextion LCD serial port repeater on USART1 (Do not use with STM32_USART1_HOST enabled): +// #define SERIAL_REPEATER_USART1 + +// Enable P25 Wide modulation: +// #define ENABLE_P25_WIDE + +// Disable mode LEDs blink during scan mode: +// #define QUIET_MODE_LEDS + +// Enable modem debug messages +// #define ENABLE_DEBUG + +#endif From 7af016e1b733be64ff84d25ac2f4666210e6c50a Mon Sep 17 00:00:00 2001 From: phl0 Date: Sun, 25 Feb 2018 17:29:58 +0100 Subject: [PATCH 6/9] Add scripts for FW build/installation of Dual_Hat --- scripts/build_fw.sh | 6 +++ scripts/install_fw_hsdualhat.sh | 77 +++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 scripts/install_fw_hsdualhat.sh diff --git a/scripts/build_fw.sh b/scripts/build_fw.sh index e6bf9b0..6a7206c 100755 --- a/scripts/build_fw.sh +++ b/scripts/build_fw.sh @@ -50,6 +50,12 @@ make mv ~/MMDVM_HS/bin/mmdvm_f1.bin ~/MMDVM_HS/bin/mmdvm_hs_hat_fw.bin make clean +# Building MMDVM_HS_Dual_Hat +cp ~/MMDVM_HS/configs/MMDVM_HS_Dual_Hat.h ~/MMDVM_HS/Config.h +make +mv ~/MMDVM_HS/bin/mmdvm_f1.bin ~/MMDVM_HS/bin/mmdvm_hs_dual_hat_fw.bin +make clean + # Building Nano hotSPOT cp ~/MMDVM_HS/configs/Nano_hotSPOT.h ~/MMDVM_HS/Config.h make diff --git a/scripts/install_fw_hsdualhat.sh b/scripts/install_fw_hsdualhat.sh new file mode 100644 index 0000000..a5a88b7 --- /dev/null +++ b/scripts/install_fw_hsdualhat.sh @@ -0,0 +1,77 @@ +#!/bin/bash + +# Copyright (C) 2017,2018 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 +# 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. + +# Configure latest version +FW_VERSION="v1.3.2" + +# Change USB-serial port name ONLY in macOS +MAC_DEV_USB_SER="/dev/cu.usbmodem1441" + +# 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 + +# Download STM32F10X_Lib (only for binary tools) +if [ ! -d "./STM32F10X_Lib/utils" ]; then + git clone https://github.com/juribeparada/STM32F10X_Lib +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" + DFU_UTIL="./STM32F10X_Lib/utils/linux64/dfu-util" + ST_FLASH="./STM32F10X_Lib/utils/linux64/st-flash" + STM32FLASH="./STM32F10X_Lib/utils/linux64/stm32flash" + elif [ $(uname -m) == "armv7l" ]; then + echo "Raspberry Pi 3 detected" + DFU_RST="./STM32F10X_Lib/utils/rpi32/upload-reset" + DFU_UTIL="./STM32F10X_Lib/utils/rpi32/dfu-util" + ST_FLASH="./STM32F10X_Lib/utils/rpi32/st-flash" + STM32FLASH="./STM32F10X_Lib/utils/rpi32/stm32flash" + elif [ $(uname -m) == "armv6l" ]; then + echo "Raspberry Pi 2 or Pi Zero W detected" + DFU_RST="./STM32F10X_Lib/utils/rpi32/upload-reset" + DFU_UTIL="./STM32F10X_Lib/utils/rpi32/dfu-util" + ST_FLASH="./STM32F10X_Lib/utils/rpi32/st-flash" + STM32FLASH="./STM32F10X_Lib/utils/rpi32/stm32flash" + else + echo "Linux 32-bit detected" + DFU_RST="./STM32F10X_Lib/utils/linux/upload-reset" + DFU_UTIL="./STM32F10X_Lib/utils/linux/dfu-util" + ST_FLASH="./STM32F10X_Lib/utils/linux/st-flash" + STM32FLASH="./STM32F10X_Lib/utils/linux/stm32flash" + fi +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" + STM32FLASH="./STM32F10X_Lib/utils/macosx/stm32flash" +fi + +# Stop MMDVMHost process to free serial port +sudo killall MMDVMHost >/dev/null 2>&1 + +# Upload the firmware +eval sudo $STM32FLASH -v -w mmdvm_hs_dual_hat_fw.bin -g 0x0 -R -i 20,-21,21:-20,21 /dev/ttyAMA0 + From bbfee914c174a05dfe31f283c681f89f94fb2ea4 Mon Sep 17 00:00:00 2001 From: phl0 Date: Sun, 25 Feb 2018 17:55:58 +0100 Subject: [PATCH 7/9] Revert "Add config template for MMDVM_HS_Dual_Hat" This reverts commit 3ad4299e038e286ef3fc3cd26c7727401187a1cf. --- Config.h | 12 +++---- configs/MMDVM_HS_Dual_Hat.h | 71 ------------------------------------- 2 files changed, 6 insertions(+), 77 deletions(-) delete mode 100644 configs/MMDVM_HS_Dual_Hat.h diff --git a/Config.h b/Config.h index d7304e7..c42ddaf 100644 --- a/Config.h +++ b/Config.h @@ -23,11 +23,11 @@ // 1) ZUMspot RPi or ZUMspot USB: // #define ZUMSPOT_ADF7021 // 2) Libre Kit board or any homebrew hotspot with modified RF7021SE and Blue Pill STM32F103: -// #define LIBRE_KIT_ADF7021 +#define LIBRE_KIT_ADF7021 // 3) MMDVM_HS_Hat revisions 1.1, 1.2 and 1.4 (DB9MAT & DF2ET) // #define MMDVM_HS_HAT_REV12 // 4) MMDVM_HS_Dual_Hat revisions 1.0 (DB9MAT & DF2ET & DO7EN) -#define MMDVM_HS_DUAL_HAT_REV10 +// #define MMDVM_HS_DUAL_HAT_REV10 // 5) Nano hotSPOT (BI7JTA) // #define NANO_HOTSPOT @@ -35,7 +35,7 @@ #define ENABLE_ADF7021 // Enable full duplex support with dual ADF7021 (valid for homebrew hotspots only): -#define DUPLEX +// #define DUPLEX // TCXO of the ADF7021 // For 14.7456 MHz: @@ -44,14 +44,14 @@ // #define ADF7021_12_2880 // Host communication selection: -#define STM32_USART1_HOST -// #define STM32_USB_HOST +// #define STM32_USART1_HOST +#define STM32_USB_HOST // Enable mode detection: #define ENABLE_SCAN_MODE // Send RSSI value: -#define SEND_RSSI_DATA +// #define SEND_RSSI_DATA // Enable Nextion LCD serial port repeater on USART2 (ZUMspot Libre Kit and ZUMspot RPi): #define SERIAL_REPEATER diff --git a/configs/MMDVM_HS_Dual_Hat.h b/configs/MMDVM_HS_Dual_Hat.h deleted file mode 100644 index d7304e7..0000000 --- a/configs/MMDVM_HS_Dual_Hat.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2017,2018 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 - * 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. - */ - -#if !defined(CONFIG_H) -#define CONFIG_H - -// Select one board (STM32F103 based boards) -// 1) ZUMspot RPi or ZUMspot USB: -// #define ZUMSPOT_ADF7021 -// 2) Libre Kit board or any homebrew hotspot with modified RF7021SE and Blue Pill STM32F103: -// #define LIBRE_KIT_ADF7021 -// 3) MMDVM_HS_Hat revisions 1.1, 1.2 and 1.4 (DB9MAT & DF2ET) -// #define MMDVM_HS_HAT_REV12 -// 4) MMDVM_HS_Dual_Hat revisions 1.0 (DB9MAT & DF2ET & DO7EN) -#define MMDVM_HS_DUAL_HAT_REV10 -// 5) Nano hotSPOT (BI7JTA) -// #define NANO_HOTSPOT - -// Enable ADF7021 support: -#define ENABLE_ADF7021 - -// Enable full duplex support with dual ADF7021 (valid for homebrew hotspots only): -#define DUPLEX - -// TCXO of the ADF7021 -// For 14.7456 MHz: -#define ADF7021_14_7456 -// For 12.2880 MHz: -// #define ADF7021_12_2880 - -// Host communication selection: -#define STM32_USART1_HOST -// #define STM32_USB_HOST - -// Enable mode detection: -#define ENABLE_SCAN_MODE - -// Send RSSI value: -#define SEND_RSSI_DATA - -// Enable Nextion LCD serial port repeater on USART2 (ZUMspot Libre Kit and ZUMspot RPi): -#define SERIAL_REPEATER - -// Enable Nextion LCD serial port repeater on USART1 (Do not use with STM32_USART1_HOST enabled): -// #define SERIAL_REPEATER_USART1 - -// Enable P25 Wide modulation: -// #define ENABLE_P25_WIDE - -// Disable mode LEDs blink during scan mode: -// #define QUIET_MODE_LEDS - -// Enable modem debug messages -// #define ENABLE_DEBUG - -#endif From c7b9bea1cbc15b403ada912077f32bd923aa8480 Mon Sep 17 00:00:00 2001 From: phl0 Date: Sun, 25 Feb 2018 17:57:42 +0100 Subject: [PATCH 8/9] Re-add config template for MMDVM_HS_Dual_Hat --- configs/MMDVM_HS_Dual_Hat.h | 71 +++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 configs/MMDVM_HS_Dual_Hat.h diff --git a/configs/MMDVM_HS_Dual_Hat.h b/configs/MMDVM_HS_Dual_Hat.h new file mode 100644 index 0000000..2895e04 --- /dev/null +++ b/configs/MMDVM_HS_Dual_Hat.h @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2017,2018 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 + * 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. + */ + +#if !defined(CONFIG_H) +#define CONFIG_H + +// Select one board (STM32F103 based boards) +// 1) ZUMspot RPi or ZUMspot USB: +// #define ZUMSPOT_ADF7021 +// 2) Libre Kit board or any homebrew hotspot with modified RF7021SE and Blue Pill STM32F103: +// #define LIBRE_KIT_ADF7021 +// 3) MMDVM_HS_Hat revisions 1.1, 1.2 and 1.4 (DB9MAT & DF2ET) +// #define MMDVM_HS_HAT_REV12 +// 4) MMDVM_HS_Dual_Hat revisions 1.0 (DB9MAT & DF2ET & DO7EN) +#define MMDVM_HS_DUAL_HAT_REV10 +// 5) Nano hotSPOT (BI7JTA) +// #define NANO_HOTSPOT + +// Enable ADF7021 support: +#define ENABLE_ADF7021 + +// Enable full duplex support with dual ADF7021 (valid for homebrew hotspots only): +#define DUPLEX + +// TCXO of the ADF7021 +// For 14.7456 MHz: +#define ADF7021_14_7456 +// For 12.2880 MHz: +// #define ADF7021_12_2880 + +// Host communication selection: +#define STM32_USART1_HOST +// #define STM32_USB_HOST + +// Enable mode detection: +#define ENABLE_SCAN_MODE + +// Send RSSI value: +#define SEND_RSSI_DATA + +// Enable Nextion LCD serial port repeater on USART2 (ZUMspot Libre Kit and ZUMspot RPi): +#define SERIAL_REPEATER + +// Enable Nextion LCD serial port repeater on USART1 (Do not use with STM32_USART1_HOST enabled): +// #define SERIAL_REPEATER_USART1 + +// Enable P25 Wide modulation: +// #define ENABLE_P25_WIDE + +// Disable mode LEDs blink during scan mode: +// #define QUIET_MODE_LEDS + +// Enable modem debug messages +// #define ENABLE_DEBUG + +#endif From e841ae2d896b53a00ea26b24b1c81e95b777862d Mon Sep 17 00:00:00 2001 From: phl0 Date: Sun, 25 Feb 2018 17:59:07 +0100 Subject: [PATCH 9/9] Update to latest FW version --- scripts/install_fw_hsdualhat.sh | 2 +- scripts/install_fw_hshat.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install_fw_hsdualhat.sh b/scripts/install_fw_hsdualhat.sh index a5a88b7..51b66b9 100644 --- a/scripts/install_fw_hsdualhat.sh +++ b/scripts/install_fw_hsdualhat.sh @@ -17,7 +17,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # Configure latest version -FW_VERSION="v1.3.2" +FW_VERSION="v1.3.3" # Change USB-serial port name ONLY in macOS MAC_DEV_USB_SER="/dev/cu.usbmodem1441" diff --git a/scripts/install_fw_hshat.sh b/scripts/install_fw_hshat.sh index a23f59f..54c21f4 100755 --- a/scripts/install_fw_hshat.sh +++ b/scripts/install_fw_hshat.sh @@ -17,7 +17,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # Configure latest version -FW_VERSION="v1.3.2" +FW_VERSION="v1.3.3" # Change USB-serial port name ONLY in macOS MAC_DEV_USB_SER="/dev/cu.usbmodem1441"