G7710 boot workaround

mark9064 · mark9064 · commit e9b2c48bb2f3 · 2023-05-22T00:38:57.000+01:00
diff --git a/src/components/settings/Settings.cpp b/src/components/settings/Settings.cpp
@@ -38,10 +38,15 @@ void Settings::LoadSettingsFromFile() {
 
 void Settings::SaveSettingsToFile() {
   lfs_file_t settingsFile;
+  auto prevFace = settings.watchFace;
 
   if (fs.FileOpen(&settingsFile, "/settings.dat", LFS_O_WRONLY | LFS_O_CREAT) != LFS_ERR_OK) {
     return;
   }
+  if (prevFace == Pinetime::Applications::WatchFace::CasioStyleG7710) {
+    settings.watchFace = Pinetime::Applications::WatchFace::Digital;
+  }
   fs.FileWrite(&settingsFile, reinterpret_cast<uint8_t*>(&settings), sizeof(settings));
   fs.FileClose(&settingsFile);
+  settings.watchFace = prevFace;
 }

Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,15 @@ void Settings::LoadSettingsFromFile() {`
`38`	`38`
`39`	`39`	`void Settings::SaveSettingsToFile() {`
`40`	`40`	`lfs_file_t settingsFile;`
	`41`	`+ auto prevFace = settings.watchFace;`
`41`	`42`
`42`	`43`	`if (fs.FileOpen(&settingsFile, "/settings.dat", LFS_O_WRONLY \| LFS_O_CREAT) != LFS_ERR_OK) {`
`43`	`44`	`return;`
`44`	`45`	`}`
	`46`	`+ if (prevFace == Pinetime::Applications::WatchFace::CasioStyleG7710) {`
	`47`	`+ settings.watchFace = Pinetime::Applications::WatchFace::Digital;`
	`48`	`+ }`
`45`	`49`	`fs.FileWrite(&settingsFile, reinterpret_cast<uint8_t*>(&settings), sizeof(settings));`
`46`	`50`	`fs.FileClose(&settingsFile);`
	`51`	`+ settings.watchFace = prevFace;`
`47`	`52`	`}`