OSDN -- Develop and Download Open Source Software
  • 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

Revision91 (tree)
Time2020-05-14 10:28:29
Authormaharu

Log Message

(empty log message)

Change Summary

Incremental Difference

--- branches/Ver1.02/reference/PJSC.ini (revision 90)
+++ branches/Ver1.02/reference/PJSC.ini (revision 91)
@@ -7,7 +7,7 @@
77
88 queryCommand = "Q"
99 ;[PJSC v1.01] signature = "speeduino 201902"
10- signature = "speeduino - PJSC v1.01" ;[PJSC v1.01]
10+ signature = "speeduino 201902" ;[PJSC v1.02]
1111 versionInfo = "S" ;This info is what is displayed to user
1212
1313 [TunerStudio]
@@ -334,10 +334,13 @@
334334 unused2_75 = bits, U08, 75, [7:7] ;[PJSC v1.01]
335335 exTrigModeSelect = bits, U08, 76, [0:1], "Disable", "Spark timing capture", "MAP select switch", "INVALID" ;[PJSC]
336336 externalTrigEdge = bits, U08, 76, [2:2], "Rising", "Falling" ; |
337- exValveCaptureEnabled = bits, U08, 76, [3:3], "Disable", "Exhaust Valve Position capture" ; |
338- exValveCalibrationMode = bits, U08, 76, [4:4], "Off", "On" ;[PJSC]
339- unused2_76 = bits, U08, 76, [5:7] ;[PJSC v1.01]
340- dutyPulseCaptureEnabled = bits, U08, 77, [0:0], "Disable", "PWM input" ; |
337+;[PJSC v1.02] exValveCaptureEnabled = bits, U08, 76, [3:3], "Disable", "Exhaust Valve Position capture" ; |
338+;[PJSC v1.02] exValveCalibrationMode = bits, U08, 76, [4:4], "Off", "On" ;[PJSC]
339+;[PJSC v1.02] unused2_76 = bits, U08, 76, [5:7] ;[PJSC v1.01]
340+ exValveCalibrationMode = bits, U08, 76, [3:3], "Off", "On" ;[PJSC v1.02]
341+ analogInputPortSelect = bits, U08, 76, [4:5], "Disable", "Exhaust Valve Position capture", "Secondary AFR/O2", "INVALID" ;[PJSC v1.02]
342+ unused2_76 = bits, U08, 76, [6:7] ;[PJSC v1.02]
343+ dutyPulseCaptureEnabled = bits, U08, 77, [0:0], "Disable", "PWM input" ;[PJSC v1.01]
341344 dutyPulseCaptureEnabled2 = bits, U08, 77, [1:1], "Disable", "PWM input" ; |
342345 dutyPulseOnLevel = bits, U08, 77, [2:2], "High", "Low" ; |
343346 dutyPulseOnLevel2 = bits, U08, 77, [3:3], "High", "Low" ; V
@@ -551,7 +554,10 @@
551554
552555 baroDenBins = array, U08, 71, [9], "kPa", 1.0, 0.0, 0.0, 255.0, 0 ;[PJSC v1.01] Bins for the Barometric density correction curve
553556 baroDenRates = array, U08, 80, [9], "%", 1.0, 0.0, 0.0, 255.0, 0 ;[PJSC v1.01] Values for the \Barometric density correction curve
554- unused4-89 = array, U08, 89, [38], "%", 1.0, 0.0, 0.0, 255, 0 ;[PJSC v1.01]
557+;[PJSC v1.02] unused4-89 = array, U08, 89, [38], "%", 1.0, 0.0, 0.0, 255, 0 ;[PJSC v1.01]
558+ crankingFilter = bits, U08, 89, [0:0], "Enable", "Disable" ;[PJSC v1.02]
559+ unused4-89 = bits, U08, 89, [1:7] ;[PJSC v1.02]
560+ unused4-90 = array, U08, 90, [37], "%", 1.0, 0.0, 0.0, 255, 0 ;[PJSC v1.02]
555561
556562 ;--------------------------------------------------
557563 ;Start AFR page
@@ -1212,10 +1218,11 @@
12121218 requiresPowerCycle = idleUpEnabled
12131219 requiresPowerCycle = pjscFreq ;[PJSC]
12141220 requiresPowerCycle = squirtDeviceType ; |
1215- requiresPowerCycle = multiVEmapEnabled ; |
1216- requiresPowerCycle = exTrigModeSelect ; |
1217- requiresPowerCycle = exValveCaptureEnabled ; |
1218- requiresPowerCycle = dutyPulseCaptureEnabled ; V
1221+ requiresPowerCycle = multiVEmapEnabled ; V
1222+ requiresPowerCycle = exTrigModeSelect ;[PJSC]
1223+;[PJSC v1.02] requiresPowerCycle = exValveCaptureEnabled ; |
1224+ requiresPowerCycle = analogInputPortSelect ;[PJSC v1.02]
1225+ requiresPowerCycle = dutyPulseCaptureEnabled ;[PJSC]
12191226 requiresPowerCycle = dutyPulseCaptureEnabled2 ;[PJSC]
12201227 requiresPowerCycle = muxout1selection ;[PJSC v1.01]
12211228 requiresPowerCycle = muxout2selection ;[PJSC v1.01]
@@ -1330,10 +1337,11 @@
13301337 defaultValue = veMapSelection3_2Pri, 0 ; |
13311338 defaultValue = veMapSelection3_2Sec, 0 ; |
13321339 defaultValue = veMapSelection4_2Pri, 0 ; |
1333- defaultValue = veMapSelection4_2Sec, 0 ; |
1334- defaultValue = exTrigModeSelect, 0 ; |
1335- defaultValue = exValveCaptureEnabled, 1 ; |
1336- defaultValue = dutyPulseCaptureEnabled, 0 ; V
1340+ defaultValue = veMapSelection4_2Sec, 0 ; V
1341+ defaultValue = exTrigModeSelect, 0 ;[PJSC]
1342+;[PJSC v1.02] defaultValue = exValveCaptureEnabled, 1 ; |
1343+ defaultValue = analogInputPortSelect, 1 ;[PJSC v1.02]
1344+ defaultValue = dutyPulseCaptureEnabled, 0 ;[PJSC]
13371345 defaultValue = dutyPulseCaptureEnabled2, 0 ;[PJSC]
13381346 defaultValue = exValveCalibrationMode, 0 ;[PJSC v1.01]
13391347 defaultValue = exValvePosMin, 0 ; |
@@ -1908,7 +1916,8 @@
19081916 field = "Duty pulse ON Level ch2", dutyPulseOnLevel2 ;[PJSC]
19091917
19101918 dialog = analogInputPort1select, "" ;[PJSC v1.01]
1911- field = "", exValveCaptureEnabled ; |
1919+;[PJSC v1.02] field = "", exValveCaptureEnabled ; |
1920+ field = "", analogInputPortSelect ;[PJSC v1.02]
19121921 ; |
19131922 dialog = digitalInputPort1select, "" ; |
19141923 field = "", exTrigModeSelect ; |
@@ -1928,7 +1937,8 @@
19281937 dialog = analogInputPort1_controls, "Analog Input Port1", border ; |
19291938 panel = analogInputPort1select, West ; |
19301939 field = "" ; |
1931- panel = captExValveSetting, East, { exValveCaptureEnabled == 1 } ; |
1940+;[PJSC v1.02] panel = captExValveSetting, East, { exValveCaptureEnabled == 1 } ; |
1941+ panel = captExValveSetting, East, { analogInputPortSelect == 1 } ;[PJSC v1.02]
19321942 ; |
19331943 dialog = analogInputPort1_r, "Reference ADC Gauges" ; |
19341944 gauge = exValveADCGauge ; |
@@ -2298,6 +2308,7 @@
22982308 field = "Secondary trigger edge", TrigEdgeSec, { (TrigPattern == 0 && TrigSpeed == 0) || TrigPattern == 2 || TrigPattern == 9 || TrigPattern == 12 } ;Missing tooth, dual wheel and Miata 9905
22992309 field = "Missing Tooth Secondary type" trigPatternSec, { (TrigPattern == 0&& TrigSpeed == 0) }
23002310 field = "Trigger Filter", TrigFilter, { TrigPattern != 13 }
2311+ field = "Trigger Filter during cranking", crankingFilter, { TrigPattern != 13 } ;[PJSC v1.02]
23012312 field = "Re-sync every cycle", useResync, { TrigPattern == 2 || TrigPattern == 4 || TrigPattern == 7 || TrigPattern == 12 || TrigPattern == 9 || TrigPattern == 13 } ;Dual wheel, 4G63, Audi 135, Nissan 360, Miata 99-05
23022313
23032314 #if table4_spark ;[PJSC v1.01] For switching table4
@@ -2525,30 +2536,30 @@
25252536 panel = aseSettings
25262537
25272538 ;Fuel trim composite dialog
2528- dialog = inj_trim1TblTitle, "Channel #1"
2529- panel = fuelTrimTable1Tbl, { fuelTrimEnabled }
2530- dialog = inj_trim2TblTitle, "Channel #2"
2531- panel = fuelTrimTable2Tbl, { fuelTrimEnabled }
2532- dialog = inj_trim3TblTitle, "Channel #3"
2533- panel = fuelTrimTable3Tbl, { fuelTrimEnabled }
2534- dialog = inj_trim4TblTitle, "Channel #4"
2535- panel = fuelTrimTable4Tbl, { fuelTrimEnabled }
2539+;[PJSC v1.02] dialog = inj_trim1TblTitle, "Channel #1"
2540+;[PJSC v1.02] panel = fuelTrimTable1Tbl, { fuelTrimEnabled }
2541+;[PJSC v1.02] dialog = inj_trim2TblTitle, "Channel #2"
2542+;[PJSC v1.02] panel = fuelTrimTable2Tbl, { fuelTrimEnabled }
2543+;[PJSC v1.02] dialog = inj_trim3TblTitle, "Channel #3"
2544+;[PJSC v1.02] panel = fuelTrimTable3Tbl, { fuelTrimEnabled }
2545+;[PJSC v1.02] dialog = inj_trim4TblTitle, "Channel #4"
2546+;[PJSC v1.02] panel = fuelTrimTable4Tbl, { fuelTrimEnabled }
2547+;[PJSC v1.02]
2548+;[PJSC v1.02] dialog = inj_trimadt, "", xAxis
2549+;[PJSC v1.02] panel = inj_trim1TblTitle
2550+;[PJSC v1.02] panel = inj_trim2TblTitle
2551+;[PJSC v1.02] dialog = inj_trimadb, "", xAxis
2552+;[PJSC v1.02] panel = inj_trim3TblTitle
2553+;[PJSC v1.02] panel = inj_trim4TblTitle
2554+;[PJSC v1.02]
2555+;[PJSC v1.02] dialog = inj_trim_enable, ""
2556+;[PJSC v1.02] field = "Individual fuel trim enabled", fuelTrimEnabled, { injLayout == 3 }
2557+;[PJSC v1.02]
2558+;[PJSC v1.02] dialog = inj_trimad,"Injector Cyl 1-4 Trims", yAxis
2559+;[PJSC v1.02] panel = inj_trim_enable, North
2560+;[PJSC v1.02] panel = inj_trimadt, Center
2561+;[PJSC v1.02] panel = inj_trimadb, South
25362562
2537- dialog = inj_trimadt, "", xAxis
2538- panel = inj_trim1TblTitle
2539- panel = inj_trim2TblTitle
2540- dialog = inj_trimadb, "", xAxis
2541- panel = inj_trim3TblTitle
2542- panel = inj_trim4TblTitle
2543-
2544- dialog = inj_trim_enable, ""
2545- field = "Individual fuel trim enabled", fuelTrimEnabled, { injLayout == 3 }
2546-
2547- dialog = inj_trimad,"Injector Cyl 1-4 Trims", yAxis
2548- panel = inj_trim_enable, North
2549- panel = inj_trimadt, Center
2550- panel = inj_trimadb, South
2551-
25522563 ;;Injector staging
25532564 dialog = stagingTableDialog_north, ""
25542565 field = "Staging enabled", stagingEnabled
@@ -3993,6 +4004,12 @@
39934004
39944005 boostTableLimit = { boostType == 0 ? 100 : 511 } ;The maximum value allowed in the boost table. 100 is used for duty cycle, 511 for kpa
39954006
4007+ ;[PJSC v1.02] AFR parameter to separation AFR by VE analyze table
4008+ afr_analyze1 = { afr }
4009+ afr_analyze2 = { afr2 }
4010+ afr_analyze3 = { afr }
4011+ afr_analyze4 = { afr2 }
4012+
39964013 ;-------------------------------------------------------------------------------
39974014
39984015 [Datalog]
@@ -4019,6 +4036,7 @@
40194036 entry = MAPxRPM, "MAPxRPM", int, "%d"
40204037 entry = tps, "TPS", int, "%d"
40214038 entry = afr, "O2", float, "%.3f"
4039+ entry = afr2, "O2_2", float, "%.3f" ;[PJSC v1.02]
40224040 entry = lambda, "Lambda", float, "%.3f"
40234041 entry = iat, "IAT", int, "%d"
40244042 entry = coolant, "CLT", int, "%d"
@@ -4058,7 +4076,8 @@
40584076 entry = baro, "Baro Pressure",int, "%d"
40594077 entry = nitrousOn, "Nitrous On", int, "%d", { n2o_enable > 0 }
40604078 entry = syncLossCounter, "Sync Loss #", int, "%d"
4061- entry = valvePosition, "ExValve Pos", int, "%d", { exValveCaptureEnabled } ;[PJSC]
4079+ entry = valvePosition, "ExValve Pos", int, "%d", { analogInputPortSelect == 1};[PJSC v1.02]
4080+;[PJSC v1.02] entry = valvePosition, "ExValve Pos", int, "%d", { exValveCaptureEnabled } ;[PJSC]
40624081 entry = sparkedAngle, "Spark Angle", int, "%d", { exTrigModeSelect == 1 } ;[PJSC]
40634082 entry = dutyFreq, "Duty Frequency", int, "%d", { dutyPulseCaptureEnabled } ;[PJSC]
40644083 entry = dutyRatio, "Duty Ratio", int, "%d", { dutyPulseCaptureEnabled } ;[PJSC]
@@ -4132,7 +4151,8 @@
41324151
41334152 [VeAnalyze]
41344153 ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
4135- veAnalyzeMap = veTable1Tbl, afrTable1Tbl, afr, egoCorrection
4154+;[PJSC v1.02] veAnalyzeMap = veTable1Tbl, afrTable1Tbl, afr, egoCorrection
4155+ veAnalyzeMap = veTable1Tbl, afrTable1Tbl, afr_analyze1, egoCorrection ;[PJSC v1.02]
41364156 lambdaTargetTables = afrTable1Tbl, afrTSCustom,
41374157 filter = std_xAxisMin ; Auto build with appropriate axis channels
41384158 ;filter = minRPMFilter, "Minimum RPM", rpm, < , 500, , true
@@ -4168,8 +4188,9 @@
41684188 ;------------- WUE VEAL not currently working ----------------
41694189
41704190 ;[PJSC v1.01]------------------------------------------------------------------------
4171-; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
4172- veAnalyzeMap = veTable2Tbl, afrTable1Tbl, afr, egoCorrection
4191+ ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
4192+;[PJSC v1.02] veAnalyzeMap = veTable2Tbl, afrTable1Tbl, afr, egoCorrection
4193+ veAnalyzeMap = veTable2Tbl, afrTable1Tbl, afr_analyze2, egoCorrection ;[PJSC v1.02]
41734194 lambdaTargetTables = afrTable1Tbl, afrTSCustom,
41744195 filter = std_xAxisMin ; Auto build with appropriate axis channels
41754196 ;filter = minRPMFilter, "Minimum RPM", rpm, < , 500, , true
@@ -4188,8 +4209,9 @@
41884209 filter = overrunFilter, "Overrun" , pulseWidth, = , 0, , false
41894210 filter = std_Custom ; Standard Custom Expression Filter.
41904211
4191-; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
4192- veAnalyzeMap = veTable3Tbl, afrTable1Tbl, afr, egoCorrection
4212+ ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
4213+;[PJSC v1.02] veAnalyzeMap = veTable3Tbl, afrTable1Tbl, afr, egoCorrection
4214+ veAnalyzeMap = veTable3Tbl, afrTable1Tbl, afr_analyze3, egoCorrection ;[PJSC v1.02]
41934215 lambdaTargetTables = afrTable1Tbl, afrTSCustom,
41944216 filter = std_xAxisMin ; Auto build with appropriate axis channels
41954217 ;filter = minRPMFilter, "Minimum RPM", rpm, < , 500, , true
@@ -4209,8 +4231,9 @@
42094231 filter = std_Custom ; Standard Custom Expression Filter.
42104232
42114233 #if table4_fuel
4212-; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
4213- veAnalyzeMap = sparkTbl, afrTable1Tbl, afr, egoCorrection
4234+ ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
4235+;[PJSC v1.02] veAnalyzeMap = sparkTbl, afrTable1Tbl, afr, egoCorrection
4236+ veAnalyzeMap = sparkTbl, afrTable1Tbl, afr_analyze4, egoCorrection ;[PJSC v1.02]
42144237 lambdaTargetTables = afrTable1Tbl, afrTSCustom,
42154238 filter = std_xAxisMin ; Auto build with appropriate axis channels
42164239 ;filter = minRPMFilter, "Minimum RPM", rpm, < , 500, , true