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 2016-06-25 19:03:02 -04:00
parent ead56c897e
commit 58e5f003db
9 changed files with 53 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/config/engines/citroenBerlingoTU3JP.cpp
View File

@ -171,8 +171,9 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_ENGINE_PARAMETER_F) {
*/
engineConfiguration->map.sensor.hwChannel = EFI_ADC_1;
engineConfiguration->map.sensor.type = MT_CUSTOM;
engineConfiguration->map.sensor.valueAt0 = 10;
engineConfiguration->map.sensor.valueAt5 = 110;
engineConfiguration->map.sensor.lowValue = 10;
engineConfiguration->map.sensor.highValue = 110;
engineConfiguration->mapHighValueVoltage = 5;
/**
* TPS <MAGNETI MARELLI>
*/

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

@ -560,8 +560,8 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->map.sensor.type = MT_MPX4250;
engineConfiguration->baroSensor.type = MT_CUSTOM;
engineConfiguration->baroSensor.valueAt0 = 0;
engineConfiguration->baroSensor.valueAt5 = 500;
engineConfiguration->baroSensor.lowValue = 0;
engineConfiguration->baroSensor.highValue = 500;
engineConfiguration->hasMapSensor = true;
engineConfiguration->hasMafSensor = true;

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

@ -1,4 +1,4 @@
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jun 22 23:17:14 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jun 25 15:31:56 EDT 2016
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -46,15 +46,15 @@ typedef struct {
typedef struct {
/**
* kPa value at zero volts
* kPa value at low volts
* offset 0
*/
float valueAt0;
float lowValue;
/**
* kPa value at 5 volts
* kPa value at high volts
* offset 4
*/
float valueAt5;
float highValue;
/**
* offset 8
*/
@ -1818,4 +1818,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jun 22 23:17:14 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jun 25 15:31:56 EDT 2016

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

@ -128,8 +128,8 @@
#define map_samplingWindowBins_offset 176
#define map_samplingWindow_offset 208
#define map_sensor_offset 240
#define map_sensor_valueAt0_offset 240
#define map_sensor_valueAt5_offset 244
#define map_sensor_lowValue_offset 240
#define map_sensor_highValue_offset 244
#define map_sensor_type_offset 248
#define map_sensor_hwChannel_offset 252
#define clt_offset 256
@ -263,10 +263,10 @@
#define pedalPositionChannel_offset 604
#define baroSensor_offset 608
#define baroSensor_offset_hex 260
#define baroSensor_valueAt0_offset 608
#define baroSensor_valueAt0_offset_hex 260
#define baroSensor_valueAt5_offset 612
#define baroSensor_valueAt5_offset_hex 264
#define baroSensor_lowValue_offset 608
#define baroSensor_lowValue_offset_hex 260
#define baroSensor_highValue_offset 612
#define baroSensor_highValue_offset_hex 264
#define baroSensor_type_offset 616
#define baroSensor_type_offset_hex 268
#define baroSensor_hwChannel_offset 620

20
firmware/controllers/sensors/map.cpp
View File

@ -69,8 +69,8 @@ float decodePressure(float voltage, air_pressure_sensor_config_s * mapConfig DEC
switch (mapConfig->type) {
case MT_CUSTOM:
// todo: migrate to 'FastInterpolation customMap'
return interpolate(engineConfiguration->mapLowValueVoltage, mapConfig->valueAt0,
5, mapConfig->valueAt5, voltage);
return interpolate(engineConfiguration->mapLowValueVoltage, mapConfig->lowValue,
5, mapConfig->highValue, voltage);
case MT_DENSO183:
return denso183.getValue(voltage);
case MT_MPX4250:
@ -166,7 +166,7 @@ static FastInterpolation *getDecoder(air_pressure_sensor_type_e type) {
static void applyConfiguration(DECLARE_ENGINE_PARAMETER_F) {
air_pressure_sensor_config_s * apConfig = &engineConfiguration->map.sensor;
customMap.init(0, apConfig->valueAt0, 5, apConfig->valueAt5);
customMap.init(0, apConfig->lowValue, 5, apConfig->highValue);
mapDecoder = getDecoder(engineConfiguration->map.sensor.type);
}
@ -191,16 +191,22 @@ static void printMAPInfo(void) {
getMap());
if (engineConfiguration->map.sensor.type == MT_CUSTOM) {
scheduleMsg(logger, "at0=%f at5=%f", engineConfiguration->map.sensor.valueAt0,
engineConfiguration->map.sensor.valueAt5);
scheduleMsg(logger, "at %f=%f at %f=%f",
engineConfiguration->mapLowValueVoltage,
engineConfiguration->map.sensor.lowValue,
engineConfiguration->mapHighValueVoltage,
engineConfiguration->map.sensor.highValue);
}
}
if (hasBaroSensor(PASS_ENGINE_PARAMETER_F)) {
scheduleMsg(logger, "baro type=%d value=%f", engineConfiguration->baroSensor.type, getBaroPressure());
if (engineConfiguration->baroSensor.type == MT_CUSTOM) {
scheduleMsg(logger, "min=%f max=%f", engineConfiguration->baroSensor.valueAt0,
engineConfiguration->baroSensor.valueAt5);
scheduleMsg(logger, "min=%f@%f max=%f@%f",
engineConfiguration->baroSensor.lowValue,
engineConfiguration->mapLowValueVoltage,
engineConfiguration->baroSensor.highValue,
engineConfiguration->mapHighValueVoltage);
}
}
#endif /* EFI_ANALOG_SENSORS */

4
firmware/integration/rusefi_config.txt
View File

@ -112,8 +112,8 @@ custom air_pressure_sensor_type_e 4 bits, U32, @OFFSET@, [0:2] "Custom", "DENSO
custom adc_channel_e 4 bits, U32, @OFFSET@, [0:4] @@adc_channel_e_enum@@
struct air_pressure_sensor_config_s
float valueAt0;kPa value at zero volts;"kpa", 1, 0, -400, 800, 2
float valueAt5;kPa value at 5 volts;"kpa", 1, 0, -400, 800, 2
float lowValue;kPa value at low volts;"kpa", 1, 0, -400, 800, 2
float highValue;kPa value at high volts;"kpa", 1, 0, -400, 800, 2
air_pressure_sensor_type_e type;
adc_channel_e hwChannel;
end_struct

2
firmware/rusefi.cpp
View File

@ -298,5 +298,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 20160623;
return 20160625;
}

16
firmware/tunerstudio/rusefi.ini
View File

@ -42,7 +42,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jun 22 23:17:14 EDT 2016
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jun 25 15:31:56 EDT 2016
pageSize = 17080
page = 1
@ -95,8 +95,8 @@ page = 1
map_samplingAngle = array, F32, 144, [8], "deg", 1, 0, 0.0, 90, 2
map_samplingWindowBins = array, F32, 176, [8], "RPM", 1, 0, 0.0, 18000, 2
map_samplingWindow = array, F32, 208, [8], "deg", 1, 0, 0.0, 90, 2
map_sensor_valueAt0 = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2
map_sensor_valueAt5 = scalar, F32, 244, "kpa", 1, 0, -400, 800, 2
map_sensor_lowValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2
map_sensor_highValue = scalar, F32, 244, "kpa", 1, 0, -400, 800, 2
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
@ -176,8 +176,8 @@ page = 1
afr_v2 = scalar, F32, 596, "volts", 1, 0.0, 0, 10.0, 2
afr_value2 = scalar, F32, 600, "AFR", 1, 0.0, 0, 1000.0, 2
pedalPositionChannel = bits, U32, 604, [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"
baroSensor_valueAt0 = scalar, F32, 608, "kpa", 1, 0, -400, 800, 2
baroSensor_valueAt5 = scalar, F32, 612, "kpa", 1, 0, -400, 800, 2
baroSensor_lowValue = scalar, F32, 608, "kpa", 1, 0, -400, 800, 2
baroSensor_highValue = scalar, F32, 612, "kpa", 1, 0, -400, 800, 2
baroSensor_type = bits, U32, 616, [0:2] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "INVALID"
baroSensor_hwChannel = bits, U32, 620, [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"
idle_solenoidPin = bits, U32, 624, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@ -1481,8 +1481,10 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
dialog = mapSensorVDlg, "Voltage Sensor Settings", xAxis
field = "MAP ADC input", map_sensor_hwChannel, {hasFrequencyReportingMapSensor == 0}
field = "Map type", map_sensor_type, {hasFrequencyReportingMapSensor == 0}
field = "MAP value at 0.0v", map_sensor_valueAt0, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0}
field = "MAP value at 5.0v", map_sensor_valueAt5, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0}
field = "MAP value low point", map_sensor_lowValue, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0}
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0}
field = "MAP value high point", map_sensor_highValue, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0}
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0}
dialog = mapSensorFDlg, "Frequency Sensor Settings", xAxis
field = "pin", frequencyReportingMapInputPin, {hasFrequencyReportingMapSensor == 1}

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

@ -1,6 +1,6 @@
package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jun 22 23:17:14 EDT 2016
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jun 25 15:31:56 EDT 2016
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4;
@ -132,8 +132,8 @@ public class Fields {
public static final int map_samplingWindowBins_offset = 176;
public static final int map_samplingWindow_offset = 208;
public static final int map_sensor_offset = 240;
public static final int map_sensor_valueAt0_offset = 240;
public static final int map_sensor_valueAt5_offset = 244;
public static final int map_sensor_lowValue_offset = 240;
public static final int map_sensor_highValue_offset = 244;
public static final int map_sensor_type_offset = 248;
public static final int map_sensor_hwChannel_offset = 252;
public static final int clt_offset = 256;
@ -267,10 +267,10 @@ public class Fields {
public static final int pedalPositionChannel_offset = 604;
public static final int baroSensor_offset = 608;
public static final int baroSensor_offset_hex = 260;
public static final int baroSensor_valueAt0_offset = 608;
public static final int baroSensor_valueAt0_offset_hex = 260;
public static final int baroSensor_valueAt5_offset = 612;
public static final int baroSensor_valueAt5_offset_hex = 264;
public static final int baroSensor_lowValue_offset = 608;
public static final int baroSensor_lowValue_offset_hex = 260;
public static final int baroSensor_highValue_offset = 612;
public static final int baroSensor_highValue_offset_hex = 264;
public static final int baroSensor_type_offset = 616;
public static final int baroSensor_type_offset_hex = 268;
public static final int baroSensor_hwChannel_offset = 620;
@ -952,8 +952,8 @@ public class Fields {
public static final Field PRIMINGSQUIRTDURATIONMS = Field.create("PRIMINGSQUIRTDURATIONMS", 100, FieldType.FLOAT);
public static final Field IGNITIONDWELLFORCRANKINGMS = Field.create("IGNITIONDWELLFORCRANKINGMS", 104, FieldType.FLOAT);
public static final Field CRANKINGCHARGEANGLE = Field.create("CRANKINGCHARGEANGLE", 108, FieldType.FLOAT);
public static final Field MAP_SENSOR_VALUEAT0 = Field.create("MAP_SENSOR_VALUEAT0", 240, FieldType.FLOAT);
public static final Field MAP_SENSOR_VALUEAT5 = Field.create("MAP_SENSOR_VALUEAT5", 244, FieldType.FLOAT);
public static final Field MAP_SENSOR_LOWVALUE = Field.create("MAP_SENSOR_LOWVALUE", 240, FieldType.FLOAT);
public static final Field MAP_SENSOR_HIGHVALUE = Field.create("MAP_SENSOR_HIGHVALUE", 244, FieldType.FLOAT);
public static final Field MAP_SENSOR_TYPE = Field.create("MAP_SENSOR_TYPE", 248, FieldType.INT);
public static final String[] adc_channel_e = {"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"};
public static final Field MAP_SENSOR_HWCHANNEL = Field.create("MAP_SENSOR_HWCHANNEL", 252, FieldType.INT, adc_channel_e);
@ -1034,8 +1034,8 @@ public class Fields {
public static final Field AFR_V2 = Field.create("AFR_V2", 596, FieldType.FLOAT);
public static final Field AFR_VALUE2 = Field.create("AFR_VALUE2", 600, FieldType.FLOAT);
public static final Field PEDALPOSITIONCHANNEL = Field.create("PEDALPOSITIONCHANNEL", 604, FieldType.INT, adc_channel_e);
public static final Field BAROSENSOR_VALUEAT0 = Field.create("BAROSENSOR_VALUEAT0", 608, FieldType.FLOAT);
public static final Field BAROSENSOR_VALUEAT5 = Field.create("BAROSENSOR_VALUEAT5", 612, FieldType.FLOAT);
public static final Field BAROSENSOR_LOWVALUE = Field.create("BAROSENSOR_LOWVALUE", 608, FieldType.FLOAT);
public static final Field BAROSENSOR_HIGHVALUE = Field.create("BAROSENSOR_HIGHVALUE", 612, FieldType.FLOAT);
public static final Field BAROSENSOR_TYPE = Field.create("BAROSENSOR_TYPE", 616, FieldType.INT);
public static final Field BAROSENSOR_HWCHANNEL = Field.create("BAROSENSOR_HWCHANNEL", 620, FieldType.INT, adc_channel_e);
public static final String[] brain_pin_e = {"PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"};