Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TTGO T-BEAM corrections #100

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

TTGO T-BEAM corrections #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae20304
ConfigManager: add 433Mhz T-BEAM + OLED v1.1 board
khancyr Apr 29, 2021
7782c1c
ConfigManager: correct pins and clarify TTGO T-BEAM Naming
khancyr Apr 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions tinyGS/src/ConfigManager/ConfigManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,16 @@ 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" },
})
{
server.on(ROOT_URL, [this]{ handleRoot(); });
Expand Down
3 changes: 2 additions & 1 deletion tinyGS/src/ConfigManager/ConfigManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,10 @@ 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,

NUM_BOARDS //this line always has to be the last one
};
Expand Down
9 changes: 5 additions & 4 deletions tinyGS/src/ConfigManager/html.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,20 @@ 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",
};

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 = "<div style='text-align:center;min-width:260px;'>\n";
Expand Down