From a6898e6bcfb073451569ed3f480171ad6da7f482 Mon Sep 17 00:00:00 2001 From: Rob Riggs Date: Sun, 11 Aug 2019 16:54:13 -0500 Subject: [PATCH] Revert "Force BM78 to use channel 1 for RFCOMM. Update to 1.1.4rc2." This reverts commit 5bfa6d5e4946ff74579bf49c19ed4a3aef66b99d. This change would force MacOS and Windows users to re-pair their devices. Instead, we will just document that the TNC3 uses port 6 for RFCOMM. --- TNC/KissHardware.cpp | 2 +- TNC/bm78_eeprom.cpp | 7 ++++--- bm78_eeprom | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/TNC/KissHardware.cpp b/TNC/KissHardware.cpp index 75c792b..7782f0c 100644 --- a/TNC/KissHardware.cpp +++ b/TNC/KissHardware.cpp @@ -26,7 +26,7 @@ int powerOffViaUSB(void) namespace mobilinkd { namespace tnc { namespace kiss { -const char FIRMWARE_VERSION[] = "1.1.4rc2"; +const char FIRMWARE_VERSION[] = "1.1.4rc1"; const char HARDWARE_VERSION[] = "Mobilinkd TNC3 2.1.1"; Hardware& settings() diff --git a/TNC/bm78_eeprom.cpp b/TNC/bm78_eeprom.cpp index 558b22d..acb019c 100644 --- a/TNC/bm78_eeprom.cpp +++ b/TNC/bm78_eeprom.cpp @@ -1,7 +1,8 @@ + #include "bm78_eeprom.hpp" -#include + const uint8_t eeprom_data[] = { - 0x00, 0x07, 0x03, 0x00, 0x03, 0x4c, 0x00, 0x0b, + 0x00, 0x07, 0x03, 0x00, 0x03, 0x4C, 0x00, 0x0b, 0x10, 0x54, 0x4e, 0x43, 0x33, 0x20, 0x4d, 0x6f, 0x62, 0x69, 0x6c, 0x69, 0x6e, 0x6b, 0x64, 0x00, 0x00, 0x00, 0x1b, 0x10, 0x00, 0x00, 0x00, 0x00, @@ -80,7 +81,7 @@ const uint8_t eeprom_data[] = { 0x00, 0x00, 0xbb, 0x68, 0x1f, 0x96, 0xb0, 0x01, 0x49, 0xae, 0xc9, 0x46, 0x2a, 0xba, 0x03, 0x80, 0x10, 0x02, 0x00, 0x00, 0x00, 0x10, 0x0c, 0x00, - 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x03, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xa0, 0x10, 0x1b, diff --git a/bm78_eeprom b/bm78_eeprom index cb55fd9..f0858c6 100644 --- a/bm78_eeprom +++ b/bm78_eeprom @@ -46,7 +46,7 @@ 03 50 10 00 00 00 00 BB 68 1F 96 B0 01 49 AE C9 46 2A BA 03 60 10 01 00 00 00 BB 68 1F 96 B0 01 49 AE C9 46 2A BA 03 70 10 03 00 00 00 BB 68 1F 96 B0 01 49 AE C9 46 2A BA -03 80 10 02 00 00 00 10 0C 00 00 00 00 01 00 00 01 00 04 +03 80 10 02 00 00 00 10 0C 00 00 00 00 00 00 00 01 00 04 03 90 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 A0 10 1B 05 08 54 4E 43 33 11 06 BB 68 1F 96 B0 01 49 03 B0 10 AE C9 46 2A BA 01 00 00 00 02 01 02 00 00 00 00