From f1ead2101a70c56fdc6d35b30804cfc60f54f4ad Mon Sep 17 00:00:00 2001 From: altsysrq Date: Mon, 5 Jan 2026 21:35:21 -0600 Subject: [PATCH] Refactor hotspot shutdown time enum for improved readability and add hotspot scheduler time settings --- src/CrossPointSettings.h | 15 +++++++++++---- src/activities/settings/SettingsActivity.h | 4 +--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/CrossPointSettings.h b/src/CrossPointSettings.h index 107bffb9..4e0b1db7 100644 --- a/src/CrossPointSettings.h +++ b/src/CrossPointSettings.h @@ -54,7 +54,14 @@ class CrossPointSettings { enum REFRESH_FREQUENCY { REFRESH_1 = 0, REFRESH_5 = 1, REFRESH_10 = 2, REFRESH_15 = 3, REFRESH_30 = 4 }; // Hotspot scheduler settings - enum HOTSPOT_SHUTDOWN_TIME { SHUTDOWN_5_MIN = 0, SHUTDOWN_10_MIN = 1, SHUTDOWN_15_MIN = 2, SHUTDOWN_30_MIN = 3, SHUTDOWN_60_MIN = 4, SHUTDOWN_120_MIN = 5 }; + enum HOTSPOT_SHUTDOWN_TIME { + SHUTDOWN_5_MIN = 0, + SHUTDOWN_10_MIN = 1, + SHUTDOWN_15_MIN = 2, + SHUTDOWN_30_MIN = 3, + SHUTDOWN_60_MIN = 4, + SHUTDOWN_120_MIN = 5 + }; // Sleep screen settings uint8_t sleepScreen = DARK; @@ -84,9 +91,9 @@ class CrossPointSettings { // Screen margin setting (in pixels, default 0) uint8_t screenMargin = 0; - // Network credentials for FTP and HTTP servers - std::string ftpUsername = "crosspoint"; - std::string ftpPassword = "reader"; + // Network credentials for FTP and HTTP se // 0 = disabled, 1 = enabled + uint8_t hotspotSchedulerHour = 12; // Hour (0-23) + uint8_t hotspotSchedulerMinute = 0; std::string httpUsername = "crosspoint"; std::string httpPassword = "reader"; diff --git a/src/activities/settings/SettingsActivity.h b/src/activities/settings/SettingsActivity.h index de87aa64..1afafd4f 100644 --- a/src/activities/settings/SettingsActivity.h +++ b/src/activities/settings/SettingsActivity.h @@ -38,9 +38,7 @@ struct SettingInfo { return {name, SettingType::ENUM, ptr, nullptr, std::move(values), {0, 0, 0}}; } - static SettingInfo Action(const char* name) { - return {name, SettingType::ACTION, nullptr, nullptr, {}, {0, 0, 0}}; - } + static SettingInfo Action(const char* name) { return {name, SettingType::ACTION, nullptr, nullptr, {}, {0, 0, 0}}; } static SettingInfo Value(const char* name, uint8_t CrossPointSettings::* ptr, const ValueRange valueRange) { return {name, SettingType::VALUE, ptr, nullptr, {}, valueRange};