From 7ef4f0a3c4f0d8a43a10270d46d6651265495a06 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 14 Mar 2015 22:08:42 -0500 Subject: [PATCH] auto-sync --- firmware/console/binary/tunerstudio_configuration.h | 2 +- firmware/controllers/algo/engine_configuration.cpp | 5 ++--- firmware/controllers/flash_main.h | 2 +- firmware/controllers/math/speed_density.cpp | 7 +++++-- firmware/integration/rusefi_config.txt | 2 +- firmware/svnversion.h | 4 ++-- firmware/tunerstudio/rusefi.ini | 10 +++++++--- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/firmware/console/binary/tunerstudio_configuration.h b/firmware/console/binary/tunerstudio_configuration.h index 0aa39d7f4a..ad65f3245a 100644 --- a/firmware/console/binary/tunerstudio_configuration.h +++ b/firmware/console/binary/tunerstudio_configuration.h @@ -16,7 +16,7 @@ /** * this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version */ -#define TS_FILE_VERSION 20150216 +#define TS_FILE_VERSION 20150314 #define PAGE_COUNT 2 diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index c8b199b6d0..3f43a72bff 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -139,8 +139,6 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { memset(engineConfiguration, 0, sizeof(engine_configuration_s)); memset(boardConfiguration, 0, sizeof(board_configuration_s)); - setDetaultVETable(PASS_ENGINE_PARAMETER_F); - boardConfiguration->mafSensorType = Bosch0280218037; setBosch0280218037(engineConfiguration); @@ -192,9 +190,10 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { // set_whole_timing_map 3 setWholeFuelMap(3 PASS_ENGINE_PARAMETER); - setWholeVEMap(0.8 PASS_ENGINE_PARAMETER); setMap(engineConfiguration->afrTable, 14.7); + setDetaultVETable(PASS_ENGINE_PARAMETER_F); + setMap(engineConfiguration->injectionPhase, -180); setRpmTableBin(engineConfiguration->injPhaseRpmBins, FUEL_RPM_COUNT); setTableBin2(engineConfiguration->injPhaseLoadBins, FUEL_LOAD_COUNT, 10, 300, 1); diff --git a/firmware/controllers/flash_main.h b/firmware/controllers/flash_main.h index 711ac0dc12..e1d2bdde6c 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 6667 +#define FLASH_DATA_VERSION 7427 void readFromFlash(void); void initFlash(Logging *sharedLogger, Engine *engine); diff --git a/firmware/controllers/math/speed_density.cpp b/firmware/controllers/math/speed_density.cpp index e1759f306d..6791035504 100644 --- a/firmware/controllers/math/speed_density.cpp +++ b/firmware/controllers/math/speed_density.cpp @@ -86,7 +86,10 @@ float getSpeedDensityFuel(int rpm DECLARE_ENGINE_PARAMETER_S) { float intakeC = engine->engineState.iat; float tChargeK = convertCelsiusToKelvin(getTCharge(rpm, tps, coolantC, intakeC)); float map = getMap() + engine->accelEnrichment.getEnrichment(PASS_ENGINE_PARAMETER_F); - float VE = veMap.getValue(map, rpm); + /** + * *0.01 because of https://sourceforge.net/p/rusefi/tickets/153/ + */ + float VE = veMap.getValue(map, rpm) * 0.01; float AFR = afrMap.getValue(map, rpm); return sdMath(engineConfiguration, VE, map, AFR, tChargeK) * 1000; @@ -95,7 +98,7 @@ float getSpeedDensityFuel(int rpm DECLARE_ENGINE_PARAMETER_S) { void setDetaultVETable(DECLARE_ENGINE_PARAMETER_F) { setRpmTableBin(engineConfiguration->veRpmBins, FUEL_RPM_COUNT); setTableBin2(engineConfiguration->veLoadBins, FUEL_LOAD_COUNT, 10, 300, 1); - veMap.setAll(0.8); + veMap.setAll(80); // setRpmTableBin(engineConfiguration->ve2RpmBins, FUEL_RPM_COUNT); // setTableBin2(engineConfiguration->ve2LoadBins, FUEL_LOAD_COUNT, 10, 300, 1); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index a7b8d343e7..ad4ffc0dfd 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -39,7 +39,7 @@ struct engine_configuration_s ! please note that 1024 here is 4 * FUEL_RPM_COUNT * FUEL_LOAD_COUNT custom fuel_table_t 1024 array, F32, @OFFSET@, [16x16],"ms", 1, 0, 0.0, 300.0, 2 -custom ve_table_t 1024 array, F32, @OFFSET@, [16x16],"%", 100, 0, 0, 100.0, 2 +custom ve_table_t 1024 array, F32, @OFFSET@, [16x16],"%", 1, 0, 0, 200.0, 2 custom afr_table_t 1024 array, F32, @OFFSET@, [16x16],"deg", 1, 0, 0, 25.0, 2 ! please note that 1024 here is 4 * IGN_LOAD_COUNT * IGN_RPM_COUNT diff --git a/firmware/svnversion.h b/firmware/svnversion.h index 414141b337..e61aa20cce 100644 --- a/firmware/svnversion.h +++ b/firmware/svnversion.h @@ -1,5 +1,5 @@ // This file was generated by Version2Header -// Sat Mar 14 12:46:31 EDT 2015 +// Sat Mar 14 21:30:36 EDT 2015 #ifndef VCS_VERSION -#define VCS_VERSION "7411" +#define VCS_VERSION "7427" #endif diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index eaa80182dd..1e88101260 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 14 19:07:36 EDT 2015 +; this section was generated by ConfigDefinition.jar on Sat Mar 14 22:31:50 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" @@ -480,7 +480,7 @@ page = 1 ignitionTable = array, F32, 9400, [16x16],"deg", 1, 0, -360, 360, 2 ignitionLoadBins = array, F32, 10424, [16], "Load", 1, 0.0, 0, 300.0, 2 ignitionRpmBins = array, F32, 10488, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - veTable = array, F32, 10552, [16x16],"%", 100, 0, 0, 100.0, 2 + veTable = array, F32, 10552, [16x16],"%", 1, 0, 0, 200.0, 2 veLoadBins = array, F32, 11576, [16], "%", 1, 0.0, 0, 300.0, 2 veRpmBins = array, F32, 11640, [16], "RPM", 1, 0.0, 0, 18000.0, 2 afrTable = array, F32, 11704, [16x16],"deg", 1, 0, 0, 25.0, 2 @@ -520,12 +520,16 @@ page = 1 filter = minCltFilter, "Minimum CLT", coolant, < , 160, , true #endif +;[VeAnalyze] +; fuelAnalyzeMap = fuelTableTbl, afrTableTbl, AFRactual, egoCorrection , { 1 } +; filter = minRPMFilter, "Minimum RPM", rpm, < , 500, , true + [OutputChannels] ; see TS_FILE_VERSION in firmware code -fileVersion = { 20150216 } +fileVersion = { 20150314 } ochGetCommand = "O"