mirror of https://github.com/rusefi/rusefi-1.git
auto-sync
This commit is contained in:
parent
27b0cca4ef
commit
1c38b6624f
|
@ -90,12 +90,12 @@ static ICUConfig cam_icucfg = { ICU_INPUT_ACTIVE_LOW, 100000, /* 100kHz ICU cloc
|
||||||
cam_icu_width_callback, cam_icu_period_callback };
|
cam_icu_width_callback, cam_icu_period_callback };
|
||||||
|
|
||||||
|
|
||||||
static ICUDriver *turnOnTriggerInputPin(brain_pin_e hwPin, ICUConfig *icucfg) {
|
static ICUDriver *turnOnTriggerInputPin(const char *msg, brain_pin_e hwPin, ICUConfig *icucfg) {
|
||||||
if (hwPin == GPIO_UNASSIGNED)
|
if (hwPin == GPIO_UNASSIGNED)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
// configure pin
|
// configure pin
|
||||||
turnOnCapturePin("trigger", hwPin);
|
turnOnCapturePin(msg, hwPin);
|
||||||
icucfg->channel = getInputCaptureChannel(hwPin);
|
icucfg->channel = getInputCaptureChannel(hwPin);
|
||||||
|
|
||||||
ICUDriver *driver = getInputCaptureDriver(hwPin);
|
ICUDriver *driver = getInputCaptureDriver(hwPin);
|
||||||
|
@ -161,12 +161,13 @@ void applyNewTriggerInputPins(void) {
|
||||||
for (int i = 0; i < TRIGGER_SUPPORTED_CHANNELS; i++) {
|
for (int i = 0; i < TRIGGER_SUPPORTED_CHANNELS; i++) {
|
||||||
if (boardConfiguration->triggerInputPins[i]
|
if (boardConfiguration->triggerInputPins[i]
|
||||||
!= activeConfiguration.bc.triggerInputPins[i]) {
|
!= activeConfiguration.bc.triggerInputPins[i]) {
|
||||||
turnOnTriggerInputPin(boardConfiguration->triggerInputPins[i], &shaft_icucfg);
|
const char * msg = (i == 0 ? "trigger#1" : (i == 1 ? "trigger#2" : "trigger#3"));
|
||||||
|
turnOnTriggerInputPin(msg, boardConfiguration->triggerInputPins[i], &shaft_icucfg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (engineConfiguration->camInput != activeConfiguration.camInput) {
|
if (engineConfiguration->camInput != activeConfiguration.camInput) {
|
||||||
turnOnTriggerInputPin(engineConfiguration->camInput, &cam_icucfg);
|
turnOnTriggerInputPin("cam", engineConfiguration->camInput, &cam_icucfg);
|
||||||
}
|
}
|
||||||
|
|
||||||
rememberPrimaryChannel();
|
rememberPrimaryChannel();
|
||||||
|
|
|
@ -283,5 +283,5 @@ int getRusEfiVersion(void) {
|
||||||
return 123; // this is here to make the compiler happy about the unused array
|
return 123; // this is here to make the compiler happy about the unused array
|
||||||
if (UNUSED_CCM_SIZE[0] * 0 != 0)
|
if (UNUSED_CCM_SIZE[0] * 0 != 0)
|
||||||
return 3211; // this is here to make the compiler happy about the unused array
|
return 3211; // this is here to make the compiler happy about the unused array
|
||||||
return 20161216;
|
return 20161227;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue