auto-sync

firmware/console/status_loop.cpp

@@ -551,8 +551,6 @@ static void lcdThread(void *arg) {
 
 #if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
 
-extern WallFuel wallFuel;
-
 extern fuel_Map3D_t veMap;
 extern fuel_Map3D_t afrMap;
 
@@ -611,8 +609,8 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
 		tsOutputChannels->debugIntField1 = engine->tpsAccelEnrichment.cb.getSize();
 	}
 
-	tsOutputChannels->wallFuelAmount = wallFuel.getWallFuel(0);
-	tsOutputChannels->wallFuelCorrection = engine->wallFuelCorrection;
+	tsOutputChannels->wallFuelAmount = ENGINE(wallFuel).getWallFuel(0);
+	tsOutputChannels->wallFuelCorrection = ENGINE(wallFuelCorrection);
 	// TPS acceleration
 	tsOutputChannels->deltaTps = engine->tpsAccelEnrichment.getMaxDelta();
 	tsOutputChannels->tpsAccelFuel = engine->engineState.tpsAccelEnrich;

firmware/controllers/algo/accel_enrichment.cpp

@@ -32,8 +32,6 @@ EXTERN_ENGINE
 
 static Logging *logger = NULL;
 
-WallFuel wallFuel;
-
 WallFuel::WallFuel() {
 	reset();
 }

firmware/controllers/algo/engine.h

@@ -213,6 +213,7 @@ typedef struct {
 } monitoring_timestamps_s;
 
 class Engine;
+class WallFuel;
 
 typedef void (*configuration_callback_t)(Engine*);
 
@@ -222,6 +223,8 @@ public:
 	void init(persistent_config_s *config);
 	void prepareFuelSchedule(DECLARE_ENGINE_PARAMETER_F);
 
+	WallFuel wallFuel;
+
 	/**
 	 * That's the list of pending spark firing events
 	 */

firmware/controllers/algo/engine_configuration_generated_structures.h

@@ -1,4 +1,4 @@
-// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Feb 05 14:50:19 EST 2016
+// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Feb 06 08:58:48 EST 2016
 // begin
 #ifndef ENGINE_CONFIGURATION_GENERATED_H_
 #define ENGINE_CONFIGURATION_GENERATED_H_
@@ -583,6 +583,9 @@ typedef struct {
 	/**
 	offset 376 bit 13 */
 	bool startConsoleInBinaryMode : 1;
+	/**
+	offset 376 bit 14 */
+	bool useWarmupPidAfr : 1;
 	/**
 	 * offset 380
 	 */
@@ -1624,4 +1627,4 @@ typedef struct {
 
 #endif
 // end
-// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Feb 05 14:50:19 EST 2016
+// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Feb 06 08:58:48 EST 2016

firmware/controllers/algo/rusefi_generated.h

@@ -360,6 +360,7 @@
 #define useTpicAdvancedMode_offset 1000
 #define useLcdScreen_offset 1000
 #define startConsoleInBinaryMode_offset 1000
+#define useWarmupPidAfr_offset 1000
 #define logicAnalyzerPins1_offset 1004
 #define logicAnalyzerPins2_offset 1008
 #define logicAnalyzerPins3_offset 1012

firmware/controllers/engine_controller.cpp

@@ -67,7 +67,6 @@
 #endif
 
 extern bool hasFirmwareErrorFlag;
-extern WallFuel wallFuel;
 
 persistent_config_container_s persistentState CCM_OPTIONAL;
 
@@ -218,7 +217,7 @@ static void periodicFastCallback(DECLARE_ENGINE_PARAMETER_F) {
 static void resetAccel(void) {
 	engine->engineLoadAccelEnrichment.reset();
 	engine->tpsAccelEnrichment.reset();
-	wallFuel.reset();
+	engine->wallFuel.reset();
 }
 
 static void periodicSlowCallback(Engine *engine) {

firmware/controllers/trigger/main_trigger_callback.cpp

@@ -96,8 +96,6 @@ static void endSimultaniousInjection(Engine *engine) {
 	}
 }
 
-extern WallFuel wallFuel;
-
 static ALWAYS_INLINE void handleFuelInjectionEvent(int eventIndex, bool limitedFuel, InjectionEvent *event,
 		int rpm DECLARE_ENGINE_PARAMETER_S) {
 	if (limitedFuel)
@@ -108,7 +106,7 @@ static ALWAYS_INLINE void handleFuelInjectionEvent(int eventIndex, bool limitedF
 	 * wetting coefficient works the same way for any injection mode, or is something
 	 * x2 or /2?
 	 */
-	floatms_t injectionDuration = wallFuel.adjust(event->injectorIndex, ENGINE(fuelMs) PASS_ENGINE_PARAMETER);
+	floatms_t injectionDuration = ENGINE(wallFuel).adjust(event->injectorIndex, ENGINE(fuelMs) PASS_ENGINE_PARAMETER);
 
 	ENGINE(actualLastInjection) = injectionDuration;
 	if (cisnan(injectionDuration)) {

firmware/integration/rusefi_config.txt

@@ -420,6 +420,7 @@ bit is_enabled_spi_2
 	bit useTpicAdvancedMode;
 	bit useLcdScreen;
 	bit startConsoleInBinaryMode;
+	bit useWarmupPidAfr;
 
 	brain_input_pin_e[LOGIC_ANALYZER_CHANNEL_COUNT iterate] logicAnalyzerPins;
 	uint8_t[LOGIC_ANALYZER_CHANNEL_COUNT] logicAnalyzerMode;default or inverted input

firmware/tunerstudio/rusefi.ini

@@ -41,7 +41,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Feb 05 14:50:19 EST 2016
+; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Feb 06 08:58:48 EST 2016
 
 pageSize            = 16088
 page = 1
@@ -259,6 +259,7 @@ page = 1
 	useTpicAdvancedMode		= bits,    U32,   	1000, [11:11], "false", "true"
 	useLcdScreen			= bits,    U32,   	1000, [12:12], "false", "true"
 	startConsoleInBinaryMode= bits,    U32,   	1000, [13:13], "false", "true"
+	useWarmupPidAfr			= bits,    U32,   	1000, [14:14], "false", "true"
 	logicAnalyzerPins1			 = bits, U32, 1004, [0:6], "INVALID", "INVALID", "PA2", "PA3", "INVALID", "PA5", "INVALID", "INVALID", "PA8", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "INVALID", "PE7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	logicAnalyzerPins2			 = bits, U32, 1008, [0:6], "INVALID", "INVALID", "PA2", "PA3", "INVALID", "PA5", "INVALID", "INVALID", "PA8", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "INVALID", "PE7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	logicAnalyzerPins3			 = bits, U32, 1012, [0:6], "INVALID", "INVALID", "PA2", "PA3", "INVALID", "PA5", "INVALID", "INVALID", "PA8", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "INVALID", "PE7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -1402,6 +1403,7 @@ fileVersion = { 20160122 }
 		field = "wa P factor",								warmupAfrPid_pFactor
 		field = "wa I factor",								warmupAfrPid_iFactor
 		field = "wa D factor",								warmupAfrPid_dFactor
+		field = "useWarmupPidAfr",							useWarmupPidAfr
 	
 		
 		

java_console/models/src/com/rusefi/config/Fields.java

@@ -1,6 +1,6 @@
 package com.rusefi.config;
 
-// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Feb 05 14:50:19 EST 2016
+// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Feb 06 08:58:48 EST 2016
 public class Fields {
 	public static final int LE_COMMAND_LENGTH = 200;
 	public static final int TS_FILE_VERSION = 20160122;
@@ -364,6 +364,7 @@ public class Fields {
 	public static final int useTpicAdvancedMode_offset = 1000;
 	public static final int useLcdScreen_offset = 1000;
 	public static final int startConsoleInBinaryMode_offset = 1000;
+	public static final int useWarmupPidAfr_offset = 1000;
 	public static final int logicAnalyzerPins1_offset = 1004;
 	public static final int logicAnalyzerPins2_offset = 1008;
 	public static final int logicAnalyzerPins3_offset = 1012;
@@ -1018,6 +1019,7 @@ public class Fields {
 	public static final Field USETPICADVANCEDMODE = Field.create("USETPICADVANCEDMODE", 1000, FieldType.BIT, 11);
 	public static final Field USELCDSCREEN = Field.create("USELCDSCREEN", 1000, FieldType.BIT, 12);
 	public static final Field STARTCONSOLEINBINARYMODE = Field.create("STARTCONSOLEINBINARYMODE", 1000, FieldType.BIT, 13);
+	public static final Field USEWARMUPPIDAFR = Field.create("USEWARMUPPIDAFR", 1000, FieldType.BIT, 14);
 	public static final Field LOGICANALYZERPINS1 = Field.create("LOGICANALYZERPINS1", 1004, FieldType.INT, brain_input_pin_e);
 	public static final Field LOGICANALYZERPINS2 = Field.create("LOGICANALYZERPINS2", 1008, FieldType.INT, brain_input_pin_e);
 	public static final Field LOGICANALYZERPINS3 = Field.create("LOGICANALYZERPINS3", 1012, FieldType.INT, brain_input_pin_e);