diff --git a/firmware/config/engines/ford_1995_inline_6.cpp b/firmware/config/engines/ford_1995_inline_6.cpp index 4131a35bd2..ffb108e68c 100644 --- a/firmware/config/engines/ford_1995_inline_6.cpp +++ b/firmware/config/engines/ford_1995_inline_6.cpp @@ -31,6 +31,7 @@ void setFordInline6(engine_configuration_s *engineConfiguration, board_configura engineConfiguration->firingOrder = FO_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4; engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS; engineConfiguration->injectionMode = IM_BATCH; + engineConfiguration->twoWireBatch = true; /** * 0.5ms dweel time just to be sure it would fit within camshaft revolution, dwell is not controlled by us anyway diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 8e63993299..ac6882753c 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 by config_definition.jar on Sat Jan 31 07:43:00 EST 2015 +// this section was generated by config_definition.jar on Sat Jan 31 08:21:49 EST 2015 // begin #include "rusefi_types.h" typedef struct { @@ -311,7 +311,7 @@ typedef struct { /** * offset 284 */ - brain_pin_e triggerInputPins[3]; + brain_input_pin_e triggerInputPins[3]; /** * offset 296 */ @@ -396,7 +396,7 @@ typedef struct { /** * offset 376 */ - brain_pin_e logicAnalyzerPins[LOGIC_ANALYZER_CHANNEL_COUNT]; + brain_input_pin_e logicAnalyzerPins[LOGIC_ANALYZER_CHANNEL_COUNT]; /** * default or inverted input * offset 392 @@ -1112,4 +1112,4 @@ typedef struct { } engine_configuration_s; // end -// this section was generated by config_definition.jar on Sat Jan 31 07:43:00 EST 2015 +// this section was generated by config_definition.jar on Sat Jan 31 08:21:49 EST 2015 diff --git a/firmware/controllers/algo/rusefi_types.h b/firmware/controllers/algo/rusefi_types.h index 03327ae382..824b80a24b 100644 --- a/firmware/controllers/algo/rusefi_types.h +++ b/firmware/controllers/algo/rusefi_types.h @@ -91,6 +91,8 @@ typedef int16_t fsio_pwm_freq_t; typedef float fsio_setting_t; +typedef brain_pin_e brain_input_pin_e; + typedef fuel_table_t ve_table_t; typedef fuel_table_t afr_table_t; diff --git a/firmware/gen_config.bat b/firmware/gen_config.bat index ddc2a23b38..119a410319 100644 --- a/firmware/gen_config.bat +++ b/firmware/gen_config.bat @@ -1,2 +1,2 @@ -java -jar ../java_tools/ConfigDefinition.jar . controllers\algo \ No newline at end of file +java -jar ../java_tools/ConfigDefinition.jar . tunerstudio controllers\algo \ No newline at end of file