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

auto-sync

This commit is contained in:
rusEfi 2015-08-18 14:03:02 -04:00
parent 7b891a2b0e
commit 35124ec338
6 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,6 +317,9 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->noAccelAfterHardLimitPeriodSecs = 3;
setTableBin2(engineConfiguration->crankingTpsCoef, CRANKING_CURVE_SIZE, 1, 1, 1);
setTableBin2(engineConfiguration->crankingTpsBins, CRANKING_CURVE_SIZE, 0, 100, 1);
config->crankingFuelCoef[0] = 5; // base cranking fuel adjustment coefficient
config->crankingFuelBins[0] = -20; // temperature in C
config->crankingFuelCoef[1] = 3.7;

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

@ -1,4 +1,4 @@
// this section was generated by config_definition.jar on Mon Jul 13 18:45:26 EDT 2015
// this section was generated by config_definition.jar on Tue Aug 18 12:48:49 EDT 2015
// begin
#include "rusefi_types.h"
typedef struct {
@ -1238,7 +1238,15 @@ typedef struct {
/**
* offset 1760
*/
int unused3[99];
float crankingTpsCoef[CRANKING_CURVE_SIZE];
/**
* offset 1792
*/
float crankingTpsBins[CRANKING_CURVE_SIZE];
/**
* offset 1824
*/
int unused3[83];
/**
* offset 2156
*/
@ -1449,4 +1457,4 @@ typedef struct {
} persistent_config_s;
// end
// this section was generated by config_definition.jar on Mon Jul 13 18:45:26 EDT 2015
// this section was generated by config_definition.jar on Tue Aug 18 12:48:49 EDT 2015

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

@ -646,7 +646,11 @@
#define spi2SckMode_offset 1748
#define spi2MosiMode_offset 1752
#define spi2MisoMode_offset 1756
#define unused3_offset 1760
#define crankingTpsCoef_offset 1760
#define crankingTpsBins_offset 1792
#define crankingTpsBins_offset_hex 700
#define unused3_offset 1824
#define unused3_offset_hex 720
#define targetVBatt_offset 2156
#define alternatorOffAboveTps_offset 2160
#define alternatorOffAboveTps_offset_hex 870

6
firmware/integration/rusefi_config.txt
View File

@ -565,7 +565,11 @@ baro_corr_table_t baroCorrTable;
int spi2SckMode;
int spi2MosiMode;
int spi2MisoMode;
int[99] unused3;
float[CRANKING_CURVE_SIZE] crankingTpsCoef;;"%", 1, 0, 0.0, 700.0, 2
float[CRANKING_CURVE_SIZE] crankingTpsBins;;"%", 1, 0, 0.0, 100.0, 2
int[83] unused3;
float targetVBatt;;"Volts", 1, 0, 0,30, 1
float alternatorOffAboveTps;Turn off alternator output above specified TPS;"%", 1, 0, 0, 200, 2

2
firmware/rusefi.cpp
View File

@ -291,5 +291,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 20150816;
return 20150818;
}

8
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 Jul 13 18:45:30 EDT 2015
; this section was generated by ConfigDefinition.jar on Tue Aug 18 12:48:50 EDT 2015
pageSize = 15288
page = 1
@ -67,7 +67,7 @@ page = 1
map_samplingWindow = array, F32, 208, [8], "deg", 1, 0, 0.0, 90, 2
map_sensor_valueAt0 = scalar, F32, 240, "kpa", 1, 0, 0, 450, 2
map_sensor_valueAt5 = scalar, F32, 244, "kpa", 1, 0, 0, 450, 2
map_sensor_type = bits, U32, 248, [0:2] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100"
map_sensor_type = bits, U32, 248, [0:2] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "INVALID"
map_sensor_hwChannel = bits, U32, 252, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
clt_tempC_1 = scalar, F32, 256, "*C", 1, 0, -40, 200, 1
clt_tempC_2 = scalar, F32, 260, "*C", 1, 0, -40, 200, 1
@ -462,7 +462,9 @@ page = 1
;skipping spi2SckMode offset 1748
;skipping spi2MosiMode offset 1752
;skipping spi2MisoMode offset 1756
;skipping unused3 offset 1760
crankingTpsCoef = array, F32, 1760, [8], "%", 1, 0, 0.0, 700.0, 2
crankingTpsBins = array, F32, 1792, [8], "%", 1, 0, 0.0, 100.0, 2
;skipping unused3 offset 1824
targetVBatt = scalar, F32, 2156, "Volts", 1, 0, 0,30, 1
alternatorOffAboveTps = scalar, F32, 2160, "%", 1, 0, 0, 200, 2
alternatorDT = scalar, S32, 2164, "ms", 1, 0, 0, 3000, 0