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

auto-sync

This commit is contained in:
rusEfi 2016-08-20 19:02:07 -04:00
parent 04a2fc8d22
commit ca4a0ba18b
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,6 +329,11 @@ void triggerInfo(void) {
#endif
#if EFI_PROD_CODE || defined(__DOXYGEN__)
if (engineConfiguration->camInput != GPIO_UNASSIGNED) {
scheduleMsg(logger, "CAM input: %s", hwPortname(engineConfiguration->camInput));
}
scheduleMsg(logger, "primary trigger input: %s", hwPortname(boardConfiguration->triggerInputPins[0]));
scheduleMsg(logger, "primary trigger simulator: %s %s freq=%d",

12
firmware/hw_layer/trigger_input.cpp
View File

@ -84,10 +84,10 @@ static ICUConfig cam_icucfg = { ICU_INPUT_ACTIVE_LOW, 100000, /* 100kHz ICU cloc
cam_icu_width_callback, cam_icu_period_callback };
static ICUDriver *turnOnTriggerInputPin(brain_pin_e hwPin) {
static ICUDriver *turnOnTriggerInputPin(brain_pin_e hwPin, ICUConfig *icucfg) {
// configure pin
turnOnCapturePin("trigger", hwPin);
shaft_icucfg.channel = getInputCaptureChannel(hwPin);
icucfg->channel = getInputCaptureChannel(hwPin);
ICUDriver *driver = getInputCaptureDriver(hwPin);
scheduleMsg(logger, "turnOnTriggerInputPin %s", hwPortname(hwPin));
@ -100,7 +100,7 @@ static ICUDriver *turnOnTriggerInputPin(brain_pin_e hwPin) {
// bool needPeriodCallback = !CONFIG(useOnlyRisingEdgeForTrigger) || !TRIGGER_SHAPE(useRiseEdge);
// shaft_icucfg.period_cb = needPeriodCallback ? shaft_icu_period_callback : NULL;
efiIcuStart(driver, &shaft_icucfg);
efiIcuStart(driver, icucfg);
if (driver->state == ICU_READY) {
icuEnable(driver);
} else {
@ -129,7 +129,7 @@ static void rememberPrimaryChannel(void) {
void turnOnTriggerInputPins(Logging *sharedLogger) {
logger = sharedLogger;
for (int i = 0; i < TRIGGER_SUPPORTED_CHANNELS; i++) {
turnOnTriggerInputPin(boardConfiguration->triggerInputPins[i]);
turnOnTriggerInputPin(boardConfiguration->triggerInputPins[i], &shaft_icucfg);
}
rememberPrimaryChannel();
@ -154,10 +154,12 @@ void applyNewTriggerInputPins(void) {
for (int i = 0; i < TRIGGER_SUPPORTED_CHANNELS; i++) {
if (boardConfiguration->triggerInputPins[i]
!= activeConfiguration.bc.triggerInputPins[i]) {
turnOnTriggerInputPin(boardConfiguration->triggerInputPins[i]);
turnOnTriggerInputPin(boardConfiguration->triggerInputPins[i], &shaft_icucfg);
}
}
turnOnTriggerInputPin(engineConfiguration->camInput, &cam_icucfg);
rememberPrimaryChannel();
}