This might cause the hardfault, addressing bad data! Add checks.

deividAlfa · Dec 30, 2023 · fc2892a · fc2892a
1 parent 4df5b3a
commit fc2892a
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/Core/Src/settings.c b/Core/Src/settings.c
@@ -600,8 +600,10 @@ void flashTempSettingsInit(void) //call it only once during init
         break;
       }
     }
-    flashTempIndex = i;
-    flashTemp = temp_settings.temperature[i];
+    if(!setDefault){
+      flashTempIndex = i;
+      flashTemp = temp_settings.temperature[i];
+    }
   }                                                                                                           // No free slot found, reset
   else
     setDefault=1;
@@ -615,8 +617,10 @@ void flashTempSettingsInit(void) //call it only once during init
           break;
         }
       }
-      flashProfileIndex = i;
-      flashProfile=temp_settings.profile[i];
+      if(!setDefault){
+        flashProfileIndex = i;
+        flashProfile=temp_settings.profile[i];
+      }
     }
     else
       setDefault=1;
@@ -632,8 +636,10 @@ void flashTempSettingsInit(void) //call it only once during init
             break;
           }
         }
-        flashTipIndex[n] = i;
-        flashTip[n] = temp_settings.tip[n][i];
+        if(!setDefault){
+          flashTipIndex[n] = i;
+          flashTip[n] = temp_settings.tip[n][i];
+        }
       }
       else
         setDefault=1;
@@ -970,9 +976,7 @@ void loadProfile(uint8_t profile){
 
 void setCurrentTip(uint8_t tip) {
   if(tip >= systemSettings.Profile.currentNumberOfTips) // sanity check
-  {
     tip = 0u;
-  }
   uint32_t _irq = __get_PRIMASK();
   __disable_irq();
   systemSettings.currentTip = tip;