mirror of https://github.com/rusefi/rusefi-1.git
auto-sync
This commit is contained in:
parent
dc48663095
commit
ea0b748e44
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 12 01:30:52 EST 2017
|
||||
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 12 20:28:45 EST 2017
|
||||
|
||||
pageSize = 16376
|
||||
page = 1
|
||||
|
@ -554,7 +554,7 @@ page = 1
|
|||
tpsDecelEnleanmentThreshold = scalar, F32, 2232, "roc", 1, 0, 0, 200, 3
|
||||
tpsDecelEnleanmentMultiplier = scalar, F32, 2236, "coeff", 1, 0, 0, 200, 3
|
||||
slowAdcAlpha = scalar, F32, 2240, "coeff", 1, 0, 0, 200, 3
|
||||
debugMode = bits, U32, 2244, [0:3], "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"
|
||||
debugMode = bits, U32, 2244, [0:3], "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"
|
||||
warmupAfrPid_pFactor = scalar, F32, 2248, "value", 1, 0, -1000, 1000, 5
|
||||
warmupAfrPid_iFactor = scalar, F32, 2252, "value", 1, 0, -1000, 1000, 5
|
||||
warmupAfrPid_dFactor = scalar, F32, 2256, "value", 1, 0, -1000, 1000, 5
|
||||
|
@ -1216,6 +1216,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
|
||||
|
@ -1939,11 +1941,11 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
|
|||
dialog = cj125Function, "CJ125 Settings (wbo decoder)"
|
||||
field = "Enabled", isCJ125Enabled
|
||||
field = "!ECU reboot needed to apply these settings"
|
||||
field = "ChipSelect pin", cj125CsPin
|
||||
field = "ChipSelect mode", cj125CsPinMode
|
||||
field = "ChipSelect pin", cj125CsPin, {isCJ125Enabled == 1}
|
||||
field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1}
|
||||
field = "SPI device", cj125SpiDevice
|
||||
field = "UA input", cj125ua
|
||||
field = "UR input", cj125ur
|
||||
field = "UA input", cj125ua, {isCJ125Enabled == 1}
|
||||
field = "UR input", cj125ur, {isCJ125Enabled == 1}
|
||||
|
||||
dialog = spiFunction, "SPI settings"
|
||||
field = "!ECU reboot needed to apply these settings"
|
||||
|
|
|
@ -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
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -3042,4 +3042,36 @@ Connection ~ 9150 9700
|
|||
Wire Wire Line
|
||||
9150 9950 9150 10000
|
||||
Connection ~ 9150 10000
|
||||
$Comp
|
||||
L CONN_1 P65
|
||||
U 1 1 58A309FB
|
||||
P 9250 3900
|
||||
F 0 "P65" H 9330 3900 40 0000 L CNN
|
||||
F 1 "CONN_1" H 9250 3955 30 0001 C CNN
|
||||
F 2 "Pin_Headers:Pin_Header_Straight_1x01_Pitch2.00mm" V 1130 2500 60 0001 C CNN
|
||||
F 3 "" H 9250 3900 60 0001 C CNN
|
||||
F 4 "DO NOT POPULATE,DNP" V 1130 2500 60 0001 C CNN "MFG,MFG#"
|
||||
F 5 "DO NOT POPULATE,DNP" V 1130 2500 60 0001 C CNN "VEND1,VEND1#"
|
||||
1 9250 3900
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
Wire Wire Line
|
||||
9100 3900 9100 3950
|
||||
Connection ~ 9100 3950
|
||||
$Comp
|
||||
L CONN_1 P63
|
||||
U 1 1 58A3238A
|
||||
P 9250 3800
|
||||
F 0 "P63" H 9330 3800 40 0000 L CNN
|
||||
F 1 "CONN_1" H 9250 3855 30 0001 C CNN
|
||||
F 2 "Pin_Headers:Pin_Header_Straight_1x01_Pitch2.00mm" V 1130 2400 60 0001 C CNN
|
||||
F 3 "" H 9250 3800 60 0001 C CNN
|
||||
F 4 "DO NOT POPULATE,DNP" V 1130 2400 60 0001 C CNN "MFG,MFG#"
|
||||
F 5 "DO NOT POPULATE,DNP" V 1130 2400 60 0001 C CNN "VEND1,VEND1#"
|
||||
1 9250 3800
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
Wire Wire Line
|
||||
9100 3800 9100 3850
|
||||
Connection ~ 9100 3850
|
||||
$EndSCHEMATC
|
||||
|
|
|
@ -129,7 +129,7 @@
|
|||
129) RESOLVED IN R0.5 silkscreen not under but next to component: R1001 R1002 D1001 etc?
|
||||
130) RESOLVED IN R0.4.3 C472, C354 and C358 are electrolytic in the schematic, change to non polarity dependant symbols to match real world. RESOLVED IN R0.4.2
|
||||
131) Fix 3D view
|
||||
132) Add vias to PE5 & PE6 traces (these are input capture options on TIM9)
|
||||
132) RESOLVED IN R0.5 Add vias to PE5 & PE6 traces (these are input capture options on TIM9)
|
||||
|
||||
For honda add-on / rewiring board
|
||||
-- Add 2A high side solinoid drive for VTec sol
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue