rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2015-04-04 23:06:25 -05:00
parent a825ac2e17
commit 94e962afca
7 changed files with 54 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/controllers/algo/engine_configuration.cpp
View File

@ -121,7 +121,7 @@ void setWholeFuelMap(float value DECLARE_ENGINE_PARAMETER_S) {
} }
void setFuelTablesLoadBin(float minValue, float maxValue DECLARE_ENGINE_PARAMETER_S) { void setFuelTablesLoadBin(float minValue, float maxValue DECLARE_ENGINE_PARAMETER_S) {
setTableBin2(engineConfiguration->injPhaseLoadBins, FUEL_LOAD_COUNT, minValue, maxValue, 1); setTableBin2(config->injPhaseLoadBins, FUEL_LOAD_COUNT, minValue, maxValue, 1);
setTableBin2(engineConfiguration->veLoadBins, FUEL_LOAD_COUNT, minValue, maxValue, 1); setTableBin2(engineConfiguration->veLoadBins, FUEL_LOAD_COUNT, minValue, maxValue, 1);
setTableBin2(engineConfiguration->afrLoadBins, FUEL_LOAD_COUNT, minValue, maxValue, 1); setTableBin2(engineConfiguration->afrLoadBins, FUEL_LOAD_COUNT, minValue, maxValue, 1);
} }
@ -149,8 +149,12 @@ static void initTemperatureCurve(int size, float *bins, float *values) {
*/ */
void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc; board_configuration_s *boardConfiguration = &engineConfiguration->bc;
// technically these regions currently overlap, but I will reset all individually for readability
memset(engineConfiguration, 0, sizeof(engine_configuration_s)); memset(engineConfiguration, 0, sizeof(engine_configuration_s));
memset(boardConfiguration, 0, sizeof(board_configuration_s)); memset(boardConfiguration, 0, sizeof(board_configuration_s));
#if ! EFI_UNIT_TEST
memset(&persistentState.persistentConfiguration, 0, sizeof(persistentState.persistentConfiguration));
#endif
boardConfiguration->mafSensorType = Bosch0280218037; boardConfiguration->mafSensorType = Bosch0280218037;
setBosch0280218037(engineConfiguration); setBosch0280218037(engineConfiguration);
@ -218,8 +222,8 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
setDefaultVETable(PASS_ENGINE_PARAMETER_F); setDefaultVETable(PASS_ENGINE_PARAMETER_F);
setMap(engineConfiguration->injectionPhase, -180); setMap(config->injectionPhase, -180);
setRpmTableBin(engineConfiguration->injPhaseRpmBins, FUEL_RPM_COUNT); setRpmTableBin(config->injPhaseRpmBins, FUEL_RPM_COUNT);
setFuelTablesLoadBin(10, 160 PASS_ENGINE_PARAMETER); setFuelTablesLoadBin(10, 160 PASS_ENGINE_PARAMETER);
setThermistorConfiguration(&engineConfiguration->clt, 0, 9500, 23.8889, 2100, 48.8889, 1000); setThermistorConfiguration(&engineConfiguration->clt, 0, 9500, 23.8889, 2100, 48.8889, 1000);

56
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated by config_definition.jar on Sat Apr 04 17:10:30 EDT 2015 // this section was generated by config_definition.jar on Sat Apr 04 23:34:22 EDT 2015
// begin // begin
#include "rusefi_types.h" #include "rusefi_types.h"
typedef struct { typedef struct {
@ -1210,36 +1210,12 @@ typedef struct {
/** /**
* offset 12856 * offset 12856
*/ */
fuel_table_t injectionPhase;
/**
* offset 13880
*/
float injPhaseLoadBins[FUEL_LOAD_COUNT];
/**
* offset 13944
*/
float injPhaseRpmBins[FUEL_RPM_COUNT];
/**
* offset 14008
*/
float iatIdleCorrBins[IAT_CURVE_SIZE]; float iatIdleCorrBins[IAT_CURVE_SIZE];
/** /**
* offset 14072 * offset 12920
*/ */
float iatIdleCorr[IAT_CURVE_SIZE]; float iatIdleCorr[IAT_CURVE_SIZE];
/** /** total size 12984*/
* offset 14136
*/
ignition_table_t ignitionIatCorrTable;
/**
* offset 15160
*/
float ignitionIatCorrLoadBins[IGN_LOAD_COUNT];
/**
* offset 15224
*/
float ignitionIatCorrRpmBins[IGN_RPM_COUNT];
/** total size 15288*/
} engine_configuration_s; } engine_configuration_s;
typedef struct { typedef struct {
@ -1247,8 +1223,32 @@ typedef struct {
* offset 0 * offset 0
*/ */
engine_configuration_s engineConfiguration; engine_configuration_s engineConfiguration;
/**
* offset 12984
*/
ignition_table_t ignitionIatCorrTable;
/**
* offset 14008
*/
float ignitionIatCorrLoadBins[IGN_LOAD_COUNT];
/**
* offset 14072
*/
float ignitionIatCorrRpmBins[IGN_RPM_COUNT];
/**
* offset 14136
*/
fuel_table_t injectionPhase;
/**
* offset 15160
*/
float injPhaseLoadBins[FUEL_LOAD_COUNT];
/**
* offset 15224
*/
float injPhaseRpmBins[FUEL_RPM_COUNT];
/** total size 15288*/ /** total size 15288*/
} persistent_config_s; } persistent_config_s;
// end // end
// this section was generated by config_definition.jar on Sat Apr 04 17:10:30 EDT 2015 // this section was generated by config_definition.jar on Sat Apr 04 23:34:22 EDT 2015

2
firmware/controllers/algo/fuel_math.cpp
View File

@ -157,7 +157,7 @@ float getInjectorLag(float vBatt DECLARE_ENGINE_PARAMETER_S) {
*/ */
void prepareFuelMap(DECLARE_ENGINE_PARAMETER_F) { void prepareFuelMap(DECLARE_ENGINE_PARAMETER_F) {
fuelMap.init(engineConfiguration->fuelTable, engineConfiguration->fuelLoadBins, engineConfiguration->fuelRpmBins); fuelMap.init(engineConfiguration->fuelTable, engineConfiguration->fuelLoadBins, engineConfiguration->fuelRpmBins);
fuelPhaseMap.init(engineConfiguration->injectionPhase, engineConfiguration->injPhaseLoadBins, engineConfiguration->injPhaseRpmBins); fuelPhaseMap.init(config->injectionPhase, config->injPhaseLoadBins, config->injPhaseRpmBins);
} }
/** /**

2
firmware/controllers/flash_main.h
View File

@ -12,7 +12,7 @@
#include "engine_configuration.h" #include "engine_configuration.h"
#include "engine.h" #include "engine.h"
#define FLASH_DATA_VERSION 7612 #define FLASH_DATA_VERSION 7613
void readFromFlash(void); void readFromFlash(void);
void initFlash(Logging *sharedLogger, Engine *engine); void initFlash(Logging *sharedLogger, Engine *engine);

2
firmware/controllers/settings.cpp
View File

@ -547,7 +547,7 @@ static void setWholeTimingMap(float value) {
static void setWholePhaseMapCmd(float value) { static void setWholePhaseMapCmd(float value) {
scheduleMsg(&logger, "Setting whole injection phase map to %f", value); scheduleMsg(&logger, "Setting whole injection phase map to %f", value);
setMap(engineConfiguration->injectionPhase, value); setMap(config->injectionPhase, value);
} }
static void setWholeTimingMapCmd(float value) { static void setWholeTimingMapCmd(float value) {

15
firmware/integration/rusefi_config.txt
View File

@ -526,21 +526,20 @@ afr_table_t afrTable;
float[FUEL_LOAD_COUNT] afrLoadBins;;"%", 1, 0.0, 0, 300.0, 2 float[FUEL_LOAD_COUNT] afrLoadBins;;"%", 1, 0.0, 0, 300.0, 2
float[FUEL_RPM_COUNT] afrRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2 float[FUEL_RPM_COUNT] afrRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2
fuel_table_t injectionPhase;
float[FUEL_LOAD_COUNT] injPhaseLoadBins;;"Load", 1, 0.0, 0, 300.0, 2
float[FUEL_RPM_COUNT] injPhaseRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2
float[IAT_CURVE_SIZE] iatIdleCorrBins;;"C", 1, 0, -100.0, 250.0, 2 float[IAT_CURVE_SIZE] iatIdleCorrBins;;"C", 1, 0, -100.0, 250.0, 2
float[IAT_CURVE_SIZE] iatIdleCorr;;"%", 1, 0, 0.0, 500.0, 2 float[IAT_CURVE_SIZE] iatIdleCorr;;"%", 1, 0, 0.0, 500.0, 2
end_struct
engine_configuration_s engineConfiguration;
ignition_table_t ignitionIatCorrTable; ignition_table_t ignitionIatCorrTable;
float[IGN_LOAD_COUNT] ignitionIatCorrLoadBins;;"Load", 1, 0.0, 0, 300.0, 2 float[IGN_LOAD_COUNT] ignitionIatCorrLoadBins;;"Load", 1, 0.0, 0, 300.0, 2
float[IGN_RPM_COUNT] ignitionIatCorrRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2 float[IGN_RPM_COUNT] ignitionIatCorrRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2
fuel_table_t injectionPhase;
end_struct float[FUEL_LOAD_COUNT] injPhaseLoadBins;;"Load", 1, 0.0, 0, 300.0, 2
float[FUEL_RPM_COUNT] injPhaseRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2
engine_configuration_s engineConfiguration;
! ve_table_t ve2Table; ! ve_table_t ve2Table;
! float[FUEL_LOAD_COUNT] ve2LoadBins;;"%", 1, 0.0, 0, 300.0, 2 ! float[FUEL_LOAD_COUNT] ve2LoadBins;;"%", 1, 0.0, 0, 300.0, 2

18
firmware/tunerstudio/rusefi.ini
View File

@ -40,7 +40,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated by ConfigDefinition.jar on Sat Apr 04 14:18:43 EDT 2015 ; this section was generated by ConfigDefinition.jar on Sat Apr 04 23:34:23 EDT 2015
pageSize = 15288 pageSize = 15288
page = 1 page = 1
@ -495,14 +495,14 @@ page = 1
afrTable = array, F32, 11704, [16x16],"deg", 1, 0, 0, 25.0, 2 afrTable = array, F32, 11704, [16x16],"deg", 1, 0, 0, 25.0, 2
afrLoadBins = array, F32, 12728, [16], "%", 1, 0.0, 0, 300.0, 2 afrLoadBins = array, F32, 12728, [16], "%", 1, 0.0, 0, 300.0, 2
afrRpmBins = array, F32, 12792, [16], "RPM", 1, 0.0, 0, 18000.0, 2 afrRpmBins = array, F32, 12792, [16], "RPM", 1, 0.0, 0, 18000.0, 2
injectionPhase = array, F32, 12856, [16x16],"ms", 1, 0, 0.0, 300.0, 2 iatIdleCorrBins = array, F32, 12856, [16], "C", 1, 0, -100.0, 250.0, 2
injPhaseLoadBins = array, F32, 13880, [16], "Load", 1, 0.0, 0, 300.0, 2 iatIdleCorr = array, F32, 12920, [16], "%", 1, 0, 0.0, 500.0, 2
injPhaseRpmBins = array, F32, 13944, [16], "RPM", 1, 0.0, 0, 18000.0, 2 ignitionIatCorrTable = array, F32, 12984, [16x16],"deg", 1, 0, -360, 360, 2
iatIdleCorrBins = array, F32, 14008, [16], "C", 1, 0, -100.0, 250.0, 2 ignitionIatCorrLoadBins = array, F32, 14008, [16], "Load", 1, 0.0, 0, 300.0, 2
iatIdleCorr = array, F32, 14072, [16], "%", 1, 0, 0.0, 500.0, 2 ignitionIatCorrRpmBins = array, F32, 14072, [16], "RPM", 1, 0.0, 0, 18000.0, 2
ignitionIatCorrTable = array, F32, 14136, [16x16],"deg", 1, 0, -360, 360, 2 injectionPhase = array, F32, 14136, [16x16],"ms", 1, 0, 0.0, 300.0, 2
ignitionIatCorrLoadBins = array, F32, 15160, [16], "Load", 1, 0.0, 0, 300.0, 2 injPhaseLoadBins = array, F32, 15160, [16], "Load", 1, 0.0, 0, 300.0, 2
ignitionIatCorrRpmBins = array, F32, 15224, [16], "RPM", 1, 0.0, 0, 18000.0, 2 injPhaseRpmBins = array, F32, 15224, [16], "RPM", 1, 0.0, 0, 18000.0, 2
; total TS size = 15288 ; total TS size = 15288
; CONFIG_DEFINITION_END ; CONFIG_DEFINITION_END