From e8bb650a38f472727b95a82beb510c330e8bae6d Mon Sep 17 00:00:00 2001 From: pablohc Date: Thu, 29 Jan 2026 04:03:49 +0100 Subject: [PATCH] clang-format-fix --- src/CrossPointSettings.h | 7 +------ src/activities/boot_sleep/SleepActivity.cpp | 4 ++-- src/activities/settings/SettingsActivity.cpp | 6 +++--- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/CrossPointSettings.h b/src/CrossPointSettings.h index b9249e96..38ff1ba7 100644 --- a/src/CrossPointSettings.h +++ b/src/CrossPointSettings.h @@ -16,12 +16,7 @@ class CrossPointSettings { CrossPointSettings& operator=(const CrossPointSettings&) = delete; enum SLEEP_SCREEN_MODE { LOGO = 0, CUSTOM = 1, COVER_CROP = 2, COVER_FIT = 3, BLANK = 4, SLEEP_SCREEN_MODE_COUNT }; - enum SLEEP_SCREEN_FILTER { - ORIGINAL = 0, - CONTRAST = 1, - NEGATIVE = 2, - SLEEP_SCREEN_FILTER_COUNT - }; + enum SLEEP_SCREEN_FILTER { ORIGINAL = 0, CONTRAST = 1, NEGATIVE = 2, SLEEP_SCREEN_FILTER_COUNT }; // Status bar display type enum enum STATUS_BAR_MODE { diff --git a/src/activities/boot_sleep/SleepActivity.cpp b/src/activities/boot_sleep/SleepActivity.cpp index 2de14187..d3bd826b 100644 --- a/src/activities/boot_sleep/SleepActivity.cpp +++ b/src/activities/boot_sleep/SleepActivity.cpp @@ -181,8 +181,8 @@ void SleepActivity::renderBitmapSleepScreen(const Bitmap& bitmap) const { Serial.printf("[%lu] [SLP] drawing to %d x %d\n", millis(), x, y); renderer.clearScreen(); - const bool hasGreyscale = bitmap.hasGreyscale() && - SETTINGS.sleepScreenFilter == CrossPointSettings::SLEEP_SCREEN_FILTER::ORIGINAL; + const bool hasGreyscale = + bitmap.hasGreyscale() && SETTINGS.sleepScreenFilter == CrossPointSettings::SLEEP_SCREEN_FILTER::ORIGINAL; renderer.drawBitmap(bitmap, x, y, pageWidth, pageHeight, cropX, cropY); diff --git a/src/activities/settings/SettingsActivity.cpp b/src/activities/settings/SettingsActivity.cpp index 6436abef..ca07e3e0 100644 --- a/src/activities/settings/SettingsActivity.cpp +++ b/src/activities/settings/SettingsActivity.cpp @@ -14,9 +14,9 @@ namespace { constexpr int displaySettingsCount = 5; const SettingInfo displaySettings[displaySettingsCount] = { // Should match with SLEEP_SCREEN_MODE - SettingInfo::Enum("Sleep Screen", &CrossPointSettings::sleepScreenMode, {"Logo", "Custom", "Cover Crop", "Cover Fit", "None"}), - SettingInfo::Enum("Sleep Screen Filter", &CrossPointSettings::sleepScreenFilter, - {"None", "Contrast", "Negative"}), + SettingInfo::Enum("Sleep Screen", &CrossPointSettings::sleepScreenMode, + {"Logo", "Custom", "Cover Crop", "Cover Fit", "None"}), + SettingInfo::Enum("Sleep Screen Filter", &CrossPointSettings::sleepScreenFilter, {"None", "Contrast", "Negative"}), SettingInfo::Enum("Status Bar", &CrossPointSettings::statusBar, {"None", "No Progress", "Full w/ Percentage", "Full w/ Progress Bar", "Progress Bar"}), SettingInfo::Enum("Hide Battery %", &CrossPointSettings::hideBatteryPercentage, {"Never", "In Reader", "Always"}),