snark13/Xteink-X4-crosspoint-reader
1
0
Fork 0
mirror of https://github.com/daveallie/crosspoint-reader.git synced 2026-02-04 22:57:50 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix formatting issues

Browse Source
This commit is contained in:
Irene Ying 2026-01-17 14:23:18 -08:00
parent 5ca778fe6a
commit 1c3073f472
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/activities/boot_sleep/SleepActivity.cpp
View File

@ -19,11 +19,15 @@ void SleepActivity::onEnter() {
(!fromTimeout && SETTINGS.showSleepScreen == CrossPointSettings::SHOW_SLEEP_SCREEN::EXCEPT_TIMEOUT); (!fromTimeout && SETTINGS.showSleepScreen == CrossPointSettings::SHOW_SLEEP_SCREEN::EXCEPT_TIMEOUT);
Activity::onEnter(); Activity::onEnter();
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
if (SHOW_SLEEP_SCREEN) { if (SHOW_SLEEP_SCREEN) {
======= =======
if(SETTINGS.sleepScreen != CrossPointSettings::SLEEP_SCREEN_MODE::LAST_SCREEN) { if(SETTINGS.sleepScreen != CrossPointSettings::SLEEP_SCREEN_MODE::LAST_SCREEN) {
>>>>>>> 4709ffb (Remove Entering Sleep message) >>>>>>> 4709ffb (Remove Entering Sleep message)
=======
if (SETTINGS.sleepScreen != CrossPointSettings::SLEEP_SCREEN_MODE::LAST_SCREEN) {
>>>>>>> b392ba3 (fix formatting issues)
renderPopup("Entering Sleep..."); renderPopup("Entering Sleep...");
} else { } else {
return renderLastScreenSleepScreen(); return renderLastScreenSleepScreen();