Merge branch 'FOME-Tech:master' into master

firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h

@@ -1135,6 +1135,7 @@ struct engine_configuration_s {
 	// offset 642
 	scaled_channel<uint8_t, 1, 100> lambdaProtectionMinRpm;
 
+	// %
 	// offset 643
 	scaled_channel<uint8_t, 1, 10> lambdaProtectionMinLoad;
 
@@ -1393,6 +1394,7 @@ struct engine_configuration_s {
 	// offset 746
 	uint16_t startCrankingDuration;
 
+	// %
 	// offset 748
 	scaled_channel<uint8_t, 1, 1> lambdaProtectionMinTps;
 
@@ -1401,8 +1403,9 @@ struct engine_configuration_s {
 	// offset 749
 	scaled_channel<uint8_t, 10, 1> lambdaProtectionTimeout;
 
+	// RPM
 	// offset 750
-	uint8_t unused748;
+	scaled_channel<uint8_t, 1, 100> lambdaProtectionRestoreRpm;
 
 	// offset 751
 	pin_output_mode_e acRelayPinMode;
@@ -2329,8 +2332,13 @@ struct engine_configuration_s {
 	// offset 1440
 	scaled_channel<uint8_t, 1, 5> benchTestOffTime;
 
+	// %
 	// offset 1441
-	uint8_t unused1445[2];
+	scaled_channel<uint8_t, 1, 1> lambdaProtectionRestoreTps;
+
+	// %
+	// offset 1442
+	scaled_channel<uint8_t, 1, 10> lambdaProtectionRestoreLoad;
 
 	// offset 1443
 	pin_input_mode_e launchActivatePinMode;

firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h

@@ -981,7 +981,7 @@
 #define show_Frankenso_presets false
 #define show_Proteus_presets false
 #define show_test_presets false
-#define SIGNATURE_HASH 1353177119
+#define SIGNATURE_HASH 583617090
 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4"
 #define spi_device_e_SPI_DEVICE_1 1
 #define spi_device_e_SPI_DEVICE_2 2
@@ -1248,12 +1248,12 @@
 #define ts_show_vbatt true
 #define ts_show_vr_threshold_2 true
 #define ts_show_vr_threshold_all true
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.subaru_eg33_f7.1353177119"
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.09.subaru_eg33_f7.583617090"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
 #define TS_TEST_COMMAND_char t
-#define TS_TOTAL_OUTPUT_SIZE 1372
+#define TS_TOTAL_OUTPUT_SIZE 1376
 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1"
 #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2"
 #define TS_TRIGGER_SCOPE_DISABLE 5

firmware/console/binary/generated/data_logs.ini

@@ -47,7 +47,6 @@ entry = actualLastInjection, "Fuel: Last inj pulse width", float,  "%.3f"
 entry = injectorDutyCycle, "Fuel: injector duty cycle", float,  "%.3f"
 entry = veValue, "Fuel: VE", float,  "%.3f"
 entry = injectionOffset, "Fuel: Injection timing SOI", int,    "%d"
-entry = injectorLagMs, "Fuel: injector lag", float,  "%.3f"
 entry = engineMakeCodeNameCrc16, "Engine CRC16", int,    "%d"
 entry = wallFuelAmount, "Fuel: wall amount", float,  "%.3f"
 entry = wallFuelCorrectionValue, "Fuel: wall correction", float,  "%.3f"
@@ -357,9 +356,6 @@ entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
 entry = m_maximumRetard, "m_maximumRetard", float,  "%.3f"
-entry = throttleUseWotModel, "Air: Throttle model WOT", int,    "%d"
-entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float,  "%.3f"
-entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float,  "%.3f"
 entry = m_requested_pump, "HPFP duration", float,  "%.3f"
 entry = fuel_requested_percent, "fuel_requested_percent", float,  "%.3f"
 entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float,  "%.3f"
@@ -368,9 +364,9 @@ entry = angleAboveMin, "angleAboveMin", int,    "%d"
 entry = isHpfpInactive, "isHpfpInactive", int,    "%d"
 entry = nextLobe, "nextLobe", float,  "%.3f"
 entry = di_nextStart, "DI: next start", float,  "%.3f"
-entry = m_deadtime, "injectorLag(VBatt)", float,  "%.3f"
-entry = pressureDelta, "fuel: injector pressureDelta", float,  "%.3f"
-entry = pressureRatio, "fuel: injector pressureRatio", float,  "%.3f"
+entry = m_deadtime, "Fuel: injector lag", float,  "%.3f"
+entry = pressureDelta, "fuel: Injector pressure delta", float,  "%.3f"
+entry = pressureRatio, "fuel: Injector pressure ratio", float,  "%.3f"
 entry = retardThresholdRpm, "retardThresholdRpm", int,    "%d"
 entry = combinedConditions, "combinedConditions", int,    "%d"
 entry = launchActivatePinState, "launchActivatePinState", int,    "%d"
@@ -561,3 +557,8 @@ entry = isEnabled0, "isEnabled0", int,    "%d"
 entry = value0, "ETB: SENT value0", int,    "%d"
 entry = value1, "ETB: SENT value1", int,    "%d"
 entry = errorRate, "ETB: SENT error rate", float,  "%.3f"
+entry = throttleUseWotModel, "Air: Throttle model WOT", int,    "%d"
+entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float,  "%.3f"
+entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float,  "%.3f"
+entry = vvtTarget, "vvtTarget", float,  "%.3f"
+entry = vvtOutput, "vvtOutput", float,  "%.3f"

firmware/console/binary/generated/fancy_content.ini

@@ -41,15 +41,6 @@ dialog = knock_controllerDialog, "knock_controller"
 		graphLine = m_knockCount
 		graphLine = m_maximumRetard
 
-indicatorPanel = throttle_modelIndicatorPanel, 2
-	indicator = {throttleUseWotModel}, "throttleUseWotModel No", "throttleUseWotModel Yes"
-
-dialog = throttle_modelDialog, "throttle_model"
-	panel = throttle_modelIndicatorPanel
-	liveGraph = throttle_model_1_Graph, "Graph", South
-		graphLine = throttleModelCrossoverAngle
-		graphLine = throttleEstimatedFlow
-
 indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2
 	indicator = {noValve}, "noValve No", "noValve Yes"
 	indicator = {angleAboveMin}, "angleAboveMin No", "angleAboveMin Yes"
@@ -373,3 +364,18 @@ dialog = sent_stateDialog, "sent_state"
 		graphLine = value1
 		graphLine = errorRate
 
+indicatorPanel = throttle_modelIndicatorPanel, 2
+	indicator = {throttleUseWotModel}, "throttleUseWotModel No", "throttleUseWotModel Yes"
+
+dialog = throttle_modelDialog, "throttle_model"
+	panel = throttle_modelIndicatorPanel
+	liveGraph = throttle_model_1_Graph, "Graph", South
+		graphLine = throttleModelCrossoverAngle
+		graphLine = throttleEstimatedFlow
+
+
+dialog = vvtDialog, "vvt"
+	liveGraph = vvt_1_Graph, "Graph", South
+		graphLine = vvtTarget
+		graphLine = vvtOutput
+

firmware/console/binary/generated/fancy_menu.ini

@@ -1,7 +1,6 @@
 			subMenu = fuel_computerDialog, "fuel_computer"
 			subMenu = ignition_stateDialog, "ignition_state"
 			subMenu = knock_controllerDialog, "knock_controller"
-			subMenu = throttle_modelDialog, "throttle_model"
 			subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump"
 			subMenu = injector_modelDialog, "injector_model"
 			subMenu = launch_control_stateDialog, "launch_control_state"
@@ -22,3 +21,5 @@
 			subMenu = wideband_stateDialog, "wideband_state"
 			subMenu = dc_motorsDialog, "dc_motors"
 			subMenu = sent_stateDialog, "sent_state"
+			subMenu = throttle_modelDialog, "throttle_model"
+			subMenu = vvtDialog, "vvt"

firmware/console/binary/generated/live_data_fragments.h

@@ -3,7 +3,6 @@ decl_frag<output_channels_s>{},
 decl_frag<fuel_computer_s>{},
 decl_frag<ignition_state_s>{},
 decl_frag<knock_controller_s>{},
-decl_frag<throttle_model_s>{},
 decl_frag<high_pressure_fuel_pump_s>{},
 decl_frag<injector_model_s>{},
 decl_frag<launch_control_state_s>{},
@@ -31,3 +30,5 @@ decl_frag<wideband_state_s, 0>{},	// wb1
 // decl_frag<wideband_state_s, 1>{},	// wb2
 decl_frag<dc_motors_s>{},
 decl_frag<sent_state_s>{},
+decl_frag<throttle_model_s>{},
+decl_frag<vvt_s>{},

firmware/console/binary/generated/live_data_ids.h

@@ -6,7 +6,6 @@ LDS_output_channels,
 LDS_fuel_computer,
 LDS_ignition_state,
 LDS_knock_controller,
-LDS_throttle_model,
 LDS_high_pressure_fuel_pump,
 LDS_injector_model,
 LDS_launch_control_state,
@@ -27,29 +26,32 @@ LDS_electronic_throttle,
 LDS_wideband_state,
 LDS_dc_motors,
 LDS_sent_state,
+LDS_throttle_model,
+LDS_vvt,
 } live_data_e;
 #define OUTPUT_CHANNELS_BASE_ADDRESS 0
 #define FUEL_COMPUTER_BASE_ADDRESS 820
 #define IGNITION_STATE_BASE_ADDRESS 860
 #define KNOCK_CONTROLLER_BASE_ADDRESS 892
-#define THROTTLE_MODEL_BASE_ADDRESS 908
-#define HIGH_PRESSURE_FUEL_PUMP_BASE_ADDRESS 920
-#define INJECTOR_MODEL_BASE_ADDRESS 944
-#define LAUNCH_CONTROL_STATE_BASE_ADDRESS 956
-#define ANTILAG_SYSTEM_STATE_BASE_ADDRESS 964
-#define BOOST_CONTROL_BASE_ADDRESS 976
-#define AC_CONTROL_BASE_ADDRESS 1000
-#define FAN_CONTROL_BASE_ADDRESS 1012
-#define FUEL_PUMP_CONTROL_BASE_ADDRESS 1016
-#define MAIN_RELAY_BASE_ADDRESS 1020
-#define ENGINE_STATE_BASE_ADDRESS 1024
-#define TPS_ACCEL_STATE_BASE_ADDRESS 1108
-#define TRIGGER_CENTRAL_BASE_ADDRESS 1156
-#define TRIGGER_STATE_BASE_ADDRESS 1208
-#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1228
-#define WALL_FUEL_STATE_BASE_ADDRESS 1232
-#define IDLE_STATE_BASE_ADDRESS 1240
-#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1288
-#define WIDEBAND_STATE_BASE_ADDRESS 1340
-#define DC_MOTORS_BASE_ADDRESS 1352
-#define SENT_STATE_BASE_ADDRESS 1364
+#define HIGH_PRESSURE_FUEL_PUMP_BASE_ADDRESS 908
+#define INJECTOR_MODEL_BASE_ADDRESS 932
+#define LAUNCH_CONTROL_STATE_BASE_ADDRESS 944
+#define ANTILAG_SYSTEM_STATE_BASE_ADDRESS 952
+#define BOOST_CONTROL_BASE_ADDRESS 964
+#define AC_CONTROL_BASE_ADDRESS 988
+#define FAN_CONTROL_BASE_ADDRESS 1000
+#define FUEL_PUMP_CONTROL_BASE_ADDRESS 1004
+#define MAIN_RELAY_BASE_ADDRESS 1008
+#define ENGINE_STATE_BASE_ADDRESS 1012
+#define TPS_ACCEL_STATE_BASE_ADDRESS 1096
+#define TRIGGER_CENTRAL_BASE_ADDRESS 1144
+#define TRIGGER_STATE_BASE_ADDRESS 1196
+#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1216
+#define WALL_FUEL_STATE_BASE_ADDRESS 1220
+#define IDLE_STATE_BASE_ADDRESS 1228
+#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1276
+#define WIDEBAND_STATE_BASE_ADDRESS 1328
+#define DC_MOTORS_BASE_ADDRESS 1340
+#define SENT_STATE_BASE_ADDRESS 1352
+#define THROTTLE_MODEL_BASE_ADDRESS 1360
+#define VVT_BASE_ADDRESS 1372