From 9396bb350dfbcab7fb4767b921859b7b3a613e2f Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 22 Jan 2017 09:03:08 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/mazda_miata_vvt.cpp | 1 + firmware/controllers/algo/engine_configuration.cpp | 2 +- firmware/controllers/algo/obd_error_codes.h | 12 ++++++------ firmware/controllers/math/engine_math.cpp | 2 +- firmware/controllers/sensors/tps.cpp | 2 +- .../controllers/trigger/main_trigger_callback.cpp | 2 +- firmware/controllers/trigger/spark_logic.cpp | 2 +- firmware/hw_layer/pwm_generator.cpp | 4 ++++ firmware/rusefi.cpp | 2 +- java_console/autotest/src/com/rusefi/AutoTest.java | 5 +++++ 10 files changed, 22 insertions(+), 12 deletions(-) diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index a98b437d07..2da89cb02e 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -121,6 +121,7 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->vvtOffset = -70; engineConfiguration->activateAuxPid1 = true; // todo: remove this field? + engineConfiguration->auxPidFrequency = 300; engineConfiguration->auxPidPins[0] = GPIOE_3; // VVT solenoid control // /** // * set_fsio_setting 0 0.55 diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 01b906af4d..4e91f470c8 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -998,7 +998,7 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN break; default: - warning(CUSTOM_OBD_3, "Unexpected engine type: %d", engineType); + warning(CUSTOM_UNEXPECTED_ENGINE_TYPE, "Unexpected engine type: %d", engineType); } applyNonPersistentConfiguration(logger PASS_ENGINE_PARAMETER); // todo: eliminate triggerShape.operationMode? diff --git a/firmware/controllers/algo/obd_error_codes.h b/firmware/controllers/algo/obd_error_codes.h index fd29c3d634..1df038f262 100644 --- a/firmware/controllers/algo/obd_error_codes.h +++ b/firmware/controllers/algo/obd_error_codes.h @@ -1670,7 +1670,7 @@ typedef enum { CUSTOM_NAN_ENGINE_LOAD = 6000, CUSTOM_WRONG_ALGORITHM = 6001, CUSTOM_NAN_ENGINE_LOAD_2 = 6002, - CUSTOM_OBD_3 = 6003, + CUSTOM_NEGATIVE_DURATION = 6003, CUSTOM_NAN_DURACTION = 6004, CUSTOM_OBD_5 = 6005, CUSTOM_OBD_6 = 6006, @@ -1686,7 +1686,7 @@ typedef enum { CUSTOM_OBD_15 = 6015, CUSTOM_OBD_16 = 6016, CUSTOM_OBD_17 = 6017, - CUSTOM_OBD_18 = 6018, + CUSTOM_UNKNOWN_ALGORITHM = 6018, CUSTOM_OBD_COIL_PIN_NOT_ASSIGNED = 6019, CUSTOM_OBD_INJECTION_NO_PIN_ASSIGNED = 6020, @@ -1696,13 +1696,13 @@ typedef enum { CUSTOM_OBD_24 = 6024, CUSTOM_OBD_25 = 6025, CUSTOM_OBD_26 = 6026, - CUSTOM_OBD_27 = 6027, - CUSTOM_OBD_28 = 6028, + CUSTOM_UNEXPECTED_ENGINE_TYPE = 6027, + CUSTOM_INVALID_TPS_SETTING = 6028, CUSTOM_OBD_29 = 6029, CUSTOM_OBD_NAN_INJECTION = 6030, CUSTOM_OBD_NEG_INJECTION = 6031, - CUSTOM_OBD_32 = 6032, + CUSTOM_ZERO_DWELL = 6032, CUSTOM_OBD_33 = 6033, CUSTOM_OBD_34 = 6034, CUSTOM_OBD_TRG_DECODING = 6035, @@ -1721,7 +1721,7 @@ typedef enum { CUSTOM_OBD_SKIPPED_FUEL = 6046, CUSTOM_OBD_SCH_REUSE = 6047, CUSTOM_OBD_48 = 6048, - CUSTOM_OBD_49 = 6049, + CUSTOM_OBD_LOW_FREQUENCY = 6049, CUSTOM_TOO_LONG_FUEL_INJECTION = 6050, CUSTOM_OBD_ZERO_CYLINDER_COUNT = 6051, diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp index 0958dcb601..eae83e4db5 100644 --- a/firmware/controllers/math/engine_math.cpp +++ b/firmware/controllers/math/engine_math.cpp @@ -70,7 +70,7 @@ float getEngineLoadT(DECLARE_ENGINE_PARAMETER_F) { return getRealMaf(PASS_ENGINE_PARAMETER_F); } default: - warning(CUSTOM_OBD_18, "Unexpected engine load parameter: %d", engineConfiguration->fuelAlgorithm); + warning(CUSTOM_UNKNOWN_ALGORITHM, "Unexpected engine load parameter: %d", engineConfiguration->fuelAlgorithm); return -1; } } diff --git a/firmware/controllers/sensors/tps.cpp b/firmware/controllers/sensors/tps.cpp index 66438efadf..1c50e573c3 100644 --- a/firmware/controllers/sensors/tps.cpp +++ b/firmware/controllers/sensors/tps.cpp @@ -59,7 +59,7 @@ float getTpsRateOfChange(void) { * */ percent_t getTpsValue(int adc DECLARE_ENGINE_PARAMETER_S) { if (engineConfiguration->tpsMin == engineConfiguration->tpsMax) { - warning(CUSTOM_OBD_28, "Invalid TPS configuration: same value %d", engineConfiguration->tpsMin); + warning(CUSTOM_INVALID_TPS_SETTING, "Invalid TPS configuration: same value %d", engineConfiguration->tpsMin); return NAN; } float result = interpolate(TPS_TS_CONVERSION * engineConfiguration->tpsMax, 100, TPS_TS_CONVERSION * engineConfiguration->tpsMin, 0, adc); diff --git a/firmware/controllers/trigger/main_trigger_callback.cpp b/firmware/controllers/trigger/main_trigger_callback.cpp index a8ee1fb37d..a57ada336c 100644 --- a/firmware/controllers/trigger/main_trigger_callback.cpp +++ b/firmware/controllers/trigger/main_trigger_callback.cpp @@ -209,7 +209,7 @@ static void seScheduleByTime(const char *prefix, scheduling_s *scheduling, efiti static void scheduleFuelInjection(int rpm, OutputSignalPair *pair, efitimeus_t nowUs, floatus_t delayUs, floatus_t durationUs, InjectionEvent *event DECLARE_ENGINE_PARAMETER_S) { if (durationUs < 0) { - warning(CUSTOM_OBD_3, "duration cannot be negative: %d", durationUs); + warning(CUSTOM_NEGATIVE_DURATION, "duration cannot be negative: %d", durationUs); return; } if (cisnan(durationUs)) { diff --git a/firmware/controllers/trigger/spark_logic.cpp b/firmware/controllers/trigger/spark_logic.cpp index 27e9416bf9..990199a56c 100644 --- a/firmware/controllers/trigger/spark_logic.cpp +++ b/firmware/controllers/trigger/spark_logic.cpp @@ -289,7 +289,7 @@ static ALWAYS_INLINE void prepareIgnitionSchedule(int rpm DECLARE_ENGINE_PARAMET } if (engine->engineState.dwellAngle == 0) { - warning(CUSTOM_OBD_32, "dwell is zero?"); + warning(CUSTOM_ZERO_DWELL, "dwell is zero?"); } if (engine->engineState.dwellAngle > maxAllowedDwellAngle) { warning(CUSTOM_OBD_33, "dwell angle too long: %f", engine->engineState.dwellAngle); diff --git a/firmware/hw_layer/pwm_generator.cpp b/firmware/hw_layer/pwm_generator.cpp index fbb8ae6620..5d2f976efc 100644 --- a/firmware/hw_layer/pwm_generator.cpp +++ b/firmware/hw_layer/pwm_generator.cpp @@ -34,6 +34,10 @@ void applyPinState(PwmConfig *state, int stateIndex) { void startSimplePwm(PwmConfig *state, const char *msg, OutputPin *output, float frequency, float dutyCycle, pwm_gen_callback *stateChangeCallback) { efiAssertVoid(dutyCycle >= 0 && dutyCycle <= 1, "dutyCycle"); + if (frequency < 1) { + warning(CUSTOM_OBD_LOW_FREQUENCY, "low frequency %f", frequency); + return; + } float switchTimes[] = { dutyCycle, 1 }; pin_state_t pinStates0[] = { 0, 1 }; diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index bc219ad4f1..82950262e6 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -249,5 +249,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20170119; + return 20170122; } diff --git a/java_console/autotest/src/com/rusefi/AutoTest.java b/java_console/autotest/src/com/rusefi/AutoTest.java index fe0e7ff948..e408529019 100644 --- a/java_console/autotest/src/com/rusefi/AutoTest.java +++ b/java_console/autotest/src/com/rusefi/AutoTest.java @@ -26,6 +26,7 @@ public class AutoTest { static void mainTestBody() { sendCommand("fl 1"); // just in case it was disabled + testMazdaMiata2003(); test2003DodgeNeon(); testFordAspire(); test1995DodgeNeon(); @@ -39,6 +40,10 @@ public class AutoTest { testFordFiesta(); } + private static void testMazdaMiata2003() { + setEngineType(47); + } + private static void testSachs() { setEngineType(29); String msg = "BMW";