From ae203045ad8c7eb3ce10dd08f6391c45372a5527 Mon Sep 17 00:00:00 2001 From: Pierre Kancir Date: Thu, 29 Apr 2021 10:38:07 +0200 Subject: [PATCH 1/2] ConfigManager: add 433Mhz T-BEAM + OLED v1.1 board --- tinyGS/src/ConfigManager/ConfigManager.cpp | 1 + tinyGS/src/ConfigManager/ConfigManager.h | 1 + tinyGS/src/ConfigManager/html.h | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tinyGS/src/ConfigManager/ConfigManager.cpp b/tinyGS/src/ConfigManager/ConfigManager.cpp index 717e3b87..9a18e3e8 100644 --- a/tinyGS/src/ConfigManager/ConfigManager.cpp +++ b/tinyGS/src/ConfigManager/ConfigManager.cpp @@ -49,6 +49,7 @@ ConfigManager::ConfigManager() { 0x3c, 21, 22, 16, 38, 22, 1, 18, 26, 33, 0, 14, 19, 27, 5, 0.0f, "T-BEAM V1.0 + OLED" }, // @fafu { 0x3c, 21, 22, 16, 0, 2, 0, 5, 0, 34, 32, 14, 19, 27, 18, 1.6f, "433Mhz FOSSA 1W Ground Station" }, // @jgromes { 0x3c, 21, 22, 16, 0, 2, 0, 5, 0, 34, 32, 14, 19, 27, 18, 1.6f, "868-915Mhz FOSSA 1W Ground Station" }, // @jgromes + { 0x3c, 21, 22, 16, 38, 4, 1, 18, 26, 33, 32, 23, 19, 27, 5, 0.0f, "433Mhz T-BEAM + OLED v1.1" }, }) { server.on(ROOT_URL, [this]{ handleRoot(); }); diff --git a/tinyGS/src/ConfigManager/ConfigManager.h b/tinyGS/src/ConfigManager/ConfigManager.h index b21e22ce..7e3f3d4f 100644 --- a/tinyGS/src/ConfigManager/ConfigManager.h +++ b/tinyGS/src/ConfigManager/ConfigManager.h @@ -85,6 +85,7 @@ enum boardNum { TBEAM_OLED_v1_0, ESP32_SX126X_TXC0_1W_LF, ESP32_SX126X_TXC0_1W_HF, + TBEAM_OLED_LF_v1_1, NUM_BOARDS //this line always has to be the last one }; diff --git a/tinyGS/src/ConfigManager/html.h b/tinyGS/src/ConfigManager/html.h index 1f6b4a5d..28906bde 100644 --- a/tinyGS/src/ConfigManager/html.h +++ b/tinyGS/src/ConfigManager/html.h @@ -43,10 +43,11 @@ const char BOARD_NAMES[][BOARD_NAME_LENGTH] PROGMEM = "T-BEAM V1.0 + OLED" , "433Mhz FOSSA 1W Ground Station", "868-915Mhz FOSSA 1W Ground Station", + "433Mhz T-BEAM + OLED v1.1", }; constexpr auto BOARD_LENGTH = 3; -const char BOARD_VALUES[][BOARD_LENGTH] PROGMEM = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16" }; +const char BOARD_VALUES[][BOARD_LENGTH] PROGMEM = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17" }; const char IOTWEBCONF_DASHBOARD_STYLE_INNER[] PROGMEM = "table{margin:20px auto;}h3{text-align:center;}.card{height:12em;margin:10px;text-align:left;font-family:Arial;border:3px groove;border-radius:0.3rem;display:inline-block;padding:10px;min-width:260px;}td{padding:0 10px;}textarea{resize:vertical;width:100%;margin:0;height:318px;padding:5px;overflow:auto;}#c1{width:98%;padding:5px;}#t1{width:98%}.console{display:inline-block;text-align:center;margin:10px 0;width:98%;max-width:1080px;}.G{color:green;}.R{color:red}"; const char IOTWEBCONF_DASHBOARD_BODY_INNER[] PROGMEM = "
\n"; From 7782c1c87fbf9c7df77c74d5a612e981b9c7c006 Mon Sep 17 00:00:00 2001 From: Pierre Kancir Date: Thu, 29 Apr 2021 10:39:04 +0200 Subject: [PATCH 2/2] ConfigManager: correct pins and clarify TTGO T-BEAM Naming According to official pinout https://github.com/Xinyuan-LilyGO/LilyGo-LoRa-Series/blob/master/examples/ArduinoLoRa/LoRaReceiver/utilities.h --- tinyGS/src/ConfigManager/ConfigManager.cpp | 6 +++--- tinyGS/src/ConfigManager/ConfigManager.h | 2 +- tinyGS/src/ConfigManager/html.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tinyGS/src/ConfigManager/ConfigManager.cpp b/tinyGS/src/ConfigManager/ConfigManager.cpp index 9a18e3e8..4f7cd367 100644 --- a/tinyGS/src/ConfigManager/ConfigManager.cpp +++ b/tinyGS/src/ConfigManager/ConfigManager.cpp @@ -40,13 +40,13 @@ ConfigManager::ConfigManager() { 0x3c, 4, 15, 16, 0, 2, 1, 18, 26, 0, 0, 14, 19, 27, 5, 0.0f, "868-915Mhz TTGO LoRa 32 v1" }, // { 0x3c, 21, 22, 16, 0, 22, 1, 18, 26, 33, 0, 14, 19, 27, 5, 0.0f, "433 Mhz TTGO LoRA 32 v2" }, // @TCRobotics { 0x3c, 21, 22, 16, 0, 22, 1, 18, 26, 33, 0, 14, 19, 27, 5, 0.0f, "868-915Mhz TTGO LoRA 32 v2" }, // - { 0x3c, 21, 22, 16, 39, 22, 1, 18, 26, 33, 32, 14, 19, 27, 5, 0.0f, "433Mhz T-BEAM + OLED" }, - { 0x3c, 21, 22, 16, 39, 22, 1, 18, 26, 33, 32, 14, 19, 27, 5, 0.0f, "868-915Mhz T-BEAM + OLED" }, + { 0x3c, 21, 22, 16, 39, 14, 1, 18, 26, 33, 32, 23, 19, 27, 5, 0.0f, "433Mhz T-BEAM + OLED v0.7" }, + { 0x3c, 21, 22, 16, 39, 14, 1, 18, 26, 33, 32, 23, 19, 27, 5, 0.0f, "868-915Mhz T-BEAM + OLED v0.7"}, { 0x3c, 21, 22, 16, 0, 25, 0, 5, 0, 27, 26, 14, 19, 23, 18, 0.0f, "Custom ESP32 Wroom + SX126x (Crystal)" }, // @4m1g0, @lillefyr { 0x3c, 21, 22, 16, 0, 25, 0, 18, 0, 33, 32, 14, 19, 27, 5, 0.0f, "TTGO LoRa 32 V2 Modified with module SX126x (crystal)" },// @TCRobotics { 0x3c, 21, 22, 16, 0, 25, 0, 5, 0, 2, 13, 26, 19, 23, 18, 1.6f, "Custom ESP32 Wroom + SX126x DRF1268T (TCX0) (5, 2, 26, 13)" }, // @sdey76 { 0x3c, 21, 22, 16, 0, 25, 0, 5, 0, 26, 12, 14, 19, 23, 18, 1.6f, "Custom ESP32 Wroom + SX126x DRF1268T (TCX0) (5, 26, 14, 12)" }, // @imants - { 0x3c, 21, 22, 16, 38, 22, 1, 18, 26, 33, 0, 14, 19, 27, 5, 0.0f, "T-BEAM V1.0 + OLED" }, // @fafu + { 0x3c, 21, 22, 16, 38, 4, 1, 18, 26, 33, 32, 23, 19, 27, 5, 0.0f, "868-915Mhz T-BEAM + OLED v1.0" }, // @fafu { 0x3c, 21, 22, 16, 0, 2, 0, 5, 0, 34, 32, 14, 19, 27, 18, 1.6f, "433Mhz FOSSA 1W Ground Station" }, // @jgromes { 0x3c, 21, 22, 16, 0, 2, 0, 5, 0, 34, 32, 14, 19, 27, 18, 1.6f, "868-915Mhz FOSSA 1W Ground Station" }, // @jgromes { 0x3c, 21, 22, 16, 38, 4, 1, 18, 26, 33, 32, 23, 19, 27, 5, 0.0f, "433Mhz T-BEAM + OLED v1.1" }, diff --git a/tinyGS/src/ConfigManager/ConfigManager.h b/tinyGS/src/ConfigManager/ConfigManager.h index 7e3f3d4f..6158c64c 100644 --- a/tinyGS/src/ConfigManager/ConfigManager.h +++ b/tinyGS/src/ConfigManager/ConfigManager.h @@ -82,7 +82,7 @@ enum boardNum { TTGO_V2_SX126X_XTAL, ESP32_SX126X_TXC0_1, ESP32_SX126X_TXC0_2, - TBEAM_OLED_v1_0, + TBEAM_OLED_HF_v1_0, ESP32_SX126X_TXC0_1W_LF, ESP32_SX126X_TXC0_1W_HF, TBEAM_OLED_LF_v1_1, diff --git a/tinyGS/src/ConfigManager/html.h b/tinyGS/src/ConfigManager/html.h index 28906bde..e4c93a38 100644 --- a/tinyGS/src/ConfigManager/html.h +++ b/tinyGS/src/ConfigManager/html.h @@ -34,13 +34,13 @@ const char BOARD_NAMES[][BOARD_NAME_LENGTH] PROGMEM = "868-915Mhz TTGO LoRa 32 v1", "433 Mhz TTGO LoRA 32 v2", "868-915Mhz TTGO LoRA 32 v2", - "433Mhz T-BEAM + OLED", - "868-915Mhz T-BEAM + OLED", + "433Mhz T-BEAM + OLED v0.7", + "868-915Mhz T-BEAM + OLED v0.7", "Custom ESP32 Wroom + SX126x (Crystal)", "TTGO LoRa 32 V2 Modified with module SX126x (crystal)", "Custom ESP32 Wroom + SX126x DRF1268T (TCX0) (5, 2, 26, 13)", "Custom ESP32 Wroom + SX126x DRF1268T (TCX0) (5, 26, 14, 12)", - "T-BEAM V1.0 + OLED" , + "868-915Mhz T-BEAM + OLED v1.0" , "433Mhz FOSSA 1W Ground Station", "868-915Mhz FOSSA 1W Ground Station", "433Mhz T-BEAM + OLED v1.1",