mirror of https://github.com/rusefi/rusefi-1.git
auto-sync
This commit is contained in:
parent
c604b3875c
commit
9396bb350d
|
@ -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
|
||||
|
|
|
@ -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?
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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)) {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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 };
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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";
|
||||
|
|
Loading…
Reference in New Issue