From 9384ef858bd7c74842ea9ccc983777542329740c Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 22 Mar 2015 19:10:32 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/dodge_neon.cpp | 1 + .../controllers/algo/engine_configuration.cpp | 2 ++ ...engine_configuration_generated_structures.h | 18 +++++++++++++++--- firmware/controllers/alternatorController.cpp | 13 ++++++++++--- firmware/integration/rusefi_config.txt | 5 ++++- firmware/tunerstudio/rusefi.ini | 7 +++++-- .../autotest/src/com/rusefi/TestingUtils.java | 4 ---- 7 files changed, 37 insertions(+), 13 deletions(-) diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 483de73d05..9b3b165aaf 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -389,6 +389,7 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->algorithm = LM_SPEED_DENSITY; boardConfiguration->alternatorControlPin = GPIOD_5; + engineConfiguration->alternatorControlPFactor = 40; // engineConfiguration->isCanEnabled = true; boardConfiguration->canTxPin = GPIOB_6; diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 18586f4247..034346fbc0 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -308,6 +308,8 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->HD44780width = 20; engineConfiguration->HD44780height = 4; + engineConfiguration->alternatorControlPFactor = 30; + engineConfiguration->tpsAdcChannel = EFI_ADC_3; engineConfiguration->vbattAdcChannel = EFI_ADC_5; engineConfiguration->cltAdcChannel = EFI_ADC_6; diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 4665638b0e..ce9f1948fe 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 Sun Mar 22 13:03:07 EDT 2015 +// this section was generated by config_definition.jar on Sun Mar 22 19:43:37 EDT 2015 // begin #include "rusefi_types.h" typedef struct { @@ -1080,7 +1080,19 @@ typedef struct { /** * offset 5208 */ - int unused3[143]; + float alternatorControlPFactor; + /** + * offset 5212 + */ + float alternatorControlIFactor; + /** + * offset 5216 + */ + float alternatorControlDFactor; + /** + * offset 5220 + */ + int unused3[140]; /** * offset 5780 */ @@ -1184,4 +1196,4 @@ typedef struct { } engine_configuration_s; // end -// this section was generated by config_definition.jar on Sun Mar 22 13:03:07 EDT 2015 +// this section was generated by config_definition.jar on Sun Mar 22 19:43:37 EDT 2015 diff --git a/firmware/controllers/alternatorController.cpp b/firmware/controllers/alternatorController.cpp index 1669a3143e..30003578aa 100644 --- a/firmware/controllers/alternatorController.cpp +++ b/firmware/controllers/alternatorController.cpp @@ -49,9 +49,14 @@ static msg_t AltCtrlThread(int param) { #endif } -static void setAltPid(float p) { +static void applySettings(void) { + altPid.updateFactors(engineConfiguration->alternatorControlPFactor, 0, 0); +} + +static void setAltPFactor(float p) { + engineConfiguration->alternatorControlPFactor = p; scheduleMsg(logger, "setAltPid: %f", p); - altPid.updateFactors(p, 0, 0); + applySettings(); } static void applyAlternatorPinState(PwmConfig *state, int stateIndex) { @@ -79,6 +84,8 @@ void initAlternatorCtrl(Logging *sharedLogger) { chThdCreateStatic(alternatorControlThreadStack, sizeof(alternatorControlThreadStack), LOWPRIO, (tfunc_t) AltCtrlThread, NULL); - addConsoleActionF("alt_pid", setAltPid); + addConsoleActionF("set_alt_p", setAltPFactor); addConsoleAction("altinfo", showAltInfo); + + applySettings(); } diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 88f7e4d8ce..095fe944be 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -473,7 +473,10 @@ custom pin_input_mode_e 4 scalar, F32, @OFFSET@, "ms", 1, 0, 0, 200, 1 pin_input_mode_e[LE_COMMAND_COUNT iterate] fsioInputModes; adc_channel_e externalKnockSenseAdc; - int[143] unused3; + float alternatorControlPFactor; + float alternatorControlIFactor; + float alternatorControlDFactor; + int[140] unused3; int accelLength;;"len", 1, 0, 0, 200, 3 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index e5c49be125..06e71a2b05 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 Sun Mar 22 13:03:09 EDT 2015 +; this section was generated by ConfigDefinition.jar on Sun Mar 22 19:43:39 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" @@ -465,7 +465,10 @@ page = 1 fsioInputModes15 = scalar, F32, 5196, "ms", 1, 0, 0, 200, 1 fsioInputModes16 = scalar, F32, 5200, "ms", 1, 0, 0, 200, 1 externalKnockSenseAdc = bits, U32, 5204, [0:3] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" -;skipping unused3 offset 5208 +;skipping alternatorControlPFactor offset 5208 +;skipping alternatorControlIFactor offset 5212 +;skipping alternatorControlDFactor offset 5216 +;skipping unused3 offset 5220 accelLength = scalar, S32, 5780, "len", 1, 0, 0, 200, 3 deaccelEnrichmentThreshold = scalar, F32, 5784, "roc", 1, 0, 0, 200, 3 deaccelEnrichmentMultiplier = scalar, F32, 5788, "coeff", 1, 0, 0, 200, 3 diff --git a/java_console/autotest/src/com/rusefi/TestingUtils.java b/java_console/autotest/src/com/rusefi/TestingUtils.java index 20964c6532..b98673f904 100644 --- a/java_console/autotest/src/com/rusefi/TestingUtils.java +++ b/java_console/autotest/src/com/rusefi/TestingUtils.java @@ -109,11 +109,7 @@ public class TestingUtils { } static String getNextWaveChart() { - // we need to skip TWO because spark could have been scheduled a while ago and happen now - // todo: improve this logic, compare times IoUtil.sendCommand("reset_wave_chart"); -// getWaveChart(); - // we want to wait for the 2nd chart to see same same RPM across the whole chart String result = getWaveChart(); FileLog.MAIN.logLine("current chart: " + result); return result;