mirror of
https://github.com/g4klx/MMDVM_HS.git
synced 2025-12-06 07:02:00 +01:00
Updating #define names for boards
This commit is contained in:
Andy CA6JAU
parent
bfb82b4bd0
commit
6c34fd4c6d
|
|
@ -838,7 +838,7 @@ uint16_t CIO::devP25()
|
|||
|
||||
void CIO::printConf()
|
||||
{
|
||||
DEBUG1("ZUMspot configuration:");
|
||||
DEBUG1("MMDVM_HS FW configuration:");
|
||||
DEBUG2I("TX freq (Hz):", TXfreq());
|
||||
DEBUG2I("RX freq (Hz):", RXfreq());
|
||||
DEBUG2("D-Star dev (Hz):", devDSTAR());
|
||||
|
|
|
|||
14
BUILD.md
14
BUILD.md
|
|
@ -108,7 +108,7 @@ Edit Config.h
|
|||
|
||||
and enable:
|
||||
|
||||
#define PI_HAT_7021_REV_03
|
||||
#define ZUMSPOT_ADF7021
|
||||
#define ENABLE_ADF7021
|
||||
#define ADF7021_14_7456
|
||||
#define STM32_USART1_HOST
|
||||
|
|
@ -198,7 +198,7 @@ Under the menu "Tools" select "Board" and then select:
|
|||
|
||||
Edit Config.h:
|
||||
|
||||
#define ADF7021_CARRIER_BOARD
|
||||
#define LIBRE_KIT_ADF7021
|
||||
#define ENABLE_ADF7021
|
||||
#define ADF7021_14_7456
|
||||
#define STM32_USB_HOST
|
||||
|
|
@ -301,7 +301,7 @@ Edit Config.h:
|
|||
|
||||
and enable:
|
||||
|
||||
#define ADF7021_CARRIER_BOARD
|
||||
#define LIBRE_KIT_ADF7021
|
||||
#define ENABLE_ADF7021
|
||||
#define ADF7021_14_7456
|
||||
#define STM32_USB_HOST
|
||||
|
|
@ -395,7 +395,7 @@ Under the menu "Tools" select "Board" and then select:
|
|||
|
||||
Edit Config.h:
|
||||
|
||||
#define PI_HAT_7021_REV_03
|
||||
#define ZUMSPOT_ADF7021
|
||||
#define ENABLE_ADF7021
|
||||
#define ADF7021_14_7456
|
||||
#define STM32_USB_HOST
|
||||
|
|
@ -437,7 +437,7 @@ Edit Config.h
|
|||
|
||||
and enable:
|
||||
|
||||
#define PI_HAT_7021_REV_03
|
||||
#define ZUMSPOT_ADF7021
|
||||
#define ENABLE_ADF7021
|
||||
#define ADF7021_14_7456
|
||||
#define STM32_USB_HOST
|
||||
|
|
@ -534,10 +534,10 @@ ZUMspot RPi (no USB support needed):
|
|||
|
||||
# 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.
|
||||
|
||||
- #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).
|
||||
|
||||
- #define MMDVM_HS_HAT_REV12: enable this option if you have a MMDVM_HS_Hat board for RPi.
|
||||
|
|
|
|||
10
Config.h
10
Config.h
|
|
@ -20,17 +20,17 @@
|
|||
#define CONFIG_H
|
||||
|
||||
// Select one board (STM32F103 based boards)
|
||||
// 1) ZUMspot USB and ZUMspot RPi:
|
||||
// #define PI_HAT_7021_REV_03
|
||||
// 2) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103:
|
||||
#define ADF7021_CARRIER_BOARD
|
||||
// 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 and 1.2 (DB9MAT & DF2ET)
|
||||
// #define MMDVM_HS_HAT_REV12
|
||||
|
||||
// Enable ADF7021 support:
|
||||
#define ENABLE_ADF7021
|
||||
|
||||
// Enable full duplex support with dual ADF7021:
|
||||
// Enable full duplex support with dual ADF7021 (valid for homebrew hotspots only):
|
||||
// #define DUPLEX
|
||||
|
||||
// TCXO of the ADF7021
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
// STM32F1 pin definitions, using STM32duino
|
||||
|
||||
#if defined(PI_HAT_7021_REV_03)
|
||||
#if defined(ZUMSPOT_ADF7021)
|
||||
|
||||
#define PIN_SCLK PB5
|
||||
#define PIN_SREAD PB6
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
#define PIN_PTT_LED PB14
|
||||
#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_SREAD PB7
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
#define PIN_COS_LED PB15
|
||||
|
||||
#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
|
||||
|
||||
#elif defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)
|
||||
|
|
@ -144,7 +144,7 @@ void CIO::Init()
|
|||
{
|
||||
#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);
|
||||
#endif
|
||||
|
||||
|
|
|
|||
14
IOSTM.cpp
14
IOSTM.cpp
|
|
@ -86,7 +86,7 @@
|
|||
#define PIN_COS_LED GPIO_Pin_13
|
||||
#define PORT_COS_LED GPIOB
|
||||
|
||||
#elif defined(PI_HAT_7021_REV_03)
|
||||
#elif defined(ZUMSPOT_ADF7021)
|
||||
|
||||
#define PIN_SCLK GPIO_Pin_5
|
||||
#define PORT_SCLK GPIOB
|
||||
|
|
@ -146,7 +146,7 @@
|
|||
#define PIN_COS_LED GPIO_Pin_15
|
||||
#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 PORT_SCLK GPIOB
|
||||
|
|
@ -216,7 +216,7 @@
|
|||
#define PORT_COS_LED GPIOB
|
||||
|
||||
#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
|
||||
|
||||
extern "C" {
|
||||
|
|
@ -238,7 +238,7 @@ extern "C" {
|
|||
}
|
||||
#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)
|
||||
void EXTI3_IRQHandler(void) {
|
||||
|
|
@ -275,7 +275,7 @@ void CIO::Init()
|
|||
|
||||
#if defined(PI_HAT_7021_REV_02)
|
||||
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);
|
||||
#endif
|
||||
|
||||
|
|
@ -439,7 +439,7 @@ void CIO::Init()
|
|||
EXTI_InitStructure.EXTI_Line = EXTI_Line14;
|
||||
#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)
|
||||
// Connect EXTI3 Line
|
||||
|
|
@ -487,7 +487,7 @@ void CIO::startInt()
|
|||
|
||||
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)
|
||||
// Enable and set EXTI3 Interrupt
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ Be aware that some Blue Pill STM32F103 board are defectives. If you have trouble
|
|||
|
||||
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).
|
||||
|
||||
|
|
@ -180,7 +180,7 @@ Edit Config.h
|
|||
|
||||
and enable:
|
||||
|
||||
#define PI_HAT_7021_REV_03
|
||||
#define ZUMSPOT_ADF7021
|
||||
#define ENABLE_ADF7021
|
||||
#define ADF7021_14_7456
|
||||
#define STM32_USART1_HOST
|
||||
|
|
|
|||
|
|
@ -20,17 +20,17 @@
|
|||
#define CONFIG_H
|
||||
|
||||
// Select one board (STM32F103 based boards)
|
||||
// 1) ZUMspot USB and ZUMspot RPi:
|
||||
// #define PI_HAT_7021_REV_03
|
||||
// 2) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103:
|
||||
// #define ADF7021_CARRIER_BOARD
|
||||
// 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 and 1.2 (DB9MAT & DF2ET)
|
||||
#define MMDVM_HS_HAT_REV12
|
||||
|
||||
// Enable ADF7021 support:
|
||||
#define ENABLE_ADF7021
|
||||
|
||||
// Enable full duplex support with dual ADF7021:
|
||||
// Enable full duplex support with dual ADF7021 (valid for homebrew hotspots only):
|
||||
// #define DUPLEX
|
||||
|
||||
// TCXO of the ADF7021
|
||||
|
|
|
|||
|
|
@ -20,17 +20,17 @@
|
|||
#define CONFIG_H
|
||||
|
||||
// Select one board (STM32F103 based boards)
|
||||
// 1) ZUMspot USB and ZUMspot RPi:
|
||||
// #define PI_HAT_7021_REV_03
|
||||
// 2) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103:
|
||||
#define ADF7021_CARRIER_BOARD
|
||||
// 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 and 1.2 (DB9MAT & DF2ET)
|
||||
// #define MMDVM_HS_HAT_REV12
|
||||
|
||||
// Enable ADF7021 support:
|
||||
#define ENABLE_ADF7021
|
||||
|
||||
// Enable full duplex support with dual ADF7021:
|
||||
// Enable full duplex support with dual ADF7021 (valid for homebrew hotspots only):
|
||||
// #define DUPLEX
|
||||
|
||||
// TCXO of the ADF7021
|
||||
|
|
|
|||
|
|
@ -20,17 +20,17 @@
|
|||
#define CONFIG_H
|
||||
|
||||
// Select one board (STM32F103 based boards)
|
||||
// 1) ZUMspot USB and ZUMspot RPi:
|
||||
#define PI_HAT_7021_REV_03
|
||||
// 2) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103:
|
||||
// #define ADF7021_CARRIER_BOARD
|
||||
// 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 and 1.2 (DB9MAT & DF2ET)
|
||||
// #define MMDVM_HS_HAT_REV12
|
||||
|
||||
// Enable ADF7021 support:
|
||||
#define ENABLE_ADF7021
|
||||
|
||||
// Enable full duplex support with dual ADF7021:
|
||||
// Enable full duplex support with dual ADF7021 (valid for homebrew hotspots only):
|
||||
// #define DUPLEX
|
||||
|
||||
// TCXO of the ADF7021
|
||||
|
|
|
|||
|
|
@ -20,17 +20,17 @@
|
|||
#define CONFIG_H
|
||||
|
||||
// Select one board (STM32F103 based boards)
|
||||
// 1) ZUMspot USB and ZUMspot RPi:
|
||||
#define PI_HAT_7021_REV_03
|
||||
// 2) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103:
|
||||
// #define ADF7021_CARRIER_BOARD
|
||||
// 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 and 1.2 (DB9MAT & DF2ET)
|
||||
// #define MMDVM_HS_HAT_REV12
|
||||
|
||||
// Enable ADF7021 support:
|
||||
#define ENABLE_ADF7021
|
||||
|
||||
// Enable full duplex support with dual ADF7021:
|
||||
// Enable full duplex support with dual ADF7021 (valid for homebrew hotspots only):
|
||||
// #define DUPLEX
|
||||
|
||||
// TCXO of the ADF7021
|
||||
|
|
|
|||
|
|
@ -20,17 +20,17 @@
|
|||
#define CONFIG_H
|
||||
|
||||
// Select one board (STM32F103 based boards)
|
||||
// 1) ZUMspot USB and ZUMspot RPi:
|
||||
// #define PI_HAT_7021_REV_03
|
||||
// 2) ZUMspot Libre Kit or board with modified RF7021SE and Blue Pill STM32F103:
|
||||
#define ADF7021_CARRIER_BOARD
|
||||
// 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 and 1.2 (DB9MAT & DF2ET)
|
||||
// #define MMDVM_HS_HAT_REV12
|
||||
|
||||
// Enable ADF7021 support:
|
||||
#define ENABLE_ADF7021
|
||||
|
||||
// Enable full duplex support with dual ADF7021:
|
||||
// Enable full duplex support with dual ADF7021 (valid for homebrew hotspots only):
|
||||
#define DUPLEX
|
||||
|
||||
// TCXO of the ADF7021
|
||||
|
|
|
|||
Loading…
Reference in a new issue