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-10-20 13:02:30 -04:00
parent 5ee797d2aa
commit 7ee9ddaf4c
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
// this section was generated by config_definition.jar on Mon Oct 19 21:36:30 EDT 2015
// this section was generated by config_definition.jar on Tue Oct 20 12:50:40 EDT 2015
// begin
#include "rusefi_types.h"
typedef struct {
@ -1476,7 +1476,7 @@ typedef struct {
/**
* offset 9528
*/
fuel_table_t injectionPhase;
ignition_table_t injectionPhase;
/**
* offset 10552
*/
@ -1538,4 +1538,4 @@ typedef struct {
} persistent_config_s;
// end
// this section was generated by config_definition.jar on Mon Oct 19 21:36:30 EDT 2015
// this section was generated by config_definition.jar on Tue Oct 20 12:50:40 EDT 2015

2
firmware/controllers/algo/rusefi_types.h
View File

@ -53,7 +53,7 @@ typedef char le_formula_t[LE_COMMAND_LENGTH];
typedef brain_pin_e egt_cs_array_t[EGT_CHANNEL_COUNT];
// todo: merge these two types together?
// todo: merge these two types together? but these tables have different TS parameters like ranges etc
typedef float fuel_table_t[FUEL_LOAD_COUNT][FUEL_RPM_COUNT];
typedef float ignition_table_t[IGN_LOAD_COUNT][IGN_RPM_COUNT];

6
firmware/integration/rusefi_config.txt
View File

@ -66,7 +66,7 @@ custom baro_corr_table_t 64 array, F32, @OFFSET@, [@@BARO_CORR_SIZE@@x@@BARO
! please note that 1024 here is 4 * IGN_LOAD_COUNT * IGN_RPM_COUNT
custom ignition_table_t 1024 array, F32, @OFFSET@, [16x16],"deg", 1, 0, -360, 360, 2
custom ignition_table_t 1024 array, F32, @OFFSET@, [16x16],"deg", 1, 0, -720, 720, 2
struct cranking_parameters_s
@ -197,7 +197,7 @@ engine_load_mode_e algorithm;This setting controls which algorithm is used for E
custom injection_mode_e 4 bits, U32, @OFFSET@, [0:1], "Simultaneous", "Sequential", "Batch", "INVALID"
injection_mode_e crankingInjectionMode;
injection_mode_e injectionMode;
angle_t injectionOffset;this is about deciding when the injector starts it's squirt\nSee also injectionPhase map;"deg", 1, 0.0, 0, 1000.0, 2
angle_t injectionOffset;this is about deciding when the injector starts it's squirt\nSee also injectionPhase map;"deg", 1, 0.0, -720, 720, 2
angle_t crankingTimingAngle;Timing advance while cranking enginee; "deg", 1, 0.0, -360, 360, 2
custom ignition_mode_e 4 bits, U32, @OFFSET@, [0:1], "One coil", "Individual Coils", "Wasted", "INVALID"
@ -640,7 +640,7 @@ ignition_table_t ignitionIatCorrTable;
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
fuel_table_t injectionPhase;
ignition_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

10
firmware/tunerstudio/rusefi.ini
View File

@ -40,7 +40,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated by ConfigDefinition.jar on Mon Oct 19 21:36:35 EDT 2015
; this section was generated by ConfigDefinition.jar on Tue Oct 20 12:50:42 EDT 2015
pageSize = 15288
page = 1
@ -100,7 +100,7 @@ page = 1
algorithm = bits, U32, 424, [0:1], "MAF", "Alpha-N/TPS", "MAP", "SPEED DENSITY"
crankingInjectionMode = bits, U32, 428, [0:1], "Simultaneous", "Sequential", "Batch", "INVALID"
injectionMode = bits, U32, 432, [0:1], "Simultaneous", "Sequential", "Batch", "INVALID"
injectionOffset = scalar, F32, 436, "deg", 1, 0.0, 0, 1000.0, 2
injectionOffset = scalar, F32, 436, "deg", 1, 0.0, -720, 720, 2
crankingTimingAngle = scalar, F32, 440, "deg", 1, 0.0, -360, 360, 2
ignitionMode = bits, U32, 444, [0:1], "One coil", "Individual Coils", "Wasted", "INVALID"
ignitionOffset = scalar, F32, 448, "RPM", 1, 0, 0, 3000.0, 0
@ -529,16 +529,16 @@ page = 1
cltIdleCorr = array, F32, 6264, [16], "%", 1, 0, 0.0, 500.0, 2
mafDecoding = array, F32, 6328, [256], "kg/hour", 1, 0, -500.0, 4000.0, 2
mafDecodingBins = array, F32, 7352, [256], "V", 1, 0, -5.0, 150.0, 2
ignitionIatCorrTable = array, F32, 8376, [16x16],"deg", 1, 0, -360, 360, 2
ignitionIatCorrTable = array, F32, 8376, [16x16],"deg", 1, 0, -720, 720, 2
ignitionIatCorrLoadBins = array, F32, 9400, [16], "Load", 1, 0.0, 0, 300.0, 2
ignitionIatCorrRpmBins = array, F32, 9464, [16], "RPM", 1, 0.0, 0, 18000.0, 2
injectionPhase = array, F32, 9528, [16x16],"ms", 1, 0, 0.0, 300.0, 2
injectionPhase = array, F32, 9528, [16x16],"deg", 1, 0, -720, 720, 2
injPhaseLoadBins = array, F32, 10552, [16], "Load", 1, 0.0, 0, 300.0, 2
injPhaseRpmBins = array, F32, 10616, [16], "RPM", 1, 0.0, 0, 18000.0, 2
fuelTable = array, F32, 10680, [16x16],"ms", 1, 0, 0.0, 300.0, 2
fuelLoadBins = array, F32, 11704, [16], "V", 1, 0, 0.0, 300.0, 2
fuelRpmBins = array, F32, 11768, [16], "RPM", 1, 0, 0.0, 25500.0, 2
ignitionTable = array, F32, 11832, [16x16],"deg", 1, 0, -360, 360, 2
ignitionTable = array, F32, 11832, [16x16],"deg", 1, 0, -720, 720, 2
ignitionLoadBins = array, F32, 12856, [16], "Load", 1, 0.0, 0, 300.0, 2
ignitionRpmBins = array, F32, 12920, [16], "RPM", 1, 0.0, 0, 18000.0, 2
veTable = array, F32, 12984, [16x16],"%", 1, 0, 0, 999.0, 2