From 3e45f251a25063980b1d764ac069ba39b3ff9f06 Mon Sep 17 00:00:00 2001 From: Tony Corbett G0WFV Date: Thu, 17 Nov 2016 20:01:18 +0200 Subject: [PATCH 1/6] Allow lesser Arduinos to communicate with the Nextion display --- UMP/UMP.ino | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/UMP/UMP.ino b/UMP/UMP.ino index 679a37b..bc416d5 100644 --- a/UMP/UMP.ino +++ b/UMP/UMP.ino @@ -16,20 +16,28 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) && !defined(__AVR_ATmega32U4__) && !defined(__SAM3X8E__) +#include +#endif + #if !defined(PIN_LED) #define PIN_LED 13 #endif -#define PIN_DSTAR 2 -#define PIN_DMR 3 -#define PIN_YSF 4 -#define PIN_P25 5 +#define PIN_DSTAR 2 +#define PIN_DMR 3 +#define PIN_YSF 4 +#define PIN_P25 5 -#define PIN_TX 6 +#define PIN_TX 6 +#define PIN_CD 7 -#define PIN_CD 7 +#define PIN_LOCKOUT 8 -#define PIN_LOCKOUT 8 +#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) && !defined(__AVR_ATmega32U4__) && !defined(__SAM3X8E__) +#define SOFT_SERIAL_TX 9 +#define SOFT_SERIAL_RX 10 +#endif // Use the LOCKOUT function on the UMP // #define USE_LOCKOUT @@ -40,6 +48,9 @@ void setup() #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega32U4__) || defined(__SAM3X8E__) Serial1.begin(9600); +#else + SoftwareSerial mySerial(SOFT_SERIAL_RX, SOFT_SERIAL_TX); // RX, TX + mySerial.begin(9600); #endif pinMode(PIN_LED, OUTPUT); @@ -121,11 +132,13 @@ void loop() case UMP_SET_CD: digitalWrite(PIN_CD, m_buffer[3U] == 0x01U ? HIGH : LOW); break; -#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega32U4__) || defined(__SAM3X8E__) case UMP_WRITE_SERIAL: +#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega32U4__) || defined(__SAM3X8E__) Serial1.write(m_buffer + 3U, m_length - 3U); - break; +#else + mySerial.write(m_buffer + 3U, m_length - 3U); #endif + break; default: break; } @@ -154,6 +167,9 @@ void loop() #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega32U4__) || defined(__SAM3X8E__) while (Serial1.available()) Serial1.read(); +#else + while (mySerial.available()) + mySerial.read(); #endif m_count++; From d4fdd420e462d87b4e504e63dff85b46d2f0db4d Mon Sep 17 00:00:00 2001 From: Tony Corbett G0WFV Date: Thu, 17 Nov 2016 20:12:05 +0200 Subject: [PATCH 2/6] Fix schoolboy scope error --- UMP/UMP.ino | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/UMP/UMP.ino b/UMP/UMP.ino index bc416d5..cb784af 100644 --- a/UMP/UMP.ino +++ b/UMP/UMP.ino @@ -37,6 +37,8 @@ #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) && !defined(__AVR_ATmega32U4__) && !defined(__SAM3X8E__) #define SOFT_SERIAL_TX 9 #define SOFT_SERIAL_RX 10 + +SoftwareSerial mySerial(SOFT_SERIAL_RX, SOFT_SERIAL_TX); // RX, TX #endif // Use the LOCKOUT function on the UMP @@ -49,7 +51,6 @@ void setup() #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega32U4__) || defined(__SAM3X8E__) Serial1.begin(9600); #else - SoftwareSerial mySerial(SOFT_SERIAL_RX, SOFT_SERIAL_TX); // RX, TX mySerial.begin(9600); #endif From f176b54e1a0aa12f5fa0d750a594a51c1cc170a1 Mon Sep 17 00:00:00 2001 From: Tony Corbett G0WFV Date: Thu, 17 Nov 2016 20:42:10 +0200 Subject: [PATCH 3/6] Fix tabulation --- UMP/UMP.ino | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/UMP/UMP.ino b/UMP/UMP.ino index cb784af..52cf5f2 100644 --- a/UMP/UMP.ino +++ b/UMP/UMP.ino @@ -51,7 +51,7 @@ void setup() #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega32U4__) || defined(__SAM3X8E__) Serial1.begin(9600); #else - mySerial.begin(9600); + mySerial.begin(9600); #endif pinMode(PIN_LED, OUTPUT); @@ -137,7 +137,7 @@ void loop() #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega32U4__) || defined(__SAM3X8E__) Serial1.write(m_buffer + 3U, m_length - 3U); #else - mySerial.write(m_buffer + 3U, m_length - 3U); + mySerial.write(m_buffer + 3U, m_length - 3U); #endif break; default: @@ -169,8 +169,8 @@ void loop() while (Serial1.available()) Serial1.read(); #else - while (mySerial.available()) - mySerial.read(); + while (mySerial.available()) + mySerial.read(); #endif m_count++; @@ -188,4 +188,3 @@ void loop() } } } - From cea8f0e1e6a6c6149d9a9a8f84da4959bb66e461 Mon Sep 17 00:00:00 2001 From: Tony Corbett G0WFV Date: Fri, 18 Nov 2016 19:09:05 +0200 Subject: [PATCH 4/6] Add extra if !defined statement for Teensy 3.1/3.2 and tidy up --- UMP/UMP.ino | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/UMP/UMP.ino b/UMP/UMP.ino index 3163ff9..55f5c86 100644 --- a/UMP/UMP.ino +++ b/UMP/UMP.ino @@ -16,7 +16,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) && !defined(__AVR_ATmega32U4__) && !defined(__SAM3X8E__) +#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) && !defined(__AVR_ATmega32U4__) && !defined(__SAM3X8E__) && !defined(__MK20DX256__) #include #endif @@ -45,7 +45,8 @@ #define PIN_LOCKOUT 8 #endif -#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) && !defined(__AVR_ATmega32U4__) && !defined(__SAM3X8E__) + +#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) && !defined(__AVR_ATmega32U4__) && !defined(__SAM3X8E__) && !defined(__MK20DX256__) #define SOFT_SERIAL_TX 9 #define SOFT_SERIAL_RX 10 From 93dd989eb176e8493e04cef72a124a41f6f43cdc Mon Sep 17 00:00:00 2001 From: Tony Corbett G0WFV Date: Tue, 22 Nov 2016 23:14:03 +0200 Subject: [PATCH 5/6] Try another software serial library ... --- UMP/UMP.ino | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/UMP/UMP.ino b/UMP/UMP.ino index 607d653..8e0f595 100644 --- a/UMP/UMP.ino +++ b/UMP/UMP.ino @@ -17,7 +17,7 @@ */ #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) && !defined(__AVR_ATmega32U4__) && !defined(__SAM3X8E__) && !defined(__MK20DX256__) -#include +#include #endif #if !defined(PIN_LED) @@ -45,16 +45,13 @@ #define PIN_TX 6 #define PIN_CD 7 -#define PIN_LOCKOUT 8 +#define PIN_LOCKOUT 10 #define FLASH_DELAY 3200U #endif #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) && !defined(__AVR_ATmega32U4__) && !defined(__SAM3X8E__) && !defined(__MK20DX256__) -#define SOFT_SERIAL_TX 9 -#define SOFT_SERIAL_RX 10 - -SoftwareSerial mySerial(SOFT_SERIAL_RX, SOFT_SERIAL_TX); // RX, TX +AltSoftSerial mySerial; #endif // Use the LOCKOUT function on the UMP From 11e75abf86506710a36c1dd791b5df03dd869c52 Mon Sep 17 00:00:00 2001 From: Tony Corbett G0WFV Date: Tue, 22 Nov 2016 23:35:37 +0200 Subject: [PATCH 6/6] Move LOCKOUT to pin 12 to accommodate the AltSoftSerial Library --- UMP/UMP.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UMP/UMP.ino b/UMP/UMP.ino index 8e0f595..a0c99aa 100644 --- a/UMP/UMP.ino +++ b/UMP/UMP.ino @@ -45,7 +45,7 @@ #define PIN_TX 6 #define PIN_CD 7 -#define PIN_LOCKOUT 10 +#define PIN_LOCKOUT 12 #define FLASH_DELAY 3200U #endif