diff --git a/firmware/controllers/algo/algo.mk b/firmware/controllers/algo/algo.mk index a1bc19d336..6e89e0eb6e 100644 --- a/firmware/controllers/algo/algo.mk +++ b/firmware/controllers/algo/algo.mk @@ -13,4 +13,5 @@ CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/advance_map.cpp \ $(PROJECT_DIR)/controllers/algo/lcd_menu_tree.cpp \ $(PROJECT_DIR)/controllers/algo/event_registry.cpp \ $(PROJECT_DIR)/controllers/algo/algo.cpp \ + $(PROJECT_DIR)/controllers/algo/aux_pid.cpp \ $(PROJECT_DIR)/controllers/algo/signal_executor.cpp diff --git a/firmware/controllers/algo/aux_pid.cpp b/firmware/controllers/algo/aux_pid.cpp new file mode 100644 index 0000000000..82d72b3cb4 --- /dev/null +++ b/firmware/controllers/algo/aux_pid.cpp @@ -0,0 +1,13 @@ +/* + * @file aux_pid.cpp + * + * @date Jun 26, 2016 + * @author Andrey Belomutskiy, (c) 2012-2016 + */ + +#include "aux_pid.h" + +void initAuxPid(Logging *sharedLogger) { + +} + diff --git a/firmware/controllers/algo/aux_pid.h b/firmware/controllers/algo/aux_pid.h new file mode 100644 index 0000000000..82754e4ab0 --- /dev/null +++ b/firmware/controllers/algo/aux_pid.h @@ -0,0 +1,15 @@ +/* + * @file aux_pid.h + * + * @date Jun 26, 2016 + * @author Andrey Belomutskiy, (c) 2012-2016 + */ + +#ifndef CONTROLLERS_ALGO_AUX_PID_H_ +#define CONTROLLERS_ALGO_AUX_PID_H_ + +#include "engine.h" + +void initAuxPid(Logging *sharedLogger); + +#endif /* CONTROLLERS_ALGO_AUX_PID_H_ */ diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index fe45507b49..2fa5693222 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/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 Sat Jun 25 15:31:56 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jun 26 11:58:16 EDT 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -782,7 +782,7 @@ typedef struct { bool directSelfStimulation : 1; /** offset 80 bit 1 */ - bool issue_294_1 : 1; + bool activateAuxPid1 : 1; /** offset 80 bit 2 */ bool issue_294_2 : 1; @@ -1629,7 +1629,11 @@ typedef struct { /** * offset 2408 */ - int unused[160]; + pid_s auxPid1; + /** + * offset 2424 + */ + int unused[156]; /** total size 3048*/ } engine_configuration_s; @@ -1818,4 +1822,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jun 25 15:31:56 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jun 26 11:58:16 EDT 2016 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 67da8f0984..becc03ee9d 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -45,8 +45,8 @@ #define injector_battLagCorr_offset_hex 30 #define directSelfStimulation_offset 80 #define directSelfStimulation_offset_hex 50 -#define issue_294_1_offset 80 -#define issue_294_1_offset_hex 50 +#define activateAuxPid1_offset 80 +#define activateAuxPid1_offset_hex 50 #define issue_294_2_offset 80 #define issue_294_2_offset_hex 50 #define issue_294_3_offset 80 @@ -826,8 +826,17 @@ #define mapHighValueVoltage_offset_hex 960 #define egoValueShift_offset 2404 #define egoValueShift_offset_hex 964 -#define unused_offset 2408 -#define unused_offset_hex 968 +#define auxPid1_offset 2408 +#define auxPid1_offset_hex 968 +#define auxPid1_pFactor_offset 2408 +#define auxPid1_pFactor_offset_hex 968 +#define auxPid1_iFactor_offset 2412 +#define auxPid1_dFactor_offset 2416 +#define auxPid1_dFactor_offset_hex 970 +#define auxPid1_offset_offset 2420 +#define auxPid1_offset_offset_hex 974 +#define unused_offset 2424 +#define unused_offset_hex 978 #define le_formulas1_offset 3048 #define le_formulas2_offset 3248 #define le_formulas3_offset 3448 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 294115bc4b..fb7cd1a5cd 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -166,7 +166,7 @@ injector_s injector bit directSelfStimulation;+Should trigger emulator push data right into trigger handling logic, eliminating the need for physical jumper wires?\nPS: Funny name, right? :) -bit issue_294_1; +bit activateAuxPid1; bit issue_294_2; bit issue_294_3; bit issue_294_4; @@ -697,7 +697,8 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300, float mapLowValueVoltage;MAP voltage for low point;"v", 1, 0, 0.0, 10, 2 float mapHighValueVoltage;MAP voltage for low point;"v", 1, 0, 0.0, 10, 2 float egoValueShift;EGO value correction;"value", 1, 0, -10.0, 10, 2 - int[160] unused; + pid_s auxPid1; + int[156] unused; end_struct