From 0c91be95ed4432aa2bfaec8e8150c826c82683ba Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 29 Mar 2015 17:04:52 -0500 Subject: [PATCH] auto-sync --- firmware/controllers/algo/engine_configuration.cpp | 7 +++++++ .../engine_configuration_generated_structures.h | 14 +++++++++++--- firmware/controllers/flash_main.h | 2 +- firmware/hw_layer/stepper.cpp | 10 +++++----- firmware/integration/rusefi_config.txt | 5 ++++- firmware/rusefi.cpp | 2 +- firmware/tunerstudio/rusefi.ini | 6 ++++-- 7 files changed, 33 insertions(+), 13 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 974337d092..74a705ad6c 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -548,6 +548,13 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { boardConfiguration->isVerboseAlternator = false; boardConfiguration->tunerStudioSerialSpeed = TS_DEFAULT_SPEED; + + boardConfiguration->idleStepperStep = GPIO_UNASSIGNED; + boardConfiguration->idleStepperDirection = GPIO_UNASSIGNED; + + engineConfiguration->accelLength = 6; + engineConfiguration->accelEnrichmentThreshold = 5; // kPa +// engineConfiguration->accelEnrichmentMultiplier = 2; } void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_ENGINE_PARAMETER_S) { diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index e3492c416a..12f0cd96de 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 Mar 28 17:28:27 EDT 2015 +// this section was generated by config_definition.jar on Sun Mar 29 17:07:25 EDT 2015 // begin #include "rusefi_types.h" typedef struct { @@ -593,7 +593,15 @@ typedef struct { /** * offset 784 */ - int unusedbs[5]; + brain_pin_e idleStepperDirection; + /** + * offset 788 + */ + brain_pin_e idleStepperStep; + /** + * offset 792 + */ + int unusedbs[3]; /** * offset 804 */ @@ -1196,4 +1204,4 @@ typedef struct { } engine_configuration_s; // end -// this section was generated by config_definition.jar on Sat Mar 28 17:28:27 EDT 2015 +// this section was generated by config_definition.jar on Sun Mar 29 17:07:25 EDT 2015 diff --git a/firmware/controllers/flash_main.h b/firmware/controllers/flash_main.h index 1fcae7c5be..06b9c00b00 100644 --- a/firmware/controllers/flash_main.h +++ b/firmware/controllers/flash_main.h @@ -12,7 +12,7 @@ #include "engine_configuration.h" #include "engine.h" -#define FLASH_DATA_VERSION 7500 +#define FLASH_DATA_VERSION 7568 void readFromFlash(void); void initFlash(Logging *sharedLogger, Engine *engine); diff --git a/firmware/hw_layer/stepper.cpp b/firmware/hw_layer/stepper.cpp index c7d49b8b93..9c9422db54 100644 --- a/firmware/hw_layer/stepper.cpp +++ b/firmware/hw_layer/stepper.cpp @@ -16,16 +16,16 @@ static msg_t stThread(StepperMotor *motor) { chRegSetThreadName("stepper"); - - palWritePad(motor->directionPort, motor->directionPin, true); + + palWritePad(motor->directionPort, motor->directionPin, true); // let's part the motor in a known position to begin with for (int i = 0; i < ST_COUNT; i++) { motor->pulse(); } - palWritePad(motor->directionPort, motor->directionPin, false); - + palWritePad(motor->directionPort, motor->directionPin, false); + // let's part the motor in a known position to begin with for (int i = 0; i < ST_COUNT / 2; i++) { motor->pulse(); @@ -47,7 +47,7 @@ void StepperMotor::initialize(brain_pin_e stepPin, brain_pin_e directionPin) { stepPort = getHwPort(stepPin); this->stepPin = getHwPin(stepPin); - directionPort = getHwPort(directionPin); + directionPort = getHwPort(directionPin); this->directionPin = getHwPin(directionPin); mySetPadMode2("st step", stepPin, PAL_MODE_OUTPUT_PUSHPULL); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 4dc6fb308b..a6039eb17d 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -388,7 +388,10 @@ custom fsio_setting_t 4 scalar, F32, @OFFSET@, "Val", 1, 0, 0, custom analog_chart_e 4 bits, S32, @OFFSET@, [0:1], "none", "trigger", "MAP", "INVALID" analog_chart_e analogChartMode; maf_sensor_type_e mafSensorType; - int[5] unusedbs; + brain_pin_e idleStepperDirection; + brain_pin_e idleStepperStep; + + int[3] unusedbs; custom le_formula_t 200 array, U08, @OFFSET@, [200],"char", 1, 0, 0.0, 3.0, 2 le_formula_t[LE_COMMAND_COUNT iterate] le_formulas; diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index c473fcc79d..e47ff2210e 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -276,5 +276,5 @@ int getRusEfiVersion(void) { return 1; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] == 0) return 1; // this is here to make the compiler happy about the unused array - return 20150328; + return 20150329; } diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 087f5e8cb9..2b7fe599e7 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/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 by ConfigDefinition.jar on Sat Mar 28 17:28:29 EDT 2015 +; this section was generated by ConfigDefinition.jar on Sun Mar 29 17:07:27 EDT 2015 page = 1 engineType = bits, S32, 0, [0:2], "AUDI_AAN", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD", "FORD_INLINE_6_1995", "GY6_139QMB" @@ -363,7 +363,9 @@ page = 1 joystickDPin = bits, U32, 1644, [0:6], "GPIOA_0", "GPIOA_1", "GPIOA_2", "GPIOA_3", "GPIOA_4", "GPIOA_5", "GPIOA_6", "GPIOA_7", "GPIOA_8", "GPIOA_9", "GPIOA_10", "GPIOA_11", "GPIOA_12", "GPIOA_13", "GPIOA_14", "GPIOA_15", "GPIOB_0", "GPIOB_1", "GPIOB_2", "GPIOB_3", "GPIOB_4", "GPIOB_5", "GPIOB_6", "GPIOB_7", "GPIOB_8", "GPIOB_9", "GPIOB_10", "GPIOB_11", "GPIOB_12", "GPIOB_13", "GPIOB_14", "GPIOB_15", "GPIOC_0", "GPIOC_1", "GPIOC_2", "GPIOC_3", "GPIOC_4", "GPIOC_5", "GPIOC_6", "GPIOC_7", "GPIOC_8", "GPIOC_9", "GPIOC_10", "GPIOC_11", "GPIOC_12", "GPIOC_13", "GPIOC_14", "GPIOC_15", "GPIOD_0", "GPIOD_1", "GPIOD_2", "GPIOD_3", "GPIOD_4", "GPIOD_5", "GPIOD_6", "GPIOD_7", "GPIOD_8", "GPIOD_9", "GPIOD_10", "GPIOD_11", "GPIOD_12", "GPIOD_13", "GPIOD_14", "GPIOD_15", "GPIOE_0", "GPIOE_1", "GPIOE_2", "GPIOE_3", "GPIOE_4", "GPIOE_5", "GPIOE_6", "GPIOE_7", "GPIOE_8", "GPIOE_9", "GPIOE_10", "GPIOE_11", "GPIOE_12", "GPIOE_13", "GPIOE_14", "GPIOE_15", "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" analogChartMode = bits, S32, 1648, [0:1], "none", "trigger", "MAP", "INVALID" ;skipping mafSensorType offset 1652 -;skipping unusedbs offset 1656 + idleStepperDirection = bits, U32, 1656, [0:6], "GPIOA_0", "GPIOA_1", "GPIOA_2", "GPIOA_3", "GPIOA_4", "GPIOA_5", "GPIOA_6", "GPIOA_7", "GPIOA_8", "GPIOA_9", "GPIOA_10", "GPIOA_11", "GPIOA_12", "GPIOA_13", "GPIOA_14", "GPIOA_15", "GPIOB_0", "GPIOB_1", "GPIOB_2", "GPIOB_3", "GPIOB_4", "GPIOB_5", "GPIOB_6", "GPIOB_7", "GPIOB_8", "GPIOB_9", "GPIOB_10", "GPIOB_11", "GPIOB_12", "GPIOB_13", "GPIOB_14", "GPIOB_15", "GPIOC_0", "GPIOC_1", "GPIOC_2", "GPIOC_3", "GPIOC_4", "GPIOC_5", "GPIOC_6", "GPIOC_7", "GPIOC_8", "GPIOC_9", "GPIOC_10", "GPIOC_11", "GPIOC_12", "GPIOC_13", "GPIOC_14", "GPIOC_15", "GPIOD_0", "GPIOD_1", "GPIOD_2", "GPIOD_3", "GPIOD_4", "GPIOD_5", "GPIOD_6", "GPIOD_7", "GPIOD_8", "GPIOD_9", "GPIOD_10", "GPIOD_11", "GPIOD_12", "GPIOD_13", "GPIOD_14", "GPIOD_15", "GPIOE_0", "GPIOE_1", "GPIOE_2", "GPIOE_3", "GPIOE_4", "GPIOE_5", "GPIOE_6", "GPIOE_7", "GPIOE_8", "GPIOE_9", "GPIOE_10", "GPIOE_11", "GPIOE_12", "GPIOE_13", "GPIOE_14", "GPIOE_15", "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" + idleStepperStep = bits, U32, 1660, [0:6], "GPIOA_0", "GPIOA_1", "GPIOA_2", "GPIOA_3", "GPIOA_4", "GPIOA_5", "GPIOA_6", "GPIOA_7", "GPIOA_8", "GPIOA_9", "GPIOA_10", "GPIOA_11", "GPIOA_12", "GPIOA_13", "GPIOA_14", "GPIOA_15", "GPIOB_0", "GPIOB_1", "GPIOB_2", "GPIOB_3", "GPIOB_4", "GPIOB_5", "GPIOB_6", "GPIOB_7", "GPIOB_8", "GPIOB_9", "GPIOB_10", "GPIOB_11", "GPIOB_12", "GPIOB_13", "GPIOB_14", "GPIOB_15", "GPIOC_0", "GPIOC_1", "GPIOC_2", "GPIOC_3", "GPIOC_4", "GPIOC_5", "GPIOC_6", "GPIOC_7", "GPIOC_8", "GPIOC_9", "GPIOC_10", "GPIOC_11", "GPIOC_12", "GPIOC_13", "GPIOC_14", "GPIOC_15", "GPIOD_0", "GPIOD_1", "GPIOD_2", "GPIOD_3", "GPIOD_4", "GPIOD_5", "GPIOD_6", "GPIOD_7", "GPIOD_8", "GPIOD_9", "GPIOD_10", "GPIOD_11", "GPIOD_12", "GPIOD_13", "GPIOD_14", "GPIOD_15", "GPIOE_0", "GPIOE_1", "GPIOE_2", "GPIOE_3", "GPIOE_4", "GPIOE_5", "GPIOE_6", "GPIOE_7", "GPIOE_8", "GPIOE_9", "GPIOE_10", "GPIOE_11", "GPIOE_12", "GPIOE_13", "GPIOE_14", "GPIOE_15", "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" +;skipping unusedbs offset 1664 le_formulas1 = array, U08, 1676, [200],"char", 1, 0, 0.0, 3.0, 2 le_formulas2 = array, U08, 1876, [200],"char", 1, 0, 0.0, 3.0, 2 le_formulas3 = array, U08, 2076, [200],"char", 1, 0, 0.0, 3.0, 2