Massive clean thanks to Schwabe : unifdef -m -DCPUARM -UCPUM64 -UCPUM2560 -UPCBSTD -UPCBMEGA2560 -UPCBGRUVIN9X -UPCB9X $(find . -name "*.cpp" -or -name "*.h")

radio/src/storage/storage_common.cpp

@@ -41,9 +41,7 @@ void storageDirty(uint8_t msk)
 
 void preModelLoad()
 {
-#if defined(CPUARM)
   watchdogSuspend(500/*5s*/);
-#endif
 
 #if defined(SDCARD)
   logsClose();
@@ -76,7 +74,6 @@ void postModelLoad(bool alarms)
 
   restoreTimers();
 
-#if defined(CPUARM)
   for (int i=0; i<MAX_TELEMETRY_SENSORS; i++) {
     TelemetrySensor & sensor = g_model.telemetrySensors[i];
     if (sensor.type == TELEM_TYPE_CALCULATED && sensor.persistent) {
@@ -84,7 +81,6 @@ void postModelLoad(bool alarms)
       telemetryItems[i].lastReceived = TELEMETRY_VALUE_OLD;   // #3595: make value visible even before the first new value is received)
     }
   }
-#endif
 
   LOAD_MODEL_CURVES();
 
@@ -120,7 +116,6 @@ void storageFlushCurrentModel()
 {
   saveTimers();
 
-#if defined(CPUARM)
   for (int i=0; i<MAX_TELEMETRY_SENSORS; i++) {
     TelemetrySensor & sensor = g_model.telemetrySensors[i];
     if (sensor.type == TELEM_TYPE_CALCULATED && sensor.persistent && sensor.persistentValue != telemetryItems[i].value) {
@@ -128,9 +123,7 @@ void storageFlushCurrentModel()
       storageDirty(EE_MODEL);
     }
   }
-#endif
 
-#if defined(CPUARM)
   if (g_model.potsWarnMode == POTS_WARN_AUTO) {
     for (int i=0; i<NUM_POTS+NUM_SLIDERS; i++) {
       if (!(g_model.potsWarnEnabled & (1 << i))) {
@@ -139,5 +132,4 @@ void storageFlushCurrentModel()
     }
     storageDirty(EE_MODEL);
   }
-#endif
 }