Merge 052b058643 into da4d3b5ea5

src/activities/boot_sleep/SleepActivity.cpp

@@ -290,8 +290,8 @@ void SleepActivity::renderCoverSleepScreen() const {
 void SleepActivity::renderLastScreenSleepScreen() const {
   const auto pageHeight = renderer.getScreenHeight();
 
-  renderer.drawImage(MoonIcon, 48, pageHeight - 48, 48, 48);
-  renderer.displayBuffer(EInkDisplay::HALF_REFRESH);
+  renderer.drawImage(MoonIcon, 0, pageHeight - 48, 48, 48);
+  renderer.displayBuffer(HalDisplay::HALF_REFRESH);
 }
 
 void SleepActivity::renderBlankSleepScreen() const {

src/activities/settings/SettingsActivity.cpp

@@ -11,7 +11,7 @@
 const char* SettingsActivity::categoryNames[categoryCount] = {"Display", "Reader", "Controls", "System"};
 
 namespace {
-constexpr int displaySettingsCount = 6;
+constexpr int displaySettingsCount = 7;
 const SettingInfo displaySettings[displaySettingsCount] = {
     // Should match with SLEEP_SCREEN_MODE
     SettingInfo::Enum("Sleep Screen", &CrossPointSettings::sleepScreen, {"Dark", "Light", "Custom", "Cover", "None"}),

src/main.cpp

@@ -354,7 +354,7 @@ void loop() {
   }
 
   if (gpio.isPressed(HalGPIO::BTN_POWER) && gpio.getHeldTime() > SETTINGS.getPowerButtonDuration()) {
-    enterDeepSleep();
+    enterDeepSleep(false);
     // This should never be hit as `enterDeepSleep` calls esp_deep_sleep_start
     return;
   }