g4klx/MMDVM_HS
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVM_HS.git synced 2025-12-06 07:02:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into devel

Browse source
This commit is contained in:
Andy CA6JAU 2017-12-26 17:55:51 -03:00
parent dc3392a883 a17386eb51
commit 4c67850fd3
13 changed files with 125 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ADF7021.cpp
View file

@ -838,7 +838,7 @@ uint16_t CIO::devP25()
void CIO::printConf() void CIO::printConf()
{ {
DEBUG1("ZUMspot configuration:"); DEBUG1("MMDVM_HS FW configuration:");
DEBUG2I("TX freq (Hz):", TXfreq()); DEBUG2I("TX freq (Hz):", TXfreq());
DEBUG2I("RX freq (Hz):", RXfreq()); DEBUG2I("RX freq (Hz):", RXfreq());
DEBUG2("D-Star dev (Hz):", devDSTAR()); DEBUG2("D-Star dev (Hz):", devDSTAR());

14
BUILD.md
View file

@ -108,7 +108,7 @@ Edit Config.h
and enable: and enable:
#define PI_HAT_7021_REV_03 #define ZUMSPOT_ADF7021
#define ENABLE_ADF7021 #define ENABLE_ADF7021
#define ADF7021_14_7456 #define ADF7021_14_7456
#define STM32_USART1_HOST #define STM32_USART1_HOST
@ -198,7 +198,7 @@ Under the menu "Tools" select "Board" and then select:
Edit Config.h: Edit Config.h:
#define ADF7021_CARRIER_BOARD #define LIBRE_KIT_ADF7021
#define ENABLE_ADF7021 #define ENABLE_ADF7021
#define ADF7021_14_7456 #define ADF7021_14_7456
#define STM32_USB_HOST #define STM32_USB_HOST
@ -301,7 +301,7 @@ Edit Config.h:
and enable: and enable:
#define ADF7021_CARRIER_BOARD #define LIBRE_KIT_ADF7021
#define ENABLE_ADF7021 #define ENABLE_ADF7021
#define ADF7021_14_7456 #define ADF7021_14_7456
#define STM32_USB_HOST #define STM32_USB_HOST
@ -395,7 +395,7 @@ Under the menu "Tools" select "Board" and then select:
Edit Config.h: Edit Config.h:
#define PI_HAT_7021_REV_03 #define ZUMSPOT_ADF7021
#define ENABLE_ADF7021 #define ENABLE_ADF7021
#define ADF7021_14_7456 #define ADF7021_14_7456
#define STM32_USB_HOST #define STM32_USB_HOST
@ -437,7 +437,7 @@ Edit Config.h
and enable: and enable:
#define PI_HAT_7021_REV_03 #define ZUMSPOT_ADF7021
#define ENABLE_ADF7021 #define ENABLE_ADF7021
#define ADF7021_14_7456 #define ADF7021_14_7456
#define STM32_USB_HOST #define STM32_USB_HOST
@ -534,10 +534,10 @@ ZUMspot RPi (no USB support needed):
# Config.h options # Config.h options
- #define PI_HAT_7021_REV_03: enable pinouts support for ZUMspot RPi or ZUMspot USB. You have - #define ZUMSPOT_ADF7021: enable pinouts support for ZUMspot RPi or ZUMspot USB. You have
to enable this option if you have one of these products. to enable this option if you have one of these products.
- #define ADF7021_CARRIER_BOARD: enable this option if you have a ZUMspot Libre Kit (Board with - #define LIBRE_KIT_ADF7021: enable this option if you have a ZUMspot Libre Kit (Board with
modified RF7021SE and Blue Pill STM32F103). 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_HAT_REV12: enable this option if you have a MMDVM_HS_Hat board for RPi.

10
Config.h
View file

@ -20,17 +20,17 @@
#define CONFIG_H #define CONFIG_H
// Select one board (STM32F103 based boards) // Select one board (STM32F103 based boards)
// 1) ZUMspot USB and ZUMspot RPi: // 1) ZUMspot RPi or ZUMspot USB:
// #define PI_HAT_7021_REV_03 // #define ZUMSPOT_ADF7021
// 2) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103: // 2) Libre Kit board or any homebrew hotspot with modified RF7021SE and Blue Pill STM32F103:
#define ADF7021_CARRIER_BOARD #define LIBRE_KIT_ADF7021
// 3) MMDVM_HS_Hat revisions 1.1 and 1.2 (DB9MAT & DF2ET) // 3) MMDVM_HS_Hat revisions 1.1 and 1.2 (DB9MAT & DF2ET)
// #define MMDVM_HS_HAT_REV12 // #define MMDVM_HS_HAT_REV12
// Enable ADF7021 support: // Enable ADF7021 support:
#define ENABLE_ADF7021 #define ENABLE_ADF7021
// Enable full duplex support with dual ADF7021: // Enable full duplex support with dual ADF7021 (valid for homebrew hotspots only):
// #define DUPLEX // #define DUPLEX
// TCXO of the ADF7021 // TCXO of the ADF7021

8
IOArduino.cpp
View file

@ -28,7 +28,7 @@
// STM32F1 pin definitions, using STM32duino // STM32F1 pin definitions, using STM32duino
#if defined(PI_HAT_7021_REV_03) #if defined(ZUMSPOT_ADF7021)
#define PIN_SCLK PB5 #define PIN_SCLK PB5
#define PIN_SREAD PB6 #define PIN_SREAD PB6
@ -50,7 +50,7 @@
#define PIN_PTT_LED PB14 #define PIN_PTT_LED PB14
#define PIN_COS_LED PB15 #define PIN_COS_LED PB15
#elif defined(ADF7021_CARRIER_BOARD) || defined(MMDVM_HS_HAT_REV12) #elif defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12)
#define PIN_SCLK PB5 #define PIN_SCLK PB5
#define PIN_SREAD PB7 #define PIN_SREAD PB7
@ -73,7 +73,7 @@
#define PIN_COS_LED PB15 #define PIN_COS_LED PB15
#else #else
#error "Either PI_HAT_7021_REV_03 or ADF7021_CARRIER_BOARD or MMDVM_HS_HAT_REV12 need to be defined" #error "Either ZUMSPOT_ADF7021 or LIBRE_KIT_ADF7021 or MMDVM_HS_HAT_REV12 need to be defined"
#endif #endif
#elif defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__) #elif defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)
@ -144,7 +144,7 @@ void CIO::Init()
{ {
#if defined (__STM32F1__) #if defined (__STM32F1__)
#if defined(PI_HAT_7021_REV_03) || defined(ADF7021_CARRIER_BOARD) || defined(MMDVM_HS_HAT_REV12) #if defined(ZUMSPOT_ADF7021) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12)
afio_cfg_debug_ports(AFIO_DEBUG_SW_ONLY); afio_cfg_debug_ports(AFIO_DEBUG_SW_ONLY);
#endif #endif

14
IOSTM.cpp
View file

@ -86,7 +86,7 @@
#define PIN_COS_LED GPIO_Pin_13 #define PIN_COS_LED GPIO_Pin_13
#define PORT_COS_LED GPIOB #define PORT_COS_LED GPIOB
#elif defined(PI_HAT_7021_REV_03) #elif defined(ZUMSPOT_ADF7021)
#define PIN_SCLK GPIO_Pin_5 #define PIN_SCLK GPIO_Pin_5
#define PORT_SCLK GPIOB #define PORT_SCLK GPIOB
@ -146,7 +146,7 @@
#define PIN_COS_LED GPIO_Pin_15 #define PIN_COS_LED GPIO_Pin_15
#define PORT_COS_LED GPIOB #define PORT_COS_LED GPIOB
#elif defined(ADF7021_CARRIER_BOARD) || defined(MMDVM_HS_HAT_REV12) #elif defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12)
#define PIN_SCLK GPIO_Pin_5 #define PIN_SCLK GPIO_Pin_5
#define PORT_SCLK GPIOB #define PORT_SCLK GPIOB
@ -216,7 +216,7 @@
#define PORT_COS_LED GPIOB #define PORT_COS_LED GPIOB
#else #else
#error "Either PI_HAT_7021_REV_02, PI_HAT_7021_REV_03,ADF7021_CARRIER_BOARD or MMDVM_HS_HAT_REV12 need to be defined" #error "Either PI_HAT_7021_REV_02, ZUMSPOT_ADF7021, LIBRE_KIT_ADF7021 or MMDVM_HS_HAT_REV12 need to be defined"
#endif #endif
extern "C" { extern "C" {
@ -238,7 +238,7 @@ extern "C" {
} }
#endif #endif
#elif defined(PI_HAT_7021_REV_03) || defined(ADF7021_CARRIER_BOARD) || defined(MMDVM_HS_HAT_REV12) #elif defined(ZUMSPOT_ADF7021) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12)
#if defined(BIDIR_DATA_PIN) #if defined(BIDIR_DATA_PIN)
void EXTI3_IRQHandler(void) { void EXTI3_IRQHandler(void) {
@ -275,7 +275,7 @@ void CIO::Init()
#if defined(PI_HAT_7021_REV_02) #if defined(PI_HAT_7021_REV_02)
GPIO_PinRemapConfig(GPIO_Remap_SWJ_Disable, ENABLE); GPIO_PinRemapConfig(GPIO_Remap_SWJ_Disable, ENABLE);
#elif defined(PI_HAT_7021_REV_03) || defined(ADF7021_CARRIER_BOARD) || defined(MMDVM_HS_HAT_REV12) #elif defined(ZUMSPOT_ADF7021) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12)
GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE); GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
#endif #endif
@ -439,7 +439,7 @@ void CIO::Init()
EXTI_InitStructure.EXTI_Line = EXTI_Line14; EXTI_InitStructure.EXTI_Line = EXTI_Line14;
#endif #endif
#elif defined(PI_HAT_7021_REV_03) || defined(ADF7021_CARRIER_BOARD) || defined(MMDVM_HS_HAT_REV12) #elif defined(ZUMSPOT_ADF7021) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12)
#if defined(BIDIR_DATA_PIN) #if defined(BIDIR_DATA_PIN)
// Connect EXTI3 Line // Connect EXTI3 Line
@ -487,7 +487,7 @@ void CIO::startInt()
NVIC_InitStructure.NVIC_IRQChannel = EXTI15_10_IRQn; NVIC_InitStructure.NVIC_IRQChannel = EXTI15_10_IRQn;
#elif defined(PI_HAT_7021_REV_03) || defined(ADF7021_CARRIER_BOARD) || defined(MMDVM_HS_HAT_REV12) #elif defined(ZUMSPOT_ADF7021) || defined(LIBRE_KIT_ADF7021) || defined(MMDVM_HS_HAT_REV12)
#if defined(BIDIR_DATA_PIN) #if defined(BIDIR_DATA_PIN)
// Enable and set EXTI3 Interrupt // Enable and set EXTI3 Interrupt

26
README.md
View file

@ -1,6 +1,6 @@
# Introduction # Introduction
This is the source code of ZUMspot/MMDVM_HS, personal hotspot (ADF7021 version of the MMDVM firmware), based on Jonathan G4KLX's MMDVM software. This firmware supports D-Star, DMR, System Fusion and P25 digital modes. This is the source code of ZUMspot/MMDVM_HS, personal hotspot (ADF7021 version of the MMDVM firmware), based on Jonathan G4KLX's [MMDVM](https://github.com/g4klx/MMDVM) software. This firmware supports D-Star, DMR, System Fusion and P25 digital modes.
This software is intended to be run on STM32F103 microcontroller. You can build this code using Arduino IDE with STM32duino package, or using "make" with ARM GCC tools. Also, Arduino with 3.3 V I/O (Arduino Due and Zero) and Teensy (3.1, 3.2, 3.5 or 3.6) are supported. This software is intended to be run on STM32F103 microcontroller. You can build this code using Arduino IDE with STM32duino package, or using "make" with ARM GCC tools. Also, Arduino with 3.3 V I/O (Arduino Due and Zero) and Teensy (3.1, 3.2, 3.5 or 3.6) are supported.
@ -10,7 +10,7 @@ This software is licenced under the GPL v2 and is intended for amateur and educa
- Supported modes: D-Star, DMR, Yaesu Fusion and P25 Phase 1 - Supported modes: D-Star, DMR, Yaesu Fusion and P25 Phase 1
- Automatic mode detection (scanning) - Automatic mode detection (scanning)
- G4KLX software suite: MMDVMHost, ircDDBGateway, YSFGateway, P25Gateway and DMRGateway - G4KLX software suite: [MMDVMHost](https://github.com/g4klx/MMDVMHost), [ircDDBGateway](https://github.com/dl5di/OpenDV), [YSFGateway](https://github.com/g4klx/YSFClients), [P25Gateway](https://github.com/g4klx/P25Clients) and [DMRGateway](https://github.com/g4klx/DMRGateway)
- Bands: 144, 220, 430 and 900 MHz (VHF requires external inductor) - Bands: 144, 220, 430 and 900 MHz (VHF requires external inductor)
- Status LEDs (PTT, COR and digital modes) - Status LEDs (PTT, COR and digital modes)
- Serial repeater port for Nextion displays - Serial repeater port for Nextion displays
@ -24,31 +24,27 @@ The ADF7021 (or RF7021SE module) must operate with a 14.7456 MHz TCXO and with a
The jumper wire to CLKOUT in RF7021SE module is not longer required for lastest MMDVM_HS firmware. But CE pin connection of ADF7021 is required for proper operation of ZUMspot. The jumper wire to CLKOUT in RF7021SE module is not longer required for lastest MMDVM_HS firmware. But CE pin connection of ADF7021 is required for proper operation of ZUMspot.
Be aware that some Blue Pill STM32F103 board are defectives. If you have trouble with USB, please check this: http://wiki.stm32duino.com/index.php?title=Blue_Pill Be aware that some Blue Pill STM32F103 board are defectives. If you have trouble with USB, please check this [link](http://wiki.stm32duino.com/index.php?title=Blue_Pill).
VHF (144-148 MHz) support for ZUMSpot is added by an external 18 nH inductor between L1 and L2 pins of ADF7021. This will enable dual band (VHF/UHF) operation. VHF (144-148 MHz) support for ZUMSpot is added by an external 18 nH inductor between L1 and L2 pins of ADF7021. This will enable dual band (VHF/UHF) operation.
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. 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 LIBRE_KIT_ADF7021 (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 have test equipment, enable TEST_TX feature (see "Hidden functions" in [BUILD.md](BUILD.md) document). 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 # Quick start
Please see [BUILD.md](BUILD.md) for more details, and also MMDVM Yahoo Groups. You also can check at MMDVM_HS/scripts folder for some automatic tasks. Please see [BUILD.md](BUILD.md) for more details, and also [MMDVM](https://groups.yahoo.com/neo/groups/mmdvm/info) Yahoo Groups. You also can check at MMDVM_HS/scripts folder for some automatic tasks.
## Binary firmware installation ## Binary firmware installation
Please check the latest firmware: Please check the latest firmware [here](https://github.com/juribeparada/MMDVM_HS/releases).
https://github.com/juribeparada/MMDVM_HS/releases
### Windows ### Windows
Download the ZUMspotFW firmware upgrade utility (ZUMspotFW_setup.exe) from the releases section: Download the ZUMspotFW firmware upgrade utility (ZUMspotFW_setup.exe) from the [releases section](https://github.com/juribeparada/MMDVM_HS/releases/download/v1.0.2/ZUMSpotFW_setup.exe).
https://github.com/juribeparada/MMDVM_HS/releases/download/v1.0.2/ZUMSpotFW_setup.exe This utility includes firmwares binaries and USB drivers for Windows 7/8/10. If you have problems with the installer, you can download [ZUMspotFW.zip](https://github.com/juribeparada/MMDVM_HS/releases/download/v1.0.2/ZUMspotFW.zip) for a manual installation.
This utility includes firmwares binaries and USB drivers for Windows 7/8/10. If you have problems with the installer, you can download ZUMspotFW.zip for a manual installation.
### Linux or macOS ### Linux or macOS
@ -81,9 +77,7 @@ You could check at MMDVM_HS/configs for common Config.h examples, using differen
### MMDVM_HS_Hat ### MMDVM_HS_Hat
Please check here for detailed instructions: Please visit Mathis Schmieder GitHub [here](https://github.com/mathisschmieder/MMDVM_HS_Hat/blob/master/README.md) for detailed instructions.
https://github.com/mathisschmieder/MMDVM_HS_Hat/blob/master/README.md
### ZUMspot Libre Kit (under Linux Raspbian) ### ZUMspot Libre Kit (under Linux Raspbian)
@ -186,7 +180,7 @@ Edit Config.h
and enable: and enable:
#define PI_HAT_7021_REV_03 #define ZUMSPOT_ADF7021
#define ENABLE_ADF7021 #define ENABLE_ADF7021
#define ADF7021_14_7456 #define ADF7021_14_7456
#define STM32_USART1_HOST #define STM32_USART1_HOST

22
SerialPort.cpp
View file

@ -20,11 +20,7 @@
#include "Config.h" #include "Config.h"
#include "Globals.h" #include "Globals.h"
#include "version.h"
#if defined(MADEBYMAKEFILE)
#include "GitVersion.h"
#endif
#include "SerialPort.h" #include "SerialPort.h"
const uint8_t MMDVM_FRAME_START = 0xE0U; const uint8_t MMDVM_FRAME_START = 0xE0U;
@ -70,20 +66,6 @@ const uint8_t MMDVM_DEBUG3 = 0xF3U;
const uint8_t MMDVM_DEBUG4 = 0xF4U; const uint8_t MMDVM_DEBUG4 = 0xF4U;
const uint8_t MMDVM_DEBUG5 = 0xF5U; const uint8_t MMDVM_DEBUG5 = 0xF5U;
#if defined(ADF7021_N_VER)
#define DESCRIPTION "ZUMspot ADF7021N v1.0.2 20171023 (DStar/DMR/YSF/P25)"
#else
#define DESCRIPTION "ZUMspot ADF7021 v1.0.2 20171023 (DStar/DMR/YSF/P25)"
#endif
#if defined(GITVERSION)
#define concat(a, b) a " GitID #" b ""
const char HARDWARE[] = concat(DESCRIPTION, GITVERSION);
#else
#define concat(a, b, c) a " (Build: " b " " c ")"
const char HARDWARE[] = concat(DESCRIPTION, __TIME__, __DATE__);
#endif
const uint8_t PROTOCOL_VERSION = 1U; const uint8_t PROTOCOL_VERSION = 1U;
CSerialPort::CSerialPort() : CSerialPort::CSerialPort() :
@ -207,7 +189,7 @@ void CSerialPort::getVersion()
uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length) uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
{ {
if (length < 13U) if (length < 15U)
return 4U; return 4U;
bool ysfLoDev = (data[0U] & 0x08U) == 0x08U; bool ysfLoDev = (data[0U] & 0x08U) == 0x08U;

10
configs/MMDVM_HS_Hat.h
View file

@ -20,17 +20,17 @@
#define CONFIG_H #define CONFIG_H
// Select one board (STM32F103 based boards) // Select one board (STM32F103 based boards)
// 1) ZUMspot USB and ZUMspot RPi: // 1) ZUMspot RPi or ZUMspot USB:
// #define PI_HAT_7021_REV_03 // #define ZUMSPOT_ADF7021
// 2) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103: // 2) Libre Kit board or any homebrew hotspot with modified RF7021SE and Blue Pill STM32F103:
// #define ADF7021_CARRIER_BOARD // #define LIBRE_KIT_ADF7021
// 3) MMDVM_HS_Hat revisions 1.1 and 1.2 (DB9MAT & DF2ET) // 3) MMDVM_HS_Hat revisions 1.1 and 1.2 (DB9MAT & DF2ET)
#define MMDVM_HS_HAT_REV12 #define MMDVM_HS_HAT_REV12
// Enable ADF7021 support: // Enable ADF7021 support:
#define ENABLE_ADF7021 #define ENABLE_ADF7021
// Enable full duplex support with dual ADF7021: // Enable full duplex support with dual ADF7021 (valid for homebrew hotspots only):
// #define DUPLEX // #define DUPLEX
// TCXO of the ADF7021 // TCXO of the ADF7021

10
configs/ZUMspot_Libre.h
View file

@ -20,17 +20,17 @@
#define CONFIG_H #define CONFIG_H
// Select one board (STM32F103 based boards) // Select one board (STM32F103 based boards)
// 1) ZUMspot USB and ZUMspot RPi: // 1) ZUMspot RPi or ZUMspot USB:
// #define PI_HAT_7021_REV_03 // #define ZUMSPOT_ADF7021
// 2) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103: // 2) Libre Kit board or any homebrew hotspot with modified RF7021SE and Blue Pill STM32F103:
#define ADF7021_CARRIER_BOARD #define LIBRE_KIT_ADF7021
// 3) MMDVM_HS_Hat revisions 1.1 and 1.2 (DB9MAT & DF2ET) // 3) MMDVM_HS_Hat revisions 1.1 and 1.2 (DB9MAT & DF2ET)
// #define MMDVM_HS_HAT_REV12 // #define MMDVM_HS_HAT_REV12
// Enable ADF7021 support: // Enable ADF7021 support:
#define ENABLE_ADF7021 #define ENABLE_ADF7021
// Enable full duplex support with dual ADF7021: // Enable full duplex support with dual ADF7021 (valid for homebrew hotspots only):
// #define DUPLEX // #define DUPLEX
// TCXO of the ADF7021 // TCXO of the ADF7021

10
configs/ZUMspot_RPi.h
View file

@ -20,17 +20,17 @@
#define CONFIG_H #define CONFIG_H
// Select one board (STM32F103 based boards) // Select one board (STM32F103 based boards)
// 1) ZUMspot USB and ZUMspot RPi: // 1) ZUMspot RPi or ZUMspot USB:
#define PI_HAT_7021_REV_03 #define ZUMSPOT_ADF7021
// 2) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103: // 2) Libre Kit board or any homebrew hotspot with modified RF7021SE and Blue Pill STM32F103:
// #define ADF7021_CARRIER_BOARD // #define LIBRE_KIT_ADF7021
// 3) MMDVM_HS_Hat revisions 1.1 and 1.2 (DB9MAT & DF2ET) // 3) MMDVM_HS_Hat revisions 1.1 and 1.2 (DB9MAT & DF2ET)
// #define MMDVM_HS_HAT_REV12 // #define MMDVM_HS_HAT_REV12
// Enable ADF7021 support: // Enable ADF7021 support:
#define ENABLE_ADF7021 #define ENABLE_ADF7021
// Enable full duplex support with dual ADF7021: // Enable full duplex support with dual ADF7021 (valid for homebrew hotspots only):
// #define DUPLEX // #define DUPLEX
// TCXO of the ADF7021 // TCXO of the ADF7021

10
configs/ZUMspot_USB.h
View file

@ -20,17 +20,17 @@
#define CONFIG_H #define CONFIG_H
// Select one board (STM32F103 based boards) // Select one board (STM32F103 based boards)
// 1) ZUMspot USB and ZUMspot RPi: // 1) ZUMspot RPi or ZUMspot USB:
#define PI_HAT_7021_REV_03 #define ZUMSPOT_ADF7021
// 2) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103: // 2) Libre Kit board or any homebrew hotspot with modified RF7021SE and Blue Pill STM32F103:
// #define ADF7021_CARRIER_BOARD // #define LIBRE_KIT_ADF7021
// 3) MMDVM_HS_Hat revisions 1.1 and 1.2 (DB9MAT & DF2ET) // 3) MMDVM_HS_Hat revisions 1.1 and 1.2 (DB9MAT & DF2ET)
// #define MMDVM_HS_HAT_REV12 // #define MMDVM_HS_HAT_REV12
// Enable ADF7021 support: // Enable ADF7021 support:
#define ENABLE_ADF7021 #define ENABLE_ADF7021
// Enable full duplex support with dual ADF7021: // Enable full duplex support with dual ADF7021 (valid for homebrew hotspots only):
// #define DUPLEX // #define DUPLEX
// TCXO of the ADF7021 // TCXO of the ADF7021

10
configs/ZUMspot_duplex.h
View file

@ -20,17 +20,17 @@
#define CONFIG_H #define CONFIG_H
// Select one board (STM32F103 based boards) // Select one board (STM32F103 based boards)
// 1) ZUMspot USB and ZUMspot RPi: // 1) ZUMspot RPi or ZUMspot USB:
// #define PI_HAT_7021_REV_03 // #define ZUMSPOT_ADF7021
// 2) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103: // 2) Libre Kit board or any homebrew hotspot with modified RF7021SE and Blue Pill STM32F103:
#define ADF7021_CARRIER_BOARD #define LIBRE_KIT_ADF7021
// 3) MMDVM_HS_Hat revisions 1.1 and 1.2 (DB9MAT & DF2ET) // 3) MMDVM_HS_Hat revisions 1.1 and 1.2 (DB9MAT & DF2ET)
// #define MMDVM_HS_HAT_REV12 // #define MMDVM_HS_HAT_REV12
// Enable ADF7021 support: // Enable ADF7021 support:
#define ENABLE_ADF7021 #define ENABLE_ADF7021
// Enable full duplex support with dual ADF7021: // Enable full duplex support with dual ADF7021 (valid for homebrew hotspots only):
#define DUPLEX #define DUPLEX
// TCXO of the ADF7021 // TCXO of the ADF7021

64
version.h Normal file
View file

@ -0,0 +1,64 @@
/*
* Copyright (C) 2016, 2017 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(VERSION_H)
#define VERSION_H
#include "Config.h"
#define VER_MAJOR "1"
#define VER_MINOR "0"
#define VER_REV "3"
#define VERSION_DATE "20171226"
#if defined(ZUMSPOT_ADF7021)
#define BOARD_INFO "ZUMspot"
#elif defined(MMDVM_HS_HAT_REV12)
#define BOARD_INFO "MMDVM_HS_Hat"
#else
#define BOARD_INFO "MMDVM_HS"
#endif
#if defined(ENABLE_ADF7021)
#define RF_CHIP "ADF7021"
#endif
#if defined(DUPLEX)
#define RF_DUAL "dual "
#else
#define RF_DUAL ""
#endif
#define FW_VERSION "v" VER_MAJOR "." VER_MINOR "." VER_REV " " VERSION_DATE
#define DESCRIPTION BOARD_INFO "-" FW_VERSION " " RF_DUAL RF_CHIP " FW by CA6JAU"
#if defined(MADEBYMAKEFILE)
#include "GitVersion.h"
#endif
#if defined(GITVERSION)
#define concat(a, b) a " GitID #" b ""
const char HARDWARE[] = concat(DESCRIPTION, GITVERSION);
#else
#define concat(a, b, c) a " (Build: " b " " c ")"
const char HARDWARE[] = concat(DESCRIPTION, __TIME__, __DATE__);
#endif
#endif