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

auto-sync

This commit is contained in:
rusEfi 2015-02-07 14:04:45 -06:00
parent 2fee72c75e
commit 77e34f224f
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/controllers/trigger/trigger_structure.cpp
View File

@ -84,6 +84,7 @@ void TriggerShape::clear() {
void TriggerShape::reset(operation_mode_e operationMode, bool needSecondTriggerInput) { void TriggerShape::reset(operation_mode_e operationMode, bool needSecondTriggerInput) {
this->operationMode = operationMode; this->operationMode = operationMode;
size = 0; size = 0;
this->needSecondTriggerInput = needSecondTriggerInput;
triggerShapeSynchPointIndex = 0; triggerShapeSynchPointIndex = 0;
memset(initialState, 0, sizeof(initialState)); memset(initialState, 0, sizeof(initialState));
memset(switchTimesBuffer, 0, sizeof(switchTimesBuffer)); memset(switchTimesBuffer, 0, sizeof(switchTimesBuffer));
@ -193,6 +194,8 @@ float TriggerShape::getAngle(int index) const {
void TriggerShape::addEvent(float angle, trigger_wheel_e const waveIndex, trigger_value_e const stateParam) { void TriggerShape::addEvent(float angle, trigger_wheel_e const waveIndex, trigger_value_e const stateParam) {
efiAssertVoid(operationMode != OM_NONE, "operationMode not set"); efiAssertVoid(operationMode != OM_NONE, "operationMode not set");
efiAssertVoid(waveIndex!= T_SECONDARY || needSecondTriggerInput, "secondary needed or not?");
trigger_value_e state; trigger_value_e state;
if (invertOnAdd) { if (invertOnAdd) {
state = (stateParam == TV_LOW) ? TV_HIGH : TV_LOW; state = (stateParam == TV_LOW) ? TV_HIGH : TV_LOW;

2
unit_tests/test_fuel_map.cpp
View File

@ -21,8 +21,10 @@ extern float testMafValue;
void testFuelMap(void) { void testFuelMap(void) {
printf("*************************************************** testFuelMap\r\n"); printf("*************************************************** testFuelMap\r\n");
printf("Setting up FORD_ASPIRE_1996\r\n");
EngineTestHelper eth(FORD_ASPIRE_1996); EngineTestHelper eth(FORD_ASPIRE_1996);
printf("Filling fuel map\r\n");
for (int k = 0; k < FUEL_LOAD_COUNT; k++) { for (int k = 0; k < FUEL_LOAD_COUNT; k++) {
for (int r = 0; r < FUEL_RPM_COUNT; r++) { for (int r = 0; r < FUEL_RPM_COUNT; r++) {
eth.engine.engineConfiguration->fuelTable[k][r] = k * 200 + r; eth.engine.engineConfiguration->fuelTable[k][r] = k * 200 + r;