• R/O
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

PJSC(Pump Jet Solenoid Controller)はArduinoを使用したバイク用燃料噴射コントローラです。このプロジェクトは、オープンソースECUプロジェクト『Speeduino』をベースにしています。


Commit MetaInfo

Revision140 (tree)
Time2023-07-16 04:18:48
Authormaharu

Log Message

[PJSC v1.03] Supported Warmup enrichment analyze

Change Summary

Incremental Difference

--- branches/Ver1.03/reference/PJSC.ini (revision 139)
+++ branches/Ver1.03/reference/PJSC.ini (revision 140)
@@ -6,7 +6,8 @@
66 MTversion = 2.25
77
88 queryCommand = "Q"
9- signature = "speeduino 201902"
9+; signature = "speeduino 201902"
10+ signature = "speeduino 201905"
1011 ;[PJSC v1.01] signature = "PJSC v102" ;[PJSC v1.02]
1112 versionInfo = "S" ;This info is what is displayed to user
1213
@@ -57,6 +58,13 @@
5758 mapwarn = scalar, U16, "kPa", 1, 0, 0, 30000, 0 ;[PJSC v1.02]
5859 mapdang = scalar, U16, "kPa", 1, 0, 0, 30000, 0 ;[PJSC v1.02]
5960
61+#if LAMBDA
62+ wueAFR = array, S16, [10], "Lambda", { 0.1 / stoich }, 0.000, -0.300, 0.300, 3
63+#else
64+ wueAFR = array, S16, [10], "AFR", 0.1, 0.0, -4.0, 4.0, 1
65+#endif
66+ wueRecommended = array, U08, [10], "%", 1.0, 0.0, 100, 255.0, 0
67+
6068 idleUnits = bits, U08, [0:2], "None", "On/Off", "Duty Cycle", "Duty Cycle", "Steps", "Steps"
6169
6270
@@ -112,6 +120,8 @@
112120 #define trigger_Daihatsu = 14
113121 #define trigger_Harley = 15
114122 #define trigger_ThirtySixMinus222 = 16
123+ #define trigger_NSR = 17 ;[PJSC v1.03]
124+ #define trigger_KATANA = 18 ;[PJSC v1.03]
115125
116126
117127 [Constants]
@@ -235,7 +245,7 @@
235245 wueRates = array, U08, 4, [10], "%", 1.0, 0.0, 0.0, 255, 0
236246 crankingPct = scalar, U08, 14, "%", 1.0, 0.0, 0.0, 255, 0
237247 ;[PJSC] pinLayout = bits, U08, 15, [0:7], "Speeduino v0.1", "Speeduino v0.2", "Speeduino v0.3", "Speeduino v0.4", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NA6 MX5 PNP", "Turtana PCB", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "Plazomat I/O 0.1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "Daz V6 Shield 0.1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NO2C", "UA4C", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "dvjcodec Teensy RevA", "dvjcodec Teensy RevB", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
238- pinLayout = bits, U08, 15, [0:7], "Speeduino v0.1", "Speeduino v0.2", "Speeduino v0.3", "Speeduino v0.4", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NA6 MX5 PNP", "Turtana PCB", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "Plazomat I/O 0.1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "Daz V6 Shield 0.1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NO2C", "UA4C", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "dvjcodec Teensy RevA", "dvjcodec Teensy RevB", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PJSC v1.0", "PJSC v0.2", "PJSC v0.3", "PJSC v0.4", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" ;[PJSC] Boad ID: PJSC boad ver1.0/0.2/0.3 (2018/20/19)
248+ pinLayout = bits, U08, 15, [0:7], "Speeduino v0.1", "Speeduino v0.2", "Speeduino v0.3", "Speeduino v0.4", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NA6 MX5 PNP", "Turtana PCB", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "Plazomat I/O 0.1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "Daz V6 Shield 0.1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NO2C", "UA4C", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "dvjcodec Teensy RevA", "dvjcodec Teensy RevB", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PJSC v1.0", "PJSC v1.10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" ;[PJSC] Boad ID: PJSC boad ver1.0/0.2/0.3 (2018/20/19)
239249 tachoPin = bits, U08, 16, [0:5], "Board Default", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
240250 tachoDiv = bits, U08, 16, [6:7], "Normal", "Half", "INVALID", "INVALID"
241251 unused2-17 = scalar, U08, 17, "ms", 0.1, 0.0, 0.0, 25.5, 1
@@ -335,7 +345,7 @@
335345 pjscFreq = scalar, U08, 71, "Hz", 2.0, 0.0, 10, 511, 0 ;[PJSC]
336346 exValvePosMin = scalar, U08, 72, "ADC", 1.0, 0.0, 0.0, 255.0, 0 ; |
337347 exValvePosMax = scalar, U08, 73, "ADC", 1.0, 0.0, 0.0, 255.0, 0 ; |
338- exTrigHysteresis = scalar, U08, 74, "deg", 1.0, 0.0, 0.0, 255.0, 0 ; V
348+ unused2_74 = scalar, U08, 74, "deg", 1.0, 0.0, 0.0, 255.0, 0 ; V
339349 squirtDeviceType = bits, U08, 75, [0:0], "Injector", "Pump Jet" ;[PJSC]
340350 multiVEmapEnabled = bits, U08, 75, [1:1], "Disable", "Enable" ;[PJSC v1.01] For Dual Fuel Load
341351 mapSeparationEnabled = bits, U08, 75, [2:2], "Disable", "Enable" ;[PJSC v1.01] For Dual Fuel Load
@@ -1390,7 +1400,6 @@
13901400 defaultValue = exValveCalibrationMode, 0 ;[PJSC v1.01]
13911401 defaultValue = exValvePosMin, 0 ; |
13921402 defaultValue = exValvePosMax, 100 ; |
1393- defaultValue = exTrigHysteresis, 10 ; |
13941403 defaultValue = squirtDeviceType, 0 ; |
13951404 defaultValue = externalTrigEdge, 0 ; |
13961405 defaultValue = dutyPulseOnLevel, 0 ; |
@@ -1984,7 +1993,6 @@
19841993 ; |
19851994 dialog = captSparkSetting, "Capture External Spark Control" ; |
19861995 field = "Spark capture trigger edge", externalTrigEdge ; |
1987- field = "Spark capture hysteresis", exTrigHysteresis ; |
19881996 ; |
19891997 dialog = captDutyPulseSetting, "Capture Duty Pulse Control" ; |
19901998 field = "Duty pulse ON Level ch1", dutyPulseOnLevel ; V
@@ -3665,14 +3673,28 @@
36653673 yBins = crankingEnrichValues
36663674 ;gauge = cltGau25
36673675
3668-; Warmup enrichment VEAL AFR adjustment curve (Not currently working)
3669- ;curve = warmup_afr_curve, "AFR Target Temperature Adustment"
3670- ; columnLabel = "Coolant Temp", "AFR Offset %"
3671- ; xAxis = -40, 210, 9
3672- ; yAxis = 0, 240, 6
3673- ; xBins = wueAFRBins, coolant
3674- ; yBins = wueAFRRates
3676+; Warmup enrichment VEAL AFR adjustment curves
3677+ curve = warmup_afr_curve, "Target Adjustment"
3678+ columnLabel = "Coolant", "Offset"
3679+ xAxis = -40, 210, 9
3680+#if LAMBDA
3681+ yAxis = -0.3, 0.1, 5
3682+#else
3683+ yAxis = -4, 1, 5
3684+#endif
3685+ xBins = wueBins, coolant
3686+ yBins = wueAFR
36753687
3688+ curve = warmup_analyzer_curve, "Warmup Enrichment"
3689+ columnLabel = "Coolant", "Current WUE", "Coolant", "Recommended WUE"
3690+ xAxis = -40, 210, 9
3691+ yAxis = 100, 255, 6
3692+ xBins = wueBins, coolant
3693+ yBins = wueRates
3694+ yBins = wueRecommended
3695+ lineLabel = "Current WUE"
3696+ lineLabel = "Recommended WUE"
3697+
36763698 ; Flex fuel correction curves
36773699 curve = flex_fuel_curve, "Flex Fuel Adjustments"
36783700 columnLabel = "Ethanol", "Fuel"
@@ -3723,7 +3745,6 @@
37233745 xBins = baroDenBins, baro
37243746 yBins = baroDenRates
37253747
3726-
37273748 [TableEditor]
37283749 ; table_id, map3d_id, "title", page
37293750 table = veTable1Tbl, veTable1Map, "VE Table", 1
@@ -4088,7 +4109,7 @@
40884109 ochGetCommand = "r\$tsCanId\x30%2o%2c"
40894110 ;[PJSC] ochBlockSize = 90
40904111 ;[PJSC v1.03] ochBlockSize = 116 ;[PJSC v1.02] Extend block size
4091- ochBlockSize = 133 ;[PJSC v1.03] Extend block size
4112+ ochBlockSize = 135 ;[PJSC v1.03] Extend block size
40924113
40934114 secl = scalar, U08, 0, "sec", 1.000, 0.000
40944115 status1 = scalar, U08, 1, "bits", 1.000, 0.000
@@ -4195,29 +4216,30 @@
41954216 valvePosition = scalar, U08, 93, "%", 1.000, 0.000 ;[PJSC]Extend output channel for External Trigger
41964217 valvePositionADC = scalar, U08, 94, "ADC", 1.000, 0.000 ;[PJSC]Extend output channel for External Trigger
41974218 sparkedAngle = scalar, S16, 95, "deg", 1.000, 0.000 ;[PJSC]Extend output channel for External Trigger
4198- dutyFreq = scalar, U16, 97, "Hz", 1.000, 0.000 ;[PJSC]For capturing duty pulse
4199- dutyRatio = scalar, U16, 99, "%", 0.100, 0.000 ;[PJSC]For capturing duty pulse
4200- dutyFreq2 = scalar, U16, 101, "Hz", 1.000, 0.000 ;[PJSC]For capturing duty pulse
4201- dutyRatio2 = scalar, U16, 103, "%", 0.100, 0.000 ;[PJSC]For capturing duty pulse
4202- testCnt = scalar, U16, 105, "", 1.000, 0.000 ;[PJSC v1.01]For test mode
4203- afr2 = scalar, U08, 107, "O2", 0.100, 0.000 ;[PJSC v1.01]
4204- fuelLoad2 = scalar, S16, 108, { bitStringValue( algorithmUnits2 , algorithm2 ) }, 1.000, 0.000 ;[PJSC v1.01]For dual fuel load
4205- fuelLoad3 = scalar, S16, 110, { bitStringValue( algorithmUnits2 , algorithm3 ) }, 1.000, 0.000 ;[PJSC v1.01]For dual fuel load
4206- afr_analyze1 = scalar, U08, 112, "O2 for VE Table 1", 0.100, 0.000 ;[PJSC v1.02]For AFR sensor selection
4207- afr_analyze2 = scalar, U08, 113, "O2 for VE Table 2", 0.100, 0.000 ;[PJSC v1.02]For AFR sensor selection
4208- afr_analyze3 = scalar, U08, 114, "O2 for VE Table 3", 0.100, 0.000 ;[PJSC v1.02]For AFR sensor selection
4209- afr_analyze4 = scalar, U08, 115, "O2 for VE Table 4", 0.100, 0.000 ;[PJSC v1.02]For AFR sensor selection
4210- dualVE1 = scalar, U08, 116, "%", 1.000, 0.000 ;[PJSC v1.03]For Dual Fuel Load
4211- dualVE2 = scalar, U08, 117, "%", 1.000, 0.000 ;[PJSC v1.03]For Dual Fuel Load
4212- dualVE3 = scalar, U08, 118, "%", 1.000, 0.000 ;[PJSC v1.03]For Dual Fuel Load
4213- dualVE4 = scalar, U08, 119, "%", 1.000, 0.000 ;[PJSC v1.03]For Dual Fuel Load
4214- EGTADC = scalar, U16, 120, "ADC", 1.000, 0.000 ;[PJSC v1.03]For Exhaust gas temperature input
4215- ignGap = scalar, U16, 122, "ms", 0.001, 0.000 ;[PJSC v1.03]For misfire detection
4216- sparkRPM = scalar, U16, 124, "rpm", 1.000, 0.000 ;[PJSC v1.03]For misfire detection
4217- viecleSpeed = scalar, U16, 126, "km/h", 0.100, 0.000 ;[PJSC v1.03]For capturing viecle speed
4218- dutyPulseOn_T = scalar, U16, 128, "ms", 0.001, 0.000 ;[PJSC v1.03]For capturing duty pulse
4219- dutyPulseOn_T2 = scalar, U16, 130, "ms", 0.001, 0.000 ;[PJSC v1.03]For capturing duty pulse
4220- advance = scalar, S08, 132, "deg", 1.000, 0.000 ;[PJSC v1.03]
4219+ extTriggerRPM = scalar, U16, 97, "rpm", 1.000, 0.000 ;[PJSC v1.03]Extend output channel for External Trigger
4220+ dutyFreq = scalar, U16, 99, "Hz", 1.000, 0.000 ;[PJSC]For capturing duty pulse
4221+ dutyRatio = scalar, U16, 101, "%", 0.100, 0.000 ;[PJSC]For capturing duty pulse
4222+ dutyFreq2 = scalar, U16, 103, "Hz", 1.000, 0.000 ;[PJSC]For capturing duty pulse
4223+ dutyRatio2 = scalar, U16, 105, "%", 0.100, 0.000 ;[PJSC]For capturing duty pulse
4224+ testCnt = scalar, U16, 107, "", 1.000, 0.000 ;[PJSC v1.01]For test mode
4225+ afr2 = scalar, U08, 109, "O2", 0.100, 0.000 ;[PJSC v1.01]
4226+ fuelLoad2 = scalar, S16, 110, { bitStringValue( algorithmUnits2 , algorithm2 ) }, 1.000, 0.000 ;[PJSC v1.01]For dual fuel load
4227+ fuelLoad3 = scalar, S16, 112, { bitStringValue( algorithmUnits2 , algorithm3 ) }, 1.000, 0.000 ;[PJSC v1.01]For dual fuel load
4228+ afr_analyze1 = scalar, U08, 114, "O2 for VE Table 1", 0.100, 0.000 ;[PJSC v1.02]For AFR sensor selection
4229+ afr_analyze2 = scalar, U08, 115, "O2 for VE Table 2", 0.100, 0.000 ;[PJSC v1.02]For AFR sensor selection
4230+ afr_analyze3 = scalar, U08, 116, "O2 for VE Table 3", 0.100, 0.000 ;[PJSC v1.02]For AFR sensor selection
4231+ afr_analyze4 = scalar, U08, 117, "O2 for VE Table 4", 0.100, 0.000 ;[PJSC v1.02]For AFR sensor selection
4232+ dualVE1 = scalar, U08, 118, "%", 1.000, 0.000 ;[PJSC v1.03]For Dual Fuel Load
4233+ dualVE2 = scalar, U08, 119, "%", 1.000, 0.000 ;[PJSC v1.03]For Dual Fuel Load
4234+ dualVE3 = scalar, U08, 120, "%", 1.000, 0.000 ;[PJSC v1.03]For Dual Fuel Load
4235+ dualVE4 = scalar, U08, 121, "%", 1.000, 0.000 ;[PJSC v1.03]For Dual Fuel Load
4236+ EGTADC = scalar, U16, 122, "ADC", 1.000, 0.000 ;[PJSC v1.03]For Exhaust gas temperature input
4237+ ignGap = scalar, U16, 124, "ms", 0.001, 0.000 ;[PJSC v1.03]For misfire detection
4238+ sparkRPM = scalar, U16, 126, "rpm", 1.000, 0.000 ;[PJSC v1.03]For misfire detection
4239+ viecleSpeed = scalar, U16, 128, "km/h", 0.100, 0.000 ;[PJSC v1.03]For capturing viecle speed
4240+ dutyPulseOn_T = scalar, U16, 130, "ms", 0.001, 0.000 ;[PJSC v1.03]For capturing duty pulse
4241+ dutyPulseOn_T2 = scalar, U16, 132, "ms", 0.001, 0.000 ;[PJSC v1.03]For capturing duty pulse
4242+ advance = scalar, S08, 134, "deg", 1.000, 0.000 ;[PJSC v1.03]
42214243
42224244
42234245 #if CELSIUS
@@ -4340,6 +4362,7 @@
43404362 entry = syncLossCounter, "Sync Loss #", int, "%d"
43414363 entry = valvePosition, "ExValve Pos", int, "%d", { analogInputPortSelect == 1 } ;[PJSC v1.02]
43424364 entry = sparkedAngle, "Spark Angle", int, "%d", { exTrigModeSelect == 1 } ;[PJSC]
4365+ entry = extTriggerRPM, "External Trigger RPM", int, "%d", { exTrigModeSelect == 1 || exTrigModeSelect == 3 } ;[PJSC v1.03]
43434366 entry = dutyFreq, "Duty Frequency", int, "%d", { dutyPulseCaptureEnabled } ;[PJSC]
43444367 entry = dutyRatio, "Duty Ratio", int, "%d", { dutyPulseCaptureEnabled } ;[PJSC]
43454368 entry = dutyFreq2, "Duty Frequency2", int, "%d", { dutyPulseCaptureEnabled2 } ;[PJSC]
@@ -4444,22 +4467,6 @@
44444467 filter = overrunFilter, "Overrun" , pulseWidth, = , 0, , false
44454468 filter = std_Custom ; Standard Custom Expression Filter.
44464469
4447-;------------- WUE VEAL not currently working ----------------
4448-;[WueAnalyze]
4449- ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
4450- ; wueAnalyzeMap = veTable1Tbl, afrTable1Tbl, afr, egoCorrection
4451-; wueAnalyzeMap = afrTable1Tbl, warmup_afr_curve, warmup_curve, afr, coolant, warmupEnrich ;warmup_afr_curve,
4452-; lambdaTargetTables = afrTable1Tbl, afrTSCustom,
4453- ;filter = std_xAxisMin ; Auto build with appropriate axis channels
4454- ;filter = minRPMFilter, "Minimum RPM", rpm, < , 500, , true
4455- ;filter = std_xAxisMax ; Auto build with appropriate axis channels
4456- ;filter = std_yAxisMin ; Auto build with appropriate axis channels
4457- ;filter = std_yAxisMax ; Auto build with appropriate axis channels
4458- ;filter = std_DeadLambda ; Auto build
4459-
4460-; filter = maxTPSFilter, "High Throttle", tps, < , 15, , true
4461-;------------- WUE VEAL not currently working ----------------
4462-
44634470 ;[PJSC v1.01]------------------------------------------------------------------------
44644471 ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
44654472 ;[PJSC v1.02] veAnalyzeMap = veTable2Tbl, afrTable1Tbl, afr, egoCorrection
@@ -4526,3 +4533,21 @@
45264533 filter = std_Custom ; Standard Custom Expression Filter.
45274534 #endif
45284535 ;[PJSC v1.01]-------------------------------------------------------------------------
4536+
4537+;[PJSC v1.03]-------------------------------------------------------------------------
4538+[WueAnalyze]
4539+; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, wueChannel, egoCorrectionChannel, activeCondition
4540+#if LAMBDA
4541+ wueAnalyzeMap = warmup_analyzer_curve, warmup_afr_curve, afrTable1Tbl, lambda, coolant, warmupEnrich, egoCorrection
4542+#else
4543+ wueAnalyzeMap = warmup_analyzer_curve, warmup_afr_curve, afrTable1Tbl, afr, coolant, warmupEnrich, egoCorrection
4544+#endif
4545+ lambdaTargetTables = afrTable1Tbl, afrTSCustom
4546+ filter = std_DeadLambda ; Auto build
4547+ filter = accelFilter, "Accel Flag", engine, &, 16, false
4548+ filter = aseFilter, "ASE Flag", engine, &, 4, false
4549+ filter = overrunFilter, "Overrun", pulseWidth, =, 0, false
4550+ filter = maxTPS, "Max TPS", throttle, >, 15, true
4551+ filter = minRPM, "Min RPM", rpm, <, 300, true
4552+ filter = std_Custom ; Standard Custom Expression Filter.
4553+;[PJSC v1.03]-------------------------------------------------------------------------
--- branches/Ver1.03/speeduino/cancomms.h (revision 139)
+++ branches/Ver1.03/speeduino/cancomms.h (revision 140)
@@ -2,7 +2,7 @@
22 #define CANCOMMS_H
33
44 //[PJSC v1.03]#define CAN_PACKET_SIZE 75
5-#define CAN_PACKET_SIZE 133 //[PJSC v1.03]
5+#define CAN_PACKET_SIZE 135 //[PJSC v1.03]
66
77 uint8_t currentcanCommand;
88 uint8_t currentCanPage = 1;//Not the same as the speeduino config page numbers
--- branches/Ver1.03/speeduino/comms.h (revision 139)
+++ branches/Ver1.03/speeduino/comms.h (revision 140)
@@ -20,7 +20,7 @@
2020
2121 //[PJSC]#define SERIAL_PACKET_SIZE 90 //Must match ochBlockSize in ini file
2222 //[PJSC v1.03]#define SERIAL_PACKET_SIZE 116 //[PJSC v1.02] Extend serial packet block size
23-#define SERIAL_PACKET_SIZE 133 //[PJSC v1.03] Extend serial packet block size
23+#define SERIAL_PACKET_SIZE 135 //[PJSC v1.03] Extend serial packet block size
2424
2525 byte currentPage = 1;//Not the same as the speeduino config page numbers
2626 bool isMap = true;
--- branches/Ver1.03/speeduino/globals.h (revision 139)
+++ branches/Ver1.03/speeduino/globals.h (revision 140)
@@ -673,7 +673,7 @@
673673 byte pjscFreq; //[PJSC] Offset 71
674674 byte exValvePosMin; // |
675675 byte exValvePosMax; // |
676- byte exTrigHysteresis; // |
676+ byte unused2_74; // |
677677 byte squirtDeviceType : 1; // |
678678 byte multiVEmapEnabled: 1; // |
679679 byte mapSeparationEnabled: 1; // |