that's how we can move all fields one by one from boardConfiguration to engineConfiguration

my approach is to move fields from the bottom of BC struct
This commit is contained in:
rusefi 2019-11-30 10:24:37 -05:00
parent e5c2273d13
commit b04166d173
28 changed files with 196 additions and 191 deletions

View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Fri Nov 29 21:57:01 EST 2019 // this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Nov 30 10:08:11 EST 2019
// by class com.rusefi.output.CHeaderConsumer // by class com.rusefi.output.CHeaderConsumer
// begin // begin
#ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -364,14 +364,10 @@
#define cltTimingExtra_offset_hex 950 #define cltTimingExtra_offset_hex 950
#define clutchDownPin_offset 664 #define clutchDownPin_offset 664
#define clutchDownPin_offset_hex 298 #define clutchDownPin_offset_hex 298
#define clutchDownPinInverted_offset 976
#define clutchDownPinInverted_offset_hex 3d0
#define clutchDownPinMode_offset 667 #define clutchDownPinMode_offset 667
#define clutchDownPinMode_offset_hex 29b #define clutchDownPinMode_offset_hex 29b
#define clutchUpPin_offset 969 #define clutchUpPin_offset 969
#define clutchUpPin_offset_hex 3c9 #define clutchUpPin_offset_hex 3c9
#define clutchUpPinInverted_offset 976
#define clutchUpPinInverted_offset_hex 3d0
#define clutchUpPinMode_offset 971 #define clutchUpPinMode_offset 971
#define clutchUpPinMode_offset_hex 3cb #define clutchUpPinMode_offset_hex 3cb
#define CMD_CALIBRATE_PEDAL_DOWN "calibrate_pedal_down" #define CMD_CALIBRATE_PEDAL_DOWN "calibrate_pedal_down"
@ -567,8 +563,6 @@
#define etbDeadband_offset_hex f78 #define etbDeadband_offset_hex f78
#define etbFreq_offset 2514 #define etbFreq_offset 2514
#define etbFreq_offset_hex 9d2 #define etbFreq_offset_hex 9d2
#define etbIdleRange_offset 972
#define etbIdleRange_offset_hex 3cc
#define etbIdleThrottleRange_offset 4012 #define etbIdleThrottleRange_offset 4012
#define etbIdleThrottleRange_offset_hex fac #define etbIdleThrottleRange_offset_hex fac
#define etbNeutralPosition_offset 1471 #define etbNeutralPosition_offset 1471
@ -1803,6 +1797,10 @@
#define tle8888_csPinMode_offset_hex c22 #define tle8888_csPinMode_offset_hex c22
#define tle8888spiDevice_offset 4000 #define tle8888spiDevice_offset 4000
#define tle8888spiDevice_offset_hex fa0 #define tle8888spiDevice_offset_hex fa0
#define todoClutchDownPinInverted_offset 976
#define todoClutchDownPinInverted_offset_hex 3d0
#define todoClutchUpPinInverted_offset 976
#define todoClutchUpPinInverted_offset_hex 3d0
#define TOP_DEAD_CENTER_MESSAGE "r" #define TOP_DEAD_CENTER_MESSAGE "r"
#define TOTAL_CONFIG_SIZE 20000 #define TOTAL_CONFIG_SIZE 20000
#define TOTAL_CONFIG_SIZE_hex 4e20 #define TOTAL_CONFIG_SIZE_hex 4e20
@ -1928,10 +1926,12 @@
#define unused_board_984_31_offset_hex 2e8 #define unused_board_984_31_offset_hex 2e8
#define unused_former_warmup_target_afr_offset 2096 #define unused_former_warmup_target_afr_offset 2096
#define unused_former_warmup_target_afr_offset_hex 830 #define unused_former_warmup_target_afr_offset_hex 830
#define unused_offset 972
#define unused_offset_hex 3cc
#define unusedAnotherOne_offset 744 #define unusedAnotherOne_offset 744
#define unusedAnotherOne_offset_hex 2e8 #define unusedAnotherOne_offset_hex 2e8
#define unusedAtBoardConfigurationEnd_offset 980 #define unusedAtOldBoardConfigurationEnd_offset 980
#define unusedAtBoardConfigurationEnd_offset_hex 3d4 #define unusedAtOldBoardConfigurationEnd_offset_hex 3d4
#define unusedErrorPin_offset 2040 #define unusedErrorPin_offset 2040
#define unusedErrorPin_offset_hex 7f8 #define unusedErrorPin_offset_hex 7f8
#define unusedFlexFuelSensor_offset 3100 #define unusedFlexFuelSensor_offset 3100
@ -3051,48 +3051,7 @@ struct board_configuration_s {
* offset 344 * offset 344
*/ */
sensor_chart_e sensorChartMode; sensor_chart_e sensorChartMode;
/** /** total size 348*/
* offset 348
*/
maf_sensor_type_e mafSensorType;
/**
* todo:not finished
* These input pins allow us to pull toggle buttons state
* offset 352
*/
brain_pin_e fsioDigitalInputs[FSIO_COMMAND_COUNT];
/**
* offset 368
*/
brain_input_pin_e vehicleSpeedSensorInputPin;
/**
* Some vehicles have a switch to indicate that clutch pedal is all the way up
* offset 369
*/
switch_input_pin_e clutchUpPin;
/**
* offset 370
*/
brain_input_pin_e frequencyReportingMapInputPin;
/**
* offset 371
*/
pin_input_mode_e clutchUpPinMode;
/**
* offset 372
*/
float etbIdleRange = (float)0;
/**
offset 376 bit 0 */
bool clutchUpPinInverted : 1;
/**
offset 376 bit 1 */
bool clutchDownPinInverted : 1;
/**
* offset 380
*/
int unusedAtBoardConfigurationEnd[121];
/** total size 864*/
}; };
typedef struct board_configuration_s board_configuration_s; typedef struct board_configuration_s board_configuration_s;
@ -3549,6 +3508,47 @@ struct engine_configuration_s {
* offset 600 * offset 600
*/ */
board_configuration_s bc; board_configuration_s bc;
/**
* offset 948
*/
maf_sensor_type_e mafSensorType;
/**
* todo:not finished
* These input pins allow us to pull toggle buttons state
* offset 952
*/
brain_pin_e fsioDigitalInputs[FSIO_COMMAND_COUNT];
/**
* offset 968
*/
brain_input_pin_e vehicleSpeedSensorInputPin;
/**
* Some vehicles have a switch to indicate that clutch pedal is all the way up
* offset 969
*/
switch_input_pin_e clutchUpPin;
/**
* offset 970
*/
brain_input_pin_e frequencyReportingMapInputPin;
/**
* offset 971
*/
pin_input_mode_e clutchUpPinMode;
/**
* offset 972
*/
float unused = (float)0;
/**
offset 976 bit 0 */
bool todoClutchUpPinInverted : 1;
/**
offset 976 bit 1 */
bool todoClutchDownPinInverted : 1;
/**
* offset 980
*/
int unusedAtOldBoardConfigurationEnd[121];
/** /**
offset 1464 bit 0 */ offset 1464 bit 0 */
bool vvtDisplayInverted : 1; bool vvtDisplayInverted : 1;
@ -4962,4 +4962,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif #endif
// end // end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Fri Nov 29 21:57:01 EST 2019 // this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Nov 30 10:08:11 EST 2019

View File

@ -362,14 +362,10 @@
#define cltTimingExtra_offset_hex 950 #define cltTimingExtra_offset_hex 950
#define clutchDownPin_offset 664 #define clutchDownPin_offset 664
#define clutchDownPin_offset_hex 298 #define clutchDownPin_offset_hex 298
#define clutchDownPinInverted_offset 976
#define clutchDownPinInverted_offset_hex 3d0
#define clutchDownPinMode_offset 667 #define clutchDownPinMode_offset 667
#define clutchDownPinMode_offset_hex 29b #define clutchDownPinMode_offset_hex 29b
#define clutchUpPin_offset 969 #define clutchUpPin_offset 969
#define clutchUpPin_offset_hex 3c9 #define clutchUpPin_offset_hex 3c9
#define clutchUpPinInverted_offset 976
#define clutchUpPinInverted_offset_hex 3d0
#define clutchUpPinMode_offset 971 #define clutchUpPinMode_offset 971
#define clutchUpPinMode_offset_hex 3cb #define clutchUpPinMode_offset_hex 3cb
#define CMD_CALIBRATE_PEDAL_DOWN "calibrate_pedal_down" #define CMD_CALIBRATE_PEDAL_DOWN "calibrate_pedal_down"
@ -565,8 +561,6 @@
#define etbDeadband_offset_hex f78 #define etbDeadband_offset_hex f78
#define etbFreq_offset 2514 #define etbFreq_offset 2514
#define etbFreq_offset_hex 9d2 #define etbFreq_offset_hex 9d2
#define etbIdleRange_offset 972
#define etbIdleRange_offset_hex 3cc
#define etbIdleThrottleRange_offset 4012 #define etbIdleThrottleRange_offset 4012
#define etbIdleThrottleRange_offset_hex fac #define etbIdleThrottleRange_offset_hex fac
#define etbNeutralPosition_offset 1471 #define etbNeutralPosition_offset 1471
@ -1801,6 +1795,10 @@
#define tle8888_csPinMode_offset_hex c22 #define tle8888_csPinMode_offset_hex c22
#define tle8888spiDevice_offset 4000 #define tle8888spiDevice_offset 4000
#define tle8888spiDevice_offset_hex fa0 #define tle8888spiDevice_offset_hex fa0
#define todoClutchDownPinInverted_offset 976
#define todoClutchDownPinInverted_offset_hex 3d0
#define todoClutchUpPinInverted_offset 976
#define todoClutchUpPinInverted_offset_hex 3d0
#define TOP_DEAD_CENTER_MESSAGE "r" #define TOP_DEAD_CENTER_MESSAGE "r"
#define TOTAL_CONFIG_SIZE 20000 #define TOTAL_CONFIG_SIZE 20000
#define TOTAL_CONFIG_SIZE_hex 4e20 #define TOTAL_CONFIG_SIZE_hex 4e20
@ -1926,10 +1924,12 @@
#define unused_board_984_31_offset_hex 2e8 #define unused_board_984_31_offset_hex 2e8
#define unused_former_warmup_target_afr_offset 2096 #define unused_former_warmup_target_afr_offset 2096
#define unused_former_warmup_target_afr_offset_hex 830 #define unused_former_warmup_target_afr_offset_hex 830
#define unused_offset 972
#define unused_offset_hex 3cc
#define unusedAnotherOne_offset 744 #define unusedAnotherOne_offset 744
#define unusedAnotherOne_offset_hex 2e8 #define unusedAnotherOne_offset_hex 2e8
#define unusedAtBoardConfigurationEnd_offset 980 #define unusedAtOldBoardConfigurationEnd_offset 980
#define unusedAtBoardConfigurationEnd_offset_hex 3d4 #define unusedAtOldBoardConfigurationEnd_offset_hex 3d4
#define unusedErrorPin_offset 2040 #define unusedErrorPin_offset 2040
#define unusedErrorPin_offset_hex 7f8 #define unusedErrorPin_offset_hex 7f8
#define unusedFlexFuelSensor_offset 3100 #define unusedFlexFuelSensor_offset 3100

View File

@ -69,7 +69,7 @@ void setBoardConfigurationOverrides(void) {
boardConfiguration->triggerSimulatorPins[2] = GPIO_UNASSIGNED; boardConfiguration->triggerSimulatorPins[2] = GPIO_UNASSIGNED;
boardConfiguration->triggerSimulatorPinModes[1] = OM_DEFAULT; boardConfiguration->triggerSimulatorPinModes[1] = OM_DEFAULT;
boardConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT; boardConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT;
boardConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED; engineConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED;
boardConfiguration->digitalPotentiometerSpiDevice = SPI_NONE; boardConfiguration->digitalPotentiometerSpiDevice = SPI_NONE;
boardConfiguration->max31855spiDevice = SPI_NONE; boardConfiguration->max31855spiDevice = SPI_NONE;

View File

@ -215,7 +215,7 @@ void setBoardConfigurationOverrides(void) {
boardConfiguration->triggerSimulatorPins[2] = GPIO_UNASSIGNED; boardConfiguration->triggerSimulatorPins[2] = GPIO_UNASSIGNED;
boardConfiguration->triggerSimulatorPinModes[1] = OM_DEFAULT; boardConfiguration->triggerSimulatorPinModes[1] = OM_DEFAULT;
boardConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT; boardConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT;
boardConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED; engineConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED;
boardConfiguration->digitalPotentiometerSpiDevice = SPI_NONE; boardConfiguration->digitalPotentiometerSpiDevice = SPI_NONE;
boardConfiguration->max31855spiDevice = SPI_NONE; boardConfiguration->max31855spiDevice = SPI_NONE;

View File

@ -177,7 +177,7 @@ void setBoardConfigurationOverrides(void) {
boardConfiguration->digitalPotentiometerChipSelect[1] = GPIO_UNASSIGNED; boardConfiguration->digitalPotentiometerChipSelect[1] = GPIO_UNASSIGNED;
boardConfiguration->digitalPotentiometerChipSelect[2] = GPIO_UNASSIGNED; boardConfiguration->digitalPotentiometerChipSelect[2] = GPIO_UNASSIGNED;
boardConfiguration->digitalPotentiometerChipSelect[3] = GPIO_UNASSIGNED; boardConfiguration->digitalPotentiometerChipSelect[3] = GPIO_UNASSIGNED;
boardConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED; engineConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED;
boardConfiguration->digitalPotentiometerSpiDevice = SPI_NONE; boardConfiguration->digitalPotentiometerSpiDevice = SPI_NONE;
boardConfiguration->max31855spiDevice = SPI_NONE; boardConfiguration->max31855spiDevice = SPI_NONE;

View File

@ -119,8 +119,8 @@ void setBmwE34(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
boardConfiguration->triggerErrorPin = GPIO_UNASSIGNED; boardConfiguration->triggerErrorPin = GPIO_UNASSIGNED;
// clutch up // clutch up
boardConfiguration->clutchUpPin = GPIOD_3; engineConfiguration->clutchUpPin = GPIOD_3;
boardConfiguration->clutchUpPinMode = PI_PULLUP; engineConfiguration->clutchUpPinMode = PI_PULLUP;
// fuel pump // fuel pump
boardConfiguration->fuelPumpPin = GPIOD_4; boardConfiguration->fuelPumpPin = GPIOD_4;

View File

@ -201,7 +201,7 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
/** /**
* Speed Sensor * Speed Sensor
*/ */
boardConfiguration->vehicleSpeedSensorInputPin = GPIOA_8; engineConfiguration->vehicleSpeedSensorInputPin = GPIOA_8;
/** /**
* Other * Other
*/ */

View File

@ -434,8 +434,8 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
boardConfiguration->clutchDownPin = GPIOC_12; boardConfiguration->clutchDownPin = GPIOC_12;
boardConfiguration->clutchDownPinMode = PI_PULLUP; boardConfiguration->clutchDownPinMode = PI_PULLUP;
// boardConfiguration->clutchUpPin = GPIOA_14; // note SWCLK - conflict with SWD // engineConfiguration->clutchUpPin = GPIOA_14; // note SWCLK - conflict with SWD
boardConfiguration->clutchUpPinMode = PI_PULLUP; engineConfiguration->clutchUpPinMode = PI_PULLUP;
engineConfiguration->activateAuxPid1 = 1; engineConfiguration->activateAuxPid1 = 1;
engineConfiguration->auxPidPins[0] = GPIOD_5; // playing with AUX PID for alternator engineConfiguration->auxPidPins[0] = GPIOD_5; // playing with AUX PID for alternator
@ -456,7 +456,7 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// setFsioExt(0, GPIOE_5, "0 fsio_setting", 400 PASS_CONFIG_PARAMETER_SUFFIX); // setFsioExt(0, GPIOE_5, "0 fsio_setting", 400 PASS_CONFIG_PARAMETER_SUFFIX);
#endif #endif
boardConfiguration->vehicleSpeedSensorInputPin = GPIOA_8; engineConfiguration->vehicleSpeedSensorInputPin = GPIOA_8;
engineConfiguration->fanOnTemperature = 92; engineConfiguration->fanOnTemperature = 92;
engineConfiguration->fanOffTemperature = 89; engineConfiguration->fanOffTemperature = 89;

View File

@ -304,7 +304,7 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
boardConfiguration->alternatorControlPin = GPIOE_10; boardConfiguration->alternatorControlPin = GPIOE_10;
boardConfiguration->alternatorControlPinMode = OM_OPENDRAIN; boardConfiguration->alternatorControlPinMode = OM_OPENDRAIN;
// boardConfiguration->vehicleSpeedSensorInputPin = GPIOA_8; // engineConfiguration->vehicleSpeedSensorInputPin = GPIOA_8;
boardConfiguration->vvtCamSensorUseRise = true; boardConfiguration->vvtCamSensorUseRise = true;

View File

@ -117,7 +117,7 @@ void vag_18_Turbo(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
boardConfiguration->triggerInputPins[0] = GPIOG_7; boardConfiguration->triggerInputPins[0] = GPIOG_7;
#endif /* STM32_HAS_GPIOF */ #endif /* STM32_HAS_GPIOF */
#if defined(STM32_HAS_GPIOF) && STM32_HAS_GPIOF #if defined(STM32_HAS_GPIOF) && STM32_HAS_GPIOF
boardConfiguration->vehicleSpeedSensorInputPin = GPIOF_14; engineConfiguration->vehicleSpeedSensorInputPin = GPIOF_14;
#endif /* STM32_HAS_GPIOF */ #endif /* STM32_HAS_GPIOF */

View File

@ -88,7 +88,7 @@ void setRoverv8(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
boardConfiguration->injectionPins[6] = GPIOE_2; // Frankenstein: low side - out #7 boardConfiguration->injectionPins[6] = GPIOE_2; // Frankenstein: low side - out #7
boardConfiguration->injectionPins[7] = GPIOE_3; // Frankenstein: low side - out #8 boardConfiguration->injectionPins[7] = GPIOE_3; // Frankenstein: low side - out #8
// not valid ICU pin boardConfiguration->vehicleSpeedSensorInputPin = GPIOC_2; // not valid ICU pin engineConfiguration->vehicleSpeedSensorInputPin = GPIOC_2;
//GPIOE_0 AND GPIOE_1 are bad pins since they conflict with accelerometer //GPIOE_0 AND GPIOE_1 are bad pins since they conflict with accelerometer
//no malfunction indicator pin needed, since we use CAN_BUS_MAZDA_RX8 //no malfunction indicator pin needed, since we use CAN_BUS_MAZDA_RX8

View File

@ -89,7 +89,7 @@ void setSachs(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setLinearCurve(config->afrRpmBins, 15000, 7000, 1); setLinearCurve(config->afrRpmBins, 15000, 7000, 1);
engineConfiguration->hasFrequencyReportingMapSensor = true; engineConfiguration->hasFrequencyReportingMapSensor = true;
boardConfiguration->frequencyReportingMapInputPin = GPIOC_6; engineConfiguration->frequencyReportingMapInputPin = GPIOC_6;
boardConfiguration->mapFrequency100Kpa = 159; boardConfiguration->mapFrequency100Kpa = 159;
boardConfiguration->mapFrequency0Kpa = 80; boardConfiguration->mapFrequency0Kpa = 80;
} }

View File

@ -348,8 +348,8 @@ static percent_t automaticIdleController(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
} }
engine->acSwitchState = result; engine->acSwitchState = result;
} }
if (CONFIGB(clutchUpPin) != GPIO_UNASSIGNED) { if (CONFIG(clutchUpPin) != GPIO_UNASSIGNED) {
engine->clutchUpState = efiReadPin(CONFIGB(clutchUpPin)); engine->clutchUpState = efiReadPin(CONFIG(clutchUpPin));
} }
if (CONFIG(throttlePedalUpPin) != GPIO_UNASSIGNED) { if (CONFIG(throttlePedalUpPin) != GPIO_UNASSIGNED) {
engine->engineState.idle.throttlePedalUpState = efiReadPin(CONFIG(throttlePedalUpPin)); engine->engineState.idle.throttlePedalUpState = efiReadPin(CONFIG(throttlePedalUpPin));
@ -642,9 +642,9 @@ void startIdleThread(Logging*sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
getInputMode(CONFIGB(clutchDownPinMode))); getInputMode(CONFIGB(clutchDownPinMode)));
} }
if (CONFIGB(clutchUpPin) != GPIO_UNASSIGNED) { if (CONFIG(clutchUpPin) != GPIO_UNASSIGNED) {
efiSetPadMode("clutch up switch", CONFIGB(clutchUpPin), efiSetPadMode("clutch up switch", CONFIG(clutchUpPin),
getInputMode(CONFIGB(clutchUpPinMode))); getInputMode(CONFIG(clutchUpPinMode)));
} }
if (CONFIG(throttlePedalUpPin) != GPIO_UNASSIGNED) { if (CONFIG(throttlePedalUpPin) != GPIO_UNASSIGNED) {

View File

@ -321,7 +321,7 @@ void prepareVoidConfiguration(engine_configuration_s *engineConfiguration) {
engineConfiguration->high_fuel_pressure_sensor_2 = EFI_ADC_NONE; engineConfiguration->high_fuel_pressure_sensor_2 = EFI_ADC_NONE;
boardConfiguration->clutchDownPinMode = PI_PULLUP; boardConfiguration->clutchDownPinMode = PI_PULLUP;
boardConfiguration->clutchUpPinMode = PI_PULLUP; engineConfiguration->clutchUpPinMode = PI_PULLUP;
engineConfiguration->brakePedalPinMode = PI_PULLUP; engineConfiguration->brakePedalPinMode = PI_PULLUP;
} }
@ -608,7 +608,7 @@ static void setDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
setDefaultEtbBiasCurve(PASS_CONFIG_PARAMETER_SIGNATURE); setDefaultEtbBiasCurve(PASS_CONFIG_PARAMETER_SIGNATURE);
#endif /* EFI_ELECTRONIC_THROTTLE_BODY */ #endif /* EFI_ELECTRONIC_THROTTLE_BODY */
CONFIGB(mafSensorType) = Bosch0280218037; CONFIG(mafSensorType) = Bosch0280218037;
setBosch0280218037(config); setBosch0280218037(config);
setBosch02880155868(PASS_ENGINE_PARAMETER_SIGNATURE); setBosch02880155868(PASS_ENGINE_PARAMETER_SIGNATURE);

View File

@ -195,7 +195,7 @@ static void setFsioDigitalInputPin(const char *indexStr, const char *pinName) {
scheduleMsg(logger, "invalid pin name [%s]", pinName); scheduleMsg(logger, "invalid pin name [%s]", pinName);
return; return;
} }
CONFIGB(fsioDigitalInputs)[index] = pin; CONFIG(fsioDigitalInputs)[index] = pin;
scheduleMsg(logger, "FSIO digital input pin #%d [%s]", (index + 1), hwPortname(pin)); scheduleMsg(logger, "FSIO digital input pin #%d [%s]", (index + 1), hwPortname(pin));
} }
@ -586,7 +586,7 @@ static void showFsioInfo(void) {
} }
} }
for (int i = 0; i < FSIO_COMMAND_COUNT; i++) { for (int i = 0; i < FSIO_COMMAND_COUNT; i++) {
brain_pin_e inputPin = CONFIGB(fsioDigitalInputs)[i]; brain_pin_e inputPin = CONFIG(fsioDigitalInputs)[i];
if (inputPin != GPIO_UNASSIGNED) { if (inputPin != GPIO_UNASSIGNED) {
scheduleMsg(logger, "FSIO digital input #%d: %s", i, hwPortname(inputPin)); scheduleMsg(logger, "FSIO digital input #%d: %s", i, hwPortname(inputPin));
} }
@ -697,7 +697,7 @@ void initFsioImpl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
} }
for (int i = 0; i < FSIO_COMMAND_COUNT; i++) { for (int i = 0; i < FSIO_COMMAND_COUNT; i++) {
brain_pin_e inputPin = CONFIGB(fsioDigitalInputs)[i]; brain_pin_e inputPin = CONFIG(fsioDigitalInputs)[i];
if (inputPin != GPIO_UNASSIGNED) { if (inputPin != GPIO_UNASSIGNED) {
efiSetPadMode("FSIO input", inputPin, getInputMode(engineConfiguration->fsioInputModes[i])); efiSetPadMode("FSIO input", inputPin, getInputMode(engineConfiguration->fsioInputModes[i]));

View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Nov 29 16:19:44 EST 2019 // this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Nov 30 10:15:18 EST 2019
// by class com.rusefi.output.CHeaderConsumer // by class com.rusefi.output.CHeaderConsumer
// begin // begin
#ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -989,48 +989,7 @@ struct board_configuration_s {
* offset 344 * offset 344
*/ */
sensor_chart_e sensorChartMode; sensor_chart_e sensorChartMode;
/** /** total size 348*/
* offset 348
*/
maf_sensor_type_e mafSensorType;
/**
* todo:not finished
* These input pins allow us to pull toggle buttons state
* offset 352
*/
brain_pin_e fsioDigitalInputs[FSIO_COMMAND_COUNT];
/**
* offset 368
*/
brain_input_pin_e vehicleSpeedSensorInputPin;
/**
* Some vehicles have a switch to indicate that clutch pedal is all the way up
* offset 369
*/
switch_input_pin_e clutchUpPin;
/**
* offset 370
*/
brain_input_pin_e frequencyReportingMapInputPin;
/**
* offset 371
*/
pin_input_mode_e clutchUpPinMode;
/**
* offset 372
*/
float etbIdleRange;
/**
offset 376 bit 0 */
bool clutchUpPinInverted : 1;
/**
offset 376 bit 1 */
bool clutchDownPinInverted : 1;
/**
* offset 380
*/
int unusedAtBoardConfigurationEnd[121];
/** total size 864*/
}; };
typedef struct board_configuration_s board_configuration_s; typedef struct board_configuration_s board_configuration_s;
@ -1487,6 +1446,47 @@ struct engine_configuration_s {
* offset 600 * offset 600
*/ */
board_configuration_s bc; board_configuration_s bc;
/**
* offset 948
*/
maf_sensor_type_e mafSensorType;
/**
* todo:not finished
* These input pins allow us to pull toggle buttons state
* offset 952
*/
brain_pin_e fsioDigitalInputs[FSIO_COMMAND_COUNT];
/**
* offset 968
*/
brain_input_pin_e vehicleSpeedSensorInputPin;
/**
* Some vehicles have a switch to indicate that clutch pedal is all the way up
* offset 969
*/
switch_input_pin_e clutchUpPin;
/**
* offset 970
*/
brain_input_pin_e frequencyReportingMapInputPin;
/**
* offset 971
*/
pin_input_mode_e clutchUpPinMode;
/**
* offset 972
*/
float unused;
/**
offset 976 bit 0 */
bool todoClutchUpPinInverted : 1;
/**
offset 976 bit 1 */
bool todoClutchDownPinInverted : 1;
/**
* offset 980
*/
int unusedAtOldBoardConfigurationEnd[121];
/** /**
offset 1464 bit 0 */ offset 1464 bit 0 */
bool vvtDisplayInverted : 1; bool vvtDisplayInverted : 1;
@ -2900,4 +2900,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif #endif
// end // end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Nov 29 16:19:44 EST 2019 // this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Nov 30 10:15:18 EST 2019

View File

@ -362,14 +362,10 @@
#define cltTimingExtra_offset_hex 950 #define cltTimingExtra_offset_hex 950
#define clutchDownPin_offset 664 #define clutchDownPin_offset 664
#define clutchDownPin_offset_hex 298 #define clutchDownPin_offset_hex 298
#define clutchDownPinInverted_offset 976
#define clutchDownPinInverted_offset_hex 3d0
#define clutchDownPinMode_offset 667 #define clutchDownPinMode_offset 667
#define clutchDownPinMode_offset_hex 29b #define clutchDownPinMode_offset_hex 29b
#define clutchUpPin_offset 969 #define clutchUpPin_offset 969
#define clutchUpPin_offset_hex 3c9 #define clutchUpPin_offset_hex 3c9
#define clutchUpPinInverted_offset 976
#define clutchUpPinInverted_offset_hex 3d0
#define clutchUpPinMode_offset 971 #define clutchUpPinMode_offset 971
#define clutchUpPinMode_offset_hex 3cb #define clutchUpPinMode_offset_hex 3cb
#define CMD_CALIBRATE_PEDAL_DOWN "calibrate_pedal_down" #define CMD_CALIBRATE_PEDAL_DOWN "calibrate_pedal_down"
@ -565,8 +561,6 @@
#define etbDeadband_offset_hex f78 #define etbDeadband_offset_hex f78
#define etbFreq_offset 2514 #define etbFreq_offset 2514
#define etbFreq_offset_hex 9d2 #define etbFreq_offset_hex 9d2
#define etbIdleRange_offset 972
#define etbIdleRange_offset_hex 3cc
#define etbIdleThrottleRange_offset 4012 #define etbIdleThrottleRange_offset 4012
#define etbIdleThrottleRange_offset_hex fac #define etbIdleThrottleRange_offset_hex fac
#define etbNeutralPosition_offset 1471 #define etbNeutralPosition_offset 1471
@ -1801,6 +1795,10 @@
#define tle8888_csPinMode_offset_hex c22 #define tle8888_csPinMode_offset_hex c22
#define tle8888spiDevice_offset 4000 #define tle8888spiDevice_offset 4000
#define tle8888spiDevice_offset_hex fa0 #define tle8888spiDevice_offset_hex fa0
#define todoClutchDownPinInverted_offset 976
#define todoClutchDownPinInverted_offset_hex 3d0
#define todoClutchUpPinInverted_offset 976
#define todoClutchUpPinInverted_offset_hex 3d0
#define TOP_DEAD_CENTER_MESSAGE "r" #define TOP_DEAD_CENTER_MESSAGE "r"
#define TOTAL_CONFIG_SIZE 20000 #define TOTAL_CONFIG_SIZE 20000
#define TOTAL_CONFIG_SIZE_hex 4e20 #define TOTAL_CONFIG_SIZE_hex 4e20
@ -1926,10 +1924,12 @@
#define unused_board_984_31_offset_hex 2e8 #define unused_board_984_31_offset_hex 2e8
#define unused_former_warmup_target_afr_offset 2096 #define unused_former_warmup_target_afr_offset 2096
#define unused_former_warmup_target_afr_offset_hex 830 #define unused_former_warmup_target_afr_offset_hex 830
#define unused_offset 972
#define unused_offset_hex 3cc
#define unusedAnotherOne_offset 744 #define unusedAnotherOne_offset 744
#define unusedAnotherOne_offset_hex 2e8 #define unusedAnotherOne_offset_hex 2e8
#define unusedAtBoardConfigurationEnd_offset 980 #define unusedAtOldBoardConfigurationEnd_offset 980
#define unusedAtBoardConfigurationEnd_offset_hex 3d4 #define unusedAtOldBoardConfigurationEnd_offset_hex 3d4
#define unusedErrorPin_offset 2040 #define unusedErrorPin_offset 2040
#define unusedErrorPin_offset_hex 7f8 #define unusedErrorPin_offset_hex 7f8
#define unusedFlexFuelSensor_offset 3100 #define unusedFlexFuelSensor_offset 3100

View File

@ -225,7 +225,7 @@ static void printMAPInfo(void) {
if (engineConfiguration->hasFrequencyReportingMapSensor) { if (engineConfiguration->hasFrequencyReportingMapSensor) {
scheduleMsg(logger, "instant value=%.2fHz @ %s", mapFreq, hwPortname(CONFIGB(frequencyReportingMapInputPin))); scheduleMsg(logger, "instant value=%.2fHz @ %s", mapFreq, hwPortname(CONFIG(frequencyReportingMapInputPin)));
} else { } else {
scheduleMsg(logger, "map type=%d/%s MAP=%.2fkPa mapMinBufferLength=%d", engineConfiguration->map.sensor.type, scheduleMsg(logger, "map type=%d/%s MAP=%.2fkPa mapMinBufferLength=%d", engineConfiguration->map.sensor.type,
getAir_pressure_sensor_type_e(engineConfiguration->map.sensor.type), getAir_pressure_sensor_type_e(engineConfiguration->map.sensor.type),
@ -268,14 +268,14 @@ void initMapDecoder(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
if (engineConfiguration->hasFrequencyReportingMapSensor) { if (engineConfiguration->hasFrequencyReportingMapSensor) {
#if HAL_USE_ICU #if HAL_USE_ICU
digital_input_s* digitalMapInput = startDigitalCapture("MAP freq", CONFIGB(frequencyReportingMapInputPin), true); digital_input_s* digitalMapInput = startDigitalCapture("MAP freq", CONFIG(frequencyReportingMapInputPin), true);
digitalMapInput->setWidthCallback((VoidInt) digitalMapWidthCallback, NULL); digitalMapInput->setWidthCallback((VoidInt) digitalMapWidthCallback, NULL);
#else #else
#if EFI_PROD_CODE #if EFI_PROD_CODE
efiExtiEnablePin( efiExtiEnablePin(
"Frequency MAP", "Frequency MAP",
CONFIGB(frequencyReportingMapInputPin), CONFIG(frequencyReportingMapInputPin),
PAL_EVENT_MODE_RISING_EDGE, PAL_EVENT_MODE_RISING_EDGE,
(palcallback_t)digitalMapWidthCallback, (palcallback_t)digitalMapWidthCallback,
nullptr nullptr

View File

@ -281,7 +281,7 @@ void printConfiguration(const engine_configuration_s *engineConfiguration) {
boolToString(engineConfiguration->isManualSpinningMode), boolToString(engineConfiguration->isManualSpinningMode),
boolToString(engineConfiguration->isCylinderCleanupEnabled)); boolToString(engineConfiguration->isCylinderCleanupEnabled));
scheduleMsg(&logger, "clutchUp@%s: %s", hwPortname(boardConfiguration->clutchUpPin), scheduleMsg(&logger, "clutchUp@%s: %s", hwPortname(engineConfiguration->clutchUpPin),
boolToString(engine->clutchUpState)); boolToString(engine->clutchUpState));
scheduleMsg(&logger, "clutchDown@%s: %s", hwPortname(boardConfiguration->clutchDownPin), scheduleMsg(&logger, "clutchDown@%s: %s", hwPortname(boardConfiguration->clutchDownPin),
boolToString(engine->clutchDownState)); boolToString(engine->clutchDownState));

View File

@ -333,8 +333,8 @@ void applyNewHardwareSettings(void) {
stopHD44780_pins(); stopHD44780_pins();
#endif /* #if EFI_HD44780_LCD */ #endif /* #if EFI_HD44780_LCD */
if (isPinOrModeChanged(bc.clutchUpPin, bc.clutchUpPinMode)) if (isPinOrModeChanged(clutchUpPin, clutchUpPinMode))
brain_pin_markUnused(activeConfiguration.bc.clutchUpPin); brain_pin_markUnused(activeConfiguration.clutchUpPin);
enginePins.unregisterPins(); enginePins.unregisterPins();

View File

@ -52,7 +52,7 @@ static void vsAnaWidthCallback(void) {
static void speedInfo(void) { static void speedInfo(void) {
scheduleMsg(logger, "VSS input at %s", scheduleMsg(logger, "VSS input at %s",
hwPortname(CONFIGB(vehicleSpeedSensorInputPin))); hwPortname(CONFIG(vehicleSpeedSensorInputPin)));
scheduleMsg(logger, "c=%.2f eventCounter=%d speed=%.2f", scheduleMsg(logger, "c=%.2f eventCounter=%d speed=%.2f",
engineConfiguration->vehicleSpeedCoef, engineConfiguration->vehicleSpeedCoef,
@ -63,17 +63,17 @@ static void speedInfo(void) {
} }
bool hasVehicleSpeedSensor() { bool hasVehicleSpeedSensor() {
return CONFIGB(vehicleSpeedSensorInputPin) != GPIO_UNASSIGNED; return CONFIG(vehicleSpeedSensorInputPin) != GPIO_UNASSIGNED;
} }
void stopVSSPins(void) { void stopVSSPins(void) {
stopDigitalCapture("VSS", activeConfiguration.bc.vehicleSpeedSensorInputPin); stopDigitalCapture("VSS", activeConfiguration.vehicleSpeedSensorInputPin);
} }
void startVSSPins(void) { void startVSSPins(void) {
if (!hasVehicleSpeedSensor()) if (!hasVehicleSpeedSensor())
return; return;
digital_input_s* vehicleSpeedInput = addWaveAnalyzerDriver("VSS", CONFIGB(vehicleSpeedSensorInputPin)); digital_input_s* vehicleSpeedInput = addWaveAnalyzerDriver("VSS", CONFIG(vehicleSpeedSensorInputPin));
startInputDriver("VSS", vehicleSpeedInput, true); startInputDriver("VSS", vehicleSpeedInput, true);
vehicleSpeedInput->widthListeners.registerCallback((VoidInt) vsAnaWidthCallback, NULL); vehicleSpeedInput->widthListeners.registerCallback((VoidInt) vsAnaWidthCallback, NULL);
} }

View File

@ -698,23 +698,27 @@ custom ego_sensor_e 4 bits, S32, @OFFSET@, [0:2], @@ego_sensor_e_enum@@
#define maf_sensor_type_e_enum "v0", "v1", "v2", "v3" #define maf_sensor_type_e_enum "v0", "v1", "v2", "v3"
custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:2], @@maf_sensor_type_e_enum@@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:2], @@maf_sensor_type_e_enum@@
maf_sensor_type_e mafSensorType; ! todo: keep moving all these fields at the end of board_configuration_s below 'board_configuration_s bc'
! end of board_configuration_s
end_struct
board_configuration_s bc;
maf_sensor_type_e mafSensorType;
custom le_formula_t 200 string, ASCII, @OFFSET@, 200
brain_pin_e[FSIO_COMMAND_COUNT iterate] fsioDigitalInputs;todo:not finished\nThese input pins allow us to pull toggle buttons state; brain_pin_e[FSIO_COMMAND_COUNT iterate] fsioDigitalInputs;todo:not finished\nThese input pins allow us to pull toggle buttons state;
brain_input_pin_e vehicleSpeedSensorInputPin; brain_input_pin_e vehicleSpeedSensorInputPin;
switch_input_pin_e clutchUpPin;Some vehicles have a switch to indicate that clutch pedal is all the way up switch_input_pin_e clutchUpPin;Some vehicles have a switch to indicate that clutch pedal is all the way up
brain_input_pin_e frequencyReportingMapInputPin; brain_input_pin_e frequencyReportingMapInputPin;
pin_input_mode_e clutchUpPinMode; pin_input_mode_e clutchUpPinMode;
float etbIdleRange;;"angle", 1, 0, -100, 100, 2 float unused
bit clutchUpPinInverted bit todoClutchUpPinInverted
bit clutchDownPinInverted bit todoClutchDownPinInverted
int[121] unusedAtBoardConfigurationEnd; int[121] unusedAtOldBoardConfigurationEnd;
end_struct
custom le_formula_t 200 string, ASCII, @OFFSET@, 200 bit vvtDisplayInverted
board_configuration_s bc;
bit vvtDisplayInverted
bit fuelClosedLoopCorrectionEnabled;+Enables lambda sensor closed loop feedback for fuelling. bit fuelClosedLoopCorrectionEnabled;+Enables lambda sensor closed loop feedback for fuelling.
bit isVerboseIAC;+Print details into rusEfi console bit isVerboseIAC;+Print details into rusEfi console
bit isVerboseETB;+Prints ETB details to rusEFI console bit isVerboseETB;+Prints ETB details to rusEFI console
@ -1085,6 +1089,7 @@ uint8_t[4] unusuedsw;
int[565] mainUnusedEnd; int[565] mainUnusedEnd;
! end of engine_configuration_s
end_struct end_struct
engine_configuration_s engineConfiguration; engine_configuration_s engineConfiguration;

View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Nov 29 16:25:45 EST 2019 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Nov 30 10:15:18 EST 2019
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -501,10 +501,10 @@ page = 1
clutchUpPin = bits, U08, 969, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" clutchUpPin = bits, U08, 969, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
frequencyReportingMapInputPin = bits, U08, 970, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "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", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "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", "INVALID", "INVALID", "INVALID" frequencyReportingMapInputPin = bits, U08, 970, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "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", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "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", "INVALID", "INVALID", "INVALID"
clutchUpPinMode = scalar, U08, 971, "todo", 1, 0, 0, 20, 1 clutchUpPinMode = scalar, U08, 971, "todo", 1, 0, 0, 20, 1
etbIdleRange = scalar, F32, 972, "angle", 1, 0, -100, 100, 2 ;no TS info - skipping unused offset 972
clutchUpPinInverted = bits, U32, 976, [0:0], "false", "true" todoClutchUpPinInverted = bits, U32, 976, [0:0], "false", "true"
clutchDownPinInverted = bits, U32, 976, [1:1], "false", "true" todoClutchDownPinInverted= bits, U32, 976, [1:1], "false", "true"
;no TS info - skipping unusedAtBoardConfigurationEnd offset 980 ;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 980
vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"

View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Nov 29 16:26:08 EST 2019 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Nov 30 10:08:06 EST 2019
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -501,10 +501,10 @@ page = 1
clutchUpPin = bits, U08, 969, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" clutchUpPin = bits, U08, 969, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
frequencyReportingMapInputPin = bits, U08, 970, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "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", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "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", "INVALID", "INVALID", "INVALID" frequencyReportingMapInputPin = bits, U08, 970, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "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", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "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", "INVALID", "INVALID", "INVALID"
clutchUpPinMode = scalar, U08, 971, "todo", 1, 0, 0, 20, 1 clutchUpPinMode = scalar, U08, 971, "todo", 1, 0, 0, 20, 1
etbIdleRange = scalar, F32, 972, "angle", 1, 0, -100, 100, 2 ;no TS info - skipping unused offset 972
clutchUpPinInverted = bits, U32, 976, [0:0], "false", "true" todoClutchUpPinInverted = bits, U32, 976, [0:0], "false", "true"
clutchDownPinInverted = bits, U32, 976, [1:1], "false", "true" todoClutchDownPinInverted= bits, U32, 976, [1:1], "false", "true"
;no TS info - skipping unusedAtBoardConfigurationEnd offset 980 ;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 980
vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"

View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Fri Nov 29 21:57:01 EST 2019 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Nov 30 10:08:11 EST 2019
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -501,10 +501,10 @@ page = 1
clutchUpPin = bits, U08, 969, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A" clutchUpPin = bits, U08, 969, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"
frequencyReportingMapInputPin = bits, U08, 970, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A" frequencyReportingMapInputPin = bits, U08, 970, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"
clutchUpPinMode = scalar, U08, 971, "todo", 1, 0, 0, 20, 1 clutchUpPinMode = scalar, U08, 971, "todo", 1, 0, 0, 20, 1
etbIdleRange = scalar, F32, 972, "angle", 1, 0, -100, 100, 2 ;no TS info - skipping unused offset 972
clutchUpPinInverted = bits, U32, 976, [0:0], "false", "true" todoClutchUpPinInverted = bits, U32, 976, [0:0], "false", "true"
clutchDownPinInverted = bits, U32, 976, [1:1], "false", "true" todoClutchDownPinInverted= bits, U32, 976, [1:1], "false", "true"
;no TS info - skipping unusedAtBoardConfigurationEnd offset 980 ;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 980
vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"

View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Nov 29 16:25:57 EST 2019 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Nov 30 10:08:03 EST 2019
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -501,10 +501,10 @@ page = 1
clutchUpPin = bits, U08, 969, [0:7], "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","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","Brake Switch","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Clutch Switch","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","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","INVALID" clutchUpPin = bits, U08, 969, [0:7], "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","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","Brake Switch","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Clutch Switch","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","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","INVALID"
frequencyReportingMapInputPin = bits, U08, 970, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","25 - Hall Cam","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","45 - VR/Hall Crank","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","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","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID" frequencyReportingMapInputPin = bits, U08, 970, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","25 - Hall Cam","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","45 - VR/Hall Crank","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","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","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
clutchUpPinMode = scalar, U08, 971, "todo", 1, 0, 0, 20, 1 clutchUpPinMode = scalar, U08, 971, "todo", 1, 0, 0, 20, 1
etbIdleRange = scalar, F32, 972, "angle", 1, 0, -100, 100, 2 ;no TS info - skipping unused offset 972
clutchUpPinInverted = bits, U32, 976, [0:0], "false", "true" todoClutchUpPinInverted = bits, U32, 976, [0:0], "false", "true"
clutchDownPinInverted = bits, U32, 976, [1:1], "false", "true" todoClutchDownPinInverted= bits, U32, 976, [1:1], "false", "true"
;no TS info - skipping unusedAtBoardConfigurationEnd offset 980 ;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 980
vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"

View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Nov 29 16:26:20 EST 2019 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Nov 30 10:08:09 EST 2019
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -501,10 +501,10 @@ page = 1
clutchUpPin = bits, U08, 969, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" clutchUpPin = bits, U08, 969, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
frequencyReportingMapInputPin = bits, U08, 970, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "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", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "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", "INVALID", "INVALID", "INVALID" frequencyReportingMapInputPin = bits, U08, 970, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "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", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "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", "INVALID", "INVALID", "INVALID"
clutchUpPinMode = scalar, U08, 971, "todo", 1, 0, 0, 20, 1 clutchUpPinMode = scalar, U08, 971, "todo", 1, 0, 0, 20, 1
etbIdleRange = scalar, F32, 972, "angle", 1, 0, -100, 100, 2 ;no TS info - skipping unused offset 972
clutchUpPinInverted = bits, U32, 976, [0:0], "false", "true" todoClutchUpPinInverted = bits, U32, 976, [0:0], "false", "true"
clutchDownPinInverted = bits, U32, 976, [1:1], "false", "true" todoClutchDownPinInverted= bits, U32, 976, [1:1], "false", "true"
;no TS info - skipping unusedAtBoardConfigurationEnd offset 980 ;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 980
vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"

View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated; package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Nov 29 21:56:48 EST 2019 // this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Nov 30 10:03:19 EST 2019
// by class com.rusefi.output.FileJavaFieldsConsumer // by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*; import com.rusefi.config.*;
@ -233,10 +233,8 @@ public class Fields {
public static final int cltTimingExtra_offset_hex = 950; public static final int cltTimingExtra_offset_hex = 950;
public static final int clutchDownPin_offset = 664; public static final int clutchDownPin_offset = 664;
public static final int clutchDownPin_offset_hex = 298; public static final int clutchDownPin_offset_hex = 298;
public static final int clutchDownPinInverted_offset = 976;
public static final int clutchDownPinMode_offset = 667; public static final int clutchDownPinMode_offset = 667;
public static final int clutchUpPin_offset = 969; public static final int clutchUpPin_offset = 969;
public static final int clutchUpPinInverted_offset = 976;
public static final int clutchUpPinMode_offset = 971; public static final int clutchUpPinMode_offset = 971;
public static final String CMD_CALIBRATE_PEDAL_DOWN = "calibrate_pedal_down"; public static final String CMD_CALIBRATE_PEDAL_DOWN = "calibrate_pedal_down";
public static final String CMD_CALIBRATE_PEDAL_UP = "calibrate_pedal_up"; public static final String CMD_CALIBRATE_PEDAL_UP = "calibrate_pedal_up";
@ -365,7 +363,6 @@ public class Fields {
public static final int etbCalibrationOnStart_offset = 1476; public static final int etbCalibrationOnStart_offset = 1476;
public static final int etbDeadband_offset = 3960; public static final int etbDeadband_offset = 3960;
public static final int etbFreq_offset = 2514; public static final int etbFreq_offset = 2514;
public static final int etbIdleRange_offset = 972;
public static final int etbIdleThrottleRange_offset = 4012; public static final int etbIdleThrottleRange_offset = 4012;
public static final int etbNeutralPosition_offset = 1471; public static final int etbNeutralPosition_offset = 1471;
public static final int externalKnockSenseAdc_offset = 3103; public static final int externalKnockSenseAdc_offset = 3103;
@ -1180,6 +1177,8 @@ public class Fields {
public static final int tle8888_cs_offset = 3105; public static final int tle8888_cs_offset = 3105;
public static final int tle8888_csPinMode_offset = 3106; public static final int tle8888_csPinMode_offset = 3106;
public static final int tle8888spiDevice_offset = 4000; public static final int tle8888spiDevice_offset = 4000;
public static final int todoClutchDownPinInverted_offset = 976;
public static final int todoClutchUpPinInverted_offset = 976;
public static final String TOP_DEAD_CENTER_MESSAGE = "r"; public static final String TOP_DEAD_CENTER_MESSAGE = "r";
public static final int TOTAL_CONFIG_SIZE = 20000; public static final int TOTAL_CONFIG_SIZE = 20000;
public static final int tps1_1AdcChannel_offset = 512; public static final int tps1_1AdcChannel_offset = 512;
@ -1256,8 +1255,9 @@ public class Fields {
public static final int unused_board_984_31_offset = 744; public static final int unused_board_984_31_offset = 744;
public static final int unused_former_warmup_target_afr_offset = 2096; public static final int unused_former_warmup_target_afr_offset = 2096;
public static final int unused_former_warmup_target_afr_offset_hex = 830; public static final int unused_former_warmup_target_afr_offset_hex = 830;
public static final int unused_offset = 972;
public static final int unusedAnotherOne_offset = 744; public static final int unusedAnotherOne_offset = 744;
public static final int unusedAtBoardConfigurationEnd_offset = 980; public static final int unusedAtOldBoardConfigurationEnd_offset = 980;
public static final int unusedErrorPin_offset = 2040; public static final int unusedErrorPin_offset = 2040;
public static final int unusedFlexFuelSensor_offset = 3100; public static final int unusedFlexFuelSensor_offset = 3100;
public static final int unusedFormerWarmupAfrPid_offset = 1768; public static final int unusedFormerWarmupAfrPid_offset = 1768;
@ -1740,9 +1740,9 @@ public class Fields {
public static final Field CLUTCHUPPIN = Field.create("CLUTCHUPPIN", 969, FieldType.INT8, switch_input_pin_e); public static final Field CLUTCHUPPIN = Field.create("CLUTCHUPPIN", 969, FieldType.INT8, switch_input_pin_e);
public static final Field FREQUENCYREPORTINGMAPINPUTPIN = Field.create("FREQUENCYREPORTINGMAPINPUTPIN", 970, FieldType.INT8, brain_input_pin_e); public static final Field FREQUENCYREPORTINGMAPINPUTPIN = Field.create("FREQUENCYREPORTINGMAPINPUTPIN", 970, FieldType.INT8, brain_input_pin_e);
public static final Field CLUTCHUPPINMODE = Field.create("CLUTCHUPPINMODE", 971, FieldType.INT8); public static final Field CLUTCHUPPINMODE = Field.create("CLUTCHUPPINMODE", 971, FieldType.INT8);
public static final Field ETBIDLERANGE = Field.create("ETBIDLERANGE", 972, FieldType.FLOAT); public static final Field UNUSED = Field.create("UNUSED", 972, FieldType.FLOAT);
public static final Field CLUTCHUPPININVERTED = Field.create("CLUTCHUPPININVERTED", 976, FieldType.BIT, 0); public static final Field TODOCLUTCHUPPININVERTED = Field.create("TODOCLUTCHUPPININVERTED", 976, FieldType.BIT, 0);
public static final Field CLUTCHDOWNPININVERTED = Field.create("CLUTCHDOWNPININVERTED", 976, FieldType.BIT, 1); public static final Field TODOCLUTCHDOWNPININVERTED = Field.create("TODOCLUTCHDOWNPININVERTED", 976, FieldType.BIT, 1);
public static final Field VVTDISPLAYINVERTED = Field.create("VVTDISPLAYINVERTED", 1464, FieldType.BIT, 0); public static final Field VVTDISPLAYINVERTED = Field.create("VVTDISPLAYINVERTED", 1464, FieldType.BIT, 0);
public static final Field FUELCLOSEDLOOPCORRECTIONENABLED = Field.create("FUELCLOSEDLOOPCORRECTIONENABLED", 1464, FieldType.BIT, 1); public static final Field FUELCLOSEDLOOPCORRECTIONENABLED = Field.create("FUELCLOSEDLOOPCORRECTIONENABLED", 1464, FieldType.BIT, 1);
public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 1464, FieldType.BIT, 2); public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 1464, FieldType.BIT, 2);
@ -2539,9 +2539,9 @@ public class Fields {
CLUTCHUPPIN, CLUTCHUPPIN,
FREQUENCYREPORTINGMAPINPUTPIN, FREQUENCYREPORTINGMAPINPUTPIN,
CLUTCHUPPINMODE, CLUTCHUPPINMODE,
ETBIDLERANGE, UNUSED,
CLUTCHUPPININVERTED, TODOCLUTCHUPPININVERTED,
CLUTCHDOWNPININVERTED, TODOCLUTCHDOWNPININVERTED,
VVTDISPLAYINVERTED, VVTDISPLAYINVERTED,
FUELCLOSEDLOOPCORRECTIONENABLED, FUELCLOSEDLOOPCORRECTIONENABLED,
ISVERBOSEIAC, ISVERBOSEIAC,