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-09-29 22:03:03 -04:00
parent e64b6320f8
commit 7f09917ed0
6 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
// this section was generated by config_definition.jar on Sat Sep 26 08:19:22 EDT 2015 // this section was generated by config_definition.jar on Tue Sep 29 21:15:34 EDT 2015
// begin // begin
#include "rusefi_types.h" #include "rusefi_types.h"
typedef struct { typedef struct {
@ -1083,6 +1083,12 @@ typedef struct {
bool_t cutSparkOnHardLimit : 1; bool_t cutSparkOnHardLimit : 1;
/** /**
offset 1496 bit 18 */ offset 1496 bit 18 */
bool_t step1fuelCutEnable : 1;
/**
offset 1496 bit 19 */
bool_t step1SparkCutEnable : 1;
/**
offset 1496 bit 20 */
bool_t hasFrequencyReportingMapSensor : 1; bool_t hasFrequencyReportingMapSensor : 1;
/** /**
* offset 1500 * offset 1500
@ -1294,7 +1300,11 @@ typedef struct {
/** /**
* offset 1904 * offset 1904
*/ */
int unused3[63]; int step1RpmWindow;
/**
* offset 1908
*/
int unused3[62];
/** /**
* offset 2156 * offset 2156
*/ */
@ -1505,4 +1515,4 @@ typedef struct {
} persistent_config_s; } persistent_config_s;
// end // end
// this section was generated by config_definition.jar on Sat Sep 26 08:19:22 EDT 2015 // this section was generated by config_definition.jar on Tue Sep 29 21:15:34 EDT 2015

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

@ -567,6 +567,8 @@
#define hasTpsSensor_offset 1496 #define hasTpsSensor_offset 1496
#define cutFuelOnHardLimit_offset 1496 #define cutFuelOnHardLimit_offset 1496
#define cutSparkOnHardLimit_offset 1496 #define cutSparkOnHardLimit_offset 1496
#define step1fuelCutEnable_offset 1496
#define step1SparkCutEnable_offset 1496
#define hasFrequencyReportingMapSensor_offset 1496 #define hasFrequencyReportingMapSensor_offset 1496
#define hipOutputChannel_offset 1500 #define hipOutputChannel_offset 1500
#define idleMode_offset 1504 #define idleMode_offset 1504
@ -666,8 +668,10 @@
#define mapErrorLowValue_offset 1896 #define mapErrorLowValue_offset 1896
#define mapErrorLowValue_offset_hex 768 #define mapErrorLowValue_offset_hex 768
#define mapErrorHighValue_offset 1900 #define mapErrorHighValue_offset 1900
#define unused3_offset 1904 #define step1RpmWindow_offset 1904
#define unused3_offset_hex 770 #define step1RpmWindow_offset_hex 770
#define unused3_offset 1908
#define unused3_offset_hex 774
#define targetVBatt_offset 2156 #define targetVBatt_offset 2156
#define alternatorOffAboveTps_offset 2160 #define alternatorOffAboveTps_offset 2160
#define alternatorOffAboveTps_offset_hex 870 #define alternatorOffAboveTps_offset_hex 870

9
firmware/integration/rusefi_config.txt
View File

@ -161,8 +161,8 @@ MAP_sensor_config_s map;@see hasMapSensor\n@see isMapAveragingEnabled
ThermistorConf clt;todo: merge with channel settings, use full-scale Thermistor here! ThermistorConf clt;todo: merge with channel settings, use full-scale Thermistor here!
ThermistorConf iat; ThermistorConf iat;
int step1rpm; int step1rpm;;"rpm", 1, 0, 0, 20000.0, 2
int step1timing; int step1timing;;"deg", 1, 0, -180, 180, 2
int hip9011PrescalerAndSDO;;"integer", 1, 0.0, 0.0, 32, 0 int hip9011PrescalerAndSDO;;"integer", 1, 0.0, 0.0, 32, 0
float knockBandCustom;kHz knock band override;"kHz", 1, 0.0, 0.0, 10.0, 2 float knockBandCustom;kHz knock band override;"kHz", 1, 0.0, 0.0, 10.0, 2
@ -501,6 +501,8 @@ bit hasMapSensor;@see isMapAveragingEnabled
bit hasTpsSensor bit hasTpsSensor
bit cutFuelOnHardLimit bit cutFuelOnHardLimit
bit cutSparkOnHardLimit bit cutSparkOnHardLimit
bit step1fuelCutEnable
bit step1SparkCutEnable
bit hasFrequencyReportingMapSensor; bit hasFrequencyReportingMapSensor;
adc_channel_e hipOutputChannel; adc_channel_e hipOutputChannel;
@ -581,7 +583,8 @@ baro_corr_table_t baroCorrTable;
float[7] unused72; float[7] unused72;
float mapErrorLowValue;kPa value which is too low to be true;"kPa", 1, 0, -100.0, 100.0, 2 float mapErrorLowValue;kPa value which is too low to be true;"kPa", 1, 0, -100.0, 100.0, 2
float mapErrorHighValue;kPa value which is too high to be true;"kPa", 1, 0, -100.0, 800.0, 2 float mapErrorHighValue;kPa value which is too high to be true;"kPa", 1, 0, -100.0, 800.0, 2
int[63] unused3; int step1RpmWindow;;"rpm", 1, 0, 0, 3000.0, 2
int[62] unused3;
float targetVBatt;;"Volts", 1, 0, 0,30, 1 float targetVBatt;;"Volts", 1, 0, 0,30, 1
float alternatorOffAboveTps;Turn off alternator output above specified TPS;"%", 1, 0, 0, 200, 2 float alternatorOffAboveTps;Turn off alternator output above specified TPS;"%", 1, 0, 0, 200, 2

2
firmware/rusefi.cpp
View File

@ -275,5 +275,5 @@ int getRusEfiVersion(void) {
return 123; // this is here to make the compiler happy about the unused array return 123; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE[0] * 0 != 0) if (UNUSED_CCM_SIZE[0] * 0 != 0)
return 3211; // this is here to make the compiler happy about the unused array return 3211; // this is here to make the compiler happy about the unused array
return 20150927; return 20150929;
} }

13
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 Sep 26 08:19:27 EDT 2015 ; this section was generated by ConfigDefinition.jar on Tue Sep 29 21:15:38 EDT 2015
pageSize = 15288 pageSize = 15288
page = 1 page = 1
@ -85,8 +85,8 @@ page = 1
iat_resistance_3 = scalar, F32, 308, "Ohm", 1, 0, 0, 200000, 1 iat_resistance_3 = scalar, F32, 308, "Ohm", 1, 0, 0, 200000, 1
iat_bias_resistor = scalar, F32, 312, "Ohm", 1, 0, 0, 200000, 1 iat_bias_resistor = scalar, F32, 312, "Ohm", 1, 0, 0, 200000, 1
iat_adcChannel = bits, U32, 316, [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" iat_adcChannel = bits, U32, 316, [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"
;skipping step1rpm offset 320 step1rpm = scalar, S32, 320, "rpm", 1, 0, 0, 20000.0, 2
;skipping step1timing offset 324 step1timing = scalar, S32, 324, "deg", 1, 0, -180, 180, 2
hip9011PrescalerAndSDO = scalar, S32, 328, "integer", 1, 0.0, 0.0, 32, 0 hip9011PrescalerAndSDO = scalar, S32, 328, "integer", 1, 0.0, 0.0, 32, 0
knockBandCustom = scalar, F32, 332, "kHz", 1, 0.0, 0.0, 10.0, 2 knockBandCustom = scalar, F32, 332, "kHz", 1, 0.0, 0.0, 10.0, 2
sparkDwellBins = array, F32, 336, [8], "RPM", 1, 0.0, 0.0, 18000, 2 sparkDwellBins = array, F32, 336, [8], "RPM", 1, 0.0, 0.0, 18000, 2
@ -406,7 +406,9 @@ page = 1
hasTpsSensor = bits, U32, 1496, [15:15], "false", "true" hasTpsSensor = bits, U32, 1496, [15:15], "false", "true"
cutFuelOnHardLimit = bits, U32, 1496, [16:16], "false", "true" cutFuelOnHardLimit = bits, U32, 1496, [16:16], "false", "true"
cutSparkOnHardLimit = bits, U32, 1496, [17:17], "false", "true" cutSparkOnHardLimit = bits, U32, 1496, [17:17], "false", "true"
hasFrequencyReportingMapSensor= bits, U32, 1496, [18:18], "false", "true" step1fuelCutEnable = bits, U32, 1496, [18:18], "false", "true"
step1SparkCutEnable = bits, U32, 1496, [19:19], "false", "true"
hasFrequencyReportingMapSensor= bits, U32, 1496, [20:20], "false", "true"
hipOutputChannel = bits, U32, 1500, [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" hipOutputChannel = bits, U32, 1500, [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"
idleMode = bits, U32, 1504, [0:0], "false", "true" idleMode = bits, U32, 1504, [0:0], "false", "true"
isInjectionEnabled = bits, U32, 1508, [0:0], "false", "true" isInjectionEnabled = bits, U32, 1508, [0:0], "false", "true"
@ -475,7 +477,8 @@ page = 1
;skipping unused72 offset 1868 ;skipping unused72 offset 1868
mapErrorLowValue = scalar, F32, 1896, "kPa", 1, 0, -100.0, 100.0, 2 mapErrorLowValue = scalar, F32, 1896, "kPa", 1, 0, -100.0, 100.0, 2
mapErrorHighValue = scalar, F32, 1900, "kPa", 1, 0, -100.0, 800.0, 2 mapErrorHighValue = scalar, F32, 1900, "kPa", 1, 0, -100.0, 800.0, 2
;skipping unused3 offset 1904 step1RpmWindow = scalar, S32, 1904, "rpm", 1, 0, 0, 3000.0, 2
;skipping unused3 offset 1908
targetVBatt = scalar, F32, 2156, "Volts", 1, 0, 0,30, 1 targetVBatt = scalar, F32, 2156, "Volts", 1, 0, 0,30, 1
alternatorOffAboveTps = scalar, F32, 2160, "%", 1, 0, 0, 200, 2 alternatorOffAboveTps = scalar, F32, 2160, "%", 1, 0, 0, 200, 2
alternatorDT = scalar, S32, 2164, "ms", 1, 0, 0, 3000, 0 alternatorDT = scalar, S32, 2164, "ms", 1, 0, 0, 3000, 0

7
java_console/models/src/com/rusefi/config/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config; package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar Sat Sep 26 08:19:27 EDT 2015 // this file was generated automatically by ConfigDefinition.jar Tue Sep 29 21:15:38 EDT 2015
public class Fields { public class Fields {
public static final Field ENGINETYPE = new Field("ENGINETYPE", 0, FieldType.INT); public static final Field ENGINETYPE = new Field("ENGINETYPE", 0, FieldType.INT);
public static final Field HEADERMAGICVALUE = new Field("HEADERMAGICVALUE", 4, FieldType.INT); public static final Field HEADERMAGICVALUE = new Field("HEADERMAGICVALUE", 4, FieldType.INT);
@ -362,7 +362,9 @@ public class Fields {
public static final Field HASTPSSENSOR = new Field("HASTPSSENSOR", 1496, FieldType.BIT, 15); public static final Field HASTPSSENSOR = new Field("HASTPSSENSOR", 1496, FieldType.BIT, 15);
public static final Field CUTFUELONHARDLIMIT = new Field("CUTFUELONHARDLIMIT", 1496, FieldType.BIT, 16); public static final Field CUTFUELONHARDLIMIT = new Field("CUTFUELONHARDLIMIT", 1496, FieldType.BIT, 16);
public static final Field CUTSPARKONHARDLIMIT = new Field("CUTSPARKONHARDLIMIT", 1496, FieldType.BIT, 17); public static final Field CUTSPARKONHARDLIMIT = new Field("CUTSPARKONHARDLIMIT", 1496, FieldType.BIT, 17);
public static final Field HASFREQUENCYREPORTINGMAPSENSOR = new Field("HASFREQUENCYREPORTINGMAPSENSOR", 1496, FieldType.BIT, 18); public static final Field STEP1FUELCUTENABLE = new Field("STEP1FUELCUTENABLE", 1496, FieldType.BIT, 18);
public static final Field STEP1SPARKCUTENABLE = new Field("STEP1SPARKCUTENABLE", 1496, FieldType.BIT, 19);
public static final Field HASFREQUENCYREPORTINGMAPSENSOR = new Field("HASFREQUENCYREPORTINGMAPSENSOR", 1496, FieldType.BIT, 20);
public static final Field HIPOUTPUTCHANNEL = new Field("HIPOUTPUTCHANNEL", 1500, FieldType.INT, adc_channel_e); public static final Field HIPOUTPUTCHANNEL = new Field("HIPOUTPUTCHANNEL", 1500, FieldType.INT, adc_channel_e);
public static final Field IDLEMODE = new Field("IDLEMODE", 1504, FieldType.INT); public static final Field IDLEMODE = new Field("IDLEMODE", 1504, FieldType.INT);
public static final Field ISINJECTIONENABLED = new Field("ISINJECTIONENABLED", 1508, FieldType.BIT, 0); public static final Field ISINJECTIONENABLED = new Field("ISINJECTIONENABLED", 1508, FieldType.BIT, 0);
@ -424,6 +426,7 @@ public class Fields {
public static final Field ADDEDTOWALLCOEF = new Field("ADDEDTOWALLCOEF", 1864, FieldType.FLOAT); public static final Field ADDEDTOWALLCOEF = new Field("ADDEDTOWALLCOEF", 1864, FieldType.FLOAT);
public static final Field MAPERRORLOWVALUE = new Field("MAPERRORLOWVALUE", 1896, FieldType.FLOAT); public static final Field MAPERRORLOWVALUE = new Field("MAPERRORLOWVALUE", 1896, FieldType.FLOAT);
public static final Field MAPERRORHIGHVALUE = new Field("MAPERRORHIGHVALUE", 1900, FieldType.FLOAT); public static final Field MAPERRORHIGHVALUE = new Field("MAPERRORHIGHVALUE", 1900, FieldType.FLOAT);
public static final Field STEP1RPMWINDOW = new Field("STEP1RPMWINDOW", 1904, FieldType.INT);
public static final Field TARGETVBATT = new Field("TARGETVBATT", 2156, FieldType.FLOAT); public static final Field TARGETVBATT = new Field("TARGETVBATT", 2156, FieldType.FLOAT);
public static final Field ALTERNATOROFFABOVETPS = new Field("ALTERNATOROFFABOVETPS", 2160, FieldType.FLOAT); public static final Field ALTERNATOROFFABOVETPS = new Field("ALTERNATOROFFABOVETPS", 2160, FieldType.FLOAT);
public static final Field ALTERNATORDT = new Field("ALTERNATORDT", 2164, FieldType.INT); public static final Field ALTERNATORDT = new Field("ALTERNATORDT", 2164, FieldType.INT);