From 9f392f565992ee625aa2680722366b5d22327216 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 12 Feb 2017 21:04:18 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/dodge_neon.cpp | 2 +- firmware/config/engines/ford_festiva.cpp | 2 +- firmware/console/status_loop.cpp | 14 +++++++++++--- firmware/controllers/algo/engine.cpp | 2 +- firmware/controllers/algo/engine_configuration.cpp | 2 +- firmware/controllers/algo/rusefi_enums.h | 8 ++++---- firmware/controllers/alternatorController.cpp | 4 ++-- firmware/controllers/idle_thread.cpp | 2 +- firmware/integration/rusefi_config.txt | 2 +- firmware/rusefi.cpp | 2 +- firmware/tunerstudio/rusefi.input | 2 ++ .../models/src/com/rusefi/config/Fields.java | 4 ++-- 12 files changed, 28 insertions(+), 18 deletions(-) diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 4be645ccdb..b57b13fe60 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -261,7 +261,7 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->warmupAfrPid.pFactor = -0.2; engineConfiguration->warmupAfrPid.iFactor = -0.0005; // engineConfiguration->warmupAfrPid.dFactor = -0.02; - engineConfiguration->debugMode = WARMUP_ENRICH; + engineConfiguration->debugMode = DBG_WARMUP_ENRICH; // set global_trigger_offset_angle 38 engineConfiguration->globalTriggerAngleOffset = 38; diff --git a/firmware/config/engines/ford_festiva.cpp b/firmware/config/engines/ford_festiva.cpp index cb919db239..18ddc38080 100644 --- a/firmware/config/engines/ford_festiva.cpp +++ b/firmware/config/engines/ford_festiva.cpp @@ -273,7 +273,7 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->warmupAfrPid.pFactor = -0.2; engineConfiguration->warmupAfrPid.iFactor = -0.0005; // engineConfiguration->warmupAfrPid.dFactor = -0.02; - engineConfiguration->debugMode = WARMUP_ENRICH; + engineConfiguration->debugMode = DBG_WARMUP_ENRICH; engineConfiguration->tpsAccelEnrichmentThreshold = 40; diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 882e629ae5..d9a5b253de 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -707,9 +707,14 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ } if (engineConfiguration->debugMode == DBG_TRIGGER_INPUT) { - tsOutputChannels->debugIntField1 = engine->triggerCentral.getHwEventCounter(0); - tsOutputChannels->debugIntField2 = engine->triggerCentral.getHwEventCounter(1); - tsOutputChannels->debugIntField3 = engine->triggerCentral.getHwEventCounter(2); + tsOutputChannels->debugIntField1 = engine->triggerCentral.getHwEventCounter((int)SHAFT_PRIMARY_FALLING); + tsOutputChannels->debugIntField2 = engine->triggerCentral.getHwEventCounter((int)SHAFT_SECONDARY_FALLING); + tsOutputChannels->debugIntField3 = engine->triggerCentral.getHwEventCounter((int)SHAFT_3RD_FALLING); + + tsOutputChannels->debugFloatField1 = engine->triggerCentral.getHwEventCounter((int)SHAFT_PRIMARY_RISING); + tsOutputChannels->debugFloatField2 = engine->triggerCentral.getHwEventCounter((int)SHAFT_SECONDARY_RISING); + tsOutputChannels->debugFloatField3 = engine->triggerCentral.getHwEventCounter((int)SHAFT_3RD_RISING); + } else if (engineConfiguration->debugMode == FSIO_ADC) { // todo: implement a proper loop if (engineConfiguration->fsioAdc[0] != EFI_ADC_NONE) { @@ -720,8 +725,11 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ tsOutputChannels->debugIntField1 = engine->engineState.vssCounter; } else if (engineConfiguration->debugMode == DBG_SD_CARD) { tsOutputChannels->debugIntField1 = engine->engineState.totalLoggedBytes; + } else if (engineConfiguration->debugMode == DBG_CRANKING_DETAILS) { + tsOutputChannels->debugIntField1 = engine->rpmCalculator.getRevolutionCounterSinceStart(); } + tsOutputChannels->wallFuelAmount = ENGINE(wallFuel).getWallFuel(0); tsOutputChannels->wallFuelCorrection = ENGINE(wallFuelCorrection); // TPS acceleration diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp index 72afb0144b..922a2eb4e4 100644 --- a/firmware/controllers/algo/engine.cpp +++ b/firmware/controllers/algo/engine.cpp @@ -185,7 +185,7 @@ void EngineState::periodicFastCallback(DECLARE_ENGINE_PARAMETER_F) { cltFuelCorrection = warmupAfrPid.getValue(warmupTargetAfr, currentAfr, 1); } #if ! EFI_UNIT_TEST || defined(__DOXYGEN__) - if (engineConfiguration->debugMode == WARMUP_ENRICH) { + if (engineConfiguration->debugMode == DBG_WARMUP_ENRICH) { tsOutputChannels.debugFloatField1 = warmupTargetAfr; warmupAfrPid.postState(&tsOutputChannels); } diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 738983718f..356206900b 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -715,7 +715,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->isWaveAnalyzerEnabled = true; engineConfiguration->isIdleThreadEnabled = true; - engineConfiguration->debugMode = ALTERNATOR_PID; + engineConfiguration->debugMode = DBG_ALTERNATOR_PID; engineConfiguration->acIdleRpmBump = 200; engineConfiguration->knockDetectionWindowStart = 35; diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index ea4e1ffafe..12a9655eeb 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -644,16 +644,16 @@ typedef enum { } brain_pin_e; typedef enum { - ALTERNATOR_PID = 0, + DBG_ALTERNATOR_PID = 0, DBG_TPS_ACCEL = 1, - WARMUP_ENRICH = 2, - IDLE = 3, + DBG_WARMUP_ENRICH = 2, + DBG_IDLE = 3, DBG_EL_ACCEL = 4, DBG_TRIGGER_INPUT = 5, FSIO_ADC = 6, AUX_PID_1 = 7, DBG_VVT = 8, - DBG_POST_CRANKING_ENRICH = 9, + DBG_CRANKING_DETAILS = 9, DBG_IGNITION_TIMING = 10, DBG_FUEL_PID_CORRECTION = 11, DBG_VEHICLE_SPEED_SENSOR = 12, diff --git a/firmware/controllers/alternatorController.cpp b/firmware/controllers/alternatorController.cpp index a198c1d14e..af01042038 100644 --- a/firmware/controllers/alternatorController.cpp +++ b/firmware/controllers/alternatorController.cpp @@ -59,7 +59,7 @@ static msg_t AltCtrlThread(int param) { chThdSleepMilliseconds(dt); #if ! EFI_UNIT_TEST || defined(__DOXYGEN__) - if (engineConfiguration->debugMode == ALTERNATOR_PID) { + if (engineConfiguration->debugMode == DBG_ALTERNATOR_PID) { // this block could be executed even in on/off alternator control mode // but at least we would reflect latest state tsOutputChannels.debugFloatField1 = currentAltDuty; @@ -88,7 +88,7 @@ static msg_t AltCtrlThread(int param) { bool newState = (vBatt < targetVoltage - h) || (currentPlainOnOffState && vBatt < targetVoltage); enginePins.alternatorPin.setValue(newState); currentPlainOnOffState = newState; - if (engineConfiguration->debugMode == ALTERNATOR_PID) { + if (engineConfiguration->debugMode == DBG_ALTERNATOR_PID) { tsOutputChannels.debugIntField1 = newState; } diff --git a/firmware/controllers/idle_thread.cpp b/firmware/controllers/idle_thread.cpp index 50ca4be1ff..da92e7a4d2 100644 --- a/firmware/controllers/idle_thread.cpp +++ b/firmware/controllers/idle_thread.cpp @@ -115,7 +115,7 @@ static void manualIdleController(int positionPercent) { cltCorrectedPosition = maxF(cltCorrectedPosition, 0.01); cltCorrectedPosition = minF(cltCorrectedPosition, 99.9); - if (engineConfiguration->debugMode == IDLE) { + if (engineConfiguration->debugMode == DBG_IDLE) { tsOutputChannels.debugFloatField1 = actualIdlePosition; } diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 57fef31dbe..c28d0045ff 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -113,7 +113,7 @@ float baseFuel;+Fuel squirt duration while cranking\nA number of curves adjust t int16_t rpm;+Cranking mode threshold. Special cranking logic controls fuel and spark while RPM is below this threshold\nset cranking_rpm X;"RPM", 1, 0, 0, 3000, 0 end_struct -#define debug_mode_e_enum "Alternator_PID", "TPS accel enrich", "Warmup PID", "IDLE", "EL accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT", "Post-crank enrich", "Timing", "Closed-loop fuel corr", "VSS", "SD card", "mode14", "mode15" +#define debug_mode_e_enum "Alternator_PID", "TPS accel enrich", "Warmup PID", "IDLE", "EL accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT PID", "Cranking", "Timing", "Closed-loop fuel corr", "VSS", "SD card", "mode14", "mode15" custom debug_mode_e 4 bits, U32, @OFFSET@, [0:3], @@debug_mode_e_enum@@ #define vvt_mode_e_enum "First half", "Second half", "2GZ", "Miata NB2", "mode4", "mode5", "mode6", "mode7" diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index b038f77243..4d4748e377 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 20170209; + return 20170212; } diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 1e6c1a4d09..c4313fb7dc 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1148,6 +1148,8 @@ fileVersion = { 20161225 } debugFloatField3Gauge = debugFloatField3, "debug f3", "%", 0, 100, 0, 0, 100, 100, 4, 4 debugFloatField4Gauge = debugFloatField4, "debug f4", "%", 0, 100, 0, 0, 100, 100, 4, 4 debugFloatField5Gauge = debugFloatField5, "debug f5", "%", 0, 100, 0, 0, 100, 100, 4, 4 + debugFloatField6Gauge = debugFloatField6, "debug f6", "%", 0, 100, 0, 0, 100, 100, 4, 4 + debugFloatField7Gauge = debugFloatField7, "debug f7", "%", 0, 100, 0, 0, 100, 100, 4, 4 debugIntField1Gauge = debugIntField1, "debug i1", "%", 0, 100, 0, 0, 100, 100, 0, 0 debugIntField2Gauge = debugIntField2, "debug i2", "%", 0, 100, 0, 0, 100, 100, 0, 0 debugIntField3Gauge = debugIntField3, "debug i3", "%", 0, 100, 0, 0, 100, 100, 0, 0 diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index f02d4b202a..7f51c844ca 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 12 01:30:52 EST 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 12 20:28:45 EST 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -1510,7 +1510,7 @@ public class Fields { public static final Field TPSDECELENLEANMENTTHRESHOLD = Field.create("TPSDECELENLEANMENTTHRESHOLD", 2232, FieldType.FLOAT); public static final Field TPSDECELENLEANMENTMULTIPLIER = Field.create("TPSDECELENLEANMENTMULTIPLIER", 2236, FieldType.FLOAT); public static final Field SLOWADCALPHA = Field.create("SLOWADCALPHA", 2240, FieldType.FLOAT); - public static final String[] debug_mode_e = {"Alternator_PID", "TPS accel enrich", "Warmup PID", "IDLE", "EL accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT", "Post-crank enrich", "Timing", "Closed-loop fuel corr", "VSS", "SD card", "mode14", "mode15"}; + public static final String[] debug_mode_e = {"Alternator_PID", "TPS accel enrich", "Warmup PID", "IDLE", "EL accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT PID", "Cranking", "Timing", "Closed-loop fuel corr", "VSS", "SD card", "mode14", "mode15"}; public static final Field DEBUGMODE = Field.create("DEBUGMODE", 2244, FieldType.INT, debug_mode_e); public static final Field WARMUPAFRPID_PFACTOR = Field.create("WARMUPAFRPID_PFACTOR", 2248, FieldType.FLOAT); public static final Field WARMUPAFRPID_IFACTOR = Field.create("WARMUPAFRPID_IFACTOR", 2252, FieldType.FLOAT);