From 1259cd42eaae0fa866375447d91f23086a36940e Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 17 Nov 2016 22:24:49 +0000 Subject: [PATCH 1/4] Add the Teensy 3.1/3.2 as UMP hosts. --- UMP/UMP.ino | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/UMP/UMP.ino b/UMP/UMP.ino index 679a37b..4f4469e 100644 --- a/UMP/UMP.ino +++ b/UMP/UMP.ino @@ -38,7 +38,7 @@ void setup() { Serial.begin(115200); -#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__) Serial1.begin(9600); #endif @@ -121,7 +121,7 @@ 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__) +#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega32U4__) || defined(__SAM3X8E__) || defined(__MK20DX256__) case UMP_WRITE_SERIAL: Serial1.write(m_buffer + 3U, m_length - 3U); break; @@ -151,7 +151,7 @@ void loop() m_lockout = lockout; } -#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__) while (Serial1.available()) Serial1.read(); #endif @@ -171,4 +171,3 @@ void loop() } } } - From 987a6921a1a39bf170640502d82b027ff6771ee5 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 17 Nov 2016 22:31:07 +0000 Subject: [PATCH 2/4] Alter UMP pin assignments on Teensy 3.1/3.2. --- UMP/UMP.ino | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/UMP/UMP.ino b/UMP/UMP.ino index 4f4469e..501737b 100644 --- a/UMP/UMP.ino +++ b/UMP/UMP.ino @@ -20,16 +20,27 @@ #define PIN_LED 13 #endif +#if defined(__MK20DX256__) #define PIN_DSTAR 2 -#define PIN_DMR 3 +#define PIN_DMR 3 +#define PIN_YSF 4 +#define PIN_P25 5 + +#define PIN_TX 10 +#define PIN_CD 11 + +#define PIN_LOCKOUT 12 +#else +#define PIN_DSTAR 2 +#define PIN_DMR 3 #define PIN_YSF 4 #define PIN_P25 5 #define PIN_TX 6 - #define PIN_CD 7 #define PIN_LOCKOUT 8 +#endif // Use the LOCKOUT function on the UMP // #define USE_LOCKOUT From fa89fc99a5ca44b30f4a04dcc8e76780bb7fbf07 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Fri, 18 Nov 2016 00:38:00 -0300 Subject: [PATCH 3/4] Possible fix of loop after Internet down? --- DMRNetwork.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp index 12403c0..084fb2a 100644 --- a/DMRNetwork.cpp +++ b/DMRNetwork.cpp @@ -559,7 +559,6 @@ bool CDMRNetwork::write(const unsigned char* data, unsigned int length) bool ret = m_socket.write(data, length, m_address, m_port); if (!ret) { LogError("DMR, Socket has failed when writing data to the master, retrying connection"); - close(); open(); return false; } From e720e1e4c8811bedb4b87bf53ac445d09908e7f5 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Fri, 18 Nov 2016 00:45:10 -0300 Subject: [PATCH 4/4] Possible fix of loop after Internet down? --- DMRNetwork.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp index 084fb2a..f902d2f 100644 --- a/DMRNetwork.cpp +++ b/DMRNetwork.cpp @@ -559,6 +559,7 @@ bool CDMRNetwork::write(const unsigned char* data, unsigned int length) bool ret = m_socket.write(data, length, m_address, m_port); if (!ret) { LogError("DMR, Socket has failed when writing data to the master, retrying connection"); + m_socket.close(); open(); return false; }