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

Revert "DRAFT Shrink output channels, again (#1074)" 

This reverts commit 562ce6cc
This commit is contained in:
rusefi 2019-12-21 15:02:49 -05:00
parent 86a3feb13f
commit 871f86967f
12 changed files with 376 additions and 486 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
View File

@ -1888,7 +1888,7 @@
#define triggerSimulatorPins3_offset 738 #define triggerSimulatorPins3_offset 738
#define triggerSimulatorPins3_offset_hex 2e2 #define triggerSimulatorPins3_offset_hex 2e2
#define TS_FILE_VERSION 20190701 #define TS_FILE_VERSION 20190701
#define TS_OUTPUT_SIZE 220 #define TS_OUTPUT_SIZE 356
#define ts_show_cj125 true #define ts_show_cj125 true
#define ts_show_egt true #define ts_show_egt true
#define ts_show_etb true #define ts_show_etb true

307
firmware/console/binary/tunerstudio_configuration.h
View File

@ -13,48 +13,6 @@
#include "rusefi_types.h" #include "rusefi_types.h"
#include "tunerstudio_debug_struct.h"
// This class lets us transparently store something at a ratio inside an integer type
// Just use it like a float - you can read and write to it, like this:
// scaled_channel<uint8_t, 10> myVar;
// myVar = 2.4f; // converts to an int, stores 24
// float x = myVar; // converts back to float, returns 2.4f
template <typename T, int mult = 1>
class scaled_channel {
public:
scaled_channel() : m_value(static_cast<T>(0)) { }
scaled_channel(float val)
: m_value(val * mult)
{
}
// Allow reading back out as a float (note: this may be lossy!)
operator float() const {
return m_value / (float)mult;
}
private:
T m_value;
};
// We need to guarantee that scaled values containing some type are the same size
// as that underlying type. We rely on the class only having a single member for
// this trick to work.
static_assert(sizeof(scaled_channel<uint8_t>) == 1);
static_assert(sizeof(scaled_channel<uint16_t>) == 2);
static_assert(sizeof(scaled_channel<uint32_t>) == 4);
static_assert(sizeof(scaled_channel<float>) == 4);
// Common scaling options - use these if you can!
using scaled_temperature = scaled_channel<int16_t, 100>; // +-327 deg C at 0.01 deg resolution
using scaled_ms = scaled_channel<int16_t, 300>; // +- 100ms at 0.003ms precision
using scaled_percent = scaled_channel<int16_t, 100>; // +-327% at 0.01% resolution
using scaled_pressure = scaled_channel<uint16_t, 30>; // 0-2000kPa (~300psi) at 0.03kPa resolution
using scaled_angle = scaled_channel<int16_t, 50>; // +-655 degrees at 0.02 degree resolution
using scaled_voltage = scaled_channel<uint16_t, 1000>; // 0-65v at 1mV resolution
using scaled_afr = scaled_channel<uint16_t, 1000>; // 0-65afr at 0.001 resolution
#define PAGE_COUNT 1 #define PAGE_COUNT 1
typedef struct { typedef struct {
@ -71,7 +29,36 @@ typedef struct {
*/ */
typedef struct { typedef struct {
/* see also [OutputChannels] in rusefi.input */ /* see also [OutputChannels] in rusefi.input */
// primary instrument cluster gauges
int rpm; // size 4, offset 0
/**
* This value is in Celcius - UI would convert into F if needed
*/
float coolantTemperature; // size 4, offset 4
float intakeAirTemperature; // size 4, offset 8
float throttlePositon; // size 4, offset 12
float massAirFlowVoltage; // size 4, offset 16
float airFuelRatio; // size 4, offset 20
float engineLoad; // size 4, offset 24
float vBatt; // size 4, offset 28
short int tpsADC; // size 2, offset 32
short int alignment; // size 2, offset 34
float baroPressure; // size 4, offset 36
float manifoldAirPressure; // size 4, offset 40
float crankingFuelMs; // offset 44
/**
* This is the raw value we take from the fuel map or base fuel algorithm, before the corrections
*/
float fuelBase; // 48
float tCharge; // 52
float ignitionAdvance; // 56
float sparkDwell; // 60
/**
* this one contains total resulting fuel squirt time, per event
* With all corrections and injector lag. See also baseFuel
*/
float actualLastInjection; // 64
float debugFloatField1; // 68
/** /**
* Yes, I do not really enjoy packing bits into integers but we simply have too many boolean flags and I cannot * Yes, I do not really enjoy packing bits into integers but we simply have too many boolean flags and I cannot
* water 4 bytes per traffic - I want gauges to work as fast as possible * water 4 bytes per traffic - I want gauges to work as fast as possible
@ -94,139 +81,107 @@ typedef struct {
unsigned int brakePedalState : 1; // bit 15. 0 - not pressed, 1 = pressed unsigned int brakePedalState : 1; // bit 15. 0 - not pressed, 1 = pressed
unsigned int toothLogReady : 1; // bit 16 unsigned int toothLogReady : 1; // bit 16
unsigned int acSwitchState : 1; // bit 17. 0 - not pressed, 1 = pressed unsigned int acSwitchState : 1; // bit 17. 0 - not pressed, 1 = pressed
unsigned int isTpsError : 1; // bit 18 float vehicleSpeedKph; // 76
unsigned int isCltError : 1; // bit 19 unsigned int isTpsError : 1; // bit 0, 80
unsigned int isMapError : 1; // bit 20 unsigned int isCltError : 1; // bit 1
unsigned int isIatError : 1; // bit 21 unsigned int isMapError : 1; // bit 2
unsigned int isAcSwitchEngaged : 1; // bit 22 unsigned int isIatError : 1; // bit 3
unsigned int isTriggerError : 1; // bit 23 unsigned int isAcSwitchEngaged : 1; // bit 4
unsigned int hasFatalError : 1; // bit 24 unsigned int isTriggerError : 1; // bit 5
unsigned int isWarnNow : 1; // bit 25 unsigned int hasFatalError : 1; // bit 6
unsigned int unused80b8 : 1; // bit 26 unsigned int isWarnNow : 1; // bit 7
unsigned int isKnockChipOk : 1; // bit 27 unsigned int unused80b8 : 1; // bit 8
unsigned int isKnockChipOk : 1; // bit 9
// RPM, vss int tsConfigVersion; // 84
scaled_channel<uint16_t, 4> rpm; // 4 egt_values_s egtValues; // 88
scaled_percent rpmAcceleration; // 6 float rpmAcceleration; // 104
scaled_percent speedToRpmRatio; // 8 float massAirFlow; // 108
scaled_channel<uint8_t> vehicleSpeedKph; // 10 /**
* Current volumetric efficiency
// temperatures */
scaled_channel<int8_t> internalMcuTemperature; // offset 11 float veValue; // offset 112
scaled_temperature coolantTemperature; // offset 12 /**
scaled_temperature intakeAirTemperature; // offset 14 * TPS value delta within specified number of cycles
scaled_temperature auxTemp1; // offset 16 * See tpsAccelFuel
scaled_temperature auxTemp2; // offset 18 */
float deltaTps; // offset 116
// throttle, pedal int triggerErrorsCounter; // offset 120
scaled_percent throttlePosition; // 20 /**
scaled_percent pedalPosition; // 22 * Engine load delta
uint16_t tpsADC; // 24 */
float engineLoadAccelExtra; // offset 124
// air flow/mass measurment float tpsAccelFuel; // offset 128
scaled_voltage massAirFlowVoltage; // 26 float baroCorrection; // 132
scaled_channel<uint16_t, 100> massAirFlow; // 28 float pedalPosition; // 136
scaled_pressure manifoldAirPressure; // 30 /**
scaled_pressure baroPressure; // 32 * @see coilDutyCycle
*/
scaled_afr airFuelRatio; // 34 float injectorDutyCycle; // 140
scaled_channel<uint16_t, 100> engineLoad; // 36 int knockCount; // 144
float fuelTankLevel; // 148
// misc sensors float knockLevel; // 152
scaled_voltage vBatt; // 38 int totalTriggerErrorCounter; // 156
scaled_pressure oilPressure; // 40 float wallFuelAmount; // 160
scaled_angle vvtPosition; // 42 /**
* multiplier, 1 means no correction, 1.20 means 20% extra
// Fuel math */
scaled_channel<uint16_t, 1000> chargeAirMass; // 44 float iatCorrection; // 164
scaled_ms crankingFuelMs; // 46 floatms_t wallFuelCorrection; // 168
scaled_afr currentTargetAfr; // 48 float idlePosition; // 172
// This is the raw value we take from the fuel map or base fuel algorithm, before the corrections float currentTargetAfr; // 176
scaled_ms fuelBase; // 50 float chargeAirMass; // 180
// Total fuel with CLT, IAT and TPS acceleration without injector lag corrections per cycle, as pulse per cycle /**
scaled_ms fuelRunning; // 52 * multiplier, 1 means no correction, 1.20 means 20% extra
// Actual last injection time - including all compensation and injection mode */
scaled_ms actualLastInjection; // 54 float cltCorrection; // 184
scaled_channel<uint8_t, 2> injectorDutyCycle; // 56 /**
scaled_channel<uint8_t, 2> veValue; // 57 * Total fuel with CLT, IAT and TPS acceleration without injector lag corrections per cycle,
scaled_angle injectionOffset; // 58 * as squirt duration.
scaled_temperature tCharge; // 60 *
* @see actualLastInjection
// Corrections */
scaled_ms injectorLagMs; // 62 float fuelRunning; // 188
scaled_percent iatCorrection; // 64 int debugIntField1; // 192
scaled_percent cltCorrection; // 66 float injectorLagMs; // 196
scaled_percent baroCorrection; // 68 float debugFloatField2; // 200
scaled_ms fuelPidCorrection; // 70 float debugFloatField3; // 204
float debugFloatField4; // 208
// Wall model AE float debugFloatField5; // 212
scaled_ms wallFuelAmount; // 72 int debugIntField2; // 216
scaled_channel<int16_t, 1000> wallFuelCorrection; // 74 int debugIntField3; // 220
int timeSeconds; // 224
// TPS/load AE float engineLoadDelta; // 228
scaled_percent engineLoadDelta; // 76 float speedToRpmRatio; // 232
scaled_percent deltaTps; // 78 int16_t warningCounter; // 236
scaled_percent engineLoadAccelExtra; // 80 int16_t unused_238;
scaled_ms tpsAccelFuel; // 82 int16_t lastErrorCode; // 240
int16_t unused_242;
// Ignition /**
scaled_angle ignitionAdvance; // 84 * Microcontroller own internal temperature, C
scaled_ms sparkDwell; // 86 */
scaled_percent coilDutyCycle; // 88 float internalMcuTemperature; // 244
float vvtPosition; // 248
// Idle & ETB int engineMode; // 252
scaled_percent idlePosition; // 90 float debugFloatField6; // 256
scaled_percent etbTarget; // 92 float debugFloatField7; // 260
scaled_percent etb1DutyCycle; // 94 int firmwareVersion; // 264
scaled_percent etb1Error; // 96 float fuelPidCorrection; // 268
/**
// Fuel system * @see injectorDutyCycle
scaled_percent fuelTankLevel; // 98 */
float fuelConsumptionPerHour; // 100 float coilDutyCycle; // 272
int16_t accelerationX; // 276
// Knock int16_t accelerationY; // 278
uint32_t knockCount; // 104 float oilPressure; // 280
float knockLevel; // 108 float fuelConsumptionPerHour; // 284
float injectionOffset; // 288
// Mode, firmware, protocol, run time int16_t debugIntField4; // 292
uint32_t timeSeconds; // 112 int16_t debugIntField5; // 294
uint32_t engineMode; // 116 int16_t recentErrorCodes[8]; // 298
uint32_t firmwareVersion; // 120 float etbTarget; // 312
uint32_t tsConfigVersion; // 124 float etb1DutyCycle; // 316
float etb1Error; // 320
// Errors int unused3[8];
int triggerErrorsCounter; // 128
int totalTriggerErrorCounter; // 132
int16_t warningCounter; // 136
int16_t lastErrorCode; // 138
int16_t recentErrorCodes[8]; // 140
// Debug
float debugFloatField1; // 156
float debugFloatField2;
float debugFloatField3;
float debugFloatField4;
float debugFloatField5;
float debugFloatField6;
float debugFloatField7;
int debugIntField1;
int debugIntField2;
int debugIntField3;
int16_t debugIntField4;
int16_t debugIntField5; // 198
// accelerometer
int16_t accelerationX; // 200
int16_t accelerationY; // 202
// EGT
egt_values_s egtValues; // 204
// Temporary - will remove soon
TsDebugChannels* getDebugChannels() {
return reinterpret_cast<TsDebugChannels*>(&debugFloatField1);
}
/* see also [OutputChannels] in rusefi.input */ /* see also [OutputChannels] in rusefi.input */
} TunerStudioOutputChannels; } TunerStudioOutputChannels;

16
firmware/console/binary/tunerstudio_debug_struct.h
View File

@ -1,16 +0,0 @@
#pragma once
typedef struct {
float debugFloatField1; // 180
float debugFloatField2;
float debugFloatField3;
float debugFloatField4;
float debugFloatField5;
float debugFloatField6;
float debugFloatField7;
int debugIntField1;
int debugIntField2;
int debugIntField3;
int16_t debugIntField4;
int16_t debugIntField5;
} TsDebugChannels;

4
firmware/console/status_loop.cpp
View File

@ -726,7 +726,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
// offset 8 // offset 8
tsOutputChannels->intakeAirTemperature = intake; tsOutputChannels->intakeAirTemperature = intake;
// offset 12 // offset 12
tsOutputChannels->throttlePosition = tps; tsOutputChannels->throttlePositon = tps;
// offset 16 // offset 16
tsOutputChannels->massAirFlowVoltage = hasMafSensor() ? getMafVoltage(PASS_ENGINE_PARAMETER_SIGNATURE) : 0; tsOutputChannels->massAirFlowVoltage = hasMafSensor() ? getMafVoltage(PASS_ENGINE_PARAMETER_SIGNATURE) : 0;
@ -1021,7 +1021,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
break; break;
case DBG_TLE8888: case DBG_TLE8888:
#if (BOARD_TLE8888_COUNT > 0) #if (BOARD_TLE8888_COUNT > 0)
tle8888PostState(tsOutputChannels->getDebugChannels()); tle8888PostState(tsOutputChannels);
#endif /* BOARD_TLE8888_COUNT */ #endif /* BOARD_TLE8888_COUNT */
break; break;
default: default:

2
firmware/controllers/generated/rusefi_generated.h
View File

@ -1946,7 +1946,7 @@
#define triggerSimulatorPins3_offset 738 #define triggerSimulatorPins3_offset 738
#define triggerSimulatorPins3_offset_hex 2e2 #define triggerSimulatorPins3_offset_hex 2e2
#define TS_FILE_VERSION 20190701 #define TS_FILE_VERSION 20190701
#define TS_OUTPUT_SIZE 220 #define TS_OUTPUT_SIZE 356
#define ts_show_cj125 true #define ts_show_cj125 true
#define ts_show_egt true #define ts_show_egt true
#define ts_show_etb true #define ts_show_etb true

16
firmware/hw_layer/drivers/gpio/tle8888.c
View File

@ -145,14 +145,14 @@ static const char* tle8888_pin_names[TLE8888_OUTPUTS] = {
}; };
#if EFI_TUNER_STUDIO #if EFI_TUNER_STUDIO
void tle8888PostState(TsDebugChannels *debugChannels) { void tle8888PostState(TunerStudioOutputChannels *tsOutputChannels) {
debugChannels->debugIntField1 = tle8888SpiCounter; tsOutputChannels->debugIntField1 = tle8888SpiCounter;
debugChannels->debugIntField2 = spiTxb; tsOutputChannels->debugIntField2 = spiTxb;
debugChannels->debugIntField3 = spiRxb; tsOutputChannels->debugIntField3 = spiRxb;
debugChannels->debugIntField4 = initResponsesAccumulator; tsOutputChannels->debugIntField4 = initResponsesAccumulator;
debugChannels->debugIntField5 = reinitializationCounter; tsOutputChannels->debugIntField5 = reinitializationCounter;
debugChannels->debugFloatField1 = initResponse0; tsOutputChannels->debugFloatField1 = initResponse0;
debugChannels->debugFloatField2 = initResponse1; tsOutputChannels->debugFloatField2 = initResponse1;
} }
#endif /* EFI_TUNER_STUDIO */ #endif /* EFI_TUNER_STUDIO */

4
firmware/hw_layer/drivers/gpio/tle8888.h
View File

@ -54,8 +54,8 @@ int tle8888_add(unsigned int index, const struct tle8888_config *cfg);
void requestTLE8888initialization(void); void requestTLE8888initialization(void);
#if EFI_TUNER_STUDIO #if EFI_TUNER_STUDIO
#include "tunerstudio_debug_struct.h" #include "tunerstudio_configuration.h"
void tle8888PostState(TsDebugChannels *tsDebugChannels); void tle8888PostState(TunerStudioOutputChannels *tsOutputChannels);
#endif /* EFI_TUNER_STUDIO */ #endif /* EFI_TUNER_STUDIO */
#ifdef __cplusplus #ifdef __cplusplus

2
firmware/integration/rusefi_config.txt
View File

@ -68,7 +68,7 @@ struct_no_prefix engine_configuration_s
#define ETB_BIAS_CURVE_LENGTH 8 #define ETB_BIAS_CURVE_LENGTH 8
! this is here so that rusEfi console can access it, too ! this is here so that rusEfi console can access it, too
#define TS_OUTPUT_SIZE 220 #define TS_OUTPUT_SIZE 356
#define MAP_ANGLE_SIZE 8 #define MAP_ANGLE_SIZE 8
#define MAP_WINDOW_SIZE 8 #define MAP_WINDOW_SIZE 8

274
firmware/tunerstudio/rusefi.input
View File

@ -167,172 +167,136 @@ fileVersion = { 20190701 }
; ;
; see TunerStudioOutputChannels struct ; see TunerStudioOutputChannels struct
; ;
RPMValue = scalar, U32, 0, "RPM", 1, 0.00000
; Bit flags
hasSdCard = bits, U32, 0, [0:0], "true", "false";
isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false";
ind_injection_enabled=bits,U32, 0, [2:2], "true", "false";
isCylinderCleanupEnabled=bits,U32, 0, [3:3], "true", "false";
isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false";
ind_fuel_pump = bits, U32, 0, [5:5], "true", "false";
ind_fan = bits, U32, 0, [6:6], "true", "false";
ind_o2_heater = bits, U32, 0, [7:7], "true", "false";
ind_check_engine= bits, U32, 0, [8:8], "true", "false";
needBurn = bits, U32, 0, [9:9], "true", "false";
ind_2nd_trigger_en=bits, U32, 0, [10:10], "true", "false";
clutchUpState =bits, U32, 0, [11:11], "true", "false";
clutchDownState =bits, U32, 0, [12:12], "true", "false";
knockEverIndicator=bits, U32, 0, [13:13], "true", "false";
knockNowIndicator=bits, U32, 0, [14:14], "true", "false";
brakePedalIndicator=bits, U32, 0, [15:15], "true", "false";
toothLogReady =bits, U32, 0, [16:16], "true", "false";
acSwitchIndicator =bits, U32, 0, [17:17], "true", "false";
ind_tps_error = bits, U32, 0, [18:18], "true", "false";
ind_clt_error = bits, U32, 0, [19:19], "true", "false";
ind_map_error = bits, U32, 0, [20:21], "true", "false";
ind_iat_error = bits, U32, 0, [21:22], "true", "false";
ind_isTriggerError = bits, U32, 0, [23:23], "true", "false";
ind_hasFatalError=bits, U32, 0, [24:24], "true", "false";
ind_isWarnNow =bits, U32, 0, [25:25], "true", "false";
; RPM, vss
RPMValue = scalar, U16, 4, "RPM", 0.25, 0.00000
rpmAcceleration = scalar, S16, 6, "dRpm", 0.01, 0
speedToRpmRatio = scalar, S16, 8, "value", 0.01, 0
vehicleSpeedKph = scalar, U16, 10, "kph", 0.01, 0.0
; temperatures
internalMcuTemperature = scalar,S08, 11, "deg C", 1, 0
#if CELSIUS #if CELSIUS
coolant = scalar, S16, 12, "deg C", 0.01, 0.0 coolant = scalar, F32, 4, "deg C", 1, 0.0
#else #else
coolant = scalar, S16, 12, "deg F",{9/500}, 17.77777 coolant = scalar, F32, 4, "deg F", {9/5}, 17.77777
#endif #endif
#if CELSIUS #if CELSIUS
intake = scalar, S16, 14, "deg C", 0.01, 0.0 intake = scalar, F32, 8, "deg C", 1, 0.0
#else #else
intake = scalar, S16, 14, "deg F",{9/500}, 17.77777 intake = scalar, F32, 8, "deg F", {9/5}, 17.77777
#endif #endif
; todo: aux1 TPSValue = scalar, F32, 12, "%", 1, 0
; todo: aux2 MAFValue = scalar, F32, 16, "V", 1, 0
AFRValue = scalar, F32, 20, "AFR", 1, 0.0
engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm
; throttle, pedal VBatt = scalar, F32, 28, "V", 1, 0.0
TPSValue = scalar, U16, 20, "%", 0.01, 0
throttlePedalPosition = scalar,U16, 22, "%", 0.01, 0
tpsADC = scalar, U16, 24, "ADC", 1, 0.0;
; air flow/mass measurments
MAFValue = scalar, U16, 26, "V",0.001, 0
massAirFlowValue= scalar, U16, 28, "Kg/h", 0.01, 0
MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0
baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0
AFRValue = scalar, U16, 34, "AFR",0.001, 0.0
engineLoad = scalar, U16, 36, "%", 0.01, 0.0 ; Blend of MAP and TPS, depends on algorithm
; misc sensors
VBatt = scalar, U16, 38, "V",0.001, 0.0
oilPressure = scalar, U16, 40, "kPa",{1/30}, 0.0
vvtPosition = scalar, U16, 42, "deg", 0.02, 0
; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale)
;tpsADC2 = scalar, U16, 44, "ADC", 1, 0.0; tpsADC = scalar, U16, 32, "ADC", 1, 0.0;
tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0;
baroPressure = scalar, F32, 36, "pres", 1, 0.0;
MAPValue = scalar, F32, 40, "MAP", 1, 0.0;
; total fuel squirt duration (in MS) per engine cycle according to current CLT
crankingFuelMs = scalar, F32, 44, "ms", 1, 0.0;
baseFuel = scalar, F32, 48, "ms", 1, 0
tCharge = scalar, F32, 52, "T", 1, 0.0;
ignitionAdvance = scalar, F32, 56, "deg", 1, 0.0;
sparkDwellValue = scalar, F32, 60, "ms", 1, 0.0;
; actual total Ms time per engine cycle with all corrections
actualLastInjection = scalar, F32, 64, "ms", 1, 0.0;
debugFloatField1 = scalar, F32, 68, "val", 1, 0.0;
; fuel math hasSdCard = bits, U32, 72, [0:0], "true", "false";
chargeAirMass = scalar, U16, 44, "g",0.001, 0 isIgnitionEnabledIndicator=bits, U32, 72, [1:1], "true", "false";
crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 ind_injection_enabled=bits,U32, 72, [2:2], "true", "false";
currentTargetAfr= scalar, U16, 48, "ratio",0.001, 0 isCylinderCleanupEnabled=bits, U32, 72, [3:3], "true", "false";
baseFuel = scalar, U16, 50, "ms",{1/300}, 0 isCylinderCleanupActivated=bits,U32,72, [4:4], "true", "false";
fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 ind_fuel_pump = bits, U32, 72, [5:5], "true", "false";
actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 ind_fan = bits, U32, 72, [6:6], "true", "false";
injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 ind_o2_heater = bits, U32, 72, [7:7], "true", "false";
veValue = scalar, U08, 57, "ratio", 0.5, 0 ind_check_engine= bits, U32, 72, [8:8], "true", "false";
injectionOffset = scalar, S16, 58, "deg", 0.02, 0 needBurn = bits, U32, 72, [9:9], "true", "false";
tCharge = scalar, U16, 60, "deg C", 0.01, 0.0 ind_2nd_trigger_en=bits, U32, 72, [10:10], "true", "false";
clutchUpState =bits, U32, 72, [11:11], "true", "false";
clutchDownState =bits, U32, 72, [12:12], "true", "false";
knockEverIndicator=bits, U32, 72, [13:13], "true", "false";
knockNowIndicator=bits, U32, 72, [14:14], "true", "false";
brakePedalIndicator=bits, U32, 72, [15:15], "true", "false";
toothLogReady =bits, U32, 72, [16:16], "true", "false";
acSwitchIndicator =bits, U32, 72, [17:17], "true", "false";
vehicleSpeedKph = scalar, F32, 76, "kph", 1, 0.0;
; Corrections ind_tps_error = bits, U32, 80, [0:0], "true", "false";
injectorLagMs = scalar, U16, 62, "ms",{1/300}, 0.0 ind_clt_error = bits, U32, 80, [1:1], "true", "false";
iatCorrection = scalar, U16, 64, "%", 0.01, 0 ind_map_error = bits, U32, 80, [2:2], "true", "false";
cltCorrection = scalar, U16, 66, "%", 0.01, 0 ind_iat_error = bits, U32, 80, [3:3], "true", "false";
baroCorrection = scalar, U16, 68, "%", 0.01, 0 ind_isTriggerError = bits, U32, 80, [5:5], "true", "false";
fuelPidCorrection=scalar, S16, 70, "ms",{1/300}, 0 ind_hasFatalError=bits, U32, 80, [6:6], "true", "false";
ind_isWarnNow =bits, U32, 80, [7:7], "true", "false";
firmwareTsVersion = scalar,U32, 84, "version_p", 1, 0
egt1 = scalar, S16, 88, "deg C", 1, 0
egt2 = scalar, S16, 90, "deg C", 1, 0
egt3 = scalar, S16, 92, "deg C", 1, 0
egt4 = scalar, S16, 94, "deg C", 1, 0
egt5 = scalar, S16, 96, "deg C", 1, 0
egt6 = scalar, S16, 98, "deg C", 1, 0
egt7 = scalar, S16, 100, "deg C", 1, 0
egt8 = scalar, S16, 102, "deg C", 1, 0
rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0
massAirFlowValue= scalar, F32, 108, "Kg/h", 1, 0
veValue = scalar, F32, 112, "ratio", 1, 0
deltaTps = scalar, F32, 116, "ratio", 1, 0
triggerErrorsCounter = scalar, U32,120, "counter", 1, 0
engineLoadAccelExtra = scalar,F32, 124, "value", 1, 0
tpsAccelFuel = scalar, F32, 128, "ms", 1, 0
baroCorrection = scalar, F32, 132, "%", 1, 0
throttlePedalPosition = scalar, F32, 136, "%", 1, 0
injectorDutyCycle= scalar, F32, 140, "%", 1, 0
knockCount = scalar, U32, 144, "counter", 1, 0
fuelTankLevel = scalar, F32, 148, "amount", 1, 0
knockLevel = scalar, F32, 152, "Volts", 1, 0
; totalTriggerErrorCounter 156
wallFuelAmount = scalar, F32, 160, "ms", 1, 0
iatCorrection = scalar, F32, 164, "%", 1, 0
wallFuelCorrection = scalar, F32, 168, "ms", 1, 0
idleAirValvePosition = scalar, F32, 172, "percent", 1, 0
currentTargetAfr = scalar, F32, 176, "ratio", 1, 0
chargeAirMass = scalar, F32, 180, "g", 1, 0
cltCorrection = scalar, F32, 184, "%", 1, 0
fuelRunning = scalar, F32, 188, "g", 1, 0
debugIntField1 = scalar, S32, 192, "val", 1, 0.0;
injectorLagMs = scalar, F32, 196, "ms", 1, 0.0;
debugFloatField2 = scalar, F32, 200, "val", 1, 0.0;
debugFloatField3 = scalar, F32, 204, "val", 1, 0.0;
debugFloatField4 = scalar, F32, 208, "val", 1, 0.0;
debugFloatField5 = scalar, F32, 212, "val", 1, 0.0;
debugIntField2 = scalar, S32, 216, "val", 1, 0.0;
debugIntField3 = scalar, S32, 220, "val", 1, 0.0;
timeSeconds = scalar, U32, 224, "sec", 1, 0.0;
engineLoadDelta = scalar,F32, 228, "value", 1, 0
speedToRpmRatio = scalar,F32, 232, "value", 1, 0
warningCounter = scalar,U16, 236, "count", 1, 0
; Wall model AE lastErrorCode = scalar,U16, 240, "error", 1, 0
wallFuelAmount = scalar, U16, 72, "ms",{1/300}, 0
wallFuelCorrection=scalar, S16, 74, "ms",0.001, 0
; TPS/load AE internalMcuTemperature = scalar,F32, 244, "C", 1, 0
engineLoadDelta = scalar, S16, 76, "value", 0.01, 0 vvtPosition = scalar,F32, 248, "deg", 1, 0
deltaTps = scalar, S16, 78, "ratio", 0.01, 0 engineMode = scalar, U32, 252, "em", 1, 0.0;
engineLoadAccelExtra=scalar,S16, 80, "value", 0.01, 0 debugFloatField6 = scalar, F32, 256, "val", 1, 0.0;
tpsAccelFuel = scalar, U16, 82, "ms",{1/300}, 0 debugFloatField7 = scalar, F32, 260, "val", 1, 0.0;
firmwareVersion = scalar,U32, 264, "version_f", 1, 0
; Ignition fuelPidCorrection = scalar, F32, 268, "ms", 1, 0
ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0.0 coilDutyCycle = scalar, F32, 272, "perc", 1, 0
sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 accelerationX = scalar, S16, 276, "G", 0.01, 0
coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 accelerationY = scalar, S16, 278, "G", 0.01, 0
oilPressure = scalar, F32, 280, "kPa", 1, 0.0
; Idle & ETB fuelConsumptionPerHour=scalar, F32, 284, "kPa", 1, 0.0
idleAirValvePosition=scalar,S16, 90, "%", 0.01, 0 injectionOffset = scalar, F32, 288, "deg", 1, 0;
etbTarget = scalar, S16, 92, "%", 0.01, 0 debugIntField4 = scalar, S16, 292, "val", 1, 0.0;
etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 debugIntField5 = scalar, S16, 294, "val", 1, 0.0;
etb1Error = scalar, S16, 96, "%", 0.01, 0 recentErrorCode0 = scalar,U16, 296, "error", 1, 0
recentErrorCode1 = scalar,U16, 298, "error", 1, 0
; Fuel system recentErrorCode2 = scalar,U16, 300, "error", 1, 0
fuelTankLevel = scalar, S16, 98, "amount", 0.01, 0 recentErrorCode3 = scalar,U16, 302, "error", 1, 0
fuelConsumptionPerHour=scalar,F32, 100, "kPa", 1, 0.0 recentErrorCode4 = scalar,U16, 304, "error", 1, 0
recentErrorCode5 = scalar,U16, 306, "error", 1, 0
; Knock recentErrorCode6 = scalar,U16, 308, "error", 1, 0
knockCount = scalar, U32, 104,"counter", 1, 0 recentErrorCode7 = scalar,U16, 310, "error", 1, 0
knockLevel = scalar, F32, 108, "Volts", 1, 0 etbTarget = scalar,F32, 312, "%", 1, 0
etb1DutyCycle = scalar,F32, 316, "%", 1, 0
; Mode, firmware, protocol, run time etb1Error = scalar,F32, 320, "%", 1, 0
timeSeconds = scalar, U32, 112, "sec", 1, 0.0
engineMode = scalar, U32, 116, "em", 1, 0.0;
firmwareVersion = scalar, U32, 120,"version_f", 1, 0
firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0
; Errors
triggerErrorsCounter=scalar,U32, 128,"counter", 1, 0
; totalTriggerErrorCounter 132
warningCounter = scalar, U16, 136, "count", 1, 0
lastErrorCode = scalar, U16, 138, "error", 1, 0
recentErrorCode0= scalar, U16, 140, "error", 1, 0
recentErrorCode1= scalar, U16, 142, "error", 1, 0
recentErrorCode2= scalar, U16, 144, "error", 1, 0
recentErrorCode3= scalar, U16, 146, "error", 1, 0
recentErrorCode4= scalar, U16, 148, "error", 1, 0
recentErrorCode5= scalar, U16, 150, "error", 1, 0
recentErrorCode6= scalar, U16, 152, "error", 1, 0
recentErrorCode7= scalar, U16, 154, "error", 1, 0
; Debug
debugFloatField1= scalar, F32, 156, "val", 1, 0.0
debugFloatField2= scalar, F32, 160, "val", 1, 0.0
debugFloatField3= scalar, F32, 164, "val", 1, 0.0
debugFloatField4= scalar, F32, 168, "val", 1, 0.0
debugFloatField5= scalar, F32, 172, "val", 1, 0.0
debugFloatField6= scalar, F32, 176, "val", 1, 0.0
debugFloatField7= scalar, F32, 180, "val", 1, 0.0
debugIntField1 = scalar, S32, 184, "val", 1, 0.0
debugIntField2 = scalar, S32, 188, "val", 1, 0.0
debugIntField3 = scalar, S32, 192, "val", 1, 0.0
debugIntField4 = scalar, S16, 196, "val", 1, 0.0
debugIntField5 = scalar, S16, 198, "val", 1, 0.0
; Accel
accelerationX = scalar, S16, 200, "G", 0.01, 0
accelerationY = scalar, S16, 202, "G", 0.01, 0
; egt
egt1 = scalar, S16, 204, "deg C", 1, 0
egt2 = scalar, S16, 206, "deg C", 1, 0
egt3 = scalar, S16, 208, "deg C", 1, 0
egt4 = scalar, S16, 210, "deg C", 1, 0
egt5 = scalar, S16, 212, "deg C", 1, 0
egt6 = scalar, S16, 214, "deg C", 1, 0
egt7 = scalar, S16, 216, "deg C", 1, 0
egt8 = scalar, S16, 218, "deg C", 1, 0
; ;

33
java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java
View File

@ -396,27 +396,20 @@ public class BinaryProtocol implements BinaryProtocolCommands {
ByteBuffer bb = ByteBuffer.wrap(response, 1 + sensor.getOffset(), 4); ByteBuffer bb = ByteBuffer.wrap(response, 1 + sensor.getOffset(), 4);
bb.order(ByteOrder.LITTLE_ENDIAN); bb.order(ByteOrder.LITTLE_ENDIAN);
double rawValue = getValueForChannel(bb, sensor); if (sensor.getType() == FieldType.FLOAT) {
double scaledValue = rawValue * sensor.getScale(); double value = bb.getFloat();
SensorCentral.getInstance().setValue(scaledValue, sensor); SensorCentral.getInstance().setValue(value, sensor);
} else if (sensor.getType() == FieldType.INT) {
int value = bb.getInt();
SensorCentral.getInstance().setValue(value, sensor);
} else if (sensor.getType() == FieldType.INT16) {
short value = (short) (bb.getInt() & 0xFFFF);
SensorCentral.getInstance().setValue(value, sensor);
} else if (sensor.getType() == null) {
// do nothing for old text sensors which I am suprised are still in the code
} else
throw new UnsupportedOperationException("type " + sensor.getType());
} }
return true; return true;
} }
private static double getValueForChannel(ByteBuffer bb, Sensor sensor) {
switch (sensor.getType()) {
case FLOAT:
return bb.getFloat();
case INT:
return bb.getInt();
case UINT16:
case INT16:
return (short)(bb.getInt() & 0xFFFF);
case UINT8:
case INT8:
return (byte)(bb.getInt() & 0xFF);
default:
throw new UnsupportedOperationException("type " + sensor.getType());
}
}
} }

15
java_console/models/src/com/rusefi/config/FieldType.java
View File

@ -1,15 +1,12 @@
package com.rusefi.config; package com.rusefi.config;
public enum FieldType { public enum FieldType {
// Signed
INT8(1),
INT16(2),
INT(4), INT(4),
/**
// Unsigned * signed 16 bit type
UINT8(1), */
UINT16(2), INT16(2),
INT8(1),
BIT(/*bits are stored in 4 byte packs */4), BIT(/*bits are stored in 4 byte packs */4),
FLOAT(4); FLOAT(4);
@ -28,10 +25,8 @@ public enum FieldType {
case FLOAT: case FLOAT:
return FLOAT_TYPE_STRING; return FLOAT_TYPE_STRING;
case INT16: case INT16:
//case UINT16:
return SHORT_TYPE_STRING; return SHORT_TYPE_STRING;
case INT8: case INT8:
//case UINT8:
return BYTE_TYPE_STRING; return BYTE_TYPE_STRING;
case INT: case INT:
default: default:

179
java_console/models/src/com/rusefi/core/Sensor.java
View File

@ -17,99 +17,93 @@ import static com.rusefi.config.generated.Fields.*;
* 2/11/13 * 2/11/13
*/ */
public enum Sensor { public enum Sensor {
MAP("MAP", SensorCategory.SENSOR_INPUTS, FieldType.FLOAT, /*offset */ 40, BackgroundColor.MUD, 20, 300),
/** /**
* Please note that these enum names are used to make 'set_mock_XXX_voltage' commands * Please note that these enum names are used to make 'set_mock_XXX_voltage' commands
*/ */
CLT("Coolant", SensorCategory.SENSOR_INPUTS, FieldType.FLOAT, /*offset */ 4, BackgroundColor.MUD, -40, 300),
AFR("A/F ratio", SensorCategory.SENSOR_INPUTS, FieldType.FLOAT, /*offset */ 20, BackgroundColor.MUD, 0, 20),
MAF("MAF", SensorCategory.SENSOR_INPUTS, FieldType.FLOAT, /*offset */ 16, BackgroundColor.MUD, 0, 5),
// RPM, vss // knockCount("Knock", SensorCategory.SENSOR_INPUTS, "count", 30),
RPM("RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 4, 0.25, BackgroundColor.RED, 0, 8000, "/min"), // KnockValue("Knock level", SensorCategory.SENSOR_INPUTS, "v", 6),
SPEED2RPM("SpeedToRpm", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 6, 0.01, BackgroundColor.MUD, 0, 5, "RPM/kph"),
VSS("VSS", SensorCategory.OPERATIONS, FieldType.UINT8, 8, 0.01, BackgroundColor.BLUE, 0, 150, "kph"),
// Temperatures // ENGINE_LOAD("Engine Load", SensorCategory.SENSOR_INPUTS, "x", 300),
INT_TEMP("MCU Temp", SensorCategory.OPERATIONS, FieldType.INT8, 10, 1, BackgroundColor.MUD, 0, 5, "C"),
CLT("Coolant", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 12, 0.01,BackgroundColor.MUD, -40, 150, "C"),
IAT("IAT", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 14, 0.01, BackgroundColor.WHITE, -40, 150, "C"),
// throttle, pedal
TPS("TPS", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 20, 0.01, BackgroundColor.MUD, 0, 100, "%"), // throttle position sensor
PPS("Throttle Pedal", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 22, 0.01, BackgroundColor.MUD, 0, 100, "%"), // pedal position sensor
// air flow/mass measurement // MAFR_CFM("MAFR_CFM", SensorCategory.SENSOR_INPUTS, "cub f/m", 800),
MAF("MAF", SensorCategory.SENSOR_INPUTS, FieldType.UINT16, 26, 0.001, BackgroundColor.MUD, 0, 5, "Volts"),
MAP("MAP", SensorCategory.SENSOR_INPUTS, FieldType.UINT16, 28, 1.0 / 30, BackgroundColor.MUD, 20, 300, "kPa"),
AFR("A/F ratio", SensorCategory.SENSOR_INPUTS, FieldType.UINT16, /*offset */ 34, 0.001, BackgroundColor.MUD, 10, 20, "afr"),
VBATT("VBatt", SensorCategory.SENSOR_INPUTS, FieldType.UINT16, 38, 0.001, BackgroundColor.BEIGE, 4, 18, "Volts"), // COOLANT_WIDTH("c w", "", 30),
vvtPosition("vvt position", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 42, 0.02, BackgroundColor.MUD, 0, 5, "deg"), // INTAKE_AIR_WIDTH("air w", "", 30),
// fuel math // VREF("VRef", SensorCategory.SENSOR_INPUTS, "Volts", 6),
CHARGE_AIR_MASS("airmass", SensorCategory.OPERATIONS, FieldType.UINT16, 44, 0.001, BackgroundColor.MUD, 0, 3, "g/cyl"), VBATT("VBatt", SensorCategory.SENSOR_INPUTS, FieldType.FLOAT, 28, BackgroundColor.BEIGE, 4, 18, "Volts"),
crankingFuel(GAUGE_NAME_FUEL_CRANKING, SensorCategory.FUEL, FieldType.UINT16, 46, 1.0 / 300, BackgroundColor.MUD, 0, 30, "ms"),
TARGET_AFR("A/F target", SensorCategory.OPERATIONS, FieldType.INT16, 48, 0.001, BackgroundColor.MUD, 10, 20, "afr"),
baseFuel(Fields.GAUGE_NAME_FUEL_BASE, SensorCategory.FUEL, FieldType.UINT16, 50, 1.0 / 300, BackgroundColor.MUD, 0, 30, "ms"),
runningFuel(GAUGE_NAME_FUEL_RUNNING, SensorCategory.FUEL, FieldType.UINT16, 52, 1.0 / 300, BackgroundColor.MUD, 0, 15, "ms"),
actualLastInjection(GAUGE_NAME_FUEL_LAST_INJECTION, SensorCategory.FUEL, FieldType.UINT16, /*offset */ 54, 1.0 / 300, BackgroundColor.MUD, 0, 30, "ms"),
injectorDutyCycle(Fields.GAUGE_NAME_FUEL_INJ_DUTY, SensorCategory.FUEL, FieldType.UINT8, 56, 0.5, BackgroundColor.MUD, 0, 100, "%"),
veValue(GAUGE_NAME_FUEL_VE, SensorCategory.FUEL, FieldType.FLOAT, 57, 0.5, BackgroundColor.MUD, 0, 100, "%"),
tCharge(GAUGE_NAME_TCHARGE, SensorCategory.FUEL, FieldType.FLOAT, 60, 0.01, BackgroundColor.MUD, 30, 140, "C"),
// Corrections
injectorLagMs(GAUGE_NAME_INJECTOR_LAG, SensorCategory.FUEL, FieldType.UINT16, 62, 1.0 / 300, BackgroundColor.MUD, 0, 15, "ms"),
iatCorrection(GAUGE_NAME_FUEL_IAT_CORR, SensorCategory.FUEL, FieldType.INT16, 64, 0.01, BackgroundColor.MUD, 0, 5, "ratio"),
cltCorrection(GAUGE_NAME_FUEL_CLT_CORR, SensorCategory.FUEL, FieldType.INT16, 66, 0.01, BackgroundColor.MUD, 0, 5, "ratio"),
fuelPidCorrection("Fuel PID", SensorCategory.FUEL, FieldType.INT16, 70, 1.0 / 300, BackgroundColor.MUD, -2, 2, "ms"),
// Wall model AE
wallFuelAmount(GAUGE_NAME_FUEL_WALL_AMOUNT, SensorCategory.FUEL, FieldType.UINT16, 72, 1.0 / 300, BackgroundColor.MUD, 0, 20, "ms"),
wallFuelCorrection(GAUGE_NAME_FUEL_WALL_CORRECTION, SensorCategory.FUEL, FieldType.INT16, 74, 0.001, BackgroundColor.MUD, -5, 5, "ms"),
// TPS/load AE
engineLoadAccelDelta("load accel delta", SensorCategory.FUEL, FieldType.INT16, 76, 0.01, BackgroundColor.MUD, -5, 5, "ratio"),
deltaTps(Fields.GAUGE_NAME_FUEL_TPS_ROC, SensorCategory.FUEL, FieldType.INT16, 78, 0.01, BackgroundColor.MUD, -100, 100, "%"),
tpsAccelFuel(Fields.GAUGE_NAME_FUEL_TPS_EXTRA, SensorCategory.FUEL, FieldType.INT16, 82, 1.0 / 300, BackgroundColor.MUD, 0, 200, "ms"),
// Ignition
ignitionAdvance("ignition timing", SensorCategory.OPERATIONS, FieldType.INT16, 84, 0.02, BackgroundColor.MUD, 30, 140, "deg"),
DWELL(Fields.GAUGE_COIL_DWELL_TIME, SensorCategory.OPERATIONS, FieldType.UINT16, 86, 1.0 / 300, BackgroundColor.MUD, 1, 10, "ms"),
coilDutyCycle(Fields.GAUGE_NAME_DWELL_DUTY, SensorCategory.OPERATIONS, FieldType.UINT16, 88, 0.01, BackgroundColor.MUD, 0, 100, "%"),
// Idle & ETB
idlePosition("Idle Position", SensorCategory.OPERATIONS, FieldType.INT16, 90, 0.01, BackgroundColor.MUD, 0, 100, "%"),
etbTarget(GAUGE_NAME_ETB_TARGET, SensorCategory.OTHERS, FieldType.INT16, 92, 0.01, BackgroundColor.MUD, 0, 100, "%"),
etb1DutyCycle(GAUGE_NAME_ETB_DUTY, SensorCategory.OTHERS, FieldType.INT16, 94, 0.01, BackgroundColor.MUD, 0, 100, "%"),
etb1Error(GAUGE_NAME_ETB_ERROR, SensorCategory.OTHERS, FieldType.INT16, 96, 0.01, BackgroundColor.MUD, 0, 100, "%"),
// Fuel system
// Knock
// Mode, firmware, protocol, run time
TIME_SECONDS("uptime", SensorCategory.OPERATIONS, FieldType.INT, 112, BackgroundColor.MUD, 0, 5),
engineMode("mode", SensorCategory.OPERATIONS, FieldType.INT, 116, BackgroundColor.MUD, 0, 5),
FIRMWARE_VERSION("FW version", SensorCategory.OPERATIONS, FieldType.INT, 120, BackgroundColor.BLUE),
// Errors
errorCodeCounter("error counter", SensorCategory.STATUS, FieldType.INT, 136, BackgroundColor.MUD, 0, 5),
lastErrorCode("last error", SensorCategory.STATUS, FieldType.INT, 138, BackgroundColor.MUD, 0, 5),
// Debug
debugFloatField1(GAUGE_NAME_DEBUG_F1, SensorCategory.DEBUG, FieldType.FLOAT, 156, BackgroundColor.MUD, 0, 5),
debugFloatField2(GAUGE_NAME_DEBUG_F2, SensorCategory.DEBUG, FieldType.FLOAT, 160, BackgroundColor.MUD, 0, 5),
debugFloatField3(GAUGE_NAME_DEBUG_F3, SensorCategory.DEBUG, FieldType.FLOAT, 164, BackgroundColor.MUD, 0, 5),
debugFloatField4(GAUGE_NAME_DEBUG_F4, SensorCategory.DEBUG, FieldType.FLOAT, 168, BackgroundColor.MUD, 0, 5),
debugFloatField5(GAUGE_NAME_DEBUG_F5, SensorCategory.DEBUG, FieldType.FLOAT, 172, BackgroundColor.MUD, 0, 5),
debugFloatField6(GAUGE_NAME_DEBUG_F6, SensorCategory.DEBUG, FieldType.FLOAT, 176, BackgroundColor.MUD, 0, 5),
debugFloatField7(GAUGE_NAME_DEBUG_F7, SensorCategory.DEBUG, FieldType.FLOAT, 180, BackgroundColor.MUD, 0, 5),
debugIntField1(GAUGE_NAME_DEBUG_I1, SensorCategory.DEBUG, FieldType.INT, 184, BackgroundColor.MUD, 0, 5),
debugIntField2(GAUGE_NAME_DEBUG_I2, SensorCategory.DEBUG, FieldType.INT, 188, BackgroundColor.MUD, 0, 5),
debugIntField3(GAUGE_NAME_DEBUG_I3, SensorCategory.DEBUG, FieldType.INT, 192, BackgroundColor.MUD, 0, 5),
debugIntField4("debug i4", SensorCategory.DEBUG, FieldType.INT16, 196, BackgroundColor.MUD, 0, 5),
debugIntField5("debug i5", SensorCategory.DEBUG, FieldType.INT16, 198, BackgroundColor.MUD, 0, 5),
// Synthetic (console only) channels
ETB_CONTROL_QUALITY("ETB metric", SensorCategory.SNIFFING, "", 100), ETB_CONTROL_QUALITY("ETB metric", SensorCategory.SNIFFING, "", 100),
IAT(SensorCategory.SENSOR_INPUTS, FieldType.FLOAT, 8, BackgroundColor.WHITE, -40, 150, "C"),
TPS(SensorCategory.SENSOR_INPUTS, FieldType.FLOAT, 12, BackgroundColor.MUD, 0, 100, "%"), // throttle position sensor
crankingFuel(GAUGE_NAME_FUEL_CRANKING, SensorCategory.FUEL, FieldType.FLOAT, 44, BackgroundColor.MUD, 0, 30, "ms"),
baseFuel(Fields.GAUGE_NAME_FUEL_BASE, SensorCategory.FUEL, FieldType.FLOAT, 48, BackgroundColor.MUD, 0, 30, "ms"),
tCharge(GAUGE_NAME_TCHARGE, SensorCategory.FUEL, FieldType.FLOAT, 52, BackgroundColor.MUD, 30, 140),
// todo: unify with TIMING
ignitionAdvance(SensorCategory.OPERATIONS, FieldType.FLOAT, 56, BackgroundColor.MUD, 30, 140),
DWELL(Fields.GAUGE_COIL_DWELL_TIME, SensorCategory.OPERATIONS, FieldType.FLOAT, 60, BackgroundColor.MUD, 1, 10),
actualLastInjection(GAUGE_NAME_FUEL_LAST_INJECTION, SensorCategory.FUEL, FieldType.FLOAT, /*offset */ 64, BackgroundColor.MUD, 0, 30, "ms"),
debugFloatField1(GAUGE_NAME_DEBUG_F1, SensorCategory.DEBUG, FieldType.FLOAT, 68, BackgroundColor.MUD, 0, 5),
VSS(SensorCategory.OPERATIONS, FieldType.FLOAT, 76, BackgroundColor.BLUE),
FIRMWARE_VERSION(SensorCategory.OPERATIONS, FieldType.INT, 84, BackgroundColor.BLUE),
veValue(GAUGE_NAME_FUEL_VE, SensorCategory.FUEL, FieldType.FLOAT, 112, BackgroundColor.MUD),
deltaTps(Fields.GAUGE_NAME_FUEL_TPS_ROC, SensorCategory.FUEL, FieldType.FLOAT, 116, BackgroundColor.MUD, -100, 100, "%"),
engineLoadAccelDelta(SensorCategory.FUEL, FieldType.FLOAT, 124, BackgroundColor.MUD),
tpsAccelFuel(Fields.GAUGE_NAME_FUEL_TPS_EXTRA, SensorCategory.FUEL, FieldType.FLOAT, 128, BackgroundColor.MUD, 0, 200, "ms"),
PPS("Throttle Pedal", SensorCategory.SENSOR_INPUTS, FieldType.FLOAT, 136, BackgroundColor.MUD, 0, 100, "%"), // pedal position sensor
injectorDutyCycle(Fields.GAUGE_NAME_FUEL_INJ_DUTY, SensorCategory.FUEL, FieldType.FLOAT, 140, BackgroundColor.MUD),
wallFuelAmount(GAUGE_NAME_FUEL_WALL_AMOUNT, SensorCategory.FUEL, FieldType.FLOAT, 160, BackgroundColor.MUD),
iatCorrection(GAUGE_NAME_FUEL_IAT_CORR, SensorCategory.FUEL, FieldType.FLOAT, 164, BackgroundColor.MUD, 0, 5),
wallFuelCorrection(GAUGE_NAME_FUEL_WALL_CORRECTION, SensorCategory.FUEL, FieldType.FLOAT, 168, BackgroundColor.MUD),
idlePosition(SensorCategory.OPERATIONS, FieldType.FLOAT, 172, BackgroundColor.MUD),
TARGET_AFR(SensorCategory.OPERATIONS, FieldType.FLOAT, 176, BackgroundColor.MUD),
CHARGE_AIR_MASS(SensorCategory.OPERATIONS, FieldType.FLOAT, 180, BackgroundColor.MUD),
cltCorrection(GAUGE_NAME_FUEL_CLT_CORR, SensorCategory.FUEL, FieldType.FLOAT, 184, BackgroundColor.MUD, 0, 5),
runningFuel(GAUGE_NAME_FUEL_RUNNING, SensorCategory.FUEL, FieldType.FLOAT, 188, BackgroundColor.MUD, 0, 15, "ms"),
debugIntField1(GAUGE_NAME_DEBUG_I1, SensorCategory.DEBUG, FieldType.INT, 192, BackgroundColor.MUD, 0, 5),
injectorLagMs(GAUGE_NAME_INJECTOR_LAG, SensorCategory.FUEL, FieldType.FLOAT, 196, BackgroundColor.MUD, 0, 15, "ms"),
debugFloatField2(GAUGE_NAME_DEBUG_F2, SensorCategory.DEBUG, FieldType.FLOAT, 200, BackgroundColor.MUD, 0, 5),
debugFloatField3(GAUGE_NAME_DEBUG_F3, SensorCategory.DEBUG, FieldType.FLOAT, 204, BackgroundColor.MUD, 0, 5),
debugFloatField4(GAUGE_NAME_DEBUG_F4, SensorCategory.DEBUG, FieldType.FLOAT, 208, BackgroundColor.MUD, 0, 5),
debugFloatField5(GAUGE_NAME_DEBUG_F5, SensorCategory.DEBUG, FieldType.FLOAT, 212, BackgroundColor.MUD, 0, 5),
debugIntField2(GAUGE_NAME_DEBUG_I2, SensorCategory.DEBUG, FieldType.INT, 216, BackgroundColor.MUD, 0, 5),
debugIntField3(GAUGE_NAME_DEBUG_I3, SensorCategory.DEBUG, FieldType.INT, 220, BackgroundColor.MUD, 0, 5),
errorCodeCounter(SensorCategory.STATUS, FieldType.INT, 236, BackgroundColor.MUD, 0, 5),
lastErrorCode(SensorCategory.STATUS, FieldType.INT, 240, BackgroundColor.MUD, 0, 5),
RPM(SensorCategory.SENSOR_INPUTS, FieldType.INT, 0, BackgroundColor.RED, 0, 8000),
TIME_SECONDS(SensorCategory.OPERATIONS, FieldType.INT, 224, BackgroundColor.MUD, 0, 5),
SPEED2RPM(SensorCategory.SENSOR_INPUTS, FieldType.FLOAT, 232, BackgroundColor.MUD, 0, 5),
INT_TEMP(SensorCategory.OPERATIONS, FieldType.FLOAT, 244, BackgroundColor.MUD, 0, 5),
vvtPosition(SensorCategory.SENSOR_INPUTS, FieldType.FLOAT, 248, BackgroundColor.MUD, 0, 5),
engineMode(SensorCategory.OPERATIONS, FieldType.INT, 252, BackgroundColor.MUD, 0, 5),
debugFloatField6(GAUGE_NAME_DEBUG_F6, SensorCategory.DEBUG, FieldType.FLOAT, 256, BackgroundColor.MUD, 0, 5),
debugFloatField7(GAUGE_NAME_DEBUG_F7, SensorCategory.DEBUG, FieldType.FLOAT, 260, BackgroundColor.MUD, 0, 5),
fuelPidCorrection(SensorCategory.FUEL, FieldType.FLOAT, 268, BackgroundColor.MUD),
coilDutyCycle(Fields.GAUGE_NAME_DWELL_DUTY, SensorCategory.OPERATIONS, FieldType.FLOAT, 272, BackgroundColor.MUD),
debugIntField4("debug i4", SensorCategory.DEBUG, FieldType.INT16, 292, BackgroundColor.MUD, 0, 5),
debugIntField5("debug i5", SensorCategory.DEBUG, FieldType.INT16, 294, BackgroundColor.MUD, 0, 5),
etbTarget(GAUGE_NAME_ETB_TARGET, SensorCategory.OTHERS, FieldType.FLOAT, 312, BackgroundColor.MUD),
etb1DutyCycle(GAUGE_NAME_ETB_DUTY, SensorCategory.OTHERS, FieldType.FLOAT, 316, BackgroundColor.MUD),
etb1Error(GAUGE_NAME_ETB_ERROR, SensorCategory.OTHERS, FieldType.FLOAT, 320, BackgroundColor.MUD),
; ;
private final String name; private final String name;
@ -121,13 +115,11 @@ public enum Sensor {
@Nullable @Nullable
private final FieldType type; private final FieldType type;
private final int offset; private final int offset;
private final double scale;
Sensor(String name, SensorCategory category, FieldType type, int offset, double scale, BackgroundColor color, double minValue, double maxValue, String units) { Sensor(String name, SensorCategory category, FieldType type, int offset, BackgroundColor color, double minValue, double maxValue, String units) {
this.name = name == null ? name() : name; this.name = name == null ? name() : name;
this.type = type; this.type = type;
this.offset = offset; this.offset = offset;
this.scale = scale;
this.category = category; this.category = category;
this.color = color; this.color = color;
this.units = units; this.units = units;
@ -135,8 +127,20 @@ public enum Sensor {
this.maxValue = maxValue; this.maxValue = maxValue;
} }
Sensor(SensorCategory category, FieldType type, int offset, BackgroundColor color, double minValue, double maxValue, String units) {
this(null, category, type, offset, color, minValue, maxValue, units);
}
Sensor(String name, SensorCategory category, FieldType type, int offset, BackgroundColor color, double minValue, double maxValue) { Sensor(String name, SensorCategory category, FieldType type, int offset, BackgroundColor color, double minValue, double maxValue) {
this(name, category, type, offset, 1.0, color, minValue, maxValue, "n/a"); this(name, category, type, offset, color, minValue, maxValue, "n/a");
}
Sensor(SensorCategory category, FieldType type, int offset, BackgroundColor color, double minValue, double maxValue) {
this(null, category, type, offset, color, minValue, maxValue);
}
Sensor(SensorCategory category, FieldType type, int offset, BackgroundColor color) {
this(null, category, type, offset, color);
} }
Sensor(String name, SensorCategory category, FieldType type, int offset, BackgroundColor color) { Sensor(String name, SensorCategory category, FieldType type, int offset, BackgroundColor color) {
@ -167,7 +171,6 @@ public enum Sensor {
this.minValue = minValue; this.minValue = minValue;
this.maxValue = maxValue; this.maxValue = maxValue;
this.color = color; this.color = color;
this.scale = 1.0;
type = null; type = null;
offset = -1; offset = -1;
} }
@ -233,10 +236,6 @@ public enum Sensor {
return offset; return offset;
} }
public double getScale() {
return scale;
}
public FieldType getType() { public FieldType getType() {
return type; return type;
} }