diff --git a/simulator/generated/simulator_tune.msq b/simulator/generated/simulator_tune.msq
index c085de6ac7..e6f710ae93 100644
--- a/simulator/generated/simulator_tune.msq
+++ b/simulator/generated/simulator_tune.msq
@@ -208,7 +208,7 @@
         <constant name="acrPin">"NONE"</constant>
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
-        <constant digits="0" name="byFirmwareVersion" units="index">2.024082E7</constant>
+        <constant digits="0" name="byFirmwareVersion" units="index">2.0240821E7</constant>
         <constant name="tps1_1AdcChannel">"Disabled"</constant>
         <constant name="vbattAdcChannel">"Disabled"</constant>
         <constant name="fuelLevelSensor">"Disabled"</constant>
@@ -223,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.024082E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240821E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -686,7 +686,7 @@
         <constant digits="2" name="knockDetectionWindowEnd" units="angle">60.0</constant>
         <constant digits="0" name="idleStepperReactionTime" units="ms">3.0</constant>
         <constant digits="0" name="idleStepperTotalSteps" units="count">200.0</constant>
-        <constant digits="0" name="mapAveragingSchedulingAtIndex" units="index">0.0</constant>
+        <constant digits="0" name="unusedInt3423423" units="">0.0</constant>
         <constant digits="2" name="tachPulseDuractionMs" units="">0.5</constant>
         <constant digits="2" name="wwaeTau" units="Seconds">0.3</constant>
         <constant digits="4" name="alternatorControl_pFactor" units="">30.0</constant>
@@ -4790,7 +4790,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.20.f407-discovery.36222256" version="5.0"/>
+    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.21.f407-discovery.3240305536" version="5.0"/>
     <bibliography author="rusEFI 20240819" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_BMW_M52.msq b/simulator/generated/simulator_tune_BMW_M52.msq
index 32f06385c6..8569a89d36 100644
--- a/simulator/generated/simulator_tune_BMW_M52.msq
+++ b/simulator/generated/simulator_tune_BMW_M52.msq
@@ -223,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.024082E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240821E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -686,7 +686,7 @@
         <constant digits="2" name="knockDetectionWindowEnd" units="angle">60.0</constant>
         <constant digits="0" name="idleStepperReactionTime" units="ms">3.0</constant>
         <constant digits="0" name="idleStepperTotalSteps" units="count">200.0</constant>
-        <constant digits="0" name="mapAveragingSchedulingAtIndex" units="index">0.0</constant>
+        <constant digits="0" name="unusedInt3423423" units="">0.0</constant>
         <constant digits="2" name="tachPulseDuractionMs" units="">0.5</constant>
         <constant digits="2" name="wwaeTau" units="Seconds">0.3</constant>
         <constant digits="4" name="alternatorControl_pFactor" units="">30.0</constant>
@@ -4790,7 +4790,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.20.f407-discovery.36222256" version="5.0"/>
+    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.21.f407-discovery.3240305536" version="5.0"/>
     <bibliography author="rusEFI 20240819" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HARLEY.msq b/simulator/generated/simulator_tune_HARLEY.msq
index 89d287fc4a..7375c7fc0a 100644
--- a/simulator/generated/simulator_tune_HARLEY.msq
+++ b/simulator/generated/simulator_tune_HARLEY.msq
@@ -223,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.024082E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240821E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">50.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -687,7 +687,7 @@
         <constant digits="2" name="knockDetectionWindowEnd" units="angle">60.0</constant>
         <constant digits="0" name="idleStepperReactionTime" units="ms">3.0</constant>
         <constant digits="0" name="idleStepperTotalSteps" units="count">200.0</constant>
-        <constant digits="0" name="mapAveragingSchedulingAtIndex" units="index">0.0</constant>
+        <constant digits="0" name="unusedInt3423423" units="">0.0</constant>
         <constant digits="2" name="tachPulseDuractionMs" units="">0.5</constant>
         <constant digits="2" name="wwaeTau" units="Seconds">0.3</constant>
         <constant digits="4" name="alternatorControl_pFactor" units="">30.0</constant>
@@ -4793,7 +4793,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.20.f407-discovery.36222256" version="5.0"/>
+    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.21.f407-discovery.3240305536" version="5.0"/>
     <bibliography author="rusEFI 20240819" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HELLEN_121_NISSAN_6_CYL.msq b/simulator/generated/simulator_tune_HELLEN_121_NISSAN_6_CYL.msq
index b02c88eb1f..7502e355f7 100644
--- a/simulator/generated/simulator_tune_HELLEN_121_NISSAN_6_CYL.msq
+++ b/simulator/generated/simulator_tune_HELLEN_121_NISSAN_6_CYL.msq
@@ -223,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.024082E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240821E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -687,7 +687,7 @@
         <constant digits="2" name="knockDetectionWindowEnd" units="angle">60.0</constant>
         <constant digits="0" name="idleStepperReactionTime" units="ms">3.0</constant>
         <constant digits="0" name="idleStepperTotalSteps" units="count">200.0</constant>
-        <constant digits="0" name="mapAveragingSchedulingAtIndex" units="index">0.0</constant>
+        <constant digits="0" name="unusedInt3423423" units="">0.0</constant>
         <constant digits="2" name="tachPulseDuractionMs" units="">0.5</constant>
         <constant digits="2" name="wwaeTau" units="Seconds">0.3</constant>
         <constant digits="4" name="alternatorControl_pFactor" units="">30.0</constant>
@@ -4954,7 +4954,7 @@ canRxAdd(IN_35D, onCanRxAc)</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.20.f407-discovery.36222256" version="5.0"/>
+    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.21.f407-discovery.3240305536" version="5.0"/>
     <bibliography author="rusEFI 20240819" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq b/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq
index 1d8dbc2c68..2dd40ed776 100644
--- a/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq
+++ b/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq
@@ -223,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.024082E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240821E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -688,7 +688,7 @@
         <constant digits="2" name="knockDetectionWindowEnd" units="angle">60.0</constant>
         <constant digits="0" name="idleStepperReactionTime" units="ms">3.0</constant>
         <constant digits="0" name="idleStepperTotalSteps" units="count">200.0</constant>
-        <constant digits="0" name="mapAveragingSchedulingAtIndex" units="index">0.0</constant>
+        <constant digits="0" name="unusedInt3423423" units="">0.0</constant>
         <constant digits="2" name="tachPulseDuractionMs" units="">0.5</constant>
         <constant digits="2" name="wwaeTau" units="Seconds">0.3</constant>
         <constant digits="4" name="alternatorControl_pFactor" units="">30.0</constant>
@@ -4839,7 +4839,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.20.f407-discovery.36222256" version="5.0"/>
+    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.21.f407-discovery.3240305536" version="5.0"/>
     <bibliography author="rusEFI 20240819" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq b/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq
index ae89ee3b8e..f4d2ef9d8d 100644
--- a/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq
+++ b/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq
@@ -223,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.024082E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240821E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -688,7 +688,7 @@
         <constant digits="2" name="knockDetectionWindowEnd" units="angle">60.0</constant>
         <constant digits="0" name="idleStepperReactionTime" units="ms">3.0</constant>
         <constant digits="0" name="idleStepperTotalSteps" units="count">200.0</constant>
-        <constant digits="0" name="mapAveragingSchedulingAtIndex" units="index">0.0</constant>
+        <constant digits="0" name="unusedInt3423423" units="">0.0</constant>
         <constant digits="2" name="tachPulseDuractionMs" units="">0.5</constant>
         <constant digits="2" name="wwaeTau" units="Seconds">0.3</constant>
         <constant digits="4" name="alternatorControl_pFactor" units="">30.0</constant>
@@ -4839,7 +4839,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.20.f407-discovery.36222256" version="5.0"/>
+    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.21.f407-discovery.3240305536" version="5.0"/>
     <bibliography author="rusEFI 20240819" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HONDA_K.msq b/simulator/generated/simulator_tune_HONDA_K.msq
index 9e3c6c840f..addb6202a9 100644
--- a/simulator/generated/simulator_tune_HONDA_K.msq
+++ b/simulator/generated/simulator_tune_HONDA_K.msq
@@ -223,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.024082E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240821E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -688,7 +688,7 @@
         <constant digits="2" name="knockDetectionWindowEnd" units="angle">60.0</constant>
         <constant digits="0" name="idleStepperReactionTime" units="ms">3.0</constant>
         <constant digits="0" name="idleStepperTotalSteps" units="count">200.0</constant>
-        <constant digits="0" name="mapAveragingSchedulingAtIndex" units="index">0.0</constant>
+        <constant digits="0" name="unusedInt3423423" units="">0.0</constant>
         <constant digits="2" name="tachPulseDuractionMs" units="">0.5</constant>
         <constant digits="2" name="wwaeTau" units="Seconds">0.3</constant>
         <constant digits="4" name="alternatorControl_pFactor" units="">30.0</constant>
@@ -4792,7 +4792,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.20.f407-discovery.36222256" version="5.0"/>
+    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.21.f407-discovery.3240305536" version="5.0"/>
     <bibliography author="rusEFI 20240819" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HONDA_OBD1.msq b/simulator/generated/simulator_tune_HONDA_OBD1.msq
index c02b330bfc..1fe5069ea0 100644
--- a/simulator/generated/simulator_tune_HONDA_OBD1.msq
+++ b/simulator/generated/simulator_tune_HONDA_OBD1.msq
@@ -223,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.024082E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240821E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -687,7 +687,7 @@
         <constant digits="2" name="knockDetectionWindowEnd" units="angle">60.0</constant>
         <constant digits="0" name="idleStepperReactionTime" units="ms">3.0</constant>
         <constant digits="0" name="idleStepperTotalSteps" units="count">200.0</constant>
-        <constant digits="0" name="mapAveragingSchedulingAtIndex" units="index">0.0</constant>
+        <constant digits="0" name="unusedInt3423423" units="">0.0</constant>
         <constant digits="2" name="tachPulseDuractionMs" units="">0.5</constant>
         <constant digits="2" name="wwaeTau" units="Seconds">0.3</constant>
         <constant digits="4" name="alternatorControl_pFactor" units="">30.0</constant>
@@ -4791,7 +4791,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.20.f407-discovery.36222256" version="5.0"/>
+    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.21.f407-discovery.3240305536" version="5.0"/>
     <bibliography author="rusEFI 20240819" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HYUNDAI_PB.msq b/simulator/generated/simulator_tune_HYUNDAI_PB.msq
index ff9c3a0b01..65cc41fb25 100644
--- a/simulator/generated/simulator_tune_HYUNDAI_PB.msq
+++ b/simulator/generated/simulator_tune_HYUNDAI_PB.msq
@@ -223,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.024082E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240821E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -688,7 +688,7 @@
         <constant digits="2" name="knockDetectionWindowEnd" units="angle">60.0</constant>
         <constant digits="0" name="idleStepperReactionTime" units="ms">3.0</constant>
         <constant digits="0" name="idleStepperTotalSteps" units="count">200.0</constant>
-        <constant digits="0" name="mapAveragingSchedulingAtIndex" units="index">0.0</constant>
+        <constant digits="0" name="unusedInt3423423" units="">0.0</constant>
         <constant digits="2" name="tachPulseDuractionMs" units="">0.5</constant>
         <constant digits="2" name="wwaeTau" units="Seconds">0.0</constant>
         <constant digits="4" name="alternatorControl_pFactor" units="">30.0</constant>
@@ -4882,7 +4882,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.20.f407-discovery.36222256" version="5.0"/>
+    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.21.f407-discovery.3240305536" version="5.0"/>
     <bibliography author="rusEFI 20240819" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAVERICK_X3.msq b/simulator/generated/simulator_tune_MAVERICK_X3.msq
index a8292a9c1b..502ab1eba9 100644
--- a/simulator/generated/simulator_tune_MAVERICK_X3.msq
+++ b/simulator/generated/simulator_tune_MAVERICK_X3.msq
@@ -223,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.024082E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240821E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -688,7 +688,7 @@
         <constant digits="2" name="knockDetectionWindowEnd" units="angle">60.0</constant>
         <constant digits="0" name="idleStepperReactionTime" units="ms">3.0</constant>
         <constant digits="0" name="idleStepperTotalSteps" units="count">200.0</constant>
-        <constant digits="0" name="mapAveragingSchedulingAtIndex" units="index">0.0</constant>
+        <constant digits="0" name="unusedInt3423423" units="">0.0</constant>
         <constant digits="2" name="tachPulseDuractionMs" units="">0.5</constant>
         <constant digits="2" name="wwaeTau" units="Seconds">0.3</constant>
         <constant digits="4" name="alternatorControl_pFactor" units="">30.0</constant>
@@ -4789,7 +4789,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.20.f407-discovery.36222256" version="5.0"/>
+    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.21.f407-discovery.3240305536" version="5.0"/>
     <bibliography author="rusEFI 20240819" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NA6.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NA6.msq
index 127a4396bc..427e22b5fe 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NA6.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NA6.msq
@@ -223,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.024082E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240821E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -688,7 +688,7 @@
         <constant digits="2" name="knockDetectionWindowEnd" units="angle">60.0</constant>
         <constant digits="0" name="idleStepperReactionTime" units="ms">3.0</constant>
         <constant digits="0" name="idleStepperTotalSteps" units="count">200.0</constant>
-        <constant digits="0" name="mapAveragingSchedulingAtIndex" units="index">0.0</constant>
+        <constant digits="0" name="unusedInt3423423" units="">0.0</constant>
         <constant digits="2" name="tachPulseDuractionMs" units="">0.5</constant>
         <constant digits="2" name="wwaeTau" units="Seconds">0.3</constant>
         <constant digits="4" name="alternatorControl_pFactor" units="">30.0</constant>
@@ -4792,7 +4792,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.20.f407-discovery.36222256" version="5.0"/>
+    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.21.f407-discovery.3240305536" version="5.0"/>
     <bibliography author="rusEFI 20240819" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NA94.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NA94.msq
index e86ec36cc6..a1e23b2988 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NA94.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NA94.msq
@@ -223,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.024082E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240821E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -688,7 +688,7 @@
         <constant digits="2" name="knockDetectionWindowEnd" units="angle">60.0</constant>
         <constant digits="0" name="idleStepperReactionTime" units="ms">3.0</constant>
         <constant digits="0" name="idleStepperTotalSteps" units="count">200.0</constant>
-        <constant digits="0" name="mapAveragingSchedulingAtIndex" units="index">0.0</constant>
+        <constant digits="0" name="unusedInt3423423" units="">0.0</constant>
         <constant digits="2" name="tachPulseDuractionMs" units="">0.5</constant>
         <constant digits="2" name="wwaeTau" units="Seconds">0.3</constant>
         <constant digits="4" name="alternatorControl_pFactor" units="">30.0</constant>
@@ -4792,7 +4792,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.20.f407-discovery.36222256" version="5.0"/>
+    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.21.f407-discovery.3240305536" version="5.0"/>
     <bibliography author="rusEFI 20240819" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NA96.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NA96.msq
index 170a1d0698..274cfb5908 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NA96.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NA96.msq
@@ -223,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.024082E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240821E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -688,7 +688,7 @@
         <constant digits="2" name="knockDetectionWindowEnd" units="angle">60.0</constant>
         <constant digits="0" name="idleStepperReactionTime" units="ms">3.0</constant>
         <constant digits="0" name="idleStepperTotalSteps" units="count">200.0</constant>
-        <constant digits="0" name="mapAveragingSchedulingAtIndex" units="index">0.0</constant>
+        <constant digits="0" name="unusedInt3423423" units="">0.0</constant>
         <constant digits="2" name="tachPulseDuractionMs" units="">0.5</constant>
         <constant digits="2" name="wwaeTau" units="Seconds">0.1</constant>
         <constant digits="4" name="alternatorControl_pFactor" units="">30.0</constant>
@@ -4792,7 +4792,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.20.f407-discovery.36222256" version="5.0"/>
+    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.21.f407-discovery.3240305536" version="5.0"/>
     <bibliography author="rusEFI 20240819" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NB1.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NB1.msq
index f84f5ba8f6..602e5a75f2 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NB1.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NB1.msq
@@ -223,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.024082E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240821E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -688,7 +688,7 @@
         <constant digits="2" name="knockDetectionWindowEnd" units="angle">60.0</constant>
         <constant digits="0" name="idleStepperReactionTime" units="ms">3.0</constant>
         <constant digits="0" name="idleStepperTotalSteps" units="count">200.0</constant>
-        <constant digits="0" name="mapAveragingSchedulingAtIndex" units="index">0.0</constant>
+        <constant digits="0" name="unusedInt3423423" units="">0.0</constant>
         <constant digits="2" name="tachPulseDuractionMs" units="">0.5</constant>
         <constant digits="2" name="wwaeTau" units="Seconds">0.1</constant>
         <constant digits="4" name="alternatorControl_pFactor" units="">16.0</constant>
@@ -4792,7 +4792,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.20.f407-discovery.36222256" version="5.0"/>
+    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.21.f407-discovery.3240305536" version="5.0"/>
     <bibliography author="rusEFI 20240819" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NB2.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NB2.msq
index 5f975f082d..54f04f6ceb 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NB2.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NB2.msq
@@ -223,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.024082E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240821E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -689,7 +689,7 @@
         <constant digits="2" name="knockDetectionWindowEnd" units="angle">60.0</constant>
         <constant digits="0" name="idleStepperReactionTime" units="ms">3.0</constant>
         <constant digits="0" name="idleStepperTotalSteps" units="count">200.0</constant>
-        <constant digits="0" name="mapAveragingSchedulingAtIndex" units="index">0.0</constant>
+        <constant digits="0" name="unusedInt3423423" units="">0.0</constant>
         <constant digits="2" name="tachPulseDuractionMs" units="">0.5</constant>
         <constant digits="2" name="wwaeTau" units="Seconds">0.1</constant>
         <constant digits="4" name="alternatorControl_pFactor" units="">16.0</constant>
@@ -4793,7 +4793,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.20.f407-discovery.36222256" version="5.0"/>
+    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.21.f407-discovery.3240305536" version="5.0"/>
     <bibliography author="rusEFI 20240819" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MERCEDES_M111.msq b/simulator/generated/simulator_tune_MERCEDES_M111.msq
index a11b722b78..d6f69d68f4 100644
--- a/simulator/generated/simulator_tune_MERCEDES_M111.msq
+++ b/simulator/generated/simulator_tune_MERCEDES_M111.msq
@@ -223,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.024082E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240821E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -688,7 +688,7 @@
         <constant digits="2" name="knockDetectionWindowEnd" units="angle">60.0</constant>
         <constant digits="0" name="idleStepperReactionTime" units="ms">3.0</constant>
         <constant digits="0" name="idleStepperTotalSteps" units="count">200.0</constant>
-        <constant digits="0" name="mapAveragingSchedulingAtIndex" units="index">0.0</constant>
+        <constant digits="0" name="unusedInt3423423" units="">0.0</constant>
         <constant digits="2" name="tachPulseDuractionMs" units="">0.5</constant>
         <constant digits="2" name="wwaeTau" units="Seconds">0.3</constant>
         <constant digits="4" name="alternatorControl_pFactor" units="">30.0</constant>
@@ -4792,7 +4792,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.20.f407-discovery.36222256" version="5.0"/>
+    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.21.f407-discovery.3240305536" version="5.0"/>
     <bibliography author="rusEFI 20240819" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_POLARIS_RZR.msq b/simulator/generated/simulator_tune_POLARIS_RZR.msq
index 4ccaababd5..f69afe4a2f 100644
--- a/simulator/generated/simulator_tune_POLARIS_RZR.msq
+++ b/simulator/generated/simulator_tune_POLARIS_RZR.msq
@@ -223,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.024082E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240821E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -688,7 +688,7 @@
         <constant digits="2" name="knockDetectionWindowEnd" units="angle">60.0</constant>
         <constant digits="0" name="idleStepperReactionTime" units="ms">3.0</constant>
         <constant digits="0" name="idleStepperTotalSteps" units="count">200.0</constant>
-        <constant digits="0" name="mapAveragingSchedulingAtIndex" units="index">0.0</constant>
+        <constant digits="0" name="unusedInt3423423" units="">0.0</constant>
         <constant digits="2" name="tachPulseDuractionMs" units="">0.5</constant>
         <constant digits="2" name="wwaeTau" units="Seconds">0.3</constant>
         <constant digits="4" name="alternatorControl_pFactor" units="">30.0</constant>
@@ -4789,7 +4789,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.20.f407-discovery.36222256" version="5.0"/>
+    <versionInfo firmwareInfo="20240819" nPages="1" signature="rusEFI master.2024.08.21.f407-discovery.3240305536" version="5.0"/>
     <bibliography author="rusEFI 20240819" writeDate="date"/>
     <settings/>
     <userComments/>