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

gcc 2019 q3 fails integration testing #886 

investigation
This commit is contained in:
rusefi 2019-07-14 15:22:02 -04:00
parent cc5cd0cc99
commit 56a6cdd329
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -526,11 +526,20 @@ void resetMaxValues() {
#endif /* EFI_PROD_CODE */
}
#if HAL_USE_ICU == TRUE
extern int icuWidthCallbackCounter;
extern int icuWidthPeriodCounter;
#endif /* HAL_USE_ICU */
void triggerInfo(void) {
#if EFI_PROD_CODE || EFI_SIMULATOR
TriggerShape *ts = &engine->triggerCentral.triggerShape;
#if HAL_USE_ICU == TRUE
scheduleMsg(logger, "trigger ICU hw: %d %d", icuWidthCallbackCounter, icuWidthPeriodCounter);
#endif /* HAL_USE_ICU */
scheduleMsg(logger, "Template %s (%d) trigger %s (%d) useRiseEdge=%s onlyFront=%s useOnlyFirstChannel=%s tdcOffset=%.2f",
getConfigurationName(engineConfiguration->engineType), engineConfiguration->engineType,
getTrigger_type_e(engineConfiguration->trigger.type), engineConfiguration->trigger.type,
@ -707,7 +716,7 @@ void initTriggerCentral(Logging *sharedLogger) {
#endif /* EFI_ENGINE_SNIFFER */
#if EFI_PROD_CODE || EFI_SIMULATOR
addConsoleAction("triggerinfo", triggerInfo);
addConsoleAction(CMD_TRIGGERINFO, triggerInfo);
addConsoleAction("trigger_shape_info", triggerShapeInfo);
addConsoleAction("reset_trigger", resetRunningTriggerCounters);
#endif

4
firmware/hw_layer/trigger_input.cpp
View File

@ -18,6 +18,8 @@
#define HAL_TRIGGER_USE_PAL FALSE
#endif /* HAL_TRIGGER_USE_PAL */
volatile int icuWidthCallbackCounter = 0;
volatile int icuWidthPeriodCounter = 0;
#if EFI_SHAFT_POSITION_INPUT && (HAL_TRIGGER_USE_PAL == TRUE || HAL_USE_ICU == TRUE) && (HAL_USE_COMP == FALSE)
@ -130,6 +132,7 @@ static void cam_icu_period_callback(ICUDriver *icup) {
* 'width' events happens before the 'period' event
*/
static void shaft_icu_width_callback(ICUDriver *icup) {
icuWidthCallbackCounter++;
// todo: support for 3rd trigger input channel
// todo: start using real event time from HW event, not just software timer?
if (hasFirmwareErrorFlag)
@ -146,6 +149,7 @@ static void shaft_icu_width_callback(ICUDriver *icup) {
}
static void shaft_icu_period_callback(ICUDriver *icup) {
icuWidthPeriodCounter++;
if (hasFirmwareErrorFlag)
return;
int isPrimary = icup == primaryCrankDriver;

2
java_console/autotest/src/com/rusefi/AutoTest.java
View File

@ -1,6 +1,7 @@
package com.rusefi;
import com.rusefi.config.generated.Fields;
import com.rusefi.core.MessagesCentral;
import com.rusefi.core.Sensor;
import com.rusefi.core.SensorCentral;
@ -135,6 +136,7 @@ public class AutoTest {
setEngineType(28);
String msg = "mazda 626 default cranking";
IoUtil.changeRpm(200);
sendCommand(Fields.CMD_TRIGGERINFO);
EngineChart chart;
chart = nextChart();