• 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

Revision19 (tree)
Time2018-07-30 22:19:23
Authormaharu

Log Message

Support VE map switching.

Change Summary

Incremental Difference

--- branches/Ver1.00_base/reference/PJSC.ini (revision 18)
+++ branches/Ver1.00_base/reference/PJSC.ini (revision 19)
@@ -267,48 +267,53 @@
267267 EMAPMin = scalar, S08, 67, "kpa", 1.0, 0.0, -100, 127.0, 0
268268 EMAPMax = scalar, U16, 68, "kpa", 1.0, 0.0, 0.0, 25500, 0
269269 ;[PJSC] unused2-67 = array, U08, 70, [57], "%", 1.0, 0.0, 0.0, 255, 0
270- pjscFreq = scalar, U08, 70, "Hz", 2.0, 0.0, 10, 511, 0 ;[PJSC]
271- exValvePosMin = scalar, U08, 71, "ADC", 1.0, 0.0, 0.0, 255.0, 0 ; |
272- exValvePosMax = scalar, U08, 72, "ADC", 1.0, 0.0, 0.0, 255.0, 0 ; |
273- exTrigHysteresis = scalar, U08, 73, "deg", 1.0, 0.0, 0.0, 255.0, 0 ; |
274- squirtDeviceType = bits, U08, 74, [0:0], "Injector", "Solenoid valve" ; |
275- multiVEmapEnabled = bits, U08, 74, [1:1], "No", "Yes" ; |
276- externalTriggerEnabled = bits, U08, 74, [2:2], "Off", "On" ; |
277- externalTrigEdge = bits, U08, 74, [3:3], "Rising", "Falling" ; |
278- exValveCaptureEnabled = bits, U08, 74, [4:4], "Off", "On" ; |
279- dutyPulseCaptureEnabled = bits, U08, 74, [5:5], "Off", "On" ; |
280- dutyPulseCaptureEnabled2 = bits, U08, 74, [6:6], "Off", "On" ; |
281- dutyPulseOnLevel = bits, U08, 74, [7:7], "High", "Low" ; |
282- dutyPulseOnLevel2 = bits, U08, 75, [0:0], "High", "Low" ; |
283- exValveCalibrationMode = bits, U08, 75, [1:1], "Off", "On" ; |
284- unused2-73-2 = bits, U08, 75, [2:2], "None", "None" ; |
285- unused2-73-3 = bits, U08, 75, [3:3], "None", "None" ; |
286- unused2-73-4 = bits, U08, 75, [4:4], "None", "None" ; |
287- unused2-73-5 = bits, U08, 75, [5:5], "None", "None" ; |
288- unused2-73-6 = bits, U08, 75, [6:6], "None", "None" ; V
289- unused2-73-7 = bits, U08, 75, [7:7], "None", "None" ;[PJSC]
270+ pjscFreq = scalar, U08, 70, "Hz", 2.0, 0.0, 10, 511, 0 ;[PJSC]
271+ exValvePosMin = scalar, U08, 71, "ADC", 1.0, 0.0, 0.0, 255.0, 0 ; |
272+ exValvePosMax = scalar, U08, 72, "ADC", 1.0, 0.0, 0.0, 255.0, 0 ; |
273+ exTrigHysteresis = scalar, U08, 73, "deg", 1.0, 0.0, 0.0, 255.0, 0 ; |
274+ squirtDeviceType = bits, U08, 74, [0:0], "Injector", "Solenoid valve" ; |
275+ multiVEmapEnabled = bits, U08, 74, [1:1], "No", "Yes" ; |
276+ exTrigModeSelect = bits, U08, 74, [2:3], "Disable", "Spark timing capture", "MAP select switch", "INVALID" ; |
277+ externalTrigEdge = bits, U08, 74, [4:4], "Rising", "Falling" ; |
278+ exValveCaptureEnabled = bits, U08, 74, [5:5], "Disable", "Exhaust Valve Position capture" ; |
279+ dutyPulseCaptureEnabled = bits, U08, 74, [6:6], "Disable", "PWM input" ; |
280+ dutyPulseCaptureEnabled2 = bits, U08, 74, [7:7], "Disable", "PWM input" ; |
281+ dutyPulseOnLevel = bits, U08, 75, [0:0], "High", "Low" ; |
282+ dutyPulseOnLevel2 = bits, U08, 75, [1:1], "High", "Low" ; |
283+ exValveCalibrationMode = bits, U08, 75, [2:2], "Off", "On" ; |
284+ unused2-73-3 = bits, U08, 75, [3:3], "None", "None" ; |
285+ unused2-73-4 = bits, U08, 75, [4:4], "None", "None" ; |
286+ unused2-73-5 = bits, U08, 75, [5:5], "None", "None" ; |
287+ unused2-73-6 = bits, U08, 75, [6:6], "None", "None" ; V
288+ unused2-73-7 = bits, U08, 75, [7:7], "None", "None" ;[PJSC]
290289 veMapSelection1 = bits, U08, 76, [0:7], "VE Table 1","VE Table 2","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","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","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
291290 veMapSelection2 = bits, U08, 77, [0:7], "VE Table 1","VE Table 2","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","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","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
292291 veMapSelection3 = bits, U08, 78, [0:7], "VE Table 1","VE Table 2","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","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","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
293292 veMapSelection4 = bits, U08, 79, [0:7], "VE Table 1","VE Table 2","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","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","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
294- dutyFreqTst1 = scalar, U08, 80, "Hz", 2.0, 0.0, 10, 511, 0 ;[PJSC v1.10]
295- dutyFreqTst2 = scalar, U08, 81, "Hz", 2.0, 0.0, 10, 511, 0 ;[PJSC v1.10]
296- dutyFreqTst3 = scalar, U08, 82, "Hz", 2.0, 0.0, 10, 511, 0 ;[PJSC v1.10]
297- dutyFreqTst4 = scalar, U08, 83, "Hz", 2.0, 0.0, 10, 511, 0 ;[PJSC v1.10]
298- dutyRatioTst1 = scalar, U08, 84, "%", 1.0, 0.0, 0.0, 100.0, 0 ;[PJSC v1.10]
299- dutyRatioTst2 = scalar, U08, 85, "%", 1.0, 0.0, 0.0, 100.0, 0 ;[PJSC v1.10]
300- dutyRatioTst3 = scalar, U08, 86, "%", 1.0, 0.0, 0.0, 100.0, 0 ;[PJSC v1.10]
301- dutyRatioTst4 = scalar, U08, 87, "%", 1.0, 0.0, 0.0, 100.0, 0 ;[PJSC v1.10]
302- testop_fp = bits, U08, 88, [0:0], "Off", "On"
303- testop_inj = bits, U08, 88, [1:2], "Off", "One", "INVALID", "All"
304- testop_coil = bits, U08, 88, [3:4], "Off", "One", "INVALID", "INVALID"
305- testsel_inj = bits, U08, 88, [5:6], "Inj1", "Inj2", "Inj3", "Inj4"
306- testsel_coil = bits, U08, 88, [7:7], "CoilA", "CoilB"
307- testint = scalar, U16, 89, "ms", 0.01, 0.00, 0, 655.35, 1
308- testrpm = scalar, U16, 89, "RPM", 1.0, { 60000/testint }, 0, 60000, 0
309- testpw = scalar, U16, 91, "ms", 0.01, 0.00, 0, 655.35, 1 ; * ( 1 byte)
310- testinjcnt = scalar, U16, 93, "", 1, 0, 0, 65535, 0, noLocalUpdate
311- unused2-97 = array, U08, 95, [33], "%", 1.0, 0.0, 0.0, 255, 0 ;[PJSC v1.10]
293+ veMapSelection1_2 = bits, U08, 80, [0:7], "VE Table 1","VE Table 2","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","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","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
294+ veMapSelection2_2 = bits, U08, 81, [0:7], "VE Table 1","VE Table 2","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","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","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
295+ veMapSelection3_2 = bits, U08, 82, [0:7], "VE Table 1","VE Table 2","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","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","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
296+ veMapSelection4_2 = bits, U08, 83, [0:7], "VE Table 1","VE Table 2","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","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","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
297+ dutyFreqTst1 = scalar, U08, 84, "Hz", 2.0, 0.0, 10, 511, 0 ;[PJSC v1.10]
298+ dutyFreqTst2 = scalar, U08, 85, "Hz", 2.0, 0.0, 10, 511, 0 ;[PJSC v1.10]
299+ dutyFreqTst3 = scalar, U08, 86, "Hz", 2.0, 0.0, 10, 511, 0 ;[PJSC v1.10]
300+ dutyFreqTst4 = scalar, U08, 87, "Hz", 2.0, 0.0, 10, 511, 0 ;[PJSC v1.10]
301+ dutyRatioTst1 = scalar, U08, 88, "%", 1.0, 0.0, 0.0, 100.0, 0 ;[PJSC v1.10]
302+ dutyRatioTst2 = scalar, U08, 89, "%", 1.0, 0.0, 0.0, 100.0, 0 ;[PJSC v1.10]
303+ dutyRatioTst3 = scalar, U08, 90, "%", 1.0, 0.0, 0.0, 100.0, 0 ;[PJSC v1.10]
304+ dutyRatioTst4 = scalar, U08, 91, "%", 1.0, 0.0, 0.0, 100.0, 0 ;[PJSC v1.10]
305+ testop_fp = bits, U08, 92, [0:0], "Off", "On"
306+ testop_inj = bits, U08, 92, [1:2], "Off", "One", "INVALID", "All"
307+ testop_coil = bits, U08, 92, [3:4], "Off", "One", "INVALID", "INVALID"
308+ testsel_inj = bits, U08, 92, [5:6], "Inj1", "Inj2", "Inj3", "Inj4"
309+ testsel_coil = bits, U08, 92, [7:7], "CoilA", "CoilB"
310+ testint = scalar, U16, 93, "ms", 0.01, 0.00, 0, 655.35, 1
311+ testrpm = scalar, U16, 93, "RPM", 1.0, { 60000/testint }, 0, 60000, 0
312+ testpw = scalar, U16, 95, "ms", 0.01, 0.00, 0, 655.35, 1 ; * ( 1 byte)
313+ testinjcnt = scalar, U16, 97, "", 1, 0, 0, 65535, 0, noLocalUpdate
314+ muxout1selection = bits, U08, 99, [0:3], "Disable", "IDLE control", "Thermo Fan control", "Launch control", "Fuel pump control", "Boost control", "VVT control", "Tach output", "INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
315+ muxout2selection = bits, U08, 99, [4:7], "Disable", "IDLE control", "Thermo Fan control", "Launch control", "Fuel pump control", "Boost control", "VVT control", "Tach output", "INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
316+ unused2-100 = array, U08, 100, [28], "%", 1.0, 0.0, 0.0, 255, 0 ;[PJSC v1.10]
312317
313318
314319 ;--------------------------------------------------
@@ -515,7 +520,8 @@
515520 iacCrankBins = array, U08, 112, [4], "F", 1.8, -22.23, -40, 215, 0
516521 #endif
517522
518- iacAlgorithm = bits , U08, 116, [0:2], "None", "On/Off", "PWM Open loop", "PWM Closed loop", "Stepper Open Loop", "Stepper Closed Loop", "INVALID", "INVALID"
523+;[PJSC] iacAlgorithm = bits , U08, 116, [0:2], "None", "On/Off", "PWM Open loop", "PWM Closed loop", "Stepper Open Loop", "Stepper Closed Loop", "INVALID", "INVALID"
524+ iacAlgorithm = bits , U08, 116, [0:2], "None", "On/Off", "PWM Open loop", "PWM Closed loop", "INVALID", "INVALID", "INVALID", "INVALID" ;[PJSC]
519525 iacStepTime = bits , U08, 116, [3:5], "INVALID","1", "2", "3", "4", "5", "6","INVALID"
520526 iacChannels = bits, U08, 116, [6:6], "1", "2"
521527 iacPWMdir = bits , U08, 116, [7:7], "Normal", "Reverse"
@@ -855,12 +861,13 @@
855861 requiresPowerCycle = pjscFreq ;[PJSC]
856862 requiresPowerCycle = squirtDeviceType ; |
857863 requiresPowerCycle = multiVEmapEnabled ; |
858- requiresPowerCycle = externalTriggerEnabled ; |
864+ requiresPowerCycle = exTrigModeSelect ; |
859865 requiresPowerCycle = exValveCaptureEnabled ; |
860866 requiresPowerCycle = dutyPulseCaptureEnabled ; V
861867 requiresPowerCycle = dutyPulseCaptureEnabled2 ;[PJSC]
868+ requiresPowerCycle = muxout1selection ;[PJSC v1.10]
869+ requiresPowerCycle = muxout2selection ;[PJSC v1.10]
862870
863-
864871 defaultValue = pinLayout, 1
865872 defaultValue = TrigPattern, 0
866873 defaultValue = useResync, 1
@@ -917,7 +924,7 @@
917924 defaultValue = veMapSelection2, 0 ; |
918925 defaultValue = veMapSelection3, 0 ; |
919926 defaultValue = veMapSelection4, 0 ; |
920- defaultValue = externalTriggerEnabled, 0 ; |
927+ defaultValue = exTrigModeSelect, 0 ; |
921928 defaultValue = exValveCaptureEnabled, 1 ; |
922929 defaultValue = dutyPulseCaptureEnabled, 0 ; |
923930 defaultValue = dutyPulseCaptureEnabled2, 0 ; V
@@ -944,8 +951,10 @@
944951 defaultValue = testsel_inj, 0 ; |
945952 defaultValue = testsel_coil, 0 ; |
946953 defaultValue = testint, 10.0 ; |
947- defaultValue = testpw, 0 ; V
948- defaultValue = testinjcnt, 0 ;[PJSC v1.10]
954+ defaultValue = testpw, 0 ; |
955+ defaultValue = testinjcnt, 0 ; |
956+ defaultValue = muxout1selection, 0 ; V
957+ defaultValue = muxout2selection, 0 ;[PJSC v1.10]
949958
950959 ;Default pins
951960 defaultValue = fanPin, 0
@@ -1023,31 +1032,48 @@
10231032 subMenu = crankPW, "Cranking Settings"
10241033 subMenu = warmup, "Warmup Enrichment"
10251034 subMenu = std_separator
1026- subMenu = idleSettings, "Idle Control"
1027- subMenu = iacClosedLoop_curve, "Idle - Closed loop targets", 7, { iacAlgorithm == 3 || iacAlgorithm == 5 }
1028- subMenu = iacPwm_curve, "Idle - PWM Duty Cycle", 7, { iacAlgorithm == 2 }
1029- subMenu = iacPwmCrank_curve, "Idle - PWM Cranking Duty Cycle", 7, { iacAlgorithm == 2 }
1030- subMenu = iacStep_curve, "Idle - Stepper Motor", 7, { iacAlgorithm == 4 }
1031- subMenu = iacStepCrank_curve, "Idle - Stepper Motor Cranking", 7, { iacAlgorithm == 4 }
1035+;[PJSC v1.10] subMenu = idleSettings, "Idle Control"
1036+;[PJSC v1.10] subMenu = iacClosedLoop_curve, "Idle - Closed loop targets", 7, { iacAlgorithm == 3 || iacAlgorithm == 5 }
1037+;[PJSC v1.10] subMenu = iacPwm_curve, "Idle - PWM Duty Cycle", 7, { iacAlgorithm == 2 }
1038+;[PJSC v1.10] subMenu = iacPwmCrank_curve, "Idle - PWM Cranking Duty Cycle", 7, { iacAlgorithm == 2 }
1039+;[PJSC v1.10] subMenu = iacStep_curve, "Idle - Stepper Motor", 7, { iacAlgorithm == 4 }
1040+;[PJSC v1.10] subMenu = iacStepCrank_curve, "Idle - Stepper Motor Cranking", 7, { iacAlgorithm == 4 }
1041+ subMenu = idleSettings, "Idle Control", { muxout1selection == 1 || muxout2selection == 1 } ;[PJSC v1.10] For MUX selection
1042+ subMenu = iacClosedLoop_curve, "Idle - Closed loop targets", 7, { (iacAlgorithm == 3 || iacAlgorithm == 5) && (muxout1selection == 1 || muxout2selection == 1) } ; |
1043+ subMenu = iacPwm_curve, "Idle - PWM Duty Cycle", 7, { iacAlgorithm == 2 && (muxout1selection == 1 || muxout2selection == 1) } ; V
1044+ subMenu = iacPwmCrank_curve, "Idle - PWM Cranking Duty Cycle", 7, { iacAlgorithm == 2 && (muxout1selection == 1 || muxout2selection == 1) } ;[PJSC v1.10] For MUX selection
10321045
10331046 menu = "&Accessories"
1034- subMenu = fanSettings, "Thermo Fan"
1035- subMenu = LaunchControl, "Launch Control / Flat Shift"
1036- subMenu = fuelpump, "Fuel Pump"
1037- subMenu = std_separator
1038- subMenu = boostSettings, "Boost Control"
1039- subMenu = boostTbl, "Boost target", 8, { boostEnabled }
1040- subMenu = std_separator
1041- subMenu = vvtSettings, "VVT Control"
1042- subMenu = vvtTbl, "VVT duty cycle", 8, { vvtEnabled }
1043- subMenu = std_separator
1044- subMenu = tacho, "Tacho Output"
1047+ subMenu = muxoutSetting, "MUX Output Port Setting" ;[PJSC v1.10]
1048+ subMenu = std_separator ;[PJSC v1.10]
1049+;[PJSC v1.10] subMenu = fanSettings, "Thermo Fan"
1050+;[PJSC v1.10] subMenu = LaunchControl, "Launch Control / Flat Shift"
1051+;[PJSC v1.10] subMenu = fuelpump, "Fuel Pump"
1052+;[PJSC v1.10] subMenu = std_separator
1053+;[PJSC v1.10] subMenu = boostSettings, "Boost Control"
1054+;[PJSC v1.10] subMenu = boostTbl, "Boost target", 8, { boostEnabled }
1055+;[PJSC v1.10] subMenu = std_separator
1056+;[PJSC v1.10] subMenu = vvtSettings, "VVT Control"
1057+;[PJSC v1.10] subMenu = vvtTbl, "VVT duty cycle", 8, { vvtEnabled }
1058+;[PJSC v1.10] subMenu = std_separator
1059+;[PJSC v1.10] subMenu = tacho, "Tacho Output"
1060+ subMenu = fanSettings, "Thermo Fan", { muxout1selection == 2 || muxout2selection == 2 } ;[PJSC v1.10] For MUX selection
1061+ subMenu = LaunchControl, "Launch Control / Flat Shift", { muxout1selection == 3 || muxout2selection == 3 } ; |
1062+ subMenu = fuelpump, "Fuel Pump", { muxout1selection == 4 || muxout2selection == 4 } ; |
1063+ subMenu = std_separator ; |
1064+ subMenu = boostSettings, "Boost Control", { muxout1selection == 5 || muxout2selection == 5 } ; |
1065+ subMenu = boostTbl, "Boost target", 8, { boostEnabled && (muxout1selection == 5 || muxout2selection == 5) } ; |
1066+ subMenu = std_separator ; |
1067+ subMenu = vvtSettings, "VVT Control", { muxout1selection == 6 || muxout2selection == 6 } ; |
1068+ subMenu = vvtTbl, "VVT duty cycle", 8, { vvtEnabled && (muxout1selection == 6 || muxout2selection == 6) } ; |
1069+ subMenu = std_separator ; V
1070+ subMenu = tacho, "Tacho Output", { muxout1selection == 7 || muxout2selection == 7 } ;[PJSC v1.10] For MUX selection
10451071
10461072 subMenu = std_separator ;[PJSC]
1047- subMenu = captureMode, "Capture Mode" ; |
1048- subMenu = captSparkSetting, "Capture External Spark Control", { externalTriggerEnabled == 1 } ; |
1049- subMenu = captExValveSetting, "Capture Exhaust Valve Position Control", { exValveCaptureEnabled == 1 } ; V
1050- subMenu = captDutyPulseSetting, "Capture Duty Pulse Control", { dutyPulseCaptureEnabled == 1 || dutyPulseCaptureEnabled2 == 1 } ;[PJSC]
1073+ subMenu = inputPortSetting, "Input Port Setting" ; |
1074+; subMenu = captExValveSetting, "Capture Exhaust Valve Position Control", { exValveCaptureEnabled == 1 } ; |
1075+; subMenu = captSparkSetting, "Capture External Spark Control", { exTrigModeSelect == 1 } ; V
1076+; subMenu = captDutyPulseSetting, "Capture Duty Pulse Control", { dutyPulseCaptureEnabled == 1 || dutyPulseCaptureEnabled2 == 1 } ;[PJSC]
10511077
10521078 subMenu = std_separator
10531079
@@ -1301,25 +1327,71 @@
13011327 panel = engine_constants_west, West
13021328 panel = engine_constants_east, East
13031329
1304- dialog = captureMode, "Capture Mode" ;[PJSC]
1305- field = "Capture External Spark Timing", externalTriggerEnabled ; |
1306- field = "Capture Exhaust Valve Position", exValveCaptureEnabled ; |
1307- field = "Capture Duty Pulse ch1", dutyPulseCaptureEnabled ; V
1308- field = "Capture Duty Pulse ch2", dutyPulseCaptureEnabled2 ;[PJSC]
1330+ dialog = muxWarningMessage, "" ;[PJSC v1.10]
1331+ field = "Don't select the same function for MUX out1 and MUX out2!" ; |
1332+ ; |
1333+ dialog = muxoutSetting, "MUX Output Port Setting" ; |
1334+ field = "MUX out1", muxout1selection ; |
1335+ field = "MUX out2", muxout2selection ; V
1336+ panel = muxWarningMessage, ;[PJSC v1.10]
13091337
1310- dialog = captSparkSetting, "Capture External Spark Control" ;[PJSC]
1311- field = "Spark capture trigger edge", externalTrigEdge ;[PJSC]
1312- field = "Spark capture hysteresis", exTrigHysteresis ;[PJSC]
1313-
13141338 dialog = captExValveSetting, "Capture Exhaust Valve Position Control" ;[PJSC]
13151339 field = "Exhaust valve calibration mode", exValveCalibrationMode ; |
13161340 field = "Closed exhaust valve ADC count", exValvePosMin ; V
13171341 field = "Open exhaust valve ADC count", exValvePosMax ;[PJSC]
13181342
1343+ dialog = captSparkSetting, "Capture External Spark Control" ;[PJSC]
1344+ field = "Spark capture trigger edge", externalTrigEdge ;[PJSC]
1345+ field = "Spark capture hysteresis", exTrigHysteresis ;[PJSC]
1346+
13191347 dialog = captDutyPulseSetting, "Capture Duty Pulse Control" ;[PJSC]
13201348 field = "Duty pulse ON Level ch1", dutyPulseOnLevel ;[PJSC]
13211349 field = "Duty pulse ON Level ch2", dutyPulseOnLevel2 ;[PJSC]
13221350
1351+ dialog = analogInputPort1select, "" ;[PJSC v1.10]
1352+ field = "", exValveCaptureEnabled ; |
1353+ ; |
1354+ dialog = digitalInputPort1select, "" ; |
1355+ field = "", exTrigModeSelect ; |
1356+ ; |
1357+ dialog = digitalInputPort2select, "" ; |
1358+ field = "", dutyPulseCaptureEnabled ; |
1359+ ; |
1360+ dialog = digitalInputPort3select, "" ; |
1361+ field = "", dutyPulseCaptureEnabled2 ; |
1362+ ; |
1363+ dialog = captDutyPulseSettingCh1, "Capture Duty Pulse Control" ; |
1364+ field = "Duty pulse ON Level ch1", dutyPulseOnLevel ; |
1365+ ; |
1366+ dialog = captDutyPulseSettingCh2, "Capture Duty Pulse Control" ; |
1367+ field = "Duty pulse ON Level ch2", dutyPulseOnLevel2 ; |
1368+ ; |
1369+ dialog = analogInputPort1, "Analog Input Port1", border ; |
1370+ panel = analogInputPort1select, West ; |
1371+ field = "" ; |
1372+ panel = captExValveSetting, East, { exValveCaptureEnabled == 1 } ; |
1373+ ; |
1374+ dialog = digitalInputPort1, "Digital Input Port1", border ; |
1375+ panel = digitalInputPort1select, West ; |
1376+ field = "" ; |
1377+ panel = captSparkSetting, East, { exTrigModeSelect == 1 } ; |
1378+ ; |
1379+ dialog = digitalInputPort2, "Digital Input Port2", border ; |
1380+ panel = digitalInputPort2select, West ; |
1381+ field = "" ; |
1382+ panel = captDutyPulseSettingCh1, East, { dutyPulseCaptureEnabled == 1 } ; |
1383+ ; |
1384+ dialog = digitalInputPort3, "Digital Input Port3", border ; |
1385+ panel = digitalInputPort3select, West ; |
1386+ field = "" ; |
1387+ panel = captDutyPulseSettingCh2, East, { dutyPulseCaptureEnabled2 == 1 } ; |
1388+ ; |
1389+ dialog = inputPortSetting, "Input Port Setting", yAxis ; |
1390+ panel = analogInputPort1 ; |
1391+ panel = digitalInputPort1 ; |
1392+ panel = digitalInputPort2 ; V
1393+ panel = digitalInputPort3 ;[PJSC v1.10]
1394+
13231395 # Flex fuel stuff
13241396 dialog = flexFuelSettings, "", yAxis
13251397 field = "Flex Fuel Sensor ", flexEnabled
@@ -1373,12 +1445,25 @@
13731445 panel = accelEnrichments_center, Center
13741446 panel = accelEnrichments_south, South
13751447
1376- dialog = veMapSelectDialog, "VE Table select" ;[PJSC]
1377- field = "Multi VE Table", multiVEmapEnabled ; |
1448+ dialog = veMapSelectionSet1, "VE Table selection1 - SW OFF" ;[PJSC v1.10]
13781449 field = "Injector 1", veMapSelection1, { multiVEmapEnabled == 1 } ; |
13791450 field = "Injector 2", veMapSelection2, { multiVEmapEnabled == 1 } ; |
1380- field = "Injector 3", veMapSelection3, { multiVEmapEnabled == 1 } ; V
1381- field = "Injector 4", veMapSelection4, { multiVEmapEnabled == 1 } ;[PJSC]
1451+ field = "Injector 3", veMapSelection3, { multiVEmapEnabled == 1 } ; |
1452+ field = "Injector 4", veMapSelection4, { multiVEmapEnabled == 1 } ; |
1453+ ; |
1454+ dialog = veMapSelectionSet2, "VE Table selection1 - SW ON" ; |
1455+ field = "Injector 1", veMapSelection1_2, { multiVEmapEnabled == 1 } ; |
1456+ field = "Injector 2", veMapSelection2_2, { multiVEmapEnabled == 1 } ; |
1457+ field = "Injector 3", veMapSelection3_2, { multiVEmapEnabled == 1 } ; |
1458+ field = "Injector 4", veMapSelection4_2, { multiVEmapEnabled == 1 } ; |
1459+ ; |
1460+ dialog = veMapSelectionDialog, "", xAxis ; |
1461+ panel = veMapSelectionSet1 ; |
1462+ panel = veMapSelectionSet2 ; |
1463+ ; |
1464+ dialog = veMapSelectDialog, "VE Table select" ; |
1465+ field = "Multi VE Table", multiVEmapEnabled ; V
1466+ panel = veMapSelectionDialog ;[PJSC v1.10]
13821467
13831468 ;[PJSC] dialog = veTableDialog_north, ""
13841469 ;[PJSC] panel = veTable1Tbl
@@ -1479,7 +1564,7 @@
14791564 field = "#Fast Idle"
14801565 field = "Fast idle temp", iacFastTemp, { iacAlgorithm == 1 }
14811566 panel = pwm_idle
1482- panel = stepper_idle
1567+;[PJSC] panel = stepper_idle
14831568 panel = closedloop_idle
14841569
14851570 dialog = fuelpump, "Fuel pump"
@@ -1536,9 +1621,9 @@
15361621 field = "Missing Tooth Secondary type" trigPatternSec, { TrigPattern == 0 }
15371622 field = "Trigger Filter", TrigFilter
15381623 field = "Re-sync every cycle", useResync, { TrigPattern == 2 || TrigPattern == 4 || TrigPattern == 7 || TrigPattern == 12 || TrigPattern == 9 } ;Dual wheel, 4G63, Audi 135, Nissan 360, Miata 99-05
1539- field = ""
1540- field = "#The below option is EXPERIMENTAL! If unsure what this is, please set to No"
1541- field = "User per tooth ignition calculation", perToothIgn, {TrigPattern == 0 || TrigPattern == 1 || TrigPattern == 2 || TrigPattern == 4 || TrigPattern == 12 || TrigPattern == 16 } ;Only works for missing tooth, distributor, dual wheel, nissan 360, 36-2-2-2
1624+;[PJSC v1.10] field = ""
1625+;[PJSC v1.10] field = "#The below option is EXPERIMENTAL! If unsure what this is, please set to No"
1626+;[PJSC v1.10] field = "User per tooth ignition calculation", perToothIgn, {TrigPattern == 0 || TrigPattern == 1 || TrigPattern == 2 || TrigPattern == 4 || TrigPattern == 12 || TrigPattern == 16 } ;Only works for missing tooth, distributor, dual wheel, nissan 360, 36-2-2-2
15421627
15431628 ;[PJSC] dialog = sparkSettings,"Spark Settings",4
15441629 ;[PJSC] field = "Spark output mode", sparkMode
@@ -2490,7 +2575,7 @@
24902575
24912576 gammaEnrichGauge = gammaEnrich, "Gamma Enrichment", "%", 50, 150, -1, -1, 151, 151, 0, 0
24922577 pulseWidthGauge = pulseWidth, "Pulse Width", "mSec", 0, 35.0, 1.0, 1.2, 20, 25, 3, 3
2493- tachometer = rpm, "Engine Speed", "RPM", 0, 13000, 300, 600,11500,12000, 0, 0
2578+ tachometer = rpm, "Engine Speed", "RPM", 0, 13000, 500, 900,11500,12000, 0, 0
24942579 veGauge = veCurr, "VE Current", "%", 0, 120, -1, -1, 999, 999, 0, 0
24952580 veGauge2 = veCurr2, "VE2 Current", "%", 0, 120, -1, -1, 999, 999, 0, 0 ;[PJSC]
24962581 warmupEnrichGauge = warmupEnrich, "Warmup Enrichment", "%", 100, 200, 130, 140, 140, 150, 0, 0
@@ -2502,7 +2587,7 @@
25022587 dwellGauge = dwell, "Ign Dwell", "mSec", 0, 35.0, 1.0, 1.2, 20, 25, 3, 3
25032588
25042589 gaugeCategory = "Sensor inputs"
2505- mapGauge = map, "Engine MAP", "kPa", 0, 255, 0, 20, 200, 245, 0, 0
2590+ mapGauge = map, "Engine MAP", "kPa", 0, 200, 20, 40, 160, 180, 1, 0
25062591 mapGauge_psi = map_psi, "Engine MAP (PSI)", "PSI", -15, 100, 0, 20, 200, 245, 0, 0
25072592 mapGauge_bar = map_bar, "Engine MAP (BAR)", "Bar", -1, 3, -1, -1, 5, 5, 2, 2
25082593 mapGauge_vacBoost = map_vacboost, "Engine MAP (in-Hg/PSI)", "in-Hg/PSI", -30, 30, -30, -30, 30, 30, 1, 1
@@ -2511,22 +2596,22 @@
25112596 tpsADCGauge = tpsADC, "TPS ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
25122597 throttleGauge = throttle, "Throttle Position", "%TPS", 0, 100, -1, 1, 90, 100, 0, 0
25132598
2514- afrGauge = afr, "Air:Fuel Ratio", "", 7, 25, 12, 13, 15, 16, 2, 2
2599+ afrGauge = afr, "Air:Fuel Ratio", "", 7, 22, 12, 13, 16, 17, 2, 2
25152600 afrGauge2 = afr2, "Air:Fuel Ratio 2", "", 7, 25, 12, 13, 15, 16, 2, 2
25162601 lambdaGauge = lambda, "Lambda", "", 0.5, 1.5, 0.5, 0.7, 2, 1.1, 2, 2
25172602 exValvePosGauge = valvePosition, "Exhaust Valve Position", "%open", 0, 100, -1, 1, 90, 100, 0, 0 ;[PJSC]For External Trigger
25182603 exValveADCGauge = valvePositionADC, "Exhaust Valve ADC", "", 0, 255, -1, -1, 256, 256, 0, 0 ;[PJSC]For External Trigger
2519- exSparkGauge = sparkedAngle, "Sparked Angle", "deg BTDC", -20, 60, 0, 0, 45, 50, 0, 0 ;[PJSC]For External Trigger
2604+ exSparkGauge = sparkedAngle, "Sparked Angle", "deg BTDC", -20, 60, -10, 0, 45, 50, 0, 0 ;[PJSC]For External Trigger
25202605 dutyFreqGauge = dutyFreq, "Duty Pulse Frequency", "Hz", 0, 100, 5, 10, 90, 95, 0, 0 ;[PJSC]For capturing duty pulse
25212606 dutyRatioGauge = dutyRatio, "Duty Ratio", "%", 0, 100, 5, 10, 90, 95, 0, 0 ;[PJSC]For capturing duty pulse
25222607 dutyFreqGauge2 = dutyFreq2, "Duty Pulse Frequency 2", "Hz", 0, 100, 5, 10, 90, 95, 0, 0 ;[PJSC]For capturing duty pulse
25232608 dutyRatioGauge2 = dutyRatio2, "Duty Ratio 2", "%", 0, 100, 5, 10, 90, 95, 0, 0 ;[PJSC]For capturing duty pulse
2524- baroGauge = baro, "Barometric Pressure", "kPa", 0, 255, 0, 20, 200, 245, 0, 0 ;[PJSC]Add the gage for barometric sensor
2525- injcountGauge = testCnt, "Injection Count", "pulses", 0, 1000, 65535, 65535,65535, 65535,0, 0 ;[PJSC v1.10] For test mode
2609+ baroGauge = baro, "Barometric Pressure", "kPa", 0, 200, 20, 60, 140, 180, 1, 0 ;[PJSC]Add the gage for barometric sensor
2610+ injcountGauge = testCnt, "Injection Count", "pulses", 0, 1000, 65535, 65535,65535, 65535,0, 0 ;[PJSC v1.10] For test mode
25262611
25272612 #if CELSIUS
2528- cltGauge = coolant, "Coolant Temp", "TEMP", -40, 215, -15, 0, 95, 105, 0, 0
2529- iatGauge = iat, "Inlet Air Temp", "TEMP", -40, 215, -15, 0, 95, 100, 0, 0
2613+ cltGauge = coolant, "Coolant Temp", "TEMP", -20, 120, -15, 0, 95, 105, 0, 0
2614+ iatGauge = iat, "Inlet Air Temp", "TEMP", -20, 120, -10, 0, 75, 85, 0, 0
25302615 #else
25312616 cltGauge = coolant, "Coolant Temp", "TEMP", -40, 215, 0, 30, 200, 220, 0, 0
25322617 iatGauge = iat, "Inlet Air Temp", "TEMP", -40, 215, 0, 30, 200, 210, 0, 0
@@ -2677,7 +2762,7 @@
26772762 testenabled = bits, U08, 38, [0:0]
26782763 testactive = bits, U08, 38, [1:1]
26792764 afr2 = scalar, U08, 39, "O2", 0.100, 0.000
2680- baro = scalar, U08, 40, "kpa", 1.000, 0.000
2765+ baro = scalar, U08, 40, "kpa", 1.100, 0.000
26812766 canin_gauge0 = scalar, U16, 41, "", 1.000, 0.000
26822767 canin_gauge1 = scalar, U16, 43, "", 1.000, 0.000
26832768 canin_gauge2 = scalar, U16, 45, "", 1.000, 0.000
@@ -2813,7 +2898,7 @@
28132898 entry = idleLoad, "IAC value", int, "%d"
28142899 entry = baro, "Baro Pressure",int, "%d"
28152900 entry = valvePosition, "ExValve Pos", int, "%d", { exValveCaptureEnabled } ;[PJSC]
2816- entry = sparkedAngle, "Spark Angle", int, "%d", { externalTriggerEnabled } ;[PJSC]
2901+ entry = sparkedAngle, "Spark Angle", int, "%d", { exTrigModeSelect == 1 } ;[PJSC]
28172902 entry = dutyFreq, "Duty Frequency", int, "%d", { dutyPulseCaptureEnabled } ;[PJSC]
28182903 entry = dutyRatio, "Duty Ratio", int, "%d", { dutyPulseCaptureEnabled } ;[PJSC]
28192904 entry = dutyFreq2, "Duty Frequency2", int, "%d", { dutyPulseCaptureEnabled2 } ;[PJSC]
--- branches/Ver1.00_base/speeduino/globals.h (revision 18)
+++ branches/Ver1.00_base/speeduino/globals.h (revision 19)
@@ -214,10 +214,24 @@
214214 //const byte page11_size = 128;
215215 #define MAP_PAGE_SIZE 288
216216
217-#define NUM_SQUIRT_DEVICE 4 //[PJSC]
218-#define SELECT_VE1 0 //[PJSC]
219-#define SELECT_VE2 1 //[PJSC]
217+#define NUM_SQUIRT_DEVICE 4 //[PJSC]
218+#define SELECT_VE1 0 //[PJSC]
219+#define SELECT_VE2 1 //[PJSC]
220220
221+#define EXTRIG_SPARK_DISABLE 0 //[PJSC v1.10] For MAP switching
222+#define EXTRIG_SPARK_CAPTURE 1 // V
223+#define EXTRIG_MAP_SELECT 2 //[PJSC v1.10] For MAP switching
224+#define EXTRIG_SPARK_DISABLE 0 //[PJSC v1.10] For MAP switching
225+
226+#define MUXOUT_OFF 0 //[PJSC v1.10] MUX output selection
227+#define MUXOUT_IDLE 1 //[PJSC v1.10] MUX output selection
228+#define MUXOUT_FAN 2 //[PJSC v1.10] MUX output selection
229+#define MUXOUT_LAUNCH 3 //[PJSC v1.10] MUX output selection
230+#define MUXOUT_FUELPUMP 4 //[PJSC v1.10] MUX output selection
231+#define MUXOUT_BOOST 5 //[PJSC v1.10] MUX output selection
232+#define MUXOUT_VVT 6 //[PJSC v1.10] MUX output selection
233+#define MUXOUT_TACH 7 //[PJSC v1.10] MUX output selection
234+
221235 struct table3D fuelTable; //16x16 fuel map
222236 struct table3D fuelTable2; //16x16 fuel map2 [PJSC]
223237 struct table3D ignitionTable; //16x16 ignition map
@@ -425,6 +439,8 @@
425439 byte testMode; //[PJSC v1.10] For test mode
426440 byte testModeActive; //[PJSC v1.10] For test mode
427441 int16_t testCnt; //[PJSC v1.10] For test mode
442+ boolean mapSelectSw; //[PJSC v1.10] For MAP switching
443+ byte veMapselect[4]; //[PJSC v1.10] For MAP switching
428444
429445 //Helpful bitwise operations:
430446 //Useful reference: http://playground.arduino.cc/Code/BitMath
@@ -536,7 +552,7 @@
536552 byte exTrigHysteresis; // |
537553 byte squirtDeviceType : 1; // |
538554 byte multiVEmapEnabled: 1; // |
539- byte externalTriggerEnabled : 1; // | For External Trigger
555+ byte exTrigModeSelect : 2; // | For External Trigger
540556 byte externalTrigEdge: 1; // | 0: Rising, 1: Falling
541557 byte exValveCaptureEnabled: 1; // | For capturing Exhaust valve position
542558 byte dutyPulseCaptureEnabled: 1; // | For capturing duty pulse ch1
@@ -544,7 +560,6 @@
544560 byte dutyPulseOnLevel: 1; // | For capturing duty pulse ch1, 0: high, 1: low
545561 byte dutyPulseOnLevel2: 1; // | For capturing duty pulse ch2, 0: high, 1: low
546562 byte exValveCalibrationMode: 1; // | Support Exhaust Valve calibrationmode
547- byte unused1_74_2: 1; // | Place holder
548563 byte unused1_74_3: 1; // | Place holder
549564 byte unused1_74_4: 1; // | Place holder
550565 byte unused1_74_5: 1; // | Place holder
@@ -551,6 +566,7 @@
551566 byte unused1_74_6: 1; // | Place holder
552567 byte unused1_74_7: 1; // V Place holder
553568 byte veMapSelection[4]; //[PJSC]
569+ byte veMapSelection2[4]; //[PJSC v1.10] For MAP switching
554570 byte dutyFreqTst[4]; //[PJSC v1.10] For test mode
555571 byte dutyRatioTst[4]; // |
556572 byte testop_fp: 1; // |
@@ -560,8 +576,10 @@
560576 byte testsel_coil: 1; // |
561577 uint16_t testint; // |
562578 uint16_t testpw; // |
563- uint16_t testinjcnt; // V
564- byte unused1_95[33]; //[PJSC v1.10] For test mode
579+ uint16_t testinjcnt; // |
580+ byte muxout1Selection: 4; // | MUX output1 selection
581+ byte muxout2Selection: 4; // V MUX output2 selection
582+ byte unused1_100[28]; //[PJSC v1.10] For test mode
565583
566584 #if defined(CORE_AVR)
567585 };
@@ -854,12 +872,12 @@
854872 byte pinIdle2; //2 wire idle control (Not currently used)
855873 byte pinSpareTemp1; // Future use only
856874 byte pinSpareTemp2; // Future use only
857-byte pinSpareOut1; //Generic output
858-byte pinSpareOut2; //Generic output
859-byte pinSpareOut3; //Generic output
860-byte pinSpareOut4; //Generic output
861-byte pinSpareOut5; //Generic output
862-byte pinSpareOut6; //Generic output
875+byte pinSpareOut1; //Generic output
876+byte pinSpareOut2; //Generic output
877+byte pinSpareOut3; //Generic output
878+byte pinSpareOut4; //Generic output
879+byte pinSpareOut5; //Generic output
880+byte pinSpareOut6; //Generic output
863881 byte pinSpareHOut1; //spare high current output
864882 byte pinSpareHOut2; // spare high current output
865883 byte pinSpareLOut1; // spare low current output
@@ -868,9 +886,9 @@
868886 byte pinSpareLOut4;
869887 byte pinSpareLOut5;
870888 byte pinBoost;
871-byte pinVVT_1; // vvt output 1
872-byte pinVVt_2; // vvt output 2
873-byte pinFan; // Cooling fan output
889+byte pinVVT_1; // vvt output 1
890+byte pinVVt_2; // vvt output 2
891+byte pinFan; // Cooling fan output
874892 byte pinStepperDir; //Direction pin for the stepper motor driver
875893 byte pinStepperStep; //Step pin for the stepper motor driver
876894 byte pinStepperEnable; //Turning the DRV8825 driver on/off
@@ -883,6 +901,8 @@
883901 byte pinExValve; //[PJSC] Exhaust valve position input pin
884902 byte pinCaptureDuty1; //[PJSC] For capturing duty pulse
885903 byte pinCaptureDuty2; //[PJSC] For capturing duty pulse
904+byte pinMuxout1; //[PJSC v1.10] For MUX output setting
905+byte pinMuxout2; //[PJSC v1.10] For MUX output setting
886906
887907 // global variables // from speeduino.ino
888908 extern struct statuses currentStatus; // from speeduino.ino