Merge 8a9c6affd6 into 7ff74ed1ba

2026-01-06 08:40:03 +01:00 · 2024-01-23 06:45:24 -06:00 · 2024-01-23 06:45:24 -06:00 · ac2b497d39
parent 7ff74ed1ba 8a9c6affd6
commit ac2b497d39
5 changed files with 141 additions and 6 deletions
--- a/Config.h
+++ b/Config.h
@ -38,6 +38,8 @@
 // #define SKYBRIDGE_HS
 // 9) LoneStar USB Stick ADF7071
 // #define LONESTAR_USB
+// 10) DVMega EuroNode Hotspot/board
+// #define MMDVM_HS_HAT_DVM_EuroNode

 // Enable ADF7021 support:
 #define ENABLE_ADF7021
--- a/IOSTM.cpp
+++ b/IOSTM.cpp
@ -195,7 +195,7 @@
 #define PIN_COS_LED          GPIO_Pin_15
 #define PORT_COS_LED         GPIOB

-#elif defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(MMDVM_HS_DUAL_HAT_REV10) || defined(NANO_HOTSPOT) || defined(NANO_DV_REV11) || defined(D2RG_MMDVM_HS)
+#elif defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(MMDVM_HS_DUAL_HAT_REV10) || defined(NANO_HOTSPOT) || defined(NANO_DV_REV11) || defined(D2RG_MMDVM_HS) || defined(MMDVM_HS_HAT_DVM_EuroNode)

 #define PIN_SCLK             GPIO_Pin_5
 #define PORT_SCLK            GPIOB
@ -275,7 +275,7 @@
 #define PORT_COS_LED         GPIOB

 #else
-#error "Either PI_HAT_7021_REV_02, ZUMSPOT_ADF7021, LONESTAR_USB, LIBRE_KIT_ADF7021, MMDVM_HS_HAT_REV12, MMDVM_HS_DUAL_HAT_REV10, NANO_HOTSPOT, NANO_DV_REV11, D2RG_MMDVM_HS or SKYBRIDGE_HS need to be defined"
+#error "Either PI_HAT_7021_REV_02, ZUMSPOT_ADF7021, LONESTAR_USB, LIBRE_KIT_ADF7021, MMDVM_HS_HAT_REV12, MMDVM_HS_DUAL_HAT_REV10, NANO_HOTSPOT, NANO_DV_REV11, D2RG_MMDVM_HS, MMDVM_HS_HAT_DVM_EuroNode  or SKYBRIDGE_HS need to be defined"
 #endif

 extern "C" {
@ -297,7 +297,7 @@ extern "C" {
  }
 #endif

-#elif defined(ZUMSPOT_ADF7021) || defined(LONESTAR_USB) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(MMDVM_HS_DUAL_HAT_REV10) || defined(NANO_HOTSPOT) || defined(NANO_DV_REV11) || defined(D2RG_MMDVM_HS) || defined(SKYBRIDGE_HS)
+#elif defined(ZUMSPOT_ADF7021) || defined(LONESTAR_USB) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(MMDVM_HS_DUAL_HAT_REV10) || defined(NANO_HOTSPOT) || defined(NANO_DV_REV11) || defined(D2RG_MMDVM_HS) || defined(SKYBRIDGE_HS) || defined(MMDVM_HS_HAT_DVM_EuroNode)

 #if defined(BIDIR_DATA_PIN)
  void EXTI3_IRQHandler(void) {
@ -348,7 +348,7 @@ void CIO::Init()

 #if defined(PI_HAT_7021_REV_02)
  GPIO_PinRemapConfig(GPIO_Remap_SWJ_Disable, ENABLE);
-#elif defined(ZUMSPOT_ADF7021) || defined(LONESTAR_USB) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(MMDVM_HS_DUAL_HAT_REV10) || defined(NANO_HOTSPOT) || defined(NANO_DV_REV11) || defined(D2RG_MMDVM_HS) || defined(SKYBRIDGE_HS)
+#elif defined(ZUMSPOT_ADF7021) || defined(LONESTAR_USB) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(MMDVM_HS_DUAL_HAT_REV10) || defined(NANO_HOTSPOT) || defined(NANO_DV_REV11) || defined(D2RG_MMDVM_HS) || defined(SKYBRIDGE_HS) || defined(MMDVM_HS_HAT_DVM_EuroNode)
  GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
 #endif

@ -549,7 +549,7 @@ void CIO::Init()
  EXTI_InitStructure.EXTI_Line = EXTI_Line14;
 #endif

-#elif defined(ZUMSPOT_ADF7021) || defined(LONESTAR_USB) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(MMDVM_HS_DUAL_HAT_REV10) || defined(NANO_HOTSPOT) || defined(NANO_DV_REV11) || defined(D2RG_MMDVM_HS) || defined(SKYBRIDGE_HS)
+#elif defined(ZUMSPOT_ADF7021) || defined(LONESTAR_USB) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(MMDVM_HS_DUAL_HAT_REV10) || defined(NANO_HOTSPOT) || defined(NANO_DV_REV11) || defined(D2RG_MMDVM_HS) || defined(SKYBRIDGE_HS) || defined(MMDVM_HS_HAT_DVM_EuroNode)

 #if defined(BIDIR_DATA_PIN)
  // Connect EXTI3 Line
@ -601,7 +601,7 @@ void CIO::startInt()

  NVIC_InitStructure.NVIC_IRQChannel = EXTI15_10_IRQn;

-#elif defined(ZUMSPOT_ADF7021) || defined(LONESTAR_USB) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(MMDVM_HS_DUAL_HAT_REV10) || defined(NANO_HOTSPOT) || defined(NANO_DV_REV11) || defined(D2RG_MMDVM_HS) || defined(SKYBRIDGE_HS)
+#elif defined(ZUMSPOT_ADF7021) || defined(LONESTAR_USB) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12) || defined(MMDVM_HS_DUAL_HAT_REV10) || defined(NANO_HOTSPOT) || defined(NANO_DV_REV11) || defined(D2RG_MMDVM_HS) || defined(SKYBRIDGE_HS) || defined(MMDVM_HS_HAT_DVM_EuroNode)

 #if defined(BIDIR_DATA_PIN)
  // Enable and set EXTI3 Interrupt
--- a/configs/DVMega_Euronode.h
+++ b/configs/DVMega_Euronode.h
@ -0,0 +1,121 @@
+/*
+ *   Copyright (C) 2017,2018,2019,2020 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
+// 6) NanoDV NPi or USB revisions 1.0 (BG4TGO & BG5HHP)
+// #define NANO_DV_REV10
+// 7) D2RG MMDVM_HS RPi (BG3MDO, VE2GZI, CA6JAU)
+// #define D2RG_MMDVM_HS
+// 8) BridgeCom SkyBridge HotSpot
+// #define SKYBRIDGE_HS
+// 9) DVMEGA EuroNode NPI HotSpot
+#define MMDVM_HS_HAT_DVM_EuroNode
+
+// 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
+
+// Configure receiver gain for ADF7021
+// AGC automatic, default settings:
+#define AD7021_GAIN_AUTO
+// AGC automatic with high LNA linearity:
+// #define AD7021_GAIN_AUTO_LIN
+// AGC OFF, lowest gain: 
+// #define AD7021_GAIN_LOW
+// AGC OFF, highest gain:
+// #define AD7021_GAIN_HIGH
+
+// Host communication selection:
+#define STM32_USART1_HOST
+// #define STM32_USB_HOST
+// #define STM32_I2C_HOST
+
+// I2C host address:
+#define I2C_ADDR 0x22
+
+// 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
+#define SERIAL_REPEATER_BAUD 9600
+
+// 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
+
+// Engage a constant or descreet Service LED mode once repeater is running 
+// #define CONSTANT_SRV_LED
+// #define CONSTANT_SRV_LED_INVERTED
+// #define DISCREET_SRV_LED
+// #define DISCREET_SRV_LED_INVERTED
+
+// Use the YSF and P25 LEDs for NXDN
+// #define USE_ALTERNATE_NXDN_LEDS
+
+// Use the D-Star and P25 LEDs for M17
+// #define USE_ALTERNATE_M17_LEDS
+
+// Use the D-Star and DMR LEDs for POCSAG
+#define USE_ALTERNATE_POCSAG_LEDS
+
+// Enable for RPi 3B+, USB mode
+// #define LONG_USB_RESET
+
+// Enable modem debug messages
+#define ENABLE_DEBUG
+
+// Disable frequency bands check
+// #define DISABLE_FREQ_CHECK
+
+// Disable frequency restrictions (satellite, ISS, etc)
+// #define DISABLE_FREQ_BAN
+
+// Enable UDID feature
+#define ENABLE_UDID
+
+#endif
--- a/scripts/build_fw.sh
+++ b/scripts/build_fw.sh
@ -185,4 +185,14 @@ make -j4 bl
 mv ~/MMDVM_HS/bin/mmdvm_f1bl.bin ~/MMDVM_HS/bin/lonestar_usb_fw.bin
 make clean

+# Building DVMEGA EuroNode HS_HAT HS GPIO
+echo "********************************************************************"
+echo "********* Building DVMEGA EuroNode HS_HAT HS GPIO firmware *********"
+echo "********************************************************************"
+cp ~/MMDVM_HS/configs/DVMega_Euronode.h ~/MMDVM_HS/Config.h
+make -j4
+mv ~/MMDVM_HS/bin/mmdvm_f1.bin ~/MMDVM_HS/bin/euronode_pi_fw.bin
+make clean
+
+# put default config back:
 cp ~/MMDVM_HS/configs/ZUMspot_Libre.h ~/MMDVM_HS/Config.h
--- a/version.h
+++ b/version.h
@ -46,6 +46,8 @@
 #define BOARD_INFO      "SkyBridge"
 #elif defined(LONESTAR_USB)
 #define BOARD_INFO      "LS_USB_STICK"
+#elif defined(MMDVM_HS_HAT_DVM_EuroNode)
+#define BOARD_INFO      "EuroNode"
 #else
 #define BOARD_INFO      "MMDVM_HS"
 #endif