Adolfo Reyna
2dc216fb7b
- McpSettings was hardcoded to /data/service/mcp/settings.properties, but ES3C28P uses storage.userDataLocation=SD so user data lives on /sdcard/tactility/. Settings appeared to save but on reload returned default false -> "enable and when I go back shows disabled". Fixed to use getUserDataPath()+"/settings/mcp.properties" pattern consistent with DisplaySettings/WebServerSettings, with findOrCreateParentDirectory() and isFile() guard. - HttpServer ctrl_port collision: ESP-IDF default 32768 used by both WebServer (80) and DevelopmentService (6666). Second httpd_start() failed silently -> dashboard up but /api/mcp 404 and :6666 refused. Fixed with unique ctrl_port = 32768 + (port % 1000). Added CONFIG_HTTPD_MAX_URI_HANDLERS=20 (default 8 < 9 needed for 7 handlers + 2 internal). - DevService stack 5120 -> 8192 for /app/install handling. - McpSystem video stream task stack 4096 -> 8192 and idle yield 50ms (was 5ms always) to avoid CPU starvation blocking httpd tasks. On RLCD, timer must always run: DisplayIdle early return on !supportsBacklightDuty() broke MCP manual activation (cachedSettings not loaded, backlight duty 0). Fixed to always load settings + start timer, log RLCD detection, guard setBacklightDuty with supportsBacklightDuty() and fallback duty 255. - DisplaySettings: add disableScreensaverWhenCharging bool, persisted, with UI toggle in Display app (Settings->Display) using PowerDevice::IsCharging check via findDevices callback. When charging and flag enabled, screensaver activation skipped, and if already dimmed, wake on charging. - ES3C28P Power driver: GPIO9 ADC1_CH8 2x divider 2500-4200mV spec from ~/Downloads official docs, TP4054 CHRG not connected to GPIO, so IsCharging inferred via voltage thresholds (<500mV no battery USB or >5000mV wall powered, >=4150mV high) + rising trend. Verified: flashed es3c28p to /dev/cu.usbmodem101 (192.168.68.113), WiFi FamReynaMesh RSSI -59, dashboard 200, :6666/info now works, /api/mcp returns disabled correctly until enabled, persists to SD.
72 lines
1.8 KiB
C++
72 lines
1.8 KiB
C++
#include <Tactility/settings/McpSettings.h>
|
|
#include <Tactility/file/PropertiesFile.h>
|
|
#include <Tactility/file/File.h>
|
|
#include <Tactility/Logger.h>
|
|
#include <Tactility/Paths.h>
|
|
#include <map>
|
|
#include <string>
|
|
|
|
namespace tt::settings::mcp {
|
|
|
|
static const auto LOGGER = Logger("McpSettings");
|
|
|
|
static std::string getSettingsFilePath() {
|
|
return getUserDataPath() + "/settings/mcp.properties";
|
|
}
|
|
|
|
constexpr auto* KEY_MCP_ENABLED = "mcpEnabled";
|
|
|
|
bool load(McpSettings& settings) {
|
|
auto settings_path = getSettingsFilePath();
|
|
if (!file::isFile(settings_path)) {
|
|
return false;
|
|
}
|
|
std::map<std::string, std::string> map;
|
|
if (!file::loadPropertiesFile(settings_path, map)) {
|
|
return false;
|
|
}
|
|
|
|
auto mcp_enabled = map.find(KEY_MCP_ENABLED);
|
|
settings.mcpEnabled = (mcp_enabled != map.end())
|
|
? (mcp_enabled->second == "1" || mcp_enabled->second == "true")
|
|
: false;
|
|
|
|
return true;
|
|
}
|
|
|
|
McpSettings getDefault() {
|
|
return McpSettings{
|
|
.mcpEnabled = false
|
|
};
|
|
}
|
|
|
|
McpSettings loadOrGetDefault() {
|
|
McpSettings settings;
|
|
if (!load(settings)) {
|
|
settings = getDefault();
|
|
if (!save(settings)) {
|
|
LOGGER.warn("Failed to save default MCP settings");
|
|
}
|
|
}
|
|
return settings;
|
|
}
|
|
|
|
bool save(const McpSettings& settings) {
|
|
std::map<std::string, std::string> map;
|
|
map[KEY_MCP_ENABLED] = settings.mcpEnabled ? "true" : "false";
|
|
|
|
auto settings_path = getSettingsFilePath();
|
|
if (!file::findOrCreateParentDirectory(settings_path, 0755)) {
|
|
LOGGER.error("Failed to create parent dir for {}", settings_path);
|
|
return false;
|
|
}
|
|
|
|
if (!file::savePropertiesFile(settings_path, map)) {
|
|
LOGGER.error("Failed to save MCP settings to {}", settings_path);
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
} // namespace
|