mirror of https://github.com/rusefi/rusefi.git
auto-sync
This commit is contained in:
rusEfi
parent
5d6cfde4d8
commit
6cd39875c9
|
|
@ -78,6 +78,11 @@ public:
|
|||
|
||||
class RpmCalculator;
|
||||
|
||||
typedef struct {
|
||||
ThermistorConf *config;
|
||||
adc_channel_e channel;
|
||||
} Thermistor;
|
||||
|
||||
class Engine {
|
||||
public:
|
||||
Engine();
|
||||
|
|
|
|||
|
|
@ -19,35 +19,8 @@
|
|||
|
||||
#define MOCK_UNDEFINED -1
|
||||
|
||||
|
||||
#define CLT_CURVE_SIZE 16
|
||||
#define IAT_CURVE_SIZE 16
|
||||
#define VBAT_INJECTOR_CURVE_SIZE 8
|
||||
|
||||
#define IGN_LOAD_COUNT 16
|
||||
#define IGN_RPM_COUNT 16
|
||||
|
||||
// todo: merge these two types together?
|
||||
typedef float fuel_table_t[FUEL_LOAD_COUNT][FUEL_RPM_COUNT];
|
||||
typedef float ignition_table_t[IGN_LOAD_COUNT][IGN_RPM_COUNT];
|
||||
|
||||
// todo: rename this structure one all tables migrated
|
||||
typedef struct {
|
||||
float loadBins[IGN_LOAD_COUNT];
|
||||
float rpmBins[IGN_RPM_COUNT];
|
||||
ignition_table_t map;
|
||||
} full_i_table_s;
|
||||
|
||||
#define DWELL_CURVE_SIZE 8
|
||||
|
||||
#define DWELL_COUNT 8
|
||||
|
||||
#define CRANKING_CURVE_SIZE 8
|
||||
|
||||
|
||||
// WARNING: by default, our small enums are ONE BYTE. this one is made 4-byte with the 'ENUM_32_BITS' hack
|
||||
|
||||
|
||||
// 19010105 decimal
|
||||
#define HEADER_MAGIC_NUMBER 0x1221239
|
||||
|
||||
|
|
@ -61,548 +34,6 @@ typedef struct {
|
|||
* todo: currently the fields here are simply in the order in which they were implemented
|
||||
* todo: re-arrange this structure one we have a stable code version
|
||||
*/
|
||||
typedef struct {
|
||||
// this section was generated by config_definition.jar on Thu Jan 15 15:59:00 EST 2015
|
||||
// begin
|
||||
/**
|
||||
* http://rusefi.com/wiki/index.php?title=Manual:Engine_Type
|
||||
* offset 0
|
||||
*/
|
||||
engine_type_e engineType;
|
||||
/**
|
||||
* this magic number is used to make sure that what we read from Flash is in fact some configuration
|
||||
* offset 4
|
||||
*/
|
||||
int headerMagicValue;
|
||||
/**
|
||||
* offset 8
|
||||
*/
|
||||
float battInjectorLagCorrBins[VBAT_INJECTOR_CURVE_SIZE];
|
||||
/**
|
||||
* offset 40
|
||||
*/
|
||||
float battInjectorLagCorr[VBAT_INJECTOR_CURVE_SIZE];
|
||||
/**
|
||||
* offset 72
|
||||
*/
|
||||
float cltFuelCorrBins[CLT_CURVE_SIZE];
|
||||
/**
|
||||
* offset 136
|
||||
*/
|
||||
float cltFuelCorr[CLT_CURVE_SIZE];
|
||||
/**
|
||||
* offset 200
|
||||
*/
|
||||
float iatFuelCorrBins[IAT_CURVE_SIZE];
|
||||
/**
|
||||
* offset 264
|
||||
*/
|
||||
float iatFuelCorr[IAT_CURVE_SIZE];
|
||||
/**
|
||||
* Should the trigger emulator push data right into trigger input, eliminating the need for physical jumper wires?
|
||||
* PS: Funny name, right? :)
|
||||
* todo: make this a bit on some bit field
|
||||
* offset 328
|
||||
*/
|
||||
int16_t directSelfStimulation;
|
||||
/**
|
||||
* todo: extract these two fields into a structure
|
||||
* todo: we need two sets of TPS parameters - modern ETBs have to sensors
|
||||
* offset 330
|
||||
*/
|
||||
int16_t tpsMin;
|
||||
/**
|
||||
* tpsMax value as 10 bit ADC value. Not Voltage!
|
||||
* offset 332
|
||||
*/
|
||||
int16_t tpsMax;
|
||||
/**
|
||||
* offset 334
|
||||
*/
|
||||
uint16_t unused334;
|
||||
|
||||
/**
|
||||
* todo: finish implementation. These values are used for TPS disconnect detection
|
||||
* offset 336
|
||||
*/
|
||||
int16_t tpsErrorLowValue;
|
||||
/**
|
||||
* offset 338
|
||||
*/
|
||||
int16_t tpsErrorHighValue;
|
||||
/**
|
||||
* offset 340
|
||||
*/
|
||||
float primingSquirtDurationMs;
|
||||
/**
|
||||
* 360 for two-stroke
|
||||
* 720 for four-stroke
|
||||
* offset 344
|
||||
*/
|
||||
int engineCycle;
|
||||
|
||||
/**
|
||||
* offset 348
|
||||
*/
|
||||
cranking_parameters_s cranking;
|
||||
/**
|
||||
* @see hasMapSensor
|
||||
* @see isMapAveragingEnabled
|
||||
* offset 356
|
||||
*/
|
||||
MAP_sensor_config_s map;
|
||||
|
||||
/**
|
||||
* todo: merge with channel settings, use full-scale Thermistor here!
|
||||
* offset 500
|
||||
*/
|
||||
ThermistorConf clt;
|
||||
/**
|
||||
* offset 540
|
||||
*/
|
||||
ThermistorConf iat;
|
||||
/**
|
||||
* offset 580
|
||||
*/
|
||||
float sparkDwellBins[DWELL_COUNT];
|
||||
/**
|
||||
* offset 612
|
||||
*/
|
||||
float sparkDwell[DWELL_COUNT];
|
||||
/**
|
||||
* offset 644
|
||||
*/
|
||||
float ignitionLoadBins[IGN_LOAD_COUNT];
|
||||
/**
|
||||
* offset 708
|
||||
*/
|
||||
float ignitionRpmBins[IGN_RPM_COUNT];
|
||||
/**
|
||||
* this value could be used to offset the whole ignition timing table by a constant
|
||||
* offset 772
|
||||
*/
|
||||
float ignitionBaseAngle;
|
||||
/**
|
||||
* While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft
|
||||
* degrees, not in absolute time as in running mode.
|
||||
* offset 776
|
||||
*/
|
||||
float crankingChargeAngle;
|
||||
/**
|
||||
* offset 780
|
||||
*/
|
||||
timing_mode_e timingMode;
|
||||
/**
|
||||
* This value is used in 'fixed timing' mode, i.e. constant timing
|
||||
* This mode is useful for instance while adjusting distributor location
|
||||
* offset 784
|
||||
*/
|
||||
float fixedModeTiming;
|
||||
/**
|
||||
* offset 788
|
||||
*/
|
||||
float injectorLag;
|
||||
/**
|
||||
* offset 792
|
||||
*/
|
||||
float fuelLoadBins[FUEL_LOAD_COUNT];
|
||||
/**
|
||||
* RPM is float and not integer in order to use unified methods for interpolation
|
||||
* offset 856
|
||||
*/
|
||||
float fuelRpmBins[FUEL_RPM_COUNT];
|
||||
/**
|
||||
* Engine displacement, in liters
|
||||
* see also cylindersCount
|
||||
* offset 920
|
||||
*/
|
||||
float displacement;
|
||||
/**
|
||||
* offset 924
|
||||
*/
|
||||
int rpmHardLimit;
|
||||
/**
|
||||
* offset 928
|
||||
*/
|
||||
injection_mode_e crankingInjectionMode;
|
||||
/**
|
||||
* offset 932
|
||||
*/
|
||||
injection_mode_e injectionMode;
|
||||
/**
|
||||
* This field is the angle between Top Dead Center (TDC) and the first trigger event.
|
||||
* Knowing this angle allows us to control timing and other angles in reference to TDC.
|
||||
* offset 936
|
||||
*/
|
||||
float globalTriggerAngleOffset;
|
||||
/**
|
||||
* This parameter holds the coefficient of input voltage dividers
|
||||
* offset 940
|
||||
*/
|
||||
float analogInputDividerCoefficient;
|
||||
/**
|
||||
* This setting controls which algorithm is used for ENGINE LOAD
|
||||
* offset 944
|
||||
*/
|
||||
engine_load_mode_e algorithm;
|
||||
/**
|
||||
* offset 948
|
||||
*/
|
||||
float vbattDividerCoeff;
|
||||
/**
|
||||
* Cooling fan turn-on temperature threshold, in Celsuis
|
||||
* offset 952
|
||||
*/
|
||||
float fanOnTemperature;
|
||||
/**
|
||||
* Cooling fan turn-off temperature threshold, in Celsuis
|
||||
* offset 956
|
||||
*/
|
||||
float fanOffTemperature;
|
||||
/**
|
||||
* offset 960
|
||||
*/
|
||||
brain_pin_e vehicleSpeedSensorInputPin;
|
||||
/**
|
||||
* This coefficient translates vehicle speed input frequency (in Hz) into vehicle speed, km/h
|
||||
* offset 964
|
||||
*/
|
||||
float vehicleSpeedCoef;
|
||||
/**
|
||||
* offset 968
|
||||
*/
|
||||
can_nbc_e canNbcType;
|
||||
/**
|
||||
* offset 972
|
||||
*/
|
||||
int canSleepPeriod;
|
||||
/**
|
||||
* offset 976
|
||||
*/
|
||||
int cylindersCount;
|
||||
/**
|
||||
* offset 980
|
||||
*/
|
||||
ignition_mode_e ignitionMode;
|
||||
/**
|
||||
* offset 984
|
||||
*/
|
||||
firing_order_e firingOrder;
|
||||
/**
|
||||
* todo: refactor this, see operation_mode_e
|
||||
* offset 988
|
||||
*/
|
||||
float rpmMultiplier;
|
||||
/**
|
||||
* offset 992
|
||||
*/
|
||||
display_mode_e displayMode;
|
||||
/**
|
||||
* offset 996
|
||||
*/
|
||||
log_format_e logFormat;
|
||||
/**
|
||||
* offset 1000
|
||||
*/
|
||||
int firmwareVersion;
|
||||
/**
|
||||
* offset 1004
|
||||
*/
|
||||
int HD44780width;
|
||||
/**
|
||||
* offset 1008
|
||||
*/
|
||||
int HD44780height;
|
||||
/**
|
||||
* offset 1012
|
||||
*/
|
||||
adc_channel_e tpsAdcChannel;
|
||||
/**
|
||||
* offset 1016
|
||||
*/
|
||||
int overrideCrankingIgnition;
|
||||
/**
|
||||
* offset 1020
|
||||
*/
|
||||
int analogChartFrequency;
|
||||
/**
|
||||
* offset 1024
|
||||
*/
|
||||
trigger_config_s trigger;
|
||||
/**
|
||||
* offset 1052
|
||||
*/
|
||||
spi_device_e hip9011SpiDevice;
|
||||
/**
|
||||
* offset 1056
|
||||
*/
|
||||
adc_channel_e vbattAdcChannel;
|
||||
/**
|
||||
* offset 1060
|
||||
*/
|
||||
float globalFuelCorrection;
|
||||
/**
|
||||
* todo: merge with channel settings, use full-scale Thermistor!
|
||||
* offset 1064
|
||||
*/
|
||||
adc_channel_e cltAdcChannel;
|
||||
/**
|
||||
* offset 1068
|
||||
*/
|
||||
adc_channel_e iatAdcChannel;
|
||||
/**
|
||||
* offset 1072
|
||||
*/
|
||||
adc_channel_e mafAdcChannel;
|
||||
/**
|
||||
* @see hasAfrSensor
|
||||
* offset 1076
|
||||
*/
|
||||
afr_sensor_s afrSensor;
|
||||
/**
|
||||
* this is about deciding when the injector starts it's squirt
|
||||
* offset 1096
|
||||
*/
|
||||
float injectionAngle;
|
||||
/**
|
||||
* offset 1100
|
||||
*/
|
||||
float crankingTimingAngle;
|
||||
/**
|
||||
* offset 1104
|
||||
*/
|
||||
float diffLoadEnrichmentCoef;
|
||||
/**
|
||||
* @see hasBaroSensor
|
||||
* offset 1108
|
||||
*/
|
||||
air_pressure_sensor_config_s baroSensor;
|
||||
/**
|
||||
* offset 1124
|
||||
*/
|
||||
float veLoadBins[FUEL_LOAD_COUNT];
|
||||
/**
|
||||
* offset 1188
|
||||
*/
|
||||
float veRpmBins[FUEL_RPM_COUNT];
|
||||
/**
|
||||
* offset 1252
|
||||
*/
|
||||
float afrLoadBins[FUEL_LOAD_COUNT];
|
||||
/**
|
||||
* offset 1316
|
||||
*/
|
||||
float afrRpmBins[FUEL_RPM_COUNT];
|
||||
/**
|
||||
* offset 1380
|
||||
*/
|
||||
fuel_table_t fuelTable;
|
||||
/**
|
||||
* offset 2404
|
||||
*/
|
||||
ignition_table_t ignitionTable;
|
||||
/**
|
||||
* offset 3428
|
||||
*/
|
||||
fuel_table_t veTable;
|
||||
/**
|
||||
* offset 4452
|
||||
*/
|
||||
fuel_table_t afrTable;
|
||||
|
||||
board_configuration_s bc;
|
||||
|
||||
// offset 6280 ????
|
||||
/**
|
||||
* @see isMapAveragingEnabled
|
||||
*/
|
||||
/** offset 9480 bit 0 */
|
||||
bool_t hasMapSensor : 1;
|
||||
/** offset 9480 bit 1 */
|
||||
bool_t hasIatSensor : 1;
|
||||
/** offset 9480 bit 2 */
|
||||
bool_t hasBaroSensor : 1;
|
||||
/** offset 9480 bit 3 */
|
||||
bool_t hasAfrSensor : 1;
|
||||
/** offset 9480 bit 4 */
|
||||
bool_t useConstantDwellDuringCranking : 1;
|
||||
/** offset 9480 bit 5 */
|
||||
bool_t isDigitalChartEnabled : 1;
|
||||
/** offset 9480 bit 6 */
|
||||
bool_t isCanEnabled : 1;
|
||||
/** offset 9480 bit 7 */
|
||||
bool_t hasCltSensor : 1;
|
||||
/** offset 9480 bit 8 */
|
||||
bool_t canReadEnabled : 1;
|
||||
/** offset 9480 bit 9 */
|
||||
bool_t canWriteEnabled : 1;
|
||||
/** offset 9480 bit 10 */
|
||||
bool_t hasVehicleSpeedSensor : 1;
|
||||
/** offset 9480 bit 11 */
|
||||
bool_t isJoystickEnabled : 1;
|
||||
/** offset 9480 bit 12 */
|
||||
bool_t isGpsEnabled : 1;
|
||||
/** offset 9480 bit 13 */
|
||||
bool_t hasMafSensor : 1;
|
||||
/** offset 9480 bit 14 */
|
||||
bool_t hasTpsSensor : 1;
|
||||
|
||||
/**
|
||||
* offset 6284 ???
|
||||
*/
|
||||
adc_channel_e hipOutputChannel;
|
||||
|
||||
/**
|
||||
* offset 9488
|
||||
*/
|
||||
idle_mode_e idleMode;
|
||||
/** offset 9492 bit 0 */
|
||||
bool_t isInjectionEnabled : 1;
|
||||
/** offset 9492 bit 1 */
|
||||
bool_t isIgnitionEnabled : 1;
|
||||
/** offset 9492 bit 2 */
|
||||
bool_t isCylinderCleanupEnabled : 1;
|
||||
/** offset 9492 bit 3 */
|
||||
bool_t secondTriggerChannelEnabled : 1;
|
||||
/** offset 9492 bit 4 */
|
||||
bool_t needSecondTriggerInput : 1;
|
||||
/** offset 9492 bit 5 */
|
||||
bool_t isMapAveragingEnabled : 1;
|
||||
/** offset 9492 bit 6 */
|
||||
bool_t isMilEnabled : 1;
|
||||
/** offset 9492 bit 7 */
|
||||
bool_t isFuelPumpEnabled : 1;
|
||||
/** offset 9492 bit 8 */
|
||||
bool_t isTunerStudioEnabled : 1;
|
||||
/** offset 9492 bit 9 */
|
||||
bool_t isWaveAnalyzerEnabled : 1;
|
||||
/** offset 9492 bit 10 */
|
||||
bool_t isIdleThreadEnabled : 1;
|
||||
/** offset 9492 bit 11 */
|
||||
bool_t isPrintTriggerSynchDetails : 1;
|
||||
/**
|
||||
* Usually if we have no trigger events that means engine is stopped
|
||||
* Unless we are troubleshooting and spinning the engine by hand - this case a longer
|
||||
* delay is needed
|
||||
*/
|
||||
bool isManualSpinningMode : 1; // bit 11
|
||||
|
||||
/**
|
||||
* offset 9496
|
||||
*/
|
||||
uint32_t digitalChartSize;
|
||||
/**
|
||||
* cc/min, cubic centimeter per minute
|
||||
* By the way, g/s = 0.125997881 * (lb/hr)
|
||||
* g/s = 0.125997881 * (cc/min)/10.5
|
||||
* g/s = 0.0119997981 * cc/min
|
||||
* offset 9500
|
||||
*/
|
||||
float injectorFlow;
|
||||
/**
|
||||
* offset 9504
|
||||
*/
|
||||
float crankingFuelCoef[CRANKING_CURVE_SIZE];
|
||||
/**
|
||||
* offset 9536
|
||||
*/
|
||||
float crankingFuelBins[CRANKING_CURVE_SIZE];
|
||||
/**
|
||||
* offset 9568
|
||||
*/
|
||||
float crankingCycleCoef[CRANKING_CURVE_SIZE];
|
||||
/**
|
||||
* offset 9600
|
||||
*/
|
||||
float crankingCycleBins[CRANKING_CURVE_SIZE];
|
||||
/**
|
||||
* offset 9632
|
||||
*/
|
||||
float ignitionDwellForCrankingMs;
|
||||
/**
|
||||
* offset 9636
|
||||
*/
|
||||
int targetIdleRpm;
|
||||
/**
|
||||
* A/C button input handled as analog input
|
||||
* offset 9640
|
||||
*/
|
||||
adc_channel_e acSwitchAdc;
|
||||
/**
|
||||
* offset 9644
|
||||
*/
|
||||
int ignMathCalculateAtIndex;
|
||||
/**
|
||||
* offset 9648
|
||||
*/
|
||||
int16_t acCutoffLowRpm;
|
||||
/**
|
||||
* offset 9650
|
||||
*/
|
||||
int16_t acCutoffHighRpm;
|
||||
/**
|
||||
* offset 9652
|
||||
*/
|
||||
int16_t acIdleRpmBump;
|
||||
/**
|
||||
* offset 9654
|
||||
*/
|
||||
int16_t unusedShort;
|
||||
/**
|
||||
* offset 9656
|
||||
*/
|
||||
adc_channel_e vRefAdcChannel;
|
||||
/**
|
||||
* offset 9660
|
||||
*/
|
||||
float knockDetectionWindowStart;
|
||||
/**
|
||||
* offset 9664
|
||||
*/
|
||||
float knockDetectionWindowEnd;
|
||||
/**
|
||||
* Cylinder diameter, in mm.
|
||||
* offset 9668
|
||||
*/
|
||||
float cylinderBore;
|
||||
/**
|
||||
* Some vehicles have a switch to indicate that clutch pedal is all the way up
|
||||
* offset 9672
|
||||
*/
|
||||
brain_pin_e clutchUpPin;
|
||||
/**
|
||||
* offset 9676
|
||||
*/
|
||||
pin_input_mode_e clutchUpPinMode;
|
||||
/**
|
||||
* offset 9680
|
||||
*/
|
||||
float hipThreshold;
|
||||
/**
|
||||
* offset 9684
|
||||
*/
|
||||
brain_pin_e fsioInputs[LE_COMMAND_COUNT];
|
||||
/**
|
||||
* offset 9748
|
||||
*/
|
||||
pin_input_mode_e fsioInputModes[LE_COMMAND_COUNT];
|
||||
/**
|
||||
* offset 9812
|
||||
*/
|
||||
int unused3[149];
|
||||
/**
|
||||
* offset 10408
|
||||
*/
|
||||
le_formula_t timingMultiplier;
|
||||
/**
|
||||
* offset 10608
|
||||
*/
|
||||
le_formula_t timingAdditive;
|
||||
/**
|
||||
* offset 10808
|
||||
*/
|
||||
fuel_table_t injectionPhase;
|
||||
} engine_configuration_s;
|
||||
|
||||
void setOperationMode(engine_configuration_s *engineConfiguration, operation_mode_e mode);
|
||||
operation_mode_e getOperationMode(engine_configuration_s const *engineConfiguration);
|
||||
|
|
|
|||
|
|
@ -71,6 +71,56 @@ typedef struct {
|
|||
/** total size 144*/
|
||||
} MAP_sensor_config_s;
|
||||
|
||||
/**
|
||||
* @brief Thermistor curve parameters
|
||||
|
||||
*/
|
||||
typedef struct {
|
||||
/**
|
||||
* these values are in Celcuus
|
||||
* offset 0
|
||||
*/
|
||||
float tempC_1;
|
||||
/**
|
||||
* offset 4
|
||||
*/
|
||||
float tempC_2;
|
||||
/**
|
||||
* offset 8
|
||||
*/
|
||||
float tempC_3;
|
||||
/**
|
||||
* offset 12
|
||||
*/
|
||||
float resistance_1;
|
||||
/**
|
||||
* offset 16
|
||||
*/
|
||||
float resistance_2;
|
||||
/**
|
||||
* offset 20
|
||||
*/
|
||||
float resistance_3;
|
||||
/**
|
||||
* offset 24
|
||||
*/
|
||||
float bias_resistor;
|
||||
/**
|
||||
* offset 28
|
||||
*/
|
||||
float s_h_a;
|
||||
/**
|
||||
* offset 32
|
||||
*/
|
||||
float s_h_b;
|
||||
/**
|
||||
* offset 36
|
||||
*/
|
||||
float s_h_c;
|
||||
/** total size 40*/
|
||||
} ThermistorConf;
|
||||
|
||||
|
||||
/**
|
||||
* @brief Trigger wheel(s) configuration
|
||||
|
||||
|
|
@ -490,3 +540,546 @@ typedef struct {
|
|||
le_formula_t le_formulas[LE_COMMAND_COUNT];
|
||||
/** total size 3976*/
|
||||
} board_configuration_s;
|
||||
|
||||
typedef struct {
|
||||
// this section was generated by config_definition.jar on Thu Jan 15 15:59:00 EST 2015
|
||||
// begin
|
||||
/**
|
||||
* http://rusefi.com/wiki/index.php?title=Manual:Engine_Type
|
||||
* offset 0
|
||||
*/
|
||||
engine_type_e engineType;
|
||||
/**
|
||||
* this magic number is used to make sure that what we read from Flash is in fact some configuration
|
||||
* offset 4
|
||||
*/
|
||||
int headerMagicValue;
|
||||
/**
|
||||
* offset 8
|
||||
*/
|
||||
float battInjectorLagCorrBins[VBAT_INJECTOR_CURVE_SIZE];
|
||||
/**
|
||||
* offset 40
|
||||
*/
|
||||
float battInjectorLagCorr[VBAT_INJECTOR_CURVE_SIZE];
|
||||
/**
|
||||
* offset 72
|
||||
*/
|
||||
float cltFuelCorrBins[CLT_CURVE_SIZE];
|
||||
/**
|
||||
* offset 136
|
||||
*/
|
||||
float cltFuelCorr[CLT_CURVE_SIZE];
|
||||
/**
|
||||
* offset 200
|
||||
*/
|
||||
float iatFuelCorrBins[IAT_CURVE_SIZE];
|
||||
/**
|
||||
* offset 264
|
||||
*/
|
||||
float iatFuelCorr[IAT_CURVE_SIZE];
|
||||
/**
|
||||
* Should the trigger emulator push data right into trigger input, eliminating the need for physical jumper wires?
|
||||
* PS: Funny name, right? :)
|
||||
* todo: make this a bit on some bit field
|
||||
* offset 328
|
||||
*/
|
||||
int16_t directSelfStimulation;
|
||||
/**
|
||||
* todo: extract these two fields into a structure
|
||||
* todo: we need two sets of TPS parameters - modern ETBs have to sensors
|
||||
* offset 330
|
||||
*/
|
||||
int16_t tpsMin;
|
||||
/**
|
||||
* tpsMax value as 10 bit ADC value. Not Voltage!
|
||||
* offset 332
|
||||
*/
|
||||
int16_t tpsMax;
|
||||
/**
|
||||
* offset 334
|
||||
*/
|
||||
uint16_t unused334;
|
||||
|
||||
/**
|
||||
* todo: finish implementation. These values are used for TPS disconnect detection
|
||||
* offset 336
|
||||
*/
|
||||
int16_t tpsErrorLowValue;
|
||||
/**
|
||||
* offset 338
|
||||
*/
|
||||
int16_t tpsErrorHighValue;
|
||||
/**
|
||||
* offset 340
|
||||
*/
|
||||
float primingSquirtDurationMs;
|
||||
/**
|
||||
* 360 for two-stroke
|
||||
* 720 for four-stroke
|
||||
* offset 344
|
||||
*/
|
||||
int engineCycle;
|
||||
|
||||
/**
|
||||
* offset 348
|
||||
*/
|
||||
cranking_parameters_s cranking;
|
||||
/**
|
||||
* @see hasMapSensor
|
||||
* @see isMapAveragingEnabled
|
||||
* offset 356
|
||||
*/
|
||||
MAP_sensor_config_s map;
|
||||
|
||||
/**
|
||||
* todo: merge with channel settings, use full-scale Thermistor here!
|
||||
* offset 500
|
||||
*/
|
||||
ThermistorConf clt;
|
||||
/**
|
||||
* offset 540
|
||||
*/
|
||||
ThermistorConf iat;
|
||||
/**
|
||||
* offset 580
|
||||
*/
|
||||
float sparkDwellBins[DWELL_COUNT];
|
||||
/**
|
||||
* offset 612
|
||||
*/
|
||||
float sparkDwell[DWELL_COUNT];
|
||||
/**
|
||||
* offset 644
|
||||
*/
|
||||
float ignitionLoadBins[IGN_LOAD_COUNT];
|
||||
/**
|
||||
* offset 708
|
||||
*/
|
||||
float ignitionRpmBins[IGN_RPM_COUNT];
|
||||
/**
|
||||
* this value could be used to offset the whole ignition timing table by a constant
|
||||
* offset 772
|
||||
*/
|
||||
float ignitionBaseAngle;
|
||||
/**
|
||||
* While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft
|
||||
* degrees, not in absolute time as in running mode.
|
||||
* offset 776
|
||||
*/
|
||||
float crankingChargeAngle;
|
||||
/**
|
||||
* offset 780
|
||||
*/
|
||||
timing_mode_e timingMode;
|
||||
/**
|
||||
* This value is used in 'fixed timing' mode, i.e. constant timing
|
||||
* This mode is useful for instance while adjusting distributor location
|
||||
* offset 784
|
||||
*/
|
||||
float fixedModeTiming;
|
||||
/**
|
||||
* offset 788
|
||||
*/
|
||||
float injectorLag;
|
||||
/**
|
||||
* offset 792
|
||||
*/
|
||||
float fuelLoadBins[FUEL_LOAD_COUNT];
|
||||
/**
|
||||
* RPM is float and not integer in order to use unified methods for interpolation
|
||||
* offset 856
|
||||
*/
|
||||
float fuelRpmBins[FUEL_RPM_COUNT];
|
||||
/**
|
||||
* Engine displacement, in liters
|
||||
* see also cylindersCount
|
||||
* offset 920
|
||||
*/
|
||||
float displacement;
|
||||
/**
|
||||
* offset 924
|
||||
*/
|
||||
int rpmHardLimit;
|
||||
/**
|
||||
* offset 928
|
||||
*/
|
||||
injection_mode_e crankingInjectionMode;
|
||||
/**
|
||||
* offset 932
|
||||
*/
|
||||
injection_mode_e injectionMode;
|
||||
/**
|
||||
* This field is the angle between Top Dead Center (TDC) and the first trigger event.
|
||||
* Knowing this angle allows us to control timing and other angles in reference to TDC.
|
||||
* offset 936
|
||||
*/
|
||||
float globalTriggerAngleOffset;
|
||||
/**
|
||||
* This parameter holds the coefficient of input voltage dividers
|
||||
* offset 940
|
||||
*/
|
||||
float analogInputDividerCoefficient;
|
||||
/**
|
||||
* This setting controls which algorithm is used for ENGINE LOAD
|
||||
* offset 944
|
||||
*/
|
||||
engine_load_mode_e algorithm;
|
||||
/**
|
||||
* offset 948
|
||||
*/
|
||||
float vbattDividerCoeff;
|
||||
/**
|
||||
* Cooling fan turn-on temperature threshold, in Celsuis
|
||||
* offset 952
|
||||
*/
|
||||
float fanOnTemperature;
|
||||
/**
|
||||
* Cooling fan turn-off temperature threshold, in Celsuis
|
||||
* offset 956
|
||||
*/
|
||||
float fanOffTemperature;
|
||||
/**
|
||||
* offset 960
|
||||
*/
|
||||
brain_pin_e vehicleSpeedSensorInputPin;
|
||||
/**
|
||||
* This coefficient translates vehicle speed input frequency (in Hz) into vehicle speed, km/h
|
||||
* offset 964
|
||||
*/
|
||||
float vehicleSpeedCoef;
|
||||
/**
|
||||
* offset 968
|
||||
*/
|
||||
can_nbc_e canNbcType;
|
||||
/**
|
||||
* offset 972
|
||||
*/
|
||||
int canSleepPeriod;
|
||||
/**
|
||||
* offset 976
|
||||
*/
|
||||
int cylindersCount;
|
||||
/**
|
||||
* offset 980
|
||||
*/
|
||||
ignition_mode_e ignitionMode;
|
||||
/**
|
||||
* offset 984
|
||||
*/
|
||||
firing_order_e firingOrder;
|
||||
/**
|
||||
* todo: refactor this, see operation_mode_e
|
||||
* offset 988
|
||||
*/
|
||||
float rpmMultiplier;
|
||||
/**
|
||||
* offset 992
|
||||
*/
|
||||
display_mode_e displayMode;
|
||||
/**
|
||||
* offset 996
|
||||
*/
|
||||
log_format_e logFormat;
|
||||
/**
|
||||
* offset 1000
|
||||
*/
|
||||
int firmwareVersion;
|
||||
/**
|
||||
* offset 1004
|
||||
*/
|
||||
int HD44780width;
|
||||
/**
|
||||
* offset 1008
|
||||
*/
|
||||
int HD44780height;
|
||||
/**
|
||||
* offset 1012
|
||||
*/
|
||||
adc_channel_e tpsAdcChannel;
|
||||
/**
|
||||
* offset 1016
|
||||
*/
|
||||
int overrideCrankingIgnition;
|
||||
/**
|
||||
* offset 1020
|
||||
*/
|
||||
int analogChartFrequency;
|
||||
/**
|
||||
* offset 1024
|
||||
*/
|
||||
trigger_config_s trigger;
|
||||
/**
|
||||
* offset 1052
|
||||
*/
|
||||
spi_device_e hip9011SpiDevice;
|
||||
/**
|
||||
* offset 1056
|
||||
*/
|
||||
adc_channel_e vbattAdcChannel;
|
||||
/**
|
||||
* offset 1060
|
||||
*/
|
||||
float globalFuelCorrection;
|
||||
/**
|
||||
* todo: merge with channel settings, use full-scale Thermistor!
|
||||
* offset 1064
|
||||
*/
|
||||
adc_channel_e cltAdcChannel;
|
||||
/**
|
||||
* offset 1068
|
||||
*/
|
||||
adc_channel_e iatAdcChannel;
|
||||
/**
|
||||
* offset 1072
|
||||
*/
|
||||
adc_channel_e mafAdcChannel;
|
||||
/**
|
||||
* @see hasAfrSensor
|
||||
* offset 1076
|
||||
*/
|
||||
afr_sensor_s afrSensor;
|
||||
/**
|
||||
* this is about deciding when the injector starts it's squirt
|
||||
* offset 1096
|
||||
*/
|
||||
float injectionAngle;
|
||||
/**
|
||||
* offset 1100
|
||||
*/
|
||||
float crankingTimingAngle;
|
||||
/**
|
||||
* offset 1104
|
||||
*/
|
||||
float diffLoadEnrichmentCoef;
|
||||
/**
|
||||
* @see hasBaroSensor
|
||||
* offset 1108
|
||||
*/
|
||||
air_pressure_sensor_config_s baroSensor;
|
||||
/**
|
||||
* offset 1124
|
||||
*/
|
||||
float veLoadBins[FUEL_LOAD_COUNT];
|
||||
/**
|
||||
* offset 1188
|
||||
*/
|
||||
float veRpmBins[FUEL_RPM_COUNT];
|
||||
/**
|
||||
* offset 1252
|
||||
*/
|
||||
float afrLoadBins[FUEL_LOAD_COUNT];
|
||||
/**
|
||||
* offset 1316
|
||||
*/
|
||||
float afrRpmBins[FUEL_RPM_COUNT];
|
||||
/**
|
||||
* offset 1380
|
||||
*/
|
||||
fuel_table_t fuelTable;
|
||||
/**
|
||||
* offset 2404
|
||||
*/
|
||||
ignition_table_t ignitionTable;
|
||||
/**
|
||||
* offset 3428
|
||||
*/
|
||||
fuel_table_t veTable;
|
||||
/**
|
||||
* offset 4452
|
||||
*/
|
||||
fuel_table_t afrTable;
|
||||
|
||||
board_configuration_s bc;
|
||||
|
||||
// offset 6280 ????
|
||||
/**
|
||||
* @see isMapAveragingEnabled
|
||||
*/
|
||||
/** offset 9480 bit 0 */
|
||||
bool_t hasMapSensor : 1;
|
||||
/** offset 9480 bit 1 */
|
||||
bool_t hasIatSensor : 1;
|
||||
/** offset 9480 bit 2 */
|
||||
bool_t hasBaroSensor : 1;
|
||||
/** offset 9480 bit 3 */
|
||||
bool_t hasAfrSensor : 1;
|
||||
/** offset 9480 bit 4 */
|
||||
bool_t useConstantDwellDuringCranking : 1;
|
||||
/** offset 9480 bit 5 */
|
||||
bool_t isDigitalChartEnabled : 1;
|
||||
/** offset 9480 bit 6 */
|
||||
bool_t isCanEnabled : 1;
|
||||
/** offset 9480 bit 7 */
|
||||
bool_t hasCltSensor : 1;
|
||||
/** offset 9480 bit 8 */
|
||||
bool_t canReadEnabled : 1;
|
||||
/** offset 9480 bit 9 */
|
||||
bool_t canWriteEnabled : 1;
|
||||
/** offset 9480 bit 10 */
|
||||
bool_t hasVehicleSpeedSensor : 1;
|
||||
/** offset 9480 bit 11 */
|
||||
bool_t isJoystickEnabled : 1;
|
||||
/** offset 9480 bit 12 */
|
||||
bool_t isGpsEnabled : 1;
|
||||
/** offset 9480 bit 13 */
|
||||
bool_t hasMafSensor : 1;
|
||||
/** offset 9480 bit 14 */
|
||||
bool_t hasTpsSensor : 1;
|
||||
|
||||
/**
|
||||
* offset 6284 ???
|
||||
*/
|
||||
adc_channel_e hipOutputChannel;
|
||||
|
||||
/**
|
||||
* offset 9488
|
||||
*/
|
||||
idle_mode_e idleMode;
|
||||
/** offset 9492 bit 0 */
|
||||
bool_t isInjectionEnabled : 1;
|
||||
/** offset 9492 bit 1 */
|
||||
bool_t isIgnitionEnabled : 1;
|
||||
/** offset 9492 bit 2 */
|
||||
bool_t isCylinderCleanupEnabled : 1;
|
||||
/** offset 9492 bit 3 */
|
||||
bool_t secondTriggerChannelEnabled : 1;
|
||||
/** offset 9492 bit 4 */
|
||||
bool_t needSecondTriggerInput : 1;
|
||||
/** offset 9492 bit 5 */
|
||||
bool_t isMapAveragingEnabled : 1;
|
||||
/** offset 9492 bit 6 */
|
||||
bool_t isMilEnabled : 1;
|
||||
/** offset 9492 bit 7 */
|
||||
bool_t isFuelPumpEnabled : 1;
|
||||
/** offset 9492 bit 8 */
|
||||
bool_t isTunerStudioEnabled : 1;
|
||||
/** offset 9492 bit 9 */
|
||||
bool_t isWaveAnalyzerEnabled : 1;
|
||||
/** offset 9492 bit 10 */
|
||||
bool_t isIdleThreadEnabled : 1;
|
||||
/** offset 9492 bit 11 */
|
||||
bool_t isPrintTriggerSynchDetails : 1;
|
||||
/**
|
||||
* Usually if we have no trigger events that means engine is stopped
|
||||
* Unless we are troubleshooting and spinning the engine by hand - this case a longer
|
||||
* delay is needed
|
||||
*/
|
||||
bool isManualSpinningMode : 1; // bit 11
|
||||
|
||||
/**
|
||||
* offset 9496
|
||||
*/
|
||||
uint32_t digitalChartSize;
|
||||
/**
|
||||
* cc/min, cubic centimeter per minute
|
||||
* By the way, g/s = 0.125997881 * (lb/hr)
|
||||
* g/s = 0.125997881 * (cc/min)/10.5
|
||||
* g/s = 0.0119997981 * cc/min
|
||||
* offset 9500
|
||||
*/
|
||||
float injectorFlow;
|
||||
/**
|
||||
* offset 9504
|
||||
*/
|
||||
float crankingFuelCoef[CRANKING_CURVE_SIZE];
|
||||
/**
|
||||
* offset 9536
|
||||
*/
|
||||
float crankingFuelBins[CRANKING_CURVE_SIZE];
|
||||
/**
|
||||
* offset 9568
|
||||
*/
|
||||
float crankingCycleCoef[CRANKING_CURVE_SIZE];
|
||||
/**
|
||||
* offset 9600
|
||||
*/
|
||||
float crankingCycleBins[CRANKING_CURVE_SIZE];
|
||||
/**
|
||||
* offset 9632
|
||||
*/
|
||||
float ignitionDwellForCrankingMs;
|
||||
/**
|
||||
* offset 9636
|
||||
*/
|
||||
int targetIdleRpm;
|
||||
/**
|
||||
* A/C button input handled as analog input
|
||||
* offset 9640
|
||||
*/
|
||||
adc_channel_e acSwitchAdc;
|
||||
/**
|
||||
* offset 9644
|
||||
*/
|
||||
int ignMathCalculateAtIndex;
|
||||
/**
|
||||
* offset 9648
|
||||
*/
|
||||
int16_t acCutoffLowRpm;
|
||||
/**
|
||||
* offset 9650
|
||||
*/
|
||||
int16_t acCutoffHighRpm;
|
||||
/**
|
||||
* offset 9652
|
||||
*/
|
||||
int16_t acIdleRpmBump;
|
||||
/**
|
||||
* offset 9654
|
||||
*/
|
||||
int16_t unusedShort;
|
||||
/**
|
||||
* offset 9656
|
||||
*/
|
||||
adc_channel_e vRefAdcChannel;
|
||||
/**
|
||||
* offset 9660
|
||||
*/
|
||||
float knockDetectionWindowStart;
|
||||
/**
|
||||
* offset 9664
|
||||
*/
|
||||
float knockDetectionWindowEnd;
|
||||
/**
|
||||
* Cylinder diameter, in mm.
|
||||
* offset 9668
|
||||
*/
|
||||
float cylinderBore;
|
||||
/**
|
||||
* Some vehicles have a switch to indicate that clutch pedal is all the way up
|
||||
* offset 9672
|
||||
*/
|
||||
brain_pin_e clutchUpPin;
|
||||
/**
|
||||
* offset 9676
|
||||
*/
|
||||
pin_input_mode_e clutchUpPinMode;
|
||||
/**
|
||||
* offset 9680
|
||||
*/
|
||||
float hipThreshold;
|
||||
/**
|
||||
* offset 9684
|
||||
*/
|
||||
brain_pin_e fsioInputs[LE_COMMAND_COUNT];
|
||||
/**
|
||||
* offset 9748
|
||||
*/
|
||||
pin_input_mode_e fsioInputModes[LE_COMMAND_COUNT];
|
||||
/**
|
||||
* offset 9812
|
||||
*/
|
||||
int unused3[149];
|
||||
/**
|
||||
* offset 10408
|
||||
*/
|
||||
le_formula_t timingMultiplier;
|
||||
/**
|
||||
* offset 10608
|
||||
*/
|
||||
le_formula_t timingAdditive;
|
||||
/**
|
||||
* offset 10808
|
||||
*/
|
||||
fuel_table_t injectionPhase;
|
||||
} engine_configuration_s;
|
||||
|
|
|
|||
|
|
@ -59,59 +59,28 @@ typedef brain_pin_e egt_cs_array_t[MAX31855_CS_COUNT];
|
|||
#define MAP_ANGLE_SIZE 8
|
||||
#define MAP_WINDOW_SIZE 8
|
||||
|
||||
/**
|
||||
* @brief Thermistor curve parameters
|
||||
#define DWELL_COUNT 8
|
||||
|
||||
*/
|
||||
#define DWELL_CURVE_SIZE 8
|
||||
|
||||
#define CRANKING_CURVE_SIZE 8
|
||||
|
||||
#define CLT_CURVE_SIZE 16
|
||||
#define IAT_CURVE_SIZE 16
|
||||
#define VBAT_INJECTOR_CURVE_SIZE 8
|
||||
|
||||
#define IGN_LOAD_COUNT 16
|
||||
#define IGN_RPM_COUNT 16
|
||||
|
||||
// todo: merge these two types together?
|
||||
typedef float fuel_table_t[FUEL_LOAD_COUNT][FUEL_RPM_COUNT];
|
||||
typedef float ignition_table_t[IGN_LOAD_COUNT][IGN_RPM_COUNT];
|
||||
|
||||
// todo: rename this structure one all tables migrated
|
||||
typedef struct {
|
||||
/**
|
||||
* these values are in Celcuus
|
||||
* offset 0
|
||||
*/
|
||||
float tempC_1;
|
||||
/**
|
||||
* offset 4
|
||||
*/
|
||||
float tempC_2;
|
||||
/**
|
||||
* offset 8
|
||||
*/
|
||||
float tempC_3;
|
||||
/**
|
||||
* offset 12
|
||||
*/
|
||||
float resistance_1;
|
||||
/**
|
||||
* offset 16
|
||||
*/
|
||||
float resistance_2;
|
||||
/**
|
||||
* offset 20
|
||||
*/
|
||||
float resistance_3;
|
||||
/**
|
||||
* offset 24
|
||||
*/
|
||||
float bias_resistor;
|
||||
/**
|
||||
* offset 28
|
||||
*/
|
||||
float s_h_a;
|
||||
/**
|
||||
* offset 32
|
||||
*/
|
||||
float s_h_b;
|
||||
/**
|
||||
* offset 36
|
||||
*/
|
||||
float s_h_c;
|
||||
/** total size 40*/
|
||||
} ThermistorConf;
|
||||
|
||||
|
||||
typedef struct {
|
||||
ThermistorConf *config;
|
||||
adc_channel_e channel;
|
||||
} Thermistor;
|
||||
float loadBins[IGN_LOAD_COUNT];
|
||||
float rpmBins[IGN_RPM_COUNT];
|
||||
ignition_table_t map;
|
||||
} full_i_table_s;
|
||||
|
||||
#endif /* CONTROLLERS_ALGO_RUSEFI_TYPES_H_ */
|
||||
|
|
|
|||
Loading…
Reference in New Issue