Skip to content

Commit 3eded45

Browse files
cod3doomycod3doomy
committed
Checkpoint: Repeater env built and works with HW. No screen or other periphs
1 parent 6092f57 commit 3eded45

File tree

3 files changed

+76
-49
lines changed

3 files changed

+76
-49
lines changed

‎platformio.ini‎

Lines changed: 29 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ lib_deps =
2525
build_flags = -w -DNDEBUG -DRADIOLIB_STATIC_ONLY=1 -DRADIOLIB_GODMODE=1
2626
-D LORA_FREQ=869.525
2727
-D LORA_BW=250
28-
-D LORA_SF=10
28+
-D LORA_SF=11
2929
build_src_filter =
3030
+<*.cpp>
3131
+<helpers/*.cpp>
@@ -562,12 +562,7 @@ board = t_beams3_supreme
562562
build_flags =
563563
${esp32_base.build_flags}
564564
-I variants/lilygo_tbeam_supreme_SX1262
565-
-D T_BEAM_S3_SUPREME_SX1262
566-
-D BOARD_HAS_PSRAM
567565
-D LORA_TX_POWER=22
568-
-D SX126X_DIO2_AS_RF_SWITCH=true
569-
-D SX126X_DIO3_TCXO_VOLTAGE=1.8
570-
-D SX126X_CURRENT_LIMIT=130
571566
-D RADIO_CLASS=CustomSX1262
572567
-D WRAPPER_CLASS=CustomSX1262Wrapper
573568
-D DISPLAY_CLASS=SSD1306Display
@@ -578,25 +573,27 @@ lib_deps =
578573

579574
[env:T_Beam_S3_Supreme_SX1262_Repeater]
580575
extends = T_Beam_S3_Supreme_SX1262
581-
build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter}
582-
+<helpers/ui/*.cpp>
583-
+<../examples/simple_repeater>
584576
build_flags =
585577
${T_Beam_S3_Supreme_SX1262.build_flags}
586578
-D DISPLAY_CLASS=SSD1306Display
587579
-D ADVERT_NAME='"T-Beam S3 Supreme SX1262 Repeater"'
588580
-D ADVERT_LAT=0
589581
-D ADVERT_LON=0
590582
-D ADMIN_PASSWORD='"password"'
583+
build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter}
584+
+<helpers/ui/*.cpp>
585+
+<../examples/simple_repeater>
586+
lib_deps =
587+
${T_Beam_S3_Supreme_SX1262.lib_deps}
588+
${esp32_ota.lib_deps}
591589
lib_deps =
592-
esphome/AsyncTCP-esphome@^2.1.4
593-
esphome/ESPAsyncWebServer-esphome@^3.3.0
594-
wolfssl/wolfssl@^5.7.2
590+
me-no-dev/AsyncTCP@^3.3.2
591+
esp32async/ESPAsyncWebServer@^3.7.5
595592
rweather/Crypto@^0.4.0
596593
jgromes/RadioLib@^7.1.2
597594
adafruit/RTClib@^2.1.4
598-
adafruit/Adafruit GFX Library@^1.12.0
599595
melopero/Melopero RV3028@^1.1.0
596+
adafruit/Adafruit GFX Library@^1.12.0
600597
adafruit/Adafruit SSD1306@^2.5.13
601598

602599
[LilyGo_TLora_V2_1_1_6]
@@ -905,14 +902,13 @@ build_src_filter = ${rak4631.build_src_filter}
905902
+<helpers/ui/*.cpp>
906903
+<../examples/simple_repeater>
907904
lib_deps =
908-
esphome/AsyncTCP-esphome@^2.1.4
909-
esphome/ESPAsyncWebServer-esphome@^3.3.0
910-
wolfssl/wolfssl@^5.7.2
905+
me-no-dev/AsyncTCP@^3.3.2
906+
esp32async/ESPAsyncWebServer@^3.7.5
911907
rweather/Crypto@^0.4.0
912908
jgromes/RadioLib@^7.1.2
913909
adafruit/RTClib@^2.1.4
914-
adafruit/Adafruit GFX Library@^1.12.0
915910
melopero/Melopero RV3028@^1.1.0
911+
adafruit/Adafruit GFX Library@^1.12.0
916912
adafruit/Adafruit SSD1306@^2.5.13
917913

918914
[env:RAK_4631_room_server]
@@ -929,14 +925,13 @@ build_src_filter = ${rak4631.build_src_filter}
929925
+<helpers/ui/*.cpp>
930926
+<../examples/simple_room_server>
931927
lib_deps =
932-
esphome/AsyncTCP-esphome@^2.1.4
933-
esphome/ESPAsyncWebServer-esphome@^3.3.0
934-
wolfssl/wolfssl@^5.7.2
928+
me-no-dev/AsyncTCP@^3.3.2
929+
esp32async/ESPAsyncWebServer@^3.7.5
935930
rweather/Crypto@^0.4.0
936931
jgromes/RadioLib@^7.1.2
937932
adafruit/RTClib@^2.1.4
938-
adafruit/Adafruit GFX Library@^1.12.0
939933
melopero/Melopero RV3028@^1.1.0
934+
adafruit/Adafruit GFX Library@^1.12.0
940935
adafruit/Adafruit SSD1306@^2.5.13
941936

942937
[env:RAK_4631_companion_radio_usb]
@@ -1128,14 +1123,13 @@ build_flags =
11281123
-D ADVERT_LON=0.0
11291124
-D ADMIN_PASSWORD='"password"'
11301125
lib_deps =
1131-
esphome/AsyncTCP-esphome@^2.1.4
1132-
esphome/ESPAsyncWebServer-esphome@^3.3.0
1133-
wolfssl/wolfssl@^5.7.2
1126+
me-no-dev/AsyncTCP@^3.3.2
1127+
esp32async/ESPAsyncWebServer@^3.7.5
11341128
rweather/Crypto@^0.4.0
11351129
jgromes/RadioLib@^7.1.2
11361130
adafruit/RTClib@^2.1.4
1137-
adafruit/Adafruit GFX Library@^1.12.0
11381131
melopero/Melopero RV3028@^1.1.0
1132+
adafruit/Adafruit GFX Library@^1.12.0
11391133
adafruit/Adafruit SSD1306@^2.5.13
11401134

11411135
[env:Heltec_t114_room_server]
@@ -1150,14 +1144,13 @@ build_flags =
11501144
-D ADMIN_PASSWORD='"password"'
11511145
-D ROOM_PASSWORD='"hello"'
11521146
lib_deps =
1153-
esphome/AsyncTCP-esphome@^2.1.4
1154-
esphome/ESPAsyncWebServer-esphome@^3.3.0
1155-
wolfssl/wolfssl@^5.7.2
1147+
me-no-dev/AsyncTCP@^3.3.2
1148+
esp32async/ESPAsyncWebServer@^3.7.5
11561149
rweather/Crypto@^0.4.0
11571150
jgromes/RadioLib@^7.1.2
11581151
adafruit/RTClib@^2.1.4
1159-
adafruit/Adafruit GFX Library@^1.12.0
11601152
melopero/Melopero RV3028@^1.1.0
1153+
adafruit/Adafruit GFX Library@^1.12.0
11611154
adafruit/Adafruit SSD1306@^2.5.13
11621155

11631156
[env:Heltec_t114_companion_radio_ble]
@@ -1215,14 +1208,13 @@ build_flags =
12151208
-D ADVERT_LON=0.0
12161209
-D ADMIN_PASSWORD='"password"'
12171210
lib_deps =
1218-
esphome/AsyncTCP-esphome@^2.1.4
1219-
esphome/ESPAsyncWebServer-esphome@^3.3.0
1220-
wolfssl/wolfssl@^5.7.2
1211+
me-no-dev/AsyncTCP@^3.3.2
1212+
esp32async/ESPAsyncWebServer@^3.7.5
12211213
rweather/Crypto@^0.4.0
12221214
jgromes/RadioLib@^7.1.2
12231215
adafruit/RTClib@^2.1.4
1224-
adafruit/Adafruit GFX Library@^1.12.0
12251216
melopero/Melopero RV3028@^1.1.0
1217+
adafruit/Adafruit GFX Library@^1.12.0
12261218
adafruit/Adafruit SSD1306@^2.5.13
12271219

12281220
[env:LilyGo_T-Echo_room_server]
@@ -1235,14 +1227,13 @@ build_flags =
12351227
-D ADVERT_LON=0.0
12361228
-D ADMIN_PASSWORD='"password"'
12371229
lib_deps =
1238-
esphome/AsyncTCP-esphome@^2.1.4
1239-
esphome/ESPAsyncWebServer-esphome@^3.3.0
1240-
wolfssl/wolfssl@^5.7.2
1230+
me-no-dev/AsyncTCP@^3.3.2
1231+
esp32async/ESPAsyncWebServer@^3.7.5
12411232
rweather/Crypto@^0.4.0
12421233
jgromes/RadioLib@^7.1.2
12431234
adafruit/RTClib@^2.1.4
1244-
adafruit/Adafruit GFX Library@^1.12.0
12451235
melopero/Melopero RV3028@^1.1.0
1236+
adafruit/Adafruit GFX Library@^1.12.0
12461237
adafruit/Adafruit SSD1306@^2.5.13
12471238

12481239
[env:LilyGo_T-Echo_companion_radio_ble]
@@ -1410,3 +1401,4 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter}
14101401
lib_deps =
14111402
${Xiao_S3_WIO.lib_deps}
14121403
densaugeo/base64 @ ~1.4.0
1404+
adafruit/Adafruit SSD1306@^2.5.13

‎src/helpers/TBeamS3SupremeBoard.h‎

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#include <driver/rtc_io.h>
55
#include <Wire.h>
66
#include <Arduino.h>
7-
//#include "XPowersLib.h"
7+
#include "XPowersLib.h"
88

9-
// Defined using AXP2102
10-
//#define XPOWERS_CHIP_AXP2101
9+
// Define using AXP2102
10+
#define XPOWERS_CHIP_AXP2101
1111

1212
// LoRa radio module pins for TBeam S3 Supreme
1313
#define P_LORA_DIO_1 1 //SX1262 IRQ pin
@@ -39,19 +39,51 @@
3939

4040

4141
class TBeamS3SupremeBoard : public ESP32Board {
42-
//XPowersAXP2101 PMU;
42+
XPowersAXP2101 PMU;
4343

4444
public:
4545
void begin() {
4646
ESP32Board::begin();
4747

4848
//Manually set voltage rails
49-
//PMU.setProtectedChannel(XPOWERS_DCDC3); //Set protected DCDC for esp32
50-
//PMU.setALDO2Voltage(3300); //Set LDO for LoRa module
51-
//PMU.setALDO3Voltage(3300); //Set LDO for GPS module
52-
//PMU.setDC1Voltage(3300); //Set DCDC for OLED
53-
//PMU.enableALDO2(); //Enable LDO2 for LoRa
54-
//PMU.enableALDO3(); //Enable LDO3 for GPS
49+
//GPS
50+
PMU.setALDO4Voltage(3300);
51+
PMU.disableALDO3(); //disable to save power
52+
53+
//Lora
54+
PMU.setALDO3Voltage(3300);
55+
PMU.enableALDO3();
56+
57+
//BME280 and OLED
58+
PMU.setALDO1Voltage(3300);
59+
PMU.enableALDO1();
60+
61+
//QMC6310U
62+
PMU.setALDO2Voltage(3300);
63+
PMU.disableALDO2(); //disable to save power
64+
65+
//SD card
66+
PMU.setBLDO1Voltage(3300);
67+
PMU.enableBLDO1();
68+
69+
//Out to header pins
70+
PMU.setBLDO2Voltage(3300);
71+
PMU.enableBLDO2();
72+
73+
PMU.setDC4Voltage(XPOWERS_AXP2101_DCDC4_VOL2_MAX); //1.8V
74+
PMU.enableDC4();
75+
76+
PMU.setDC5Voltage(3300);
77+
PMU.enableDC5();
78+
79+
//Other power rails
80+
PMU.setDC3Voltage(3300); //doesn't go anywhere in the schematic??
81+
PMU.enableDC3();
82+
83+
//Unused power rails
84+
PMU.disableDC2();
85+
PMU.disableDLDO1();
86+
PMU.disableDLDO2();
5587

5688

5789
esp_reset_reason_t reason = esp_reset_reason();

‎variants/lilygo_tbeam_supreme_SX1262/platformio.ini‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@ build_flags =
99
-D WRAPPER_CLASS=CustomSX1262Wrapper
1010
-D DISPLAY_CLASS=SSD1306Display
1111
-D SX126X_RX_BOOSTED_GAIN=1
12+
build_src_filter = ${esp32_base.build_src_filter}
13+
+<../variants/lilygo_tbeam_supreme_SX1262>
14+
board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
1215
lib_deps =
1316
${esp32_base.lib_deps}
1417
adafruit/Adafruit SSD1306 @ ^2.5.13
15-
;lewisxhe/XPowersLib @ ^0.2.7
18+
lewisxhe/XPowersLib @ ^0.2.7
1619

1720
; === LILYGO T-Beam S3 Supreme with SX1262 environments ===
1821
[env:T_Beam_S3_Supreme_SX1262_Repeater]
@@ -29,6 +32,6 @@ build_flags =
2932
build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter}
3033
+<helpers/ui/*.cpp>
3134
+<../examples/simple_repeater>
32-
lib_deps =
35+
lib_deps =
3336
${T_Beam_S3_Supreme_SX1262.lib_deps}
3437
${esp32_ota.lib_deps}

0 commit comments

Comments
 (0)