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

auto-sync

This commit is contained in:
rusEfi 2015-08-17 23:02:01 -04:00
parent 1114a7c468
commit 6bd6b0b43f
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/console/binary/tunerstudio_configuration.h
View File

@ -96,7 +96,8 @@ typedef struct {
int knockCount; int knockCount;
float fuelLevel; float fuelLevel;
float knockLevel; float knockLevel;
int unused3[10]; int totalTriggerErrorCounter;
int unused3[9];
} TunerStudioOutputChannels; } TunerStudioOutputChannels;
#endif /* TUNERSTUDIO_CONFIGURATION_H_ */ #endif /* TUNERSTUDIO_CONFIGURATION_H_ */

1
firmware/console/status_loop.cpp
View File

@ -597,6 +597,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->injectorDutyCycle = getInjectorDutyCycle(rpm PASS_ENGINE_PARAMETER); tsOutputChannels->injectorDutyCycle = getInjectorDutyCycle(rpm PASS_ENGINE_PARAMETER);
tsOutputChannels->fuelLevel = engine->engineState.fuelLevel; tsOutputChannels->fuelLevel = engine->engineState.fuelLevel;
tsOutputChannels->hasFatalError = hasFirmwareError(); tsOutputChannels->hasFatalError = hasFirmwareError();
tsOutputChannels->totalTriggerErrorCounter = triggerCentral.triggerState.totalTriggerErrorCounter;
tsOutputChannels->checkEngine = hasErrorCodes(); tsOutputChannels->checkEngine = hasErrorCodes();
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE || defined(__DOXYGEN__)

3
firmware/controllers/trigger/trigger_decoder.h
View File

@ -52,6 +52,9 @@ public:
*/ */
uint32_t prevTotalTime[PWM_PHASE_MAX_WAVE_PER_PWM]; uint32_t prevTotalTime[PWM_PHASE_MAX_WAVE_PER_PWM];
int expectedTotalTime[PWM_PHASE_MAX_WAVE_PER_PWM]; int expectedTotalTime[PWM_PHASE_MAX_WAVE_PER_PWM];
/**
* how many times since ECU reboot we had unexpected number of teeth in trigger cycle
*/
uint32_t totalTriggerErrorCounter; uint32_t totalTriggerErrorCounter;
uint32_t runningTriggerErrorCounter; uint32_t runningTriggerErrorCounter;
uint32_t orderingErrorCounter; uint32_t orderingErrorCounter;

2
firmware/tunerstudio/rusefi.ini
View File

@ -1034,6 +1034,8 @@ fileVersion = { 20150625 }
dialog = triggerConfiguration_IO, "Settings I/O" dialog = triggerConfiguration_IO, "Settings I/O"
field = "Primary input channel", triggerInputPins1 field = "Primary input channel", triggerInputPins1
field = "Secondary channel", triggerInputPins2 field = "Secondary channel", triggerInputPins2
field = "Trigger error LED", triggerErrorPin
field = "Trigger error LED mode", triggerErrorPinMode
dialog = triggerConfiguration dialog = triggerConfiguration
panel = triggerConfiguration_settings, North panel = triggerConfiguration_settings, North
panel = triggerConfiguration_IO, South panel = triggerConfiguration_IO, South