diff --git a/Config.h b/Config.h index 986a243..485f03f 100644 --- a/Config.h +++ b/Config.h @@ -38,8 +38,8 @@ // Allow the use of the COS line to lockout the modem // #define USE_COS_AS_LOCKOUT -// Use pins to output the current mode -// #define MODE_PINS +// Use pins to output the current mode via LEDs +// #define MODE_LEDS // For the original Arduino Due pin layout // #define ARDUINO_DUE_PAPA diff --git a/IO.cpp b/IO.cpp index 8e718ab..8267070 100644 --- a/IO.cpp +++ b/IO.cpp @@ -137,7 +137,7 @@ void CIO::selfTest() // We exclude PTT to avoid trigger the transmitter setLEDInt(ledValue); setCOSInt(ledValue); -#if defined(MODE_PINS) +#if defined(MODE_LEDS) setDStarInt(ledValue); setDMRInt(ledValue); setYSFInt(ledValue); @@ -148,7 +148,7 @@ void CIO::selfTest() delayInt(250); } -#if defined(MODE_PINS) +#if defined(MODE_LEDS) setDStarInt(true); setDMRInt(false); setYSFInt(false); @@ -546,7 +546,7 @@ void CIO::setADCDetection(bool detect) void CIO::setMode() { -#if defined(MODE_PINS) +#if defined(MODE_LEDS) setDStarInt(m_modemState == STATE_DSTAR); setDMRInt(m_modemState == STATE_DMR); setYSFInt(m_modemState == STATE_YSF); diff --git a/IODue.cpp b/IODue.cpp index e06ce07..569c6e4 100644 --- a/IODue.cpp +++ b/IODue.cpp @@ -95,7 +95,7 @@ void CIO::initInt() pinMode(PIN_LED, OUTPUT); pinMode(PIN_COS, INPUT); -#if defined(MODE_PINS) +#if defined(MODE_LEDS) // Set up the mode output pins pinMode(PIN_DSTAR, OUTPUT); pinMode(PIN_DMR, OUTPUT); diff --git a/IOSTM.cpp b/IOSTM.cpp index 3732282..c8d6be9 100644 --- a/IOSTM.cpp +++ b/IOSTM.cpp @@ -932,7 +932,7 @@ void CIO::initInt() GPIO_InitStruct.GPIO_Mode = GPIO_Mode_IN; GPIO_Init(PORT_COS, &GPIO_InitStruct); -#if defined(MODE_PINS) +#if defined(MODE_LEDS) // DSTAR pin RCC_AHB1PeriphClockCmd(RCC_Per_DSTAR, ENABLE); GPIO_InitStruct.GPIO_Pin = PIN_DSTAR; diff --git a/IOTeensy.cpp b/IOTeensy.cpp index 10adde1..1d9aa79 100644 --- a/IOTeensy.cpp +++ b/IOTeensy.cpp @@ -64,7 +64,7 @@ void CIO::initInt() pinMode(PIN_LED, OUTPUT); pinMode(PIN_COS, INPUT); -#if defined(MODE_PINS) +#if defined(MODE_LEDS) // Set up the mode output pins pinMode(PIN_DSTAR, OUTPUT); pinMode(PIN_DMR, OUTPUT); diff --git a/MMDVM_STM32F4xx.coproj b/MMDVM_STM32F4xx.coproj index d269fbd..2990342 100644 --- a/MMDVM_STM32F4xx.coproj +++ b/MMDVM_STM32F4xx.coproj @@ -97,7 +97,7 @@ - + diff --git a/mmdvmmenu.sh b/mmdvmmenu.sh index 014e32b..7c31b4a 100755 --- a/mmdvmmenu.sh +++ b/mmdvmmenu.sh @@ -83,7 +83,7 @@ EOF "3") sed -e 's/\/\/ #define EXTERNAL_OSC 14400000/#define EXTERNAL_OSC 14400000/' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "14.400 MHz clock enabled";; "4") sed -e 's/\/\/ #define EXTERNAL_OSC 19200000/#define EXTERNAL_OSC 19200000/' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "19.200 MHz clock enabled";; "5") sed -e 's/\/\/ #define USE_COS_AS_LOCKOUT /#define USE_COS_AS_LOCKOUT/' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "COS as Lockout enabled";; - "6") sed -e 's/\/\/ #define MODE_PINS/#define MODE_PINS/' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Mode pins enabled";; + "6") sed -e 's/\/\/ #define MODE_LEDS/#define MODE_LEDS/' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Mode pins enabled";; "7") sed -e 's/\/\/ #define ARDUINO_DUE_PAPA/#define ARDUINO_DUE_PAPA/' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Layout for the PAPA board enabled";; "8") sed -e 's/\/\/ #define ARDUINO_DUE_ZUM_V10/#define ARDUINO_DUE_ZUM_V10/' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Layout for ZUM V1.0 and V1.0.1 boards enabled";; "9") sed -e 's/\/\/ #define ARDUINO_DUE_NTH/#define ARDUINO_DUE_NTH/' $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Layout for SP8NTH board enabled";;