diff --git a/src/CrossPointSettings.h b/src/CrossPointSettings.h index 654148a1..3fc46607 100644 --- a/src/CrossPointSettings.h +++ b/src/CrossPointSettings.h @@ -94,9 +94,9 @@ class CrossPointSettings { uint8_t longPressChapterSkip = 1; // Calendar mode settings - uint8_t calendarModeEnabled = 0; // 0 = disabled, 1 = enabled - uint8_t calendarRefreshHours = 4; // Refresh interval in hours (1-24) - char calendarServerUrl[256] = ""; // URL to fetch BMP image from + uint8_t calendarModeEnabled = 0; // 0 = disabled, 1 = enabled + uint8_t calendarRefreshHours = 4; // Refresh interval in hours (1-24) + char calendarServerUrl[256] = ""; // URL to fetch BMP image from ~CrossPointSettings() = default; diff --git a/src/activities/calendar/CalendarActivity.cpp b/src/activities/calendar/CalendarActivity.cpp index 8d4d2ce8..46504b2b 100644 --- a/src/activities/calendar/CalendarActivity.cpp +++ b/src/activities/calendar/CalendarActivity.cpp @@ -55,9 +55,7 @@ void CalendarActivity::startWifiConnection() { stateStartTime = millis(); } -bool CalendarActivity::checkWifiConnection() { - return WiFi.status() == WL_CONNECTED; -} +bool CalendarActivity::checkWifiConnection() { return WiFi.status() == WL_CONNECTED; } bool CalendarActivity::fetchAndSaveImage() { Serial.printf("[%lu] [CAL] Fetching image from: %s\n", millis(), SETTINGS.calendarServerUrl); diff --git a/src/activities/calendar/CalendarActivity.h b/src/activities/calendar/CalendarActivity.h index b21a8c94..4114207c 100644 --- a/src/activities/calendar/CalendarActivity.h +++ b/src/activities/calendar/CalendarActivity.h @@ -19,15 +19,7 @@ * 7. Enter deep sleep */ -enum class CalendarState { - INIT, - CONNECTING_WIFI, - FETCHING_IMAGE, - SAVING_IMAGE, - RENDERING, - SCHEDULING_SLEEP, - ERROR -}; +enum class CalendarState { INIT, CONNECTING_WIFI, FETCHING_IMAGE, SAVING_IMAGE, RENDERING, SCHEDULING_SLEEP, ERROR }; class CalendarActivity final : public Activity { public: diff --git a/src/activities/settings/SettingsActivity.cpp b/src/activities/settings/SettingsActivity.cpp index b4b2edef..cec7d892 100644 --- a/src/activities/settings/SettingsActivity.cpp +++ b/src/activities/settings/SettingsActivity.cpp @@ -22,8 +22,7 @@ const SettingInfo settingsList[settingsCount] = { // Calendar mode settings SettingInfo::Toggle("Calendar Mode", &CrossPointSettings::calendarModeEnabled), SettingInfo::Value("Calendar Refresh (hours)", &CrossPointSettings::calendarRefreshHours, {1, 24, 1}), - SettingInfo::Action("Calendar Server URL"), - SettingInfo::Action("Test Calendar Now"), + SettingInfo::Action("Calendar Server URL"), SettingInfo::Action("Test Calendar Now"), SettingInfo::Enum("Sleep Screen Cover Mode", &CrossPointSettings::sleepScreenCoverMode, {"Fit", "Crop"}), SettingInfo::Enum("Status Bar", &CrossPointSettings::statusBar, {"None", "No Progress", "Full"}), SettingInfo::Enum("Hide Battery %", &CrossPointSettings::hideBatteryPercentage, {"Never", "In Reader", "Always"}), @@ -48,8 +47,7 @@ const SettingInfo settingsList[settingsCount] = { {"1 min", "5 min", "10 min", "15 min", "30 min"}), SettingInfo::Enum("Refresh Frequency", &CrossPointSettings::refreshFrequency, {"1 page", "5 pages", "10 pages", "15 pages", "30 pages"}), - SettingInfo::Action("Calibre Settings"), - SettingInfo::Action("Check for updates")}; + SettingInfo::Action("Calibre Settings"), SettingInfo::Action("Check for updates")}; } // namespace void SettingsActivity::taskTrampoline(void* param) { diff --git a/src/main.cpp b/src/main.cpp index 1770b913..86c7324e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,12 +17,12 @@ #include "activities/boot_sleep/BootActivity.h" #include "activities/boot_sleep/SleepActivity.h" #include "activities/browser/OpdsBookBrowserActivity.h" +#include "activities/calendar/CalendarActivity.h" #include "activities/home/HomeActivity.h" #include "activities/network/CrossPointWebServerActivity.h" #include "activities/reader/ReaderActivity.h" #include "activities/settings/SettingsActivity.h" #include "activities/util/FullScreenMessageActivity.h" -#include "activities/calendar/CalendarActivity.h" #include "fontIds.h" #define SPI_FQ 40000000