DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

station g2: switch to new_ui

Browse Source
This commit is contained in:
recrof
2025-08-17 11:57:38 +02:00
parent 3bb55b590c
commit a4916f81eb
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
variants/station_g2/platformio.ini
View File

@@ -22,6 +22,7 @@ build_flags =
build_src_filter = ${esp32_base.build_src_filter} build_src_filter = ${esp32_base.build_src_filter}
+<../variants/station_g2> +<../variants/station_g2>
+<helpers/ui/SH1106Display.cpp> +<helpers/ui/SH1106Display.cpp>
+<helpers/ui/MomentaryButton.cpp>
lib_deps = lib_deps =
${esp32_base.lib_deps} ${esp32_base.lib_deps}
adafruit/Adafruit SH110X @ ~2.1.13 adafruit/Adafruit SH110X @ ~2.1.13
@@ -65,14 +66,16 @@ lib_deps =
extends = Station_G2 extends = Station_G2
build_flags = build_flags =
${Station_G2.build_flags} ${Station_G2.build_flags}
-I examples/companion_radio/ui-new
-D DISPLAY_CLASS=SH1106Display -D DISPLAY_CLASS=SH1106Display
-D MAX_CONTACTS=100 -D MAX_CONTACTS=100
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1
build_src_filter = ${Station_G2.build_src_filter} build_src_filter = ${Station_G2.build_src_filter}
+<helpers/ui/SH1106Display.cpp> +<helpers/esp32/*.cpp>
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
${Station_G2.lib_deps} ${Station_G2.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
@@ -81,6 +84,7 @@ lib_deps =
extends = Station_G2 extends = Station_G2
build_flags = build_flags =
${Station_G2.build_flags} ${Station_G2.build_flags}
-I examples/companion_radio/ui-new
-D DISPLAY_CLASS=SH1106Display -D DISPLAY_CLASS=SH1106Display
-D MAX_CONTACTS=100 -D MAX_CONTACTS=100
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
@@ -91,8 +95,8 @@ build_flags =
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${Station_G2.build_src_filter} build_src_filter = ${Station_G2.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/ui/SH1106Display.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
${Station_G2.lib_deps} ${Station_G2.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0

5
variants/station_g2/target.cpp
View File

@@ -18,10 +18,7 @@ SensorManager sensors;
#ifdef DISPLAY_CLASS #ifdef DISPLAY_CLASS
DISPLAY_CLASS display; DISPLAY_CLASS display;
#endif MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
#ifndef LORA_CR
#define LORA_CR 5
#endif #endif
bool radio_init() { bool radio_init() {

2
variants/station_g2/target.h
View File

@@ -10,6 +10,7 @@
#ifdef DISPLAY_CLASS #ifdef DISPLAY_CLASS
#include <helpers/ui/SH1106Display.h> #include <helpers/ui/SH1106Display.h>
#include <helpers/ui/MomentaryButton.h>
#endif #endif
extern StationG2Board board; extern StationG2Board board;
@@ -19,6 +20,7 @@ extern SensorManager sensors;
#ifdef DISPLAY_CLASS #ifdef DISPLAY_CLASS
extern DISPLAY_CLASS display; extern DISPLAY_CLASS display;
extern MomentaryButton user_btn;
#endif #endif
bool radio_init(); bool radio_init();