From 44ddf110b22b75d7bc0a4672c4339e61c9b5be62 Mon Sep 17 00:00:00 2001
From: Irene Ying <ireneying@Irenes-MacBook-Air-2.local>
Date: Sun, 25 Jan 2026 00:25:10 -0800
Subject: [PATCH] Create new Show Sleep Screen setting

---
 src/CrossPointSettings.cpp                  | 2 +-
 src/CrossPointSettings.h                    | 4 ----
 src/activities/boot_sleep/SleepActivity.cpp | 8 --------
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/CrossPointSettings.cpp b/src/CrossPointSettings.cpp
index 8998f6c3..2395e4fc 100644
--- a/src/CrossPointSettings.cpp
+++ b/src/CrossPointSettings.cpp
@@ -14,7 +14,7 @@ CrossPointSettings CrossPointSettings::instance;
 namespace {
 constexpr uint8_t SETTINGS_FILE_VERSION = 1;
 // Increment this when adding new persisted settings fields
-constexpr uint8_t SETTINGS_COUNT = 20;
+constexpr uint8_t SETTINGS_COUNT = 21;
 constexpr char SETTINGS_FILE[] = "/.crosspoint/settings.bin";
 }  // namespace
 
diff --git a/src/CrossPointSettings.h b/src/CrossPointSettings.h
index 41896237..74306f76 100644
--- a/src/CrossPointSettings.h
+++ b/src/CrossPointSettings.h
@@ -16,12 +16,8 @@ class CrossPointSettings {
   CrossPointSettings& operator=(const CrossPointSettings&) = delete;
 
   // Should match with SettingsActivity text
-<<<<<<< HEAD
   enum SLEEP_SCREEN_MODE { DARK = 0, LIGHT = 1, CUSTOM = 2, COVER = 3, BLANK = 4 };
   enum SHOW_SLEEP_SCREEN { ALWAYS = 0, EXCEPT_TIMEOUT = 1, NEVER = 2 };
-=======
-  enum SLEEP_SCREEN_MODE { DARK = 0, LIGHT = 1, CUSTOM = 2, COVER = 3, LAST_SCREEN = 4, BLANK = 5 };
->>>>>>> cc60375 (Initial push)
   enum SLEEP_SCREEN_COVER_MODE { FIT = 0, CROP = 1 };
 
   // Status bar display type enum
diff --git a/src/activities/boot_sleep/SleepActivity.cpp b/src/activities/boot_sleep/SleepActivity.cpp
index c8a6026d..eb34b974 100644
--- a/src/activities/boot_sleep/SleepActivity.cpp
+++ b/src/activities/boot_sleep/SleepActivity.cpp
@@ -19,15 +19,7 @@ void SleepActivity::onEnter() {
       (!fromTimeout && SETTINGS.showSleepScreen == CrossPointSettings::SHOW_SLEEP_SCREEN::EXCEPT_TIMEOUT);
 
   Activity::onEnter();
-<<<<<<< HEAD
-<<<<<<< HEAD
   if (SHOW_SLEEP_SCREEN) {
-=======
-  if(SETTINGS.sleepScreen != CrossPointSettings::SLEEP_SCREEN_MODE::LAST_SCREEN) {
->>>>>>> 4709ffb (Remove Entering Sleep message)
-=======
-  if (SETTINGS.sleepScreen != CrossPointSettings::SLEEP_SCREEN_MODE::LAST_SCREEN) {
->>>>>>> b392ba3 (fix formatting issues)
     renderPopup("Entering Sleep...");
   } else {
     return renderLastScreenSleepScreen();