From bd616cba76791d84021bf51e140a6af372e77345 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 14 May 2015 11:05:08 -0400 Subject: [PATCH] auto-sync --- firmware/controllers/alternatorController.cpp | 9 +++++---- firmware/controllers/alternatorController.h | 2 ++ firmware/controllers/settings.cpp | 15 ++++++++++++--- firmware/rusefi.cpp | 2 +- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/firmware/controllers/alternatorController.cpp b/firmware/controllers/alternatorController.cpp index 5df5761e83..12324b88b9 100644 --- a/firmware/controllers/alternatorController.cpp +++ b/firmware/controllers/alternatorController.cpp @@ -53,16 +53,17 @@ static void applySettings(void) { altPid.updateFactors(engineConfiguration->alternatorControlPFactor, 0, 0); } -static void showAltInfo(void) { - scheduleMsg(logger, "alt=%s @ %s", boolToString(engineConfiguration->isAlternatorControlEnabled), - hwPortname(boardConfiguration->alternatorControlPin)); +void showAltInfo(void) { + scheduleMsg(logger, "alt=%s @%s t=%dms", boolToString(engineConfiguration->isAlternatorControlEnabled), + hwPortname(boardConfiguration->alternatorControlPin), + boardConfiguration->alternatorDT); scheduleMsg(logger, "p=%f/i=%f/d=%f", engineConfiguration->alternatorControlPFactor, 0, 0); // todo: i & d scheduleMsg(logger, "vbatt=%f/duty=%f/target=%f", getVBatt(engineConfiguration), currentAltDuty, boardConfiguration->targetVBatt); } -static void setAltPFactor(float p) { +void setAltPFactor(float p) { engineConfiguration->alternatorControlPFactor = p; scheduleMsg(logger, "setAltPid: %f", p); applySettings(); diff --git a/firmware/controllers/alternatorController.h b/firmware/controllers/alternatorController.h index 4158cff6f8..0ebcc612d3 100644 --- a/firmware/controllers/alternatorController.h +++ b/firmware/controllers/alternatorController.h @@ -12,5 +12,7 @@ #include "main.h" void initAlternatorCtrl(Logging *sharedLogger); +void setAltPFactor(float p); +void showAltInfo(void); #endif /* ALTERNATORCONTROLLER_H_ */ diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index e388ed01c0..701d2bdc84 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -22,6 +22,7 @@ #include "engine.h" #include "efiGpio.h" #include "engine_math.h" +#include "alternatorController.h" #if EFI_PROD_CODE || defined(__DOXYGEN__) #include "rusefi.h" @@ -922,12 +923,20 @@ static void setInjectorLag(float value) { } static void setValue(const char *paramStr, const char *valueStr) { - float value = atoff(valueStr); + float valueF = atoff(valueStr); + int valueI = atoi(valueStr); if (strEqualCaseInsensitive(paramStr, "vsscoeff")) { - engineConfiguration->vehicleSpeedCoef = value; + engineConfiguration->vehicleSpeedCoef = valueF; + } else if (strEqualCaseInsensitive(paramStr, "alt_t")) { + if (valueI > 10) { + boardConfiguration->alternatorDT = valueI; + } + showAltInfo(); + } else if (strEqualCaseInsensitive(paramStr, "alt_p")) { + setAltPFactor(valueF); } else if (strEqualCaseInsensitive(paramStr, "targetvbatt")) { - boardConfiguration->targetVBatt = value; + boardConfiguration->targetVBatt = valueF; } } diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 5e9a39aab3..5936beba11 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -290,5 +290,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20150512; + return 20150514; }