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

support multiple VVT sensors #885 

new fields & packing configuration. bumping configuration version
This commit is contained in:
rusefi 2019-07-12 14:24:45 -04:00
parent 6ab2832c24
commit 756dec106a
17 changed files with 776 additions and 785 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/prometheus/board_configuration.cpp
View File

@ -177,7 +177,7 @@ void setBoardConfigurationOverrides(void) {
boardConfiguration->triggerInputPins[0] = GPIOA_5;
boardConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED;
boardConfiguration->triggerInputPins[2] = GPIO_UNASSIGNED;
engineConfiguration->camInput = is469 ? GPIOE_9 : GPIOA_6;
engineConfiguration->camInputs[0] = is469 ? GPIOE_9 : GPIOA_6;
boardConfiguration->tachOutputPin = GPIOC_8;
boardConfiguration->tachOutputPinMode = OM_DEFAULT;

2
firmware/config/boards/subaru-ej20gn/board_configuration.cpp
View File

@ -139,7 +139,7 @@ void setBoardConfigurationOverrides(void) {
boardConfiguration->triggerInputPins[0] = GPIOC_8;
boardConfiguration->triggerInputPins[1] = GPIOC_9;
boardConfiguration->triggerInputPins[2] = GPIO_UNASSIGNED;
engineConfiguration->camInput = GPIO_UNASSIGNED;
engineConfiguration->camInputs[0] = GPIO_UNASSIGNED;
/* spi driven - TLE6240 - OUT8, also direct driven by GPIOG_2 */
boardConfiguration->tachOutputPin = TLE6240_PIN(0);

2
firmware/config/engines/mazda_626.cpp
View File

@ -105,5 +105,5 @@ void setMazda626EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->externalKnockSenseAdc = EFI_ADC_4;
boardConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED;
engineConfiguration->camInput = GPIOA_5;
engineConfiguration->camInputs[0] = GPIOA_5;
}

2
firmware/config/engines/mazda_miata_vvt.cpp
View File

@ -247,7 +247,7 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// boardConfiguration->triggerInputPins[0] = GPIOA_8; // custom Frankenso wiring in order to use SPI1 for accelerometer
boardConfiguration->triggerInputPins[0] = GPIOA_5; // board still not modified
boardConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED;
engineConfiguration->camInput = GPIOC_6;
engineConfiguration->camInputs[0] = GPIOC_6;
// boardConfiguration->is_enabled_spi_1 = true;

2
firmware/config/engines/me7pnp.cpp
View File

@ -109,7 +109,7 @@ void vag_18_Turbo(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
boardConfiguration->fanPin = GPIO_UNASSIGNED;
boardConfiguration->clutchDownPin = GPIOD_11;
engineConfiguration->brakePedalPin = GPIOE_10;
engineConfiguration->camInput = GPIOA_2;
engineConfiguration->camInputs[0] = GPIOA_2;
#if defined(STM32_HAS_GPIOG) && STM32_HAS_GPIOG
boardConfiguration->triggerInputPins[0] = GPIOG_7;
#endif /* STM32_HAS_GPIOF */

2
firmware/config/engines/test_engine.cpp
View File

@ -64,7 +64,7 @@ void setTestVVTEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setAlgorithm(LM_SPEED_DENSITY PASS_CONFIG_PARAMETER_SUFFIX);
boardConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED;
engineConfiguration->camInput = GPIOA_5;
engineConfiguration->camInputs[0] = GPIOA_5;
// set global_trigger_offset_angle 0
engineConfiguration->globalTriggerAngleOffset = 0;

2
firmware/config/engines/toyota_jzs147.cpp
View File

@ -106,7 +106,7 @@ void setToyota_2jz_vics(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
boardConfiguration->triggerInputPins[0] = GPIOA_5; // crank sensor
boardConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED; // cam sensor will he handled by custom vtti code
engineConfiguration->camInput = GPIOC_6;
engineConfiguration->camInputs[0] = GPIOC_6;
engineConfiguration->vvtMode = VVT_2GZ;
// set global_trigger_offset_angle 155

2
firmware/console/status_loop.cpp
View File

@ -406,7 +406,7 @@ void printOverallStatus(systime_t nowSeconds) {
#if EFI_PROD_CODE
printOutPin(CRANK1, CONFIGB(triggerInputPins)[0]);
printOutPin(CRANK2, CONFIGB(triggerInputPins)[1]);
printOutPin(VVT_NAME, engineConfiguration->camInput);
printOutPin(VVT_NAME, engineConfiguration->camInputs[0]);
printOutPin(HIP_NAME, CONFIGB(hip9011IntHoldPin));
printOutPin(TACH_NAME, CONFIGB(tachOutputPin));
printOutPin(DIZZY_NAME, engineConfiguration->dizzySparkOutputPin);

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

@ -303,7 +303,9 @@ void prepareVoidConfiguration(engine_configuration_s *engineConfiguration) {
disableLCD(boardConfiguration);
engineConfiguration->camInput = GPIO_UNASSIGNED;
for (int i = 0;i<CAM_INPUTS_COUNT;i++) {
engineConfiguration->camInputs[i] = GPIO_UNASSIGNED;
}
for (int i = 0;i<TRIGGER_INPUT_PIN_COUNT;i++) {
CONFIGB(triggerInputPins)[i] = GPIO_UNASSIGNED;
}

2
firmware/controllers/engine_controller.cpp
View File

@ -814,6 +814,6 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0)
return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20190709;
return 20190712;
}
#endif /* EFI_UNIT_TEST */

4
firmware/controllers/trigger/trigger_central.cpp
View File

@ -570,7 +570,7 @@ void triggerInfo(void) {
#if EFI_PROD_CODE
if (HAVE_CAM_INPUT()) {
scheduleMsg(logger, "VVT input: %s mode %s", hwPortname(engineConfiguration->camInput),
scheduleMsg(logger, "VVT input: %s mode %s", hwPortname(engineConfiguration->camInputs[0]),
getVvt_mode_e(engineConfiguration->vvtMode));
scheduleMsg(logger, "VVT event counters: %d/%d", vvtEventRiseCounter, vvtEventFallCounter);
@ -656,7 +656,7 @@ void onConfigurationChangeTriggerCallback(engine_configuration_s *previousConfig
COMPARE_CONFIG_PARAMS(bc.triggerInputPins[0]) ||
COMPARE_CONFIG_PARAMS(bc.triggerInputPins[1]) ||
COMPARE_CONFIG_PARAMS(bc.triggerInputPins[2]) ||
COMPARE_CONFIG_PARAMS(camInput) ||
COMPARE_CONFIG_PARAMS(camInputs[0]) ||
COMPARE_CONFIG_PARAMS(vvtMode) ||
COMPARE_CONFIG_PARAMS(bc.vvtCamSensorUseRise) ||
COMPARE_CONFIG_PARAMS(vvtOffset) ||

2
firmware/controllers/trigger/trigger_central.h
View File

@ -16,7 +16,7 @@
class Engine;
typedef void (*ShaftPositionListener)(trigger_event_e signal, uint32_t index DECLARE_ENGINE_PARAMETER_SUFFIX);
#define HAVE_CAM_INPUT() engineConfiguration->camInput != GPIO_UNASSIGNED
#define HAVE_CAM_INPUT() engineConfiguration->camInputs[0] != GPIO_UNASSIGNED
/**
* Maybe merge TriggerCentral and TriggerState classes into one class?

8
firmware/hw_layer/trigger_input.cpp
View File

@ -266,8 +266,8 @@ void stopTriggerInputPins(void) {
turnOffTriggerInputPin(activeConfiguration.bc.triggerInputPins[i]);
}
}
if (engineConfiguration->camInput != activeConfiguration.camInput) {
turnOffTriggerInputPin(activeConfiguration.camInput);
if (engineConfiguration->camInputs[0] != activeConfiguration.camInputs[0]) {
turnOffTriggerInputPin(activeConfiguration.camInputs[0]);
}
#endif /* EFI_PROD_CODE */
}
@ -282,8 +282,8 @@ void startTriggerInputPins(void) {
}
}
if (engineConfiguration->camInput != activeConfiguration.camInput) {
turnOnTriggerInputPin("cam", engineConfiguration->camInput, false);
if (engineConfiguration->camInputs[0] != activeConfiguration.camInputs[0]) {
turnOnTriggerInputPin("cam", engineConfiguration->camInputs[0], false);
}
setPrimaryChannel(CONFIGB(triggerInputPins)[0]);

51
firmware/integration/rusefi_config.txt
View File

@ -23,7 +23,12 @@
! type name;comment
#define TS_SIGNATURE "rusEFI v1.06"
#define TS_SIGNATURE "rusEFI v1.07"
!
! this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version
! so not forget to change fileVersion in rusefi.ini
! todo: is this not needed in light of TS_SIGNATURE?
#define TS_FILE_VERSION 20190701
! all the sub-structures are going to be nested within the primary structure, that's
@ -54,6 +59,8 @@ struct_no_prefix engine_configuration_s
#define FSIO_ANALOG_INPUT_COUNT 4
#define CAM_INPUTS_COUNT 4
#define SERVO_COUNT 8
#define CONSOLE_DATA_PROTOCOL_TAG " @"
@ -63,11 +70,6 @@ struct_no_prefix engine_configuration_s
! this is here so that rusEfi console can access it, too
#define TS_OUTPUT_SIZE 356
!
! this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version
! so not forget to change fileVersion in rusefi.ini
#define TS_FILE_VERSION 20171101
#define WARMUP_TARGET_AFR_SIZE 4
#define MAP_ANGLE_SIZE 8
@ -450,15 +452,14 @@ custom spi_device_e 1 bits,U32, @OFFSET@, [0:2], "Off", "SPI1", "SPI2", "SPI3"
spi_device_e hip9011SpiDevice;
adc_channel_e high_fuel_pressure_sensor_1;
adc_channel_e high_fuel_pressure_sensor_2;
uint8_t[1] unusedSpiPadding1;
adc_channel_e mafAdcChannel;See hasMafSensor
float globalFuelCorrection;set global_fuel_correction X;"coef", 1, 0.0, 0, 1000.0, 2
float adcVcc;; "volts", 1, 0.0, 0, 4.0, 3
float maxKnockSubDeg;maximum total number of degrees to subtract from ignition advance\nwhen knocking
adc_channel_e mafAdcChannel;See hasMafSensor
uint8_t[3] unusedAlignMaf;
brain_input_pin_e[CAM_INPUTS_COUNT iterate] camInputs;+Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660
struct afr_sensor_s
adc_channel_e hwChannel;
@ -539,8 +540,8 @@ switch_input_pin_e clutchDownPin;some cars have a switch to indicate that clutch
pin_output_mode_e electronicThrottlePin1Mode;
brain_pin_e wboHeaterPin;
brain_pin_e cj125CsPin;
uint8_t[1] unusedEtbM;
uint8_t[1] unusedSpiPadding9;
spi_device_e max31855spiDevice;
brain_pin_e boardTestModeJumperPin;
spi_device_e digitalPotentiometerSpiDevice;Digital Potentiometer is used by stock ECU stimulation code
brain_pin_e mc33972_cs;
@ -567,8 +568,7 @@ custom adc_channel_mode_e 4 bits, U32, @OFFSET@, [0:1], "Off", "Slow", "Fas
brain_pin_e canTxPin;
brain_pin_e canRxPin;
brain_pin_e boardTestModeJumperPin;
uint8_t[1] unusedMa2;
uint8_t[2] unusedMa2;
int idleThreadPeriodMs;
int consoleLoopPeriodMs;
@ -635,13 +635,11 @@ pin_output_mode_e hip9011IntHoldPinMode;
output_pin_e[FSIO_COMMAND_COUNT iterate] fsioOutputPins;todo: more comments
brain_pin_e[EGT_CHANNEL_COUNT iterate] max31855_cs;
spi_device_e max31855spiDevice;
uint8_t[3] unusedSpiPadding2;
custom uart_device_e 1 bits,U32, @OFFSET@, [0:1], "Off", "UART1", "UART2", "UART3"
uart_device_e consoleUartDevice;
uint8_t[3] unuseduartPadding1;
uint8_t[4] unusedSpiPadding2;
uint8_t[4] unuseduartPadding1;
int mapMinBufferLength;;"count", 1, 0, 0, 24, 0
int16_t idlePidDeactivationTpsThreshold;;"%", 1, 0, 0, 100.0, 0
@ -681,7 +679,7 @@ custom fsio_setting_t 4 scalar, F32, @OFFSET@, "Val", 1, 0, 0,
brain_pin_e joystickBPin;
brain_pin_e joystickCPin;
brain_pin_e joystickDPin;
uint8_t[1] unusedjoy;
uart_device_e consoleUartDevice;
#define sensor_chart_e_enum "none", "trigger", "MAP", "RPM ACCEL", "DETAILED RPM", "INVALID"
@ -744,7 +742,9 @@ bit unused_bit_1472_29;
bit unused_bit_1472_30;
adc_channel_e hipOutputChannel;
uint8_t[3] unusedh;
adc_channel_e acSwitchAdc;A/C button input handled as analogue input
adc_channel_e vRefAdcChannel;
uint8_t[1] unusedh;
custom idle_mode_e 4 bits, U32, @OFFSET@, [0:0], "Automatic", "Manual"
idle_mode_e idleMode;See also idleRpmPid;
@ -778,8 +778,6 @@ bit unused_1484_bit_21
int16_t idlePidRpmUpperLimit;+Relative to the target idle RPM;"RPM", 1, 0, 0, 9000, 0
int16_t primeInjFalloffTemperature;+This sets the temperature above which no priming pulse is used, The value at -40 is reduced until there is no more priming injection at this temperature.;"*C", 1, 0, 0, 1000.0, 0
adc_channel_e acSwitchAdc;A/C button input handled as analogue input
uint8_t[3] unusuedsw;
int ignMathCalculateAtIndex;+At what trigger index should some ignition-related math be executed? This is a performance trick to reduce load on synchronization trigger callback.;"index", 1, 0, 0, 7000, 0
@ -789,8 +787,6 @@ uint8_t[3] unusuedsw;
int16_t acIdleRpmBump;
int16_t warningPeriod;set warningPeriod X;"seconds", 1, 0, 0, 60, 0
adc_channel_e vRefAdcChannel;
uint8_t[3] unusuedvref;
float knockDetectionWindowStart;;"angle", 1, 0, -1000, 1000, 2
float knockDetectionWindowEnd;;"angle", 1, 0, -1000, 1000, 2
@ -800,7 +796,6 @@ float idleStepperReactionTime;;"ms", 1, 0, 1, 300, 0
float knockVThreshold;;"V", 1, 0, 1, 5, 2
pin_input_mode_e[FSIO_COMMAND_COUNT iterate] fsioInputModes;
int[3] alFIn;
int idleStepperTotalSteps;;"count", 1, 0, 5, 3000, 0
@ -907,7 +902,7 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300,
output_pin_e[AUX_PID_COUNT iterate] auxPidPins;
brain_input_pin_e camInput;+Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660
spi_device_e cj125SpiDevice;
pin_output_mode_e cj125CsPinMode;
brain_pin_e dizzySparkOutputPin;+This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin
pin_output_mode_e dizzySparkOutputPinMode;
@ -921,8 +916,6 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300,
fsio_pwm_freq_t[AUX_PID_COUNT iterate] auxPidFrequency;
int alternatorPwmFrequency;;"Hz", 1, 0, 0, 3000.0, 0
mass_storage_e storageMode;
spi_device_e cj125SpiDevice;
uint8_t[3] unusedSpiPadding3;
float[NARROW_BAND_WIDE_BAND_CONVERSION_SIZE] narrowToWideOxygenBins;Narrow Band WBO Approximation;"V", 1, 0, -10.0, 10.0, 3
float[NARROW_BAND_WIDE_BAND_CONVERSION_SIZE] narrowToWideOxygen;;"ratio", 1, 0, -40.0, 40.0, 2
@ -1059,6 +1052,10 @@ tChargeMode_e tChargeMode;
float etbIdleThrottleRange; ETB idle authority; "%", 1, 0, 0, 15, 0
uint8_t[4] unusuedvref;
uint8_t[4] unusuedsw;
int[3] alFIn;
uint8_t[4] unusedSpiPadding3;
int[590] mainUnusedEnd;

6
firmware/tunerstudio/rusefi.input
View File

@ -154,7 +154,7 @@ enable2ndByteCanID = false
[OutputChannels]
; see TS_FILE_VERSION in firmware code
fileVersion = { 20171101 }
fileVersion = { 20190701 }
ochGetCommand = "O%2o%2c"
@ -1579,7 +1579,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Invert Primary", invertPrimaryTriggerSignal
field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20}
field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20}
field = "Cam Sync/VVT input", camInput
field = "Cam Sync/VVT input", camInputs1
dialog = allPinsSensors, "Sensors"
field = "CLT ADC input", clt_adcChannel
@ -1618,7 +1618,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Throttle pedal Position Channel", throttlePedalPositionAdcChannel
field = "Primary input channel", triggerInputPins1
field = "Secondary channel", triggerInputPins2
field = "Cam Sync/VVT input", camInput
field = "Cam Sync/VVT input", camInputs1
dialog = allPins1_2
field = "Tachometer output Pin", tachOutputPin

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

File diff suppressed because it is too large Load Diff

2
unit_tests/tests/test_cam_vtt_input.cpp
View File

@ -84,7 +84,7 @@ TEST(sensors, testCamInput) {
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);
engineConfiguration->useOnlyRisingEdgeForTrigger = true;
eth.setTriggerType(TT_ONE PASS_ENGINE_PARAMETER_SUFFIX);
engineConfiguration->camInput = GPIOA_10; // we just need to indicate that we have CAM
engineConfiguration->camInputs[0] = GPIOA_10; // we just need to indicate that we have CAM
ASSERT_EQ( 0, GET_RPM()) << "testCamInput RPM";