From 7cdea8932ebcb6424d01fdf86da4f2f94a3833eb Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 26 Nov 2017 19:35:08 -0500 Subject: [PATCH] fix #500 --- README.md | 1 + firmware/controllers/core/fsio_impl.cpp | 6 +++--- firmware/rusefi.cpp | 2 +- firmware/svnversion.h | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index bcd91ccaed..a1c80badcc 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ current binaries are always available at http://rusefi.com/build_server/ | Release date | Revision | Details | | ------------ | --------- | ------- | +| 11/26/2017 | r14789 | bugfix #500: set_rpn_expression command is broken | | 11/23/2017 | r14779 | bugfix #497: engine does not start with SD card | | 11/19/2017 | r14766 | improvement #496: console flasher to support older boards | | 11/19/2017 | r14760 | improvement #495: incomppatible change - larger settings area | diff --git a/firmware/controllers/core/fsio_impl.cpp b/firmware/controllers/core/fsio_impl.cpp index 6b8bb10581..cb05d0df86 100644 --- a/firmware/controllers/core/fsio_impl.cpp +++ b/firmware/controllers/core/fsio_impl.cpp @@ -494,7 +494,7 @@ static void setFsioSetting(float humanIndexF, float value) { #endif } -static void setFsioExpression(const char *indexStr, const char *quotedLine, Engine *engine) { +static void setFsioExpression(const char *indexStr, const char *quotedLine) { #if EFI_PROD_CODE || EFI_SIMULATOR int index = atoi(indexStr) - 1; if (index < 0 || index >= FSIO_COMMAND_COUNT) { @@ -508,7 +508,7 @@ static void setFsioExpression(const char *indexStr, const char *quotedLine, Engi } scheduleMsg(logger, "setting user out #%d to [%s]", index + 1, l); - strcpy(engine->config->fsioFormulas[index], l); + strcpy(config->fsioFormulas[index], l); // this would apply the changes applyFsioConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE); showFsioInfo(); @@ -579,7 +579,7 @@ void initFsioImpl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) { #endif /* EFI_PROD_CODE */ #if EFI_PROD_CODE || EFI_SIMULATOR - addConsoleActionSS("set_rpn_expression", (VoidCharPtrCharPtr) setFsioExpression); + addConsoleActionSS("set_rpn_expression", setFsioExpression); addConsoleActionFF("set_fsio_setting", setFsioSetting); addConsoleAction("fsioinfo", showFsioInfo); addConsoleActionS("rpn_eval", (VoidCharPtr) rpnEval); diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index a9e6d157f9..491b9e54c5 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -260,5 +260,5 @@ int getRusEfiVersion(void) { if (initBootloader() != 0) return 123; #endif /* EFI_BOOTLOADER_INCLUDE_CODE */ - return 20171123; + return 20171126; } diff --git a/firmware/svnversion.h b/firmware/svnversion.h index 8f5ef28fe6..c4fada8c37 100644 --- a/firmware/svnversion.h +++ b/firmware/svnversion.h @@ -1,5 +1,5 @@ // This file was generated by Version2Header -// Thu Nov 23 17:43:17 EST 2017 +// Sun Nov 26 17:50:40 EST 2017 #ifndef VCS_VERSION -#define VCS_VERSION "14779" +#define VCS_VERSION "14789" #endif