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

auto-sync

This commit is contained in:
rusEfi 2016-12-18 19:02:00 -05:00
parent a447a0b72d
commit 423b838d2b
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/controllers/algo/engine.h
View File

@ -214,7 +214,6 @@ public:
Engine();
void setConfig(persistent_config_s *config);
void reset();
void prepareFuelSchedule(DECLARE_ENGINE_PARAMETER_F);
injection_mode_e getCurrentInjectionMode(DECLARE_ENGINE_PARAMETER_F);
OutputSignalPair fuelActuators[INJECTION_PIN_COUNT];

8
firmware/controllers/algo/obd_error_codes.h
View File

@ -1684,11 +1684,11 @@ typedef enum {
CUSTOM_OBD_16 = 6016,
CUSTOM_OBD_17 = 6017,
CUSTOM_OBD_18 = 6018,
CUSTOM_OBD_PIN_NOT_ASSIGNED = 6019,
CUSTOM_OBD_COIL_PIN_NOT_ASSIGNED = 6019,
CUSTOM_OBD_20 = 6020,
CUSTOM_OBD_21 = 6021,
CUSTOM_OBD_22 = 6022,
CUSTOM_OBD_INJECTION_NO_PIN_ASSIGNED = 6020,
CUSTOM_OBD_UNEXPECTED_INJECTION_MODE = 6021,
CUSTOM_OBD_ANGLE_CONSTRAINT_VIOLATION = 6022,
CUSTOM_OBD_23 = 6023,
CUSTOM_OBD_24 = 6024,
CUSTOM_OBD_MAP_VALUE = 6025,

6
firmware/controllers/math/engine_math.cpp
View File

@ -132,7 +132,7 @@ void FuelSchedule::addFuelEventsForCylinder(int i DECLARE_ENGINE_PARAMETER_S) {
// does not look exactly right, not too consistent with IM_SEQUENTIAL
index = i % (engineConfiguration->specs.cylindersCount / 2);
} else {
warning(CUSTOM_OBD_21, "Unexpected injection mode %d", mode);
warning(CUSTOM_OBD_UNEXPECTED_INJECTION_MODE, "Unexpected injection mode %d", mode);
index = 0;
}
@ -158,7 +158,7 @@ void FuelSchedule::addFuelEventsForCylinder(int i DECLARE_ENGINE_PARAMETER_S) {
if (!isSimultanious && !isPinAssigned(output)) {
// todo: extract method for this index math
warning(CUSTOM_OBD_20, "no_pin_inj #%s", output->name);
warning(CUSTOM_OBD_INJECTION_NO_PIN_ASSIGNED, "no_pin_inj #%s", output->name);
}
InjectionEvent *ev = &elements[i];
@ -263,7 +263,7 @@ void findTriggerPosition(event_trigger_position_s *position, angle_t angleOffset
int index = TRIGGER_SHAPE(triggerIndexByAngle[(int)angleOffset]);
angle_t eventAngle = TRIGGER_SHAPE(eventAngles[index]);
if (angleOffset < eventAngle) {
warning(CUSTOM_OBD_22, "angle constraint violation in findTriggerPosition(): %f/%f", angleOffset, eventAngle);
warning(CUSTOM_OBD_ANGLE_CONSTRAINT_VIOLATION, "angle constraint violation in findTriggerPosition(): %f/%f", angleOffset, eventAngle);
return;
}

2
firmware/controllers/trigger/spark_logic.cpp
View File

@ -214,7 +214,7 @@ static ALWAYS_INLINE void handleSparkEvent(bool limitedSpark, uint32_t trgEventI
#define assertPinAssigned(output) { \
if (!isPinAssigned(output)) { \
warning(CUSTOM_OBD_PIN_NOT_ASSIGNED, "no_pin_cl #%s", (output)->name); \
warning(CUSTOM_OBD_COIL_PIN_NOT_ASSIGNED, "no_pin_cl #%s", (output)->name); \
} \
}