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-10-22 23:13:05 -03:00
parent 58d732660c e123f6dd59
commit aa824aedf3
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Config.h
View file

@ -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

6
IOArduino.cpp
View file

@ -50,7 +50,7 @@
#define PIN_PTT_LED PB14
#define PIN_COS_LED PB15
#elif defined(ADF7021_CARRIER_BOARD)
#elif defined(ADF7021_CARRIER_BOARD) || 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 need to be defined"
#error "Either PI_HAT_7021_REV_03 or ADF7021_CARRIER_BOARD 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)
#if defined(PI_HAT_7021_REV_03) || defined(ADF7021_CARRIER_BOARD) || defined(MMDVM_HS_HAT_REV12)
afio_cfg_debug_ports(AFIO_DEBUG_SW_ONLY);
#endif

12
IOSTM.cpp
View file

@ -146,7 +146,7 @@
#define PIN_COS_LED GPIO_Pin_15
#define PORT_COS_LED GPIOB
#elif defined(ADF7021_CARRIER_BOARD)
#elif defined(ADF7021_CARRIER_BOARD) || 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 or ADF7021_CARRIER_BOARD need to be defined"
#error "Either PI_HAT_7021_REV_02, PI_HAT_7021_REV_03,ADF7021_CARRIER_BOARD 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)
#elif defined(PI_HAT_7021_REV_03) || defined(ADF7021_CARRIER_BOARD) || 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)
#elif defined(PI_HAT_7021_REV_03) || defined(ADF7021_CARRIER_BOARD) || 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)
#elif defined(PI_HAT_7021_REV_03) || defined(ADF7021_CARRIER_BOARD) || 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)
#elif defined(PI_HAT_7021_REV_03) || defined(ADF7021_CARRIER_BOARD) || defined(MMDVM_HS_HAT_REV12)
#if defined(BIDIR_DATA_PIN)
// Enable and set EXTI3 Interrupt

2
Makefile
View file

@ -377,6 +377,8 @@ ifneq ($(wildcard /usr/bin/stm32flash),)
/usr/bin/stm32flash -v -w bin/$(BINBIN_F1) -g 0x0 -R -i 20,-21,21:-20,21 /dev/ttyAMA0
endif
mmdvm_hs_hat: zumspot-pi
dfu:
ifdef devser
$(DFU_RST) $(devser) 750