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

nicer error messages

This commit is contained in:
rusefi 2020-05-09 01:49:17 -04:00
parent 452a579e8e
commit 94ca216936
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/controllers/core/state_sequence.cpp
View File

@ -53,9 +53,10 @@ float MultiChannelStateSequence::getSwitchTime(const int index) const {
return switchTimes[index];
}
void MultiChannelStateSequence::checkSwitchTimes(const int size) {
void MultiChannelStateSequence::checkSwitchTimes(const int size, const float scale) {
if (switchTimes[size - 1] != 1) {
firmwareError(CUSTOM_ERR_WAVE_1, "last switch time has to be 1 not %.2f", switchTimes[size - 1]);
firmwareError(CUSTOM_ERR_WAVE_1, "last switch time has to be 1/%f not %.2f/%f", scale,
switchTimes[size - 1], scale * switchTimes[size - 1]);
return;
}
for (int i = 0; i < size - 1; i++) {

2
firmware/controllers/core/state_sequence.h
View File

@ -71,7 +71,7 @@ public:
void reset(void);
float getSwitchTime(const int phaseIndex) const;
void setSwitchTime(const int phaseIndex, const float value);
void checkSwitchTimes(const int size);
void checkSwitchTimes(const int size, const float scale);
pin_state_t getChannelState(const int channelIndex, const int phaseIndex) const;
int findAngleMatch(const float angle, const int size) const;

2
firmware/controllers/system/timer/pwm_generator_logic.cpp
View File

@ -283,7 +283,7 @@ void copyPwmParameters(PwmConfig *state, int phaseCount, float const *switchTime
}
}
if (state->mode == PM_NORMAL) {
state->multiChannelStateSequence.checkSwitchTimes(phaseCount);
state->multiChannelStateSequence.checkSwitchTimes(phaseCount, 1);
}
}

7
firmware/controllers/trigger/decoders/trigger_structure.cpp
View File

@ -237,7 +237,10 @@ void TriggerWaveform::addEvent(angle_t angle, trigger_wheel_e const channelIndex
efiAssertVoid(CUSTOM_ERR_6599, angle > 0, "angle should be positive");
if (privateTriggerDefinitionSize > 0) {
if (angle <= previousAngle) {
warning(CUSTOM_ERR_TRG_ANGLE_ORDER, "invalid angle order: new=%.2f and prev=%.2f, size=%d", angle, previousAngle, privateTriggerDefinitionSize);
warning(CUSTOM_ERR_TRG_ANGLE_ORDER, "invalid angle order: new=%.2f/%f and prev=%.2f/%f, size=%d",
angle, angle * getCycleDuration(),
previousAngle, previousAngle * getCycleDuration(),
privateTriggerDefinitionSize);
setShapeDefinitionError(true);
return;
}
@ -653,7 +656,7 @@ void TriggerWaveform::initializeTriggerWaveform(Logging *logger, operation_mode_
version++;
if (!shapeDefinitionError) {
wave.checkSwitchTimes(getSize());
wave.checkSwitchTimes(getSize(), getCycleDuration());
}
}