dandri/trail-mate
1
0
Fork 0
mirror of https://github.com/vicliu624/trail-mate.git synced 2026-08-14 06:39:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement phone-independent mesh settings

Browse Source 
Add protocol-scoped MQTT/channel settings for Meshtastic and MeshCore, centralize Settings identity/visibility through SettingId specs, remove BLE from the ESP Arduino firmware profile, and keep Settings Wi-Fi scan/channel/backup paths on fixed buffers.
This commit is contained in:
liu weikai
2026-07-11 17:23:14 +08:00
parent 76a3da4a4b
commit 0502c68e20
30 changed files with 2163 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui_shared/src/ui/ui_status.cpp
+18 -3
View File
@@ -23,7 +23,11 @@
#include <cstdio>
#if __has_include("ble/ble_manager.h")
#ifndef TRAIL_MATE_ENABLE_BLE
#define TRAIL_MATE_ENABLE_BLE 0
#endif
#if TRAIL_MATE_ENABLE_BLE && __has_include("ble/ble_manager.h")
#include "ble/ble_manager.h"
#define TRAIL_MATE_UI_STATUS_HAS_BLE_MANAGER_HEADER 1
#else
@@ -40,7 +44,9 @@ extern "C"
extern const lv_image_dsc_t team_topbar;
#endif
extern const lv_image_dsc_t tracker_topbar;
#if TRAIL_MATE_ENABLE_BLE
extern const lv_image_dsc_t ble_topbar;
#endif
extern const lv_image_dsc_t lora_mod_topbar;
extern const lv_image_dsc_t fsk_mod_topbar;
extern const lv_image_dsc_t walkie_monitor_topbar;
@@ -60,7 +66,9 @@ struct StatusSnapshot
bool gps_enabled = false;
bool wifi_enabled = false;
bool team_active = false;
#if TRAIL_MATE_ENABLE_BLE
bool ble_enabled = false;
#endif
bool radio_mod_visible = false;
bool radio_mod_fsk = false;
bool walkie_monitor = false;
@@ -144,7 +152,7 @@ StatusSnapshot collect_status()
{
const auto& cfg = app::configFacade().getConfig();
snap.route_active = cfg.route_enabled && (cfg.route_path[0] != '\0');
#if !defined(TRAIL_MATE_FINAL_IDF_NO_APP_FACADE)
#if TRAIL_MATE_ENABLE_BLE && !defined(TRAIL_MATE_FINAL_IDF_NO_APP_FACADE)
snap.ble_enabled = app::runtimeFacade().isBleEnabled();
#if TRAIL_MATE_UI_STATUS_HAS_BLE_MANAGER_HEADER
if (auto* ble = app::runtimeFacade().getBleManager())
@@ -210,14 +218,21 @@ void apply_menu_icons(const StatusSnapshot& snap)
apply_icon(s_menu_team_icon, nullptr, false);
#endif
apply_icon(s_menu_msg_icon, &message_topbar, snap.unread > 0);
#if TRAIL_MATE_ENABLE_BLE
apply_icon(s_menu_ble_icon, &ble_topbar, snap.ble_enabled);
#else
apply_icon(s_menu_ble_icon, nullptr, false);
#endif
apply_icon(s_menu_radio_mod_icon,
snap.radio_mod_fsk ? &fsk_mod_topbar : &lora_mod_topbar,
snap.radio_mod_visible);
apply_icon(s_menu_walkie_monitor_icon, &walkie_monitor_topbar, snap.walkie_monitor);
const bool any = snap.route_active || snap.track_recording || snap.gps_enabled ||
snap.wifi_enabled || snap.team_active || snap.ble_enabled ||
snap.wifi_enabled || snap.team_active ||
#if TRAIL_MATE_ENABLE_BLE
snap.ble_enabled ||
#endif
snap.radio_mod_visible || snap.walkie_monitor || (snap.unread > 0);
if (any)
{