Superminaren
/
MMDVM
mirror of https://github.com/g4klx/MMDVM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pocsag' into pocsag_test

This commit is contained in:
Jonathan Naylor 2018-07-04 18:41:35 +01:00
parent 0092d6d9c3 a4af04fae2
commit 07e18ffcfb
5 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Config.h
View File

@ -73,4 +73,11 @@
// Do not use if employing an external hardware watchdog // Do not use if employing an external hardware watchdog
// #define CONSTANT_SRV_LED // #define CONSTANT_SRV_LED
// Use the YSF and P25 LEDs for NXDN
// #define USE_ALTERNATE_NXDN_LEDS
// Use the D-Star and DMR LEDs for POCSAG
// #define USE_ALTERNATE_POCSAG_LEDS
#endif #endif

10
IODue.cpp
View File

@ -236,12 +236,22 @@ void CIO::setP25Int(bool on)
void CIO::setNXDNInt(bool on) void CIO::setNXDNInt(bool on)
{ {
#if defined(USE_ALTERNATE_NXDN_LEDS)
digitalWrite(PIN_YSF, on ? HIGH : LOW);
digitalWrite(PIN_P25, on ? HIGH : LOW);
#else
digitalWrite(PIN_NXDN, on ? HIGH : LOW); digitalWrite(PIN_NXDN, on ? HIGH : LOW);
#endif
} }
void CIO::setPOCSAGInt(bool on) void CIO::setPOCSAGInt(bool on)
{ {
#if defined(USE_ALTERNATE_POCSAG_LEDS)
digitalWrite(PIN_DSTAR, on ? HIGH : LOW);
digitalWrite(PIN_DMR, on ? HIGH : LOW);
#else
digitalWrite(PIN_POCSAG, on ? HIGH : LOW); digitalWrite(PIN_POCSAG, on ? HIGH : LOW);
#endif
} }
void CIO::delayInt(unsigned int dly) void CIO::delayInt(unsigned int dly)

17
IOSTM.cpp
View File

@ -1115,14 +1115,31 @@ void CIO::setP25Int(bool on)
void CIO::setNXDNInt(bool on) void CIO::setNXDNInt(bool on)
{ {
#if defined(USE_ALTERNATE_NXDN_LEDS)
GPIO_WriteBit(PORT_YSF, PIN_YSF, on ? Bit_SET : Bit_RESET);
GPIO_WriteBit(PORT_P25, PIN_P25, on ? Bit_SET : Bit_RESET);
#if defined(STM32F4_NUCLEO_MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO)
GPIO_WriteBit(PORT_MYSF, PIN_MYSF, on ? Bit_SET : Bit_RESET);
GPIO_WriteBit(PORT_MP25, PIN_MP25, on ? Bit_SET : Bit_RESET);
#endif
#else
GPIO_WriteBit(PORT_NXDN, PIN_NXDN, on ? Bit_SET : Bit_RESET); GPIO_WriteBit(PORT_NXDN, PIN_NXDN, on ? Bit_SET : Bit_RESET);
#if defined(STM32F4_NUCLEO_MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO) #if defined(STM32F4_NUCLEO_MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO)
GPIO_WriteBit(PORT_MNXDN, PIN_MNXDN, on ? Bit_SET : Bit_RESET); GPIO_WriteBit(PORT_MNXDN, PIN_MNXDN, on ? Bit_SET : Bit_RESET);
#endif #endif
#endif
} }
void CIO::setPOCSAGInt(bool on) void CIO::setPOCSAGInt(bool on)
{ {
#if defined(USE_ALTERNATE_POCSAG_LEDS)
GPIO_WriteBit(PORT_DSTAR, PIN_DSTAR, on ? Bit_SET : Bit_RESET);
GPIO_WriteBit(PORT_DMR, PIN_DMR, on ? Bit_SET : Bit_RESET);
#if defined(STM32F4_NUCLEO_MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO)
GPIO_WriteBit(PORT_MDSTAR, PIN_MDSTAR, on ? Bit_SET : Bit_RESET);
GPIO_WriteBit(PORT_MDMR, PIN_MDMR, on ? Bit_SET : Bit_RESET);
#endif
#endif
} }
// Simple delay function for STM32 // Simple delay function for STM32

10
IOSTM_CMSIS.cpp
View File

@ -436,12 +436,22 @@ void CIO::setP25Int(bool on)
void CIO::setNXDNInt(bool on) void CIO::setNXDNInt(bool on)
{ {
#if defined(USE_ALTERNATE_NXDN_LEDS)
BB_YSF = !!on;
BB_P25 = !!on;
#else
BB_NXDN = !!on; BB_NXDN = !!on;
#endif
} }
void CIO::setPOCSAGInt(bool on) void CIO::setPOCSAGInt(bool on)
{ {
#if defined(USE_ALTERNATE_POCSAG_LEDS)
BB_DSTAR = !!on;
BB_DMR = !!on;
#else
BB_POCSAG = !!on; BB_POCSAG = !!on;
#endif
} }
void CIO::delayInt(unsigned int dly) void CIO::delayInt(unsigned int dly)

12
IOTeensy.cpp
View File

@ -219,14 +219,24 @@ void CIO::setP25Int(bool on)
digitalWrite(PIN_P25, on ? HIGH : LOW); digitalWrite(PIN_P25, on ? HIGH : LOW);
} }
void CIO::setNXDNInt(bool on) void CIO::setNXDNInt(bool on)
{ {
#if defined(USE_ALTERNATE_NXDN_LEDS)
digitalWrite(PIN_YSF, on ? HIGH : LOW);
digitalWrite(PIN_P25, on ? HIGH : LOW);
#else
digitalWrite(PIN_NXDN, on ? HIGH : LOW); digitalWrite(PIN_NXDN, on ? HIGH : LOW);
#endif
} }
void CIO::setPOCSAGInt(bool on) void CIO::setPOCSAGInt(bool on)
{ {
#if defined(USE_ALTERNATE_POCSAG_LEDS)
digitalWrite(PIN_DSTAR, on ? HIGH : LOW);
digitalWrite(PIN_DMR, on ? HIGH : LOW);
#else
digitalWrite(PIN_POCSAG, on ? HIGH : LOW); digitalWrite(PIN_POCSAG, on ? HIGH : LOW);
#endif
} }
void CIO::delayInt(unsigned int dly) void CIO::delayInt(unsigned int dly)