diff --git a/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-global-defaults.md b/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-global-defaults.md
index 817ed46b69..511dd20b5e 100644
--- a/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-global-defaults.md
+++ b/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-global-defaults.md
@@ -77,9 +77,9 @@
engineConfiguration->useIdleTimingPidControl = true;
// default 0.0
engineConfiguration->idleTimingPid.dFactor = 5.0E-4;
- // default 95.0
+ // default 92.0
engineConfiguration->fanOnTemperature = 86;
- // default 91.0
+ // default 88.0
engineConfiguration->fanOffTemperature = 80;
// default "false"
engineConfiguration->enableFan1WithAc = true;
diff --git a/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-global-defaults.md b/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-global-defaults.md
index dc2ff5cf2a..9b21b9dcb8 100644
--- a/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-global-defaults.md
+++ b/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-global-defaults.md
@@ -75,9 +75,9 @@
engineConfiguration->useIdleTimingPidControl = true;
// default 0.0
engineConfiguration->idleTimingPid.dFactor = 5.0E-5;
- // default 95.0
+ // default 92.0
engineConfiguration->fanOnTemperature = 80;
- // default 91.0
+ // default 88.0
engineConfiguration->fanOffTemperature = 75;
// default "false"
engineConfiguration->disableFan1WhenStopped = true;
diff --git a/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-current-Honda-OBD1-default.md b/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-current-Honda-OBD1-default.md
index fe383a0fb9..a60c55ad06 100644
--- a/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-current-Honda-OBD1-default.md
+++ b/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-current-Honda-OBD1-default.md
@@ -43,6 +43,10 @@
engineConfiguration->mapLowValueVoltage = 2.91;
// default "false"
engineConfiguration->enableAemXSeries = true;
+ // default 92.0
+ engineConfiguration->fanOnTemperature = 95;
+ // default 88.0
+ engineConfiguration->fanOffTemperature = 91;
// default "false"
engineConfiguration->enableSoftwareKnock = true;
// default 500.0
diff --git a/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults.md b/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults.md
index b31c67b714..724f66dc26 100644
--- a/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults.md
+++ b/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults.md
@@ -57,6 +57,10 @@
engineConfiguration->enableAemXSeries = true;
// default 2.0
engineConfiguration->fan1ExtraIdle = 10;
+ // default 92.0
+ engineConfiguration->fanOnTemperature = 95;
+ // default 88.0
+ engineConfiguration->fanOffTemperature = 91;
// default "false"
engineConfiguration->enableSoftwareKnock = true;
// default "false"
diff --git a/simulator/generated/canned-tunes/M52-comparing-against-current-M52-default.md b/simulator/generated/canned-tunes/M52-comparing-against-current-M52-default.md
index 283c3f74bc..f7cfe0f784 100644
--- a/simulator/generated/canned-tunes/M52-comparing-against-current-M52-default.md
+++ b/simulator/generated/canned-tunes/M52-comparing-against-current-M52-default.md
@@ -101,6 +101,10 @@
engineConfiguration->idleTimingPid.minValue = -5;
// default 10.0
engineConfiguration->idleTimingPid.maxValue = 5;
+ // default 92.0
+ engineConfiguration->fanOnTemperature = 95;
+ // default 88.0
+ engineConfiguration->fanOffTemperature = 91;
// default "false"
engineConfiguration->disableFan1WhenStopped = true;
// default 0.5
diff --git a/simulator/generated/canned-tunes/M52-comparing-against-global-defaults.md b/simulator/generated/canned-tunes/M52-comparing-against-global-defaults.md
index 57dbfba145..da646d51d7 100644
--- a/simulator/generated/canned-tunes/M52-comparing-against-global-defaults.md
+++ b/simulator/generated/canned-tunes/M52-comparing-against-global-defaults.md
@@ -107,6 +107,10 @@
engineConfiguration->idleTimingPid.minValue = -5;
// default 10.0
engineConfiguration->idleTimingPid.maxValue = 5;
+ // default 92.0
+ engineConfiguration->fanOnTemperature = 95;
+ // default 88.0
+ engineConfiguration->fanOffTemperature = 91;
// default "false"
engineConfiguration->disableFan1WhenStopped = true;
// default 0.5
diff --git a/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default.md b/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default.md
index 81d6aa0b89..7e398979c9 100644
--- a/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default.md
+++ b/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default.md
@@ -131,9 +131,9 @@
engineConfiguration->idleTimingPid.pFactor = 0.01;
// default 10.0
engineConfiguration->idleTimingPid.maxValue = 12;
- // default 95.0
+ // default 92.0
engineConfiguration->fanOnTemperature = 97;
- // default 91.0
+ // default 88.0
engineConfiguration->fanOffTemperature = 94;
// default 95.0
engineConfiguration->fan2OnTemperature = 99;
diff --git a/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults.md b/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults.md
index f53103de92..c05effbee5 100644
--- a/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults.md
+++ b/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults.md
@@ -161,9 +161,9 @@
engineConfiguration->idleTimingPid.pFactor = 0.01;
// default 10.0
engineConfiguration->idleTimingPid.maxValue = 12;
- // default 95.0
+ // default 92.0
engineConfiguration->fanOnTemperature = 97;
- // default 91.0
+ // default 88.0
engineConfiguration->fanOffTemperature = 94;
// default "false"
engineConfiguration->enableFan1WithAc = true;
diff --git a/simulator/generated/canned-tunes/PB-comparing-against-current-PB-default.md b/simulator/generated/canned-tunes/PB-comparing-against-current-PB-default.md
index cf7638cd04..23c68f90ab 100644
--- a/simulator/generated/canned-tunes/PB-comparing-against-current-PB-default.md
+++ b/simulator/generated/canned-tunes/PB-comparing-against-current-PB-default.md
@@ -31,6 +31,10 @@
engineConfiguration->throttlePedalSecondaryUpVoltage = 0.74;
// default 1.86
engineConfiguration->throttlePedalSecondaryWOTVoltage = 2.28;
+ // default 92.0
+ engineConfiguration->fanOnTemperature = 95;
+ // default 88.0
+ engineConfiguration->fanOffTemperature = 91;
// default 200.0
engineConfiguration->rpmSoftLimitWindowSize = 0;
// default 4.0
diff --git a/simulator/generated/canned-tunes/PB-comparing-against-global-defaults.md b/simulator/generated/canned-tunes/PB-comparing-against-global-defaults.md
index bdd2975175..ba008fd899 100644
--- a/simulator/generated/canned-tunes/PB-comparing-against-global-defaults.md
+++ b/simulator/generated/canned-tunes/PB-comparing-against-global-defaults.md
@@ -81,6 +81,10 @@
engineConfiguration->enableAemXSeries = true;
// default 15.0
engineConfiguration->etbIdleThrottleRange = 6;
+ // default 92.0
+ engineConfiguration->fanOnTemperature = 95;
+ // default 88.0
+ engineConfiguration->fanOffTemperature = 91;
// default "false"
engineConfiguration->enableSoftwareKnock = true;
// default 550.0
diff --git a/simulator/generated/canned-tunes/m111-alex-comparing-against-current-m111-alex-default.md b/simulator/generated/canned-tunes/m111-alex-comparing-against-current-m111-alex-default.md
index 2dc997fec4..e2b0393262 100644
--- a/simulator/generated/canned-tunes/m111-alex-comparing-against-current-m111-alex-default.md
+++ b/simulator/generated/canned-tunes/m111-alex-comparing-against-current-m111-alex-default.md
@@ -155,6 +155,10 @@
engineConfiguration->useIdleTimingPidControl = true;
// default -10.0
engineConfiguration->idleTimingPid.minValue = -15;
+ // default 92.0
+ engineConfiguration->fanOnTemperature = 95;
+ // default 88.0
+ engineConfiguration->fanOffTemperature = 91;
// default 0.5
engineConfiguration->acDelay = 0;
// default 4.0
diff --git a/simulator/generated/canned-tunes/m111-alex-comparing-against-global-defaults.md b/simulator/generated/canned-tunes/m111-alex-comparing-against-global-defaults.md
index 86472b74d7..41652f45d7 100644
--- a/simulator/generated/canned-tunes/m111-alex-comparing-against-global-defaults.md
+++ b/simulator/generated/canned-tunes/m111-alex-comparing-against-global-defaults.md
@@ -155,6 +155,10 @@
engineConfiguration->useIdleTimingPidControl = true;
// default -10.0
engineConfiguration->idleTimingPid.minValue = -15;
+ // default 92.0
+ engineConfiguration->fanOnTemperature = 95;
+ // default 88.0
+ engineConfiguration->fanOffTemperature = 91;
// default 0.5
engineConfiguration->acDelay = 0;
// default 4.0
diff --git a/simulator/generated/simulator_tune.msq b/simulator/generated/simulator_tune.msq
index 0243b1b967..bc39fe868a 100644
--- a/simulator/generated/simulator_tune.msq
+++ b/simulator/generated/simulator_tune.msq
@@ -201,8 +201,8 @@
0.0
2.0
5.333333
- 95.0
- 91.0
+ 92.0
+ 88.0
"NONE"
1000.0
"None"
diff --git a/simulator/generated/simulator_tune_BMW_M52.msq b/simulator/generated/simulator_tune_BMW_M52.msq
index a47aaa7829..1410062965 100644
--- a/simulator/generated/simulator_tune_BMW_M52.msq
+++ b/simulator/generated/simulator_tune_BMW_M52.msq
@@ -201,8 +201,8 @@
0.0
2.0
5.333333
- 95.0
- 91.0
+ 92.0
+ 88.0
"NONE"
1000.0
"None"
diff --git a/simulator/generated/simulator_tune_HARLEY.msq b/simulator/generated/simulator_tune_HARLEY.msq
index ffa9be7ec7..7137005f75 100644
--- a/simulator/generated/simulator_tune_HARLEY.msq
+++ b/simulator/generated/simulator_tune_HARLEY.msq
@@ -201,8 +201,8 @@
0.0
2.0
5.333333
- 95.0
- 91.0
+ 92.0
+ 88.0
"PG6"
1000.0
"None"
diff --git a/simulator/generated/simulator_tune_HONDA_K.msq b/simulator/generated/simulator_tune_HONDA_K.msq
index 10c5405205..53d4f52eda 100644
--- a/simulator/generated/simulator_tune_HONDA_K.msq
+++ b/simulator/generated/simulator_tune_HONDA_K.msq
@@ -201,8 +201,8 @@
663.0
2.0
5.333333
- 95.0
- 91.0
+ 92.0
+ 88.0
"NONE"
1000.0
"None"
diff --git a/simulator/generated/simulator_tune_HONDA_OBD1.msq b/simulator/generated/simulator_tune_HONDA_OBD1.msq
index 47c75ab891..56e7b2da95 100644
--- a/simulator/generated/simulator_tune_HONDA_OBD1.msq
+++ b/simulator/generated/simulator_tune_HONDA_OBD1.msq
@@ -201,8 +201,8 @@
80.0
2.0
5.333333
- 95.0
- 91.0
+ 92.0
+ 88.0
"NONE"
1000.0
"None"
diff --git a/simulator/generated/simulator_tune_HYUNDAI_PB.msq b/simulator/generated/simulator_tune_HYUNDAI_PB.msq
index 65fdca9422..5437a6adcd 100644
--- a/simulator/generated/simulator_tune_HYUNDAI_PB.msq
+++ b/simulator/generated/simulator_tune_HYUNDAI_PB.msq
@@ -201,8 +201,8 @@
90.0
2.0
5.333333
- 95.0
- 91.0
+ 92.0
+ 88.0
"NONE"
1000.0
"None"
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NA6.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NA6.msq
index 36d06ea315..1bdf7f52fc 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NA6.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NA6.msq
@@ -201,8 +201,8 @@
0.0
2.0
5.333333
- 95.0
- 91.0
+ 92.0
+ 88.0
"NONE"
551.0
"None"
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NA96.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NA96.msq
index a49d625fde..c49b785b01 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NA96.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NA96.msq
@@ -201,8 +201,8 @@
0.0
2.0
5.333333
- 95.0
- 91.0
+ 92.0
+ 88.0
"NONE"
551.0
"None"
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NB1.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NB1.msq
index 1f821b6656..f6cf2c6c33 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NB1.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NB1.msq
@@ -201,8 +201,8 @@
0.0
2.0
5.333333
- 95.0
- 91.0
+ 92.0
+ 88.0
"NONE"
551.0
"None"
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NB2.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NB2.msq
index a4b5685008..7bef87a272 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NB2.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NB2.msq
@@ -201,8 +201,8 @@
0.0
2.0
5.333333
- 95.0
- 91.0
+ 92.0
+ 88.0
"NONE"
538.0
"None"
diff --git a/simulator/generated/simulator_tune_MERCEDES_M111.msq b/simulator/generated/simulator_tune_MERCEDES_M111.msq
index 600f1272af..5c0ac7e646 100644
--- a/simulator/generated/simulator_tune_MERCEDES_M111.msq
+++ b/simulator/generated/simulator_tune_MERCEDES_M111.msq
@@ -201,8 +201,8 @@
469.0
2.0
5.333333
- 95.0
- 91.0
+ 92.0
+ 88.0
"NONE"
1000.0
"W202"