OSDN > 開發者 > maharu > 工作室 > PJSC > 提交

PJSC

(Original repository, No fork origin)

R/O
SSH
HTTPS

提交

Commit MetaInfo

修訂	82 (tree)
時間	2019-09-02 16:51:50
作者	maharu

Log Message

Changed comment for PJSC v1.01 from "PJSC v1.10" to "PJSC v1.01".

Change Summary

modified: branches/Ver1.01/reference/PJSC.ini (diff)
modified: branches/Ver1.01/speeduino/auxiliaries.ino (diff)
modified: branches/Ver1.01/speeduino/board_avr2560.h (diff)
modified: branches/Ver1.01/speeduino/comms.h (diff)
modified: branches/Ver1.01/speeduino/comms.ino (diff)
modified: branches/Ver1.01/speeduino/decoders.ino (diff)
modified: branches/Ver1.01/speeduino/globals.h (diff)
modified: branches/Ver1.01/speeduino/init.h (diff)
modified: branches/Ver1.01/speeduino/init.ino (diff)
modified: branches/Ver1.01/speeduino/scheduler.h (diff)
modified: branches/Ver1.01/speeduino/scheduler.ino (diff)
modified: branches/Ver1.01/speeduino/speeduino.h (diff)
modified: branches/Ver1.01/speeduino/speeduino.ino (diff)
modified: branches/Ver1.01/speeduino/storage.h (diff)
modified: branches/Ver1.01/speeduino/storage.ino (diff)
modified: branches/Ver1.01/speeduino/table.h (diff)
modified: branches/Ver1.01/speeduino/timers.ino (diff)
modified: branches/Ver1.01/speeduino/updates.ino (diff)

差異

--- branches/Ver1.01/reference/PJSC.ini (revision 81)

+++ branches/Ver1.01/reference/PJSC.ini (revision 82)

		@@ -6,8 +6,8 @@
6	6	MTversion = 2.25
7	7
8	8	queryCommand = "Q"
9		-;[PJSC v1.10] signature = "speeduino 201902"
10		- signature = "speeduino - PJSC v1.10" ;[PJSC v1.10]
	9	+;[PJSC v1.01] signature = "speeduino 201902"
	10	+ signature = "speeduino - PJSC v1.01" ;[PJSC v1.01]
11	11	versionInfo = "S" ;This info is what is displayed to user
12	12
13	13	[TunerStudio]

		@@ -31,9 +31,9 @@
31	31	settingOption = resetcontrol_standard, "Basic Options Only"
32	32	settingOption = resetcontrol_adv, "Advanced Features (16u2 Firmware Update Required)"
33	33
34		- settingGroup = table4_usage_group, "Selection of table4 usage" ;[PJSC v1.10] For switching 4th table
35		-;[PJSC v1.01]For debug settingOption = table4_spark, "Spark advance table" ;[PJSC v1.10] For switching 4th table
36		- settingOption = table4_fuel, "VE table4" ;[PJSC v1.10] For switching 4th table
	34	+ settingGroup = table4_usage_group, "Selection of table4 usage" ;[PJSC v1.01] For switching 4th table
	35	+;[PJSC v1.01]For debug settingOption = table4_spark, "Spark advance table" ;[PJSC v1.01] For switching 4th table
	36	+ settingOption = table4_fuel, "VE table4" ;[PJSC v1.01] For switching 4th table
37	37
38	38	[PcVariables]
39	39	; valid types: boolean, double, int, list

		@@ -58,8 +58,8 @@
58	58	algorithmNames = bits, U08, [0:2], $loadSourceNames
59	59	;algorithmUnits = bits, U08, [0:2], $loadSourceUnits
60	60	algorithmUnits = bits, U08, [0:2], "kPa", "% TPS", "%", "% TPS", "INVALID", "INVALID", "INVALID", "INVALID"
61		- algorithmUnits2 = bits, U08, [3:5], "kPa", "% TPS", "%", "% TPS", "INVALID", "INVALID", "INVALID", "INVALID" ;[PJSC v1.10] For Secondary Fuel
62		-;[PJSC v1.10] algorithmUnits3 = bits, U08, [0:2], "kPa", "% TPS", "%", "% TPS", "INVALID", "INVALID", "INVALID", "INVALID" ;[PJSC v1.10] For switching table3
	61	+ algorithmUnits2 = bits, U08, [3:5], "kPa", "% TPS", "%", "% TPS", "INVALID", "INVALID", "INVALID", "INVALID" ;[PJSC v1.01] For Secondary Fuel
	62	+;[PJSC v1.01] algorithmUnits3 = bits, U08, [0:2], "kPa", "% TPS", "%", "% TPS", "INVALID", "INVALID", "INVALID", "INVALID" ;[PJSC v1.01] For switching table3
63	63	algorithmLimits= array, U16, [8], "", 1.0, 0, 0, 511, 0, noMsqSave
64	64	#define all_IO_Pins = "Board Default", "INVALID", "INVALID", "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", "A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15", "INVALID"
65	65	#define IO_Pins_no_def = "INVALID", "INVALID", "INVALID", "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", "A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15", "INVALID"

		@@ -67,9 +67,9 @@
67	67	boostTableLabels = bits, U08, [0:1], "Duty Cycle %", "kPa"
68	68
69	69	fuelLoadMax = scalar, U08, "", 1, 0, 0, 511, 0
70		-;[PJSC v1.10] ignLoadMax = scalar, U08, "", 1, 0, 0, 511, 0
71		-;[PJSC v1.10] fuelLoadMax = scalar, U08, "", 1, 0, 0, 255, 0 ;[PJSC v1.10]
72		- ignLoadMax = scalar, U08, "", 1, 0, 0, 255, 0 ;[PJSC v1.10]
	70	+;[PJSC v1.01] ignLoadMax = scalar, U08, "", 1, 0, 0, 511, 0
	71	+;[PJSC v1.01] fuelLoadMax = scalar, U08, "", 1, 0, 0, 255, 0 ;[PJSC v1.01]
	72	+ ignLoadMax = scalar, U08, "", 1, 0, 0, 255, 0 ;[PJSC v1.01]
73	73	AUXin00Alias = string, ASCII, 20
74	74	AUXin01Alias = string, ASCII, 20
75	75	AUXin02Alias = string, ASCII, 20

		@@ -163,7 +163,7 @@
163	163	;pageSize = 288, 128, 288, 128, 288, 128, 240, 192, 192, 192
164	164	;[PJSC] pageSize = 128, 288, 288, 128, 288, 128, 240, 192, 192, 192
165	165	nPages = 11 ;[PJSC]
166		- pageSize = 128, 288, 288, 128, 288, 128, 240, 192, 192, 288, 288 ;[PJSC v1.10]
	166	+ pageSize = 128, 288, 288, 128, 288, 128, 240, 192, 192, 288, 288 ;[PJSC v1.01]
167	167
168	168	;burnCommand = "B"
169	169	;pageActivate = "P\001", "P\002", "P\003", "P\004", "P\005", "P\006", "P\007", "P\010", "P\011", "P\012", "P\013"

		@@ -179,9 +179,9 @@
179	179	;[PJSC] pageChunkWrite = "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v"
180	180
181	181	;[PJSC] New commands for PJSC
182		- pageIdentifier = "\$tsCanId\x01", "\$tsCanId\x02", "\$tsCanId\x03", "\$tsCanId\x04", "\$tsCanId\x05", "\$tsCanId\x06", "\$tsCanId\x07", "\$tsCanId\x08", "\$tsCanId\x09", "\$tsCanId\x0A", "\$tsCanId\x0B" ;[PJSC v1.10]
183		- burnCommand = "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i" ;[PJSC v1.10]
184		- pageReadCommand = "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c" ;[PJSC v1.10]
	182	+ pageIdentifier = "\$tsCanId\x01", "\$tsCanId\x02", "\$tsCanId\x03", "\$tsCanId\x04", "\$tsCanId\x05", "\$tsCanId\x06", "\$tsCanId\x07", "\$tsCanId\x08", "\$tsCanId\x09", "\$tsCanId\x0A", "\$tsCanId\x0B" ;[PJSC v1.01]
	183	+ burnCommand = "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i" ;[PJSC v1.01]
	184	+ pageReadCommand = "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c", "p%2i%2o%2c" ;[PJSC v1.01]
185	185	pageValueWrite = "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v" ;[PJSC]
186	186	pageChunkWrite = "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v", "w%2i%2o%2c%v" ;[PJSC]
187	187

		@@ -256,7 +256,7 @@
256	256	hardCutType = bits, U08, 26, [3:3], "Full", "Rolling"
257	257	ignAlgorithm = bits, U08, 26, [4:6], $loadSourceNames
258	258	indInjAng = bits, U08, 26, [7:7], "Disabled", "Enabled"
259		-;[PJSC v1.10] injOpen = scalar, U08, 27, "ms", 0.1, 0.0, 0.1, 25.5, 1
	259	+;[PJSC v1.01] injOpen = scalar, U08, 27, "ms", 0.1, 0.0, 0.1, 25.5, 1
260	260	injOpen = scalar, U08, 27, "ms", 0.01, 0.00, 0.01, 2.55, 2
261	261	inj1Ang = scalar, U16, 28, "deg", 1.0, 0.0, 0.0, 360, 0
262	262	inj2Ang = scalar, U16, 30, "deg", 1.0, 0.0, 0.0, 360, 0

		@@ -324,25 +324,25 @@
324	324	exValvePosMax = scalar, U08, 73, "ADC", 1.0, 0.0, 0.0, 255.0, 0 ; \|
325	325	exTrigHysteresis = scalar, U08, 74, "deg", 1.0, 0.0, 0.0, 255.0, 0 ; V
326	326	squirtDeviceType = bits, U08, 75, [0:0], "Injector", "Pump Jet" ;[PJSC]
327		- multiVEmapEnabled = bits, U08, 75, [1:1], "Disable", "Enable" ;[PJSC v1.10] For Dual Fuel Load
328		- mapSeparationEnabled = bits, U08, 75, [2:2], "Disable", "Enable" ;[PJSC v1.10] For Dual Fuel Load
329		- mapSwitchingEnabled = bits, U08, 75, [3:3], "Disable", "Enable" ;[PJSC v1.10] For Dual Fuel Load
330		- dualFuelEnabled = bits, U08, 75, [4:4], "Disable", "Enable" ;[PJSC v1.10] For Dual Fuel Load
331		- secondaryFuelUsage = bits, U08, 75, [5:5], "additive", "multiplicitive" ;[PJSC v1.10] For Dual Fuel Load
332		-;[PJSC v1.01c] unused2_75 = bits, U08, 75, [6:7] ;[PJSC v1.10]
333		- fuelCorrectionEnabled = bits, U08, 75, [6:6], "Disable", "Enable" ;[PJSC v1.01c]
334		- unused2_75 = bits, U08, 75, [7:7] ;[PJSC v1.01c]
	327	+ multiVEmapEnabled = bits, U08, 75, [1:1], "Disable", "Enable" ;[PJSC v1.01] For Dual Fuel Load
	328	+ mapSeparationEnabled = bits, U08, 75, [2:2], "Disable", "Enable" ;[PJSC v1.01] For Dual Fuel Load
	329	+ mapSwitchingEnabled = bits, U08, 75, [3:3], "Disable", "Enable" ;[PJSC v1.01] For Dual Fuel Load
	330	+ dualFuelEnabled = bits, U08, 75, [4:4], "Disable", "Enable" ;[PJSC v1.01] For Dual Fuel Load
	331	+ secondaryFuelUsage = bits, U08, 75, [5:5], "additive", "multiply" ;[PJSC v1.01] For Dual Fuel Load
	332	+;[PJSC v1.01] unused2_75 = bits, U08, 75, [6:7] ;[PJSC v1.01]
	333	+ fuelCorrectionEnabled = bits, U08, 75, [6:6], "Disable", "Enable" ;[PJSC v1.01]
	334	+ unused2_75 = bits, U08, 75, [7:7] ;[PJSC v1.01]
335	335	exTrigModeSelect = bits, U08, 76, [0:1], "Disable", "Spark timing capture", "MAP select switch", "INVALID" ;[PJSC]
336	336	externalTrigEdge = bits, U08, 76, [2:2], "Rising", "Falling" ; \|
337	337	exValveCaptureEnabled = bits, U08, 76, [3:3], "Disable", "Exhaust Valve Position capture" ; \|
338	338	exValveCalibrationMode = bits, U08, 76, [4:4], "Off", "On" ;[PJSC]
339		- unused2_76 = bits, U08, 76, [5:7] ;[PJSC v1.10]
	339	+ unused2_76 = bits, U08, 76, [5:7] ;[PJSC v1.01]
340	340	dutyPulseCaptureEnabled = bits, U08, 77, [0:0], "Disable", "PWM input" ; \|
341	341	dutyPulseCaptureEnabled2 = bits, U08, 77, [1:1], "Disable", "PWM input" ; \|
342	342	dutyPulseOnLevel = bits, U08, 77, [2:2], "High", "Low" ; \|
343	343	dutyPulseOnLevel2 = bits, U08, 77, [3:3], "High", "Low" ; V
344		- unused2_77 = bits, U08, 77, [4:7] ;[PJSC v1.10]
345		-#if table4_spark ;[PJSC v1.10] For switching table4
	344	+ unused2_77 = bits, U08, 77, [4:7] ;[PJSC v1.01]
	345	+#if table4_spark ;[PJSC v1.01] For switching table4
346	346	veMapSelection1Pri = bits, U08, 78, [0:3], "VE Table 1","VE Table 2","VE Table 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
347	347	veMapSelection1Sec = bits, U08, 78, [4:7], "VE Table 1","VE Table 2","VE Table 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
348	348	veMapSelection2Pri = bits, U08, 79, [0:3], "VE Table 1","VE Table 2","VE Table 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"

		@@ -359,8 +359,8 @@
359	359	veMapSelection3_2Sec = bits, U08, 84, [4:7], "VE Table 1","VE Table 2","VE Table 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
360	360	veMapSelection4_2Pri = bits, U08, 85, [0:3], "VE Table 1","VE Table 2","VE Table 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
361	361	veMapSelection4_2Sec = bits, U08, 85, [4:7], "VE Table 1","VE Table 2","VE Table 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
362		-#endif ;[PJSC v1.10] For switching table4
363		-#if table4_fuel ;[PJSC v1.10]
	362	+#endif ;[PJSC v1.01] For switching table4
	363	+#if table4_fuel ;[PJSC v1.01]
364	364	veMapSelection1Pri = bits, U08, 78, [0:3], "VE Table 1","VE Table 2","VE Table 3","VE Table 4","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
365	365	veMapSelection1Sec = bits, U08, 78, [4:7], "VE Table 1","VE Table 2","VE Table 3","VE Table 4","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
366	366	veMapSelection2Pri = bits, U08, 79, [0:3], "VE Table 1","VE Table 2","VE Table 3","VE Table 4","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"

		@@ -377,19 +377,19 @@
377	377	veMapSelection3_2Sec = bits, U08, 84, [4:7], "VE Table 1","VE Table 2","VE Table 3","VE Table 4","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
378	378	veMapSelection4_2Pri = bits, U08, 85, [0:3], "VE Table 1","VE Table 2","VE Table 3","VE Table 4","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
379	379	veMapSelection4_2Sec = bits, U08, 85, [4:7], "VE Table 1","VE Table 2","VE Table 3","VE Table 4","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
380		-#endif ;[PJSC v1.10] For switching table4
381		- dutyFreqTst1 = scalar, U08, 86, "Hz", 2.0, 0.0, 10, 511, 0 ;[PJSC v1.10]
	380	+#endif ;[PJSC v1.01] For switching table4
	381	+ dutyFreqTst1 = scalar, U08, 86, "Hz", 2.0, 0.0, 10, 511, 0 ;[PJSC v1.01]
382	382	dutyFreqTst2 = scalar, U08, 87, "Hz", 2.0, 0.0, 10, 511, 0 ; \|
383	383	dutyFreqTst3 = scalar, U08, 88, "Hz", 2.0, 0.0, 10, 511, 0 ; \|
384	384	dutyFreqTst4 = scalar, U08, 89, "Hz", 2.0, 0.0, 10, 511, 0 ; \|
385		- dutyFreqTst5 = scalar, U08, 90, "Hz", 2.0, 0.0, 10, 511, 0 ; \|[PJSC v1.01c]
386		- dutyFreqTst6 = scalar, U08, 91, "Hz", 2.0, 0.0, 10, 511, 0 ; \| \|
387		- dutyFreqTst7 = scalar, U08, 92, "Hz", 2.0, 0.0, 10, 511, 0 ; \| \|
388		- dutyFreqTst8 = scalar, U08, 93, "Hz", 2.0, 0.0, 10, 511, 0 ; \| \|
389		- dutyFreqTst9 = scalar, U08, 94, "Hz", 2.0, 0.0, 10, 511, 0 ; \| \|
390		- dutyFreqTst10 = scalar, U08, 95, "Hz", 2.0, 0.0, 10, 511, 0 ; \| \|
391		- dutyFreqTst11 = scalar, U08, 96, "Hz", 2.0, 0.0, 10, 511, 0 ; \| V
392		- dutyFreqTst12 = scalar, U08, 97, "Hz", 2.0, 0.0, 10, 511, 0 ; \|[PJSC v1.01c]
	385	+ dutyFreqTst5 = scalar, U08, 90, "Hz", 2.0, 0.0, 10, 511, 0 ; \|
	386	+ dutyFreqTst6 = scalar, U08, 91, "Hz", 2.0, 0.0, 10, 511, 0 ; \|
	387	+ dutyFreqTst7 = scalar, U08, 92, "Hz", 2.0, 0.0, 10, 511, 0 ; \|
	388	+ dutyFreqTst8 = scalar, U08, 93, "Hz", 2.0, 0.0, 10, 511, 0 ; \|
	389	+ dutyFreqTst9 = scalar, U08, 94, "Hz", 2.0, 0.0, 10, 511, 0 ; \|
	390	+ dutyFreqTst10 = scalar, U08, 95, "Hz", 2.0, 0.0, 10, 511, 0 ; \|
	391	+ dutyFreqTst11 = scalar, U08, 96, "Hz", 2.0, 0.0, 10, 511, 0 ; \|
	392	+ dutyFreqTst12 = scalar, U08, 97, "Hz", 2.0, 0.0, 10, 511, 0 ; \|
393	393	dutyRatioTst1 = scalar, U08, 98, "%", 1.0, 0.0, 0.0, 100.0, 0 ; \|
394	394	dutyRatioTst2 = scalar, U08, 99, "%", 1.0, 0.0, 0.0, 100.0, 0 ; \|
395	395	dutyRatioTst3 = scalar, U08, 100, "%", 1.0, 0.0, 0.0, 100.0, 0 ; \|

		@@ -408,34 +408,34 @@
408	408	testsel_inj = bits, U08, 110, [5:6], "Inj1", "Inj2", "Inj3", "Inj4" ; \|
409	409	testsel_coil = bits, U08, 110, [7:7], "CoilA", "CoilB" ; \|
410	410	testint = scalar, U16, 111, "ms", 0.01, 0.00, 0, 655.35, 1 ; V
411		- testrpm = scalar, U16, 111, "RPM", 1.0, { 60000/testint }, 0, 60000, 0 ;[PJSC v1.10]
	411	+ testrpm = scalar, U16, 111, "RPM", 1.0, { 60000/testint }, 0, 60000, 0 ;[PJSC v1.01]
412	412	testpw = scalar, U16, 113, "ms", 0.01, 0.00, 0, 655.35, 1 ; * ( 1 byte)
413	413	testinjcnt = scalar, U16, 115, "", 1, 0, 0, 65535, 0, noLocalUpdate ;
414		-#if table4_spark ;[PJSC v1.01c]
	414	+#if table4_spark ;[PJSC v1.01]
415	415	muxout1selection = bits, U08, 117, [0:3], "Disable/Test Mode", "IDLE control", "Thermo Fan control", "Launch control", "Fuel pump control", "Boost control", "VVT control", "Tach output", "INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
416	416	muxout2selection = bits, U08, 117, [4:7], "Disable/Test Mode", "IDLE control", "Thermo Fan control", "Launch control", "Fuel pump control", "Boost control", "VVT control", "Tach output", "INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
417	417	muxout3selection = bits, U08, 118, [0:3], "Disable/Test Mode", "IDLE control", "Thermo Fan control", "Launch control", "Fuel pump control", "Boost control", "VVT control", "Tach output", "INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
418	418	muxout4selection = bits, U08, 118, [4:7], "Disable/Test Mode", "IDLE control", "Thermo Fan control", "Launch control", "Fuel pump control", "Boost control", "VVT control", "Tach output", "INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
419		-#endif ;[PJSC v1.01c]
420		-#if table4_fuel ;[PJSC v1.01c]
421		- muxout1selection = bits, U08, 117, [0:3], "Disable/Test Mode", "IDLE control", "Thermo Fan control", "INVALID", "Fuel pump control", "Boost control", "VVT control", "Tach output", "INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID" ;[PJSC v1.01c]
422		- muxout2selection = bits, U08, 117, [4:7], "Disable/Test Mode", "IDLE control", "Thermo Fan control", "INVALID", "Fuel pump control", "Boost control", "VVT control", "Tach output", "INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID" ;[PJSC v1.01c]
423		- muxout3selection = bits, U08, 118, [0:3], "Disable/Test Mode", "IDLE control", "Thermo Fan control", "INVALID", "Fuel pump control", "Boost control", "VVT control", "Tach output", "INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID" ;[PJSC v1.01c]
424		- muxout4selection = bits, U08, 118, [4:7], "Disable/Test Mode", "IDLE control", "Thermo Fan control", "INVALID", "Fuel pump control", "Boost control", "VVT control", "Tach output", "INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID" ;[PJSC v1.01c]
425		-#endif ;[PJSC v1.01c]
426		-//[PJSC v1.01c] baroDenBins = array, U08, 102, [9], "kPa", 1.0, 0.0, 0.0, 255.0, 0 ;[PJSC v1.10] Bins for the Barometric density correction curve
427		-//[PJSC v1.01c] baroDenRates = array, U08, 111, [9], "%", 1.0, 0.0, 0.0, 255.0, 0 ;[PJSC v1.10] Values for the \Barometric density correction curve
428		- algorithm2 = bits, U08, 119, [0:2], $loadSourceNames ;[PJSC v1.10] For Dual Fuel Load
429		- algorithm3 = bits, U08, 119, [3:5], $loadSourceNames ;[PJSC v1.10]
430		- unused2_119 = bits, U08, 119, [6:7] ;[PJSC v1.10]
431		- table4Usage = bits, U08, 120, [0:0], "Fuel", "Spark" ;[PJSC v1.10]
432		- unused2_120 = bits, U08, 120, [1:7] ;[PJSC v1.10]
433		- inj1SquirtStartEnd = bits, U08, 121, [0:0], "End angle", "Start angle" ;[PJSC v1.01c]
434		- inj2SquirtStartEnd = bits, U08, 121, [1:1], "End angle", "Start angle" ;[PJSC v1.01c]
435		- inj3SquirtStartEnd = bits, U08, 121, [2:2], "End angle", "Start angle" ;[PJSC v1.01c]
436		- inj4SquirtStartEnd = bits, U08, 121, [3:3], "End angle", "Start angle" ;[PJSC v1.01c]
437		- unused2_121 = bits, U08, 121, [4:7] ;[PJSC v1.01c]
438		- unused2_122 = array, U08, 122, [6], "%", 1.0, 0.0, 0.0, 255, 0 ;[PJSC v1.10]
	419	+#endif ;[PJSC v1.01]
	420	+#if table4_fuel ;[PJSC v1.01]
	421	+ muxout1selection = bits, U08, 117, [0:3], "Disable/Test Mode", "IDLE control", "Thermo Fan control", "INVALID", "Fuel pump control", "Boost control", "VVT control", "Tach output", "INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID" ;[PJSC v1.01]
	422	+ muxout2selection = bits, U08, 117, [4:7], "Disable/Test Mode", "IDLE control", "Thermo Fan control", "INVALID", "Fuel pump control", "Boost control", "VVT control", "Tach output", "INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID" ;[PJSC v1.01]
	423	+ muxout3selection = bits, U08, 118, [0:3], "Disable/Test Mode", "IDLE control", "Thermo Fan control", "INVALID", "Fuel pump control", "Boost control", "VVT control", "Tach output", "INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID" ;[PJSC v1.01]
	424	+ muxout4selection = bits, U08, 118, [4:7], "Disable/Test Mode", "IDLE control", "Thermo Fan control", "INVALID", "Fuel pump control", "Boost control", "VVT control", "Tach output", "INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID" ;[PJSC v1.01]
	425	+#endif ;[PJSC v1.01]
	426	+//[PJSC v1.01] baroDenBins = array, U08, 102, [9], "kPa", 1.0, 0.0, 0.0, 255.0, 0 ;[PJSC v1.01] Bins for the Barometric density correction curve
	427	+//[PJSC v1.01] baroDenRates = array, U08, 111, [9], "%", 1.0, 0.0, 0.0, 255.0, 0 ;[PJSC v1.01] Values for the \Barometric density correction curve
	428	+ algorithm2 = bits, U08, 119, [0:2], $loadSourceNames ;[PJSC v1.01] For Dual Fuel Load
	429	+ algorithm3 = bits, U08, 119, [3:5], $loadSourceNames ;[PJSC v1.01]
	430	+ unused2_119 = bits, U08, 119, [6:7] ;[PJSC v1.01]
	431	+ table4Usage = bits, U08, 120, [0:0], "Fuel", "Spark" ;[PJSC v1.01]
	432	+ unused2_120 = bits, U08, 120, [1:7] ;[PJSC v1.01]
	433	+ inj1SquirtStartEnd = bits, U08, 121, [0:0], "End angle", "Start angle" ;[PJSC v1.01]
	434	+ inj2SquirtStartEnd = bits, U08, 121, [1:1], "End angle", "Start angle" ;[PJSC v1.01]
	435	+ inj3SquirtStartEnd = bits, U08, 121, [2:2], "End angle", "Start angle" ;[PJSC v1.01]
	436	+ inj4SquirtStartEnd = bits, U08, 121, [3:3], "End angle", "Start angle" ;[PJSC v1.01]
	437	+ unused2_121 = bits, U08, 121, [4:7] ;[PJSC v1.01]
	438	+ unused2_122 = array, U08, 122, [6], "%", 1.0, 0.0, 0.0, 255, 0 ;[PJSC v1.01]
439	439
440	440
441	441	;Page 2 is the fuel map and axis bins only

		@@ -445,8 +445,8 @@
445	445	; name = scalar, type, offset, units, scale, translate, lo, hi, digits
446	446	veTable = array, U08, 0, [16x16],"%", 1.0, 0.0, 0.0, 255.0, 0
447	447	rpmBins = array, U08, 256, [ 16], "RPM", 100.0, 0.0, 100.0, 25500.0, 0
448		-;[PJSC v1.10] fuelLoadBins = array, U08, 272, [ 16], { bitStringValue(algorithmUnits , algorithm) }, 2.0, 0.0, 0.0, {fuelLoadMax}, 0
449		- fuelLoadBins = array, U08, 272, [ 16], { bitStringValue(algorithmUnits , algorithm) }, 1.0, 0.0, 0.0, {fuelLoadMax}, 0 ;[PJSC v1.10]
	448	+;[PJSC v1.01] fuelLoadBins = array, U08, 272, [ 16], { bitStringValue(algorithmUnits , algorithm) }, 2.0, 0.0, 0.0, {fuelLoadMax}, 0
	449	+ fuelLoadBins = array, U08, 272, [ 16], { bitStringValue(algorithmUnits , algorithm) }, 1.0, 0.0, 0.0, {fuelLoadMax}, 0 ;[PJSC v1.01]
450	450	;fuelLoadBins = array, U08, 272, [ 16], { bitStringValue(algorithmUnits , algorithm) }, 2.0, 0.0, 0.0, { arrayValue(rpmBins , algorithm) }, 0
451	451
452	452	;--------------------------------------------------

		@@ -455,8 +455,8 @@
455	455	page = 3
456	456	advTable1 = array, U08, 0,[16x16], "deg", 1.0, -40, -40, 215.0, 0
457	457	rpmBins2 = array, U08, 256,[ 16], "RPM", 100.0, 0.0, 100, 25500, 0
458		-;[PJSC v1.10] mapBins1= array, U08, 272, [ 16], { bitStringValue(algorithmUnits , ignAlgorithm) }, 2.0, 0.0, 0.0, {ignLoadMax}, 0 ; This name has to be used in order for the table to show up in MLVs table. I can't find the regexs that make this work :(
459		- mapBins1= array, U08, 272, [ 16], { bitStringValue(algorithmUnits , ignAlgorithm) }, 1.0, 0.0, 0.0, {ignLoadMax}, 0 ;[PJSC v1.10]
	458	+;[PJSC v1.01] mapBins1= array, U08, 272, [ 16], { bitStringValue(algorithmUnits , ignAlgorithm) }, 2.0, 0.0, 0.0, {ignLoadMax}, 0 ; This name has to be used in order for the table to show up in MLVs table. I can't find the regexs that make this work :(
	459	+ mapBins1= array, U08, 272, [ 16], { bitStringValue(algorithmUnits , ignAlgorithm) }, 1.0, 0.0, 0.0, {ignLoadMax}, 0 ;[PJSC v1.01]
460	460
461	461	;--------------------------------------------------
462	462	;Start Page 4

		@@ -547,11 +547,11 @@
547	547	ADCFILTER_MAP = scalar, U08, 69, "%", 1.0, 0.0, 0, 240, 0
548	548	ADCFILTER_BARO = scalar, U08, 70, "%", 1.0, 0.0, 0, 240, 0
549	549
550		-;[PJSC v1.01c] unused4-64 = array, U08, 71, [56], "%", 1.0, 0.0, 0.0, 255, 0
	550	+;[PJSC v1.01] unused4-64 = array, U08, 71, [56], "%", 1.0, 0.0, 0.0, 255, 0
551	551
552		- baroDenBins = array, U08, 71, [9], "kPa", 1.0, 0.0, 0.0, 255.0, 0 ;[PJSC v1.01c] Bins for the Barometric density correction curve
553		- baroDenRates = array, U08, 80, [9], "%", 1.0, 0.0, 0.0, 255.0, 0 ;[PJSC v1.01c] Values for the \Barometric density correction curve
554		- unused4-89 = array, U08, 89, [38], "%", 1.0, 0.0, 0.0, 255, 0 ;[PJSC v1.01c]
	552	+ 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
	553	+ 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]
555	555
556	556	;--------------------------------------------------
557	557	;Start AFR page

		@@ -579,12 +579,12 @@
579	579	egoType = bits , U08, 0, [2:3], "Disabled", "Narrow Band", "Wide Band", "INVALID" ; egoOption
580	580	boostEnabled= bits, U08, 0, [4:4], "Off", "On"
581	581	vvtEnabled = bits, U08, 0, [5:5], "Off", "On"
582		-#if table4_spark ;[PJSC v1.01c]
	582	+#if table4_spark ;[PJSC v1.01]
583	583	boostCutType= bits, U08, 0, [6:7], "Off", "Spark Only", "Fuel Only","Both"
584		-#endif ;[PJSC v1.01c]
	584	+#endif ;[PJSC v1.01]
585	585	#if table4_fuel ; \|
586	586	boostCutType= bits, U08, 0, [6:7], "Off", "INVALID", "Fuel Only","INVALID" ; V
587		-#endif ;[PJSC v1.01c]
	587	+#endif ;[PJSC v1.01]
588	588
589	589	egoKP = scalar, U08, 1, "%", 1.0, 0.0, 0.0, 200.0, 0 ; * ( 1 byte)
590	590	egoKI = scalar, U08, 2, "%", 1.0, 0.0, 0.0, 200.0, 0 ; * ( 1 byte)

		@@ -727,44 +727,44 @@
727	727	;--------------------------------------------------
728	728	;Sequential fuel trim tables (Page 8)
729	729	;--------------------------------------------------
730		-;[PJSC v1.10]page = 8
731		-;[PJSC v1.10] fuelTrim1Table = array, U08, 0,[6x6], "%", 1.0, -128, -50, 50, 0
732		-;[PJSC v1.10] fuelTrim1rpmBins = array, U08, 36,[ 6], "RPM", 100.0, 0.0, 0, 25500, 0
733		-;[PJSC v1.10]#if SPEED_DENSITY
734		-;[PJSC v1.10] fuelTrim1loadBins = array, U08, 42,[ 6], "kPa", 2.0, 0.0, 0.0, 511.0, 0
735		-;[PJSC v1.10]#elif ALPHA_N
736		-;[PJSC v1.10] fuelTrim1loadBins = array, U08, 42,[ 6], "TPS", 2.0, 0.0, 0.0, 100.0, 0
737		-;[PJSC v1.10]#endif
738		-;[PJSC v1.10]
739		-;[PJSC v1.10] fuelTrim2Table = array, U08, 48,[6x6], "%", 1.0, -128, -50, 50, 0
740		-;[PJSC v1.10] fuelTrim2rpmBins = array, U08, 84,[ 6], "RPM", 100.0, 0.0, 0, 25500, 0
741		-;[PJSC v1.10]#if SPEED_DENSITY
742		-;[PJSC v1.10] fuelTrim2loadBins = array, U08, 90,[ 6], "kPa", 2.0, 0.0, 0.0, 511.0, 0
743		-;[PJSC v1.10]#elif ALPHA_N
744		-;[PJSC v1.10] fuelTrim2loadBins = array, U08, 90,[ 6], "TPS", 2.0, 0.0, 0.0, 100.0, 0
745		-;[PJSC v1.10]#endif
746		-;[PJSC v1.10]
747		-;[PJSC v1.10] fuelTrim3Table = array, U08, 96,[6x6], "%", 1.0, -128, -50, 50, 0
748		-;[PJSC v1.10] fuelTrim3rpmBins = array, U08, 132,[ 6], "RPM", 100.0, 0.0, 0, 25500, 0
749		-;[PJSC v1.10]#if SPEED_DENSITY
750		-;[PJSC v1.10] fuelTrim3loadBins = array, U08, 138,[ 6], "kPa", 2.0, 0.0, 0.0, 511.0, 0
751		-;[PJSC v1.10]#elif ALPHA_N
752		-;[PJSC v1.10] fuelTrim3loadBins = array, U08, 138,[ 6], "TPS", 2.0, 0.0, 0.0, 100.0, 0
753		-;[PJSC v1.10]#endif
754		-;[PJSC v1.10]
755		-;[PJSC v1.10] fuelTrim4Table = array, U08, 144,[6x6], "%", 1.0, -128, -50, 50, 0
756		-;[PJSC v1.10] fuelTrim4rpmBins = array, U08, 180,[ 6], "RPM", 100.0, 0.0, 0, 25500, 0
757		-;[PJSC v1.10]#if SPEED_DENSITY
758		-;[PJSC v1.10] fuelTrim4loadBins = array, U08, 186,[ 6], "kPa", 2.0, 0.0, 0.0, 511.0, 0
759		-;[PJSC v1.10]#elif ALPHA_N
760		-;[PJSC v1.10] fuelTrim4loadBins = array, U08, 186,[ 6], "TPS", 2.0, 0.0, 0.0, 100.0, 0
761		-;[PJSC v1.10]#endif
	730	+;[PJSC v1.01]page = 8
	731	+;[PJSC v1.01] fuelTrim1Table = array, U08, 0,[6x6], "%", 1.0, -128, -50, 50, 0
	732	+;[PJSC v1.01] fuelTrim1rpmBins = array, U08, 36,[ 6], "RPM", 100.0, 0.0, 0, 25500, 0
	733	+;[PJSC v1.01]#if SPEED_DENSITY
	734	+;[PJSC v1.01] fuelTrim1loadBins = array, U08, 42,[ 6], "kPa", 2.0, 0.0, 0.0, 511.0, 0
	735	+;[PJSC v1.01]#elif ALPHA_N
	736	+;[PJSC v1.01] fuelTrim1loadBins = array, U08, 42,[ 6], "TPS", 2.0, 0.0, 0.0, 100.0, 0
	737	+;[PJSC v1.01]#endif
	738	+;[PJSC v1.01]
	739	+;[PJSC v1.01] fuelTrim2Table = array, U08, 48,[6x6], "%", 1.0, -128, -50, 50, 0
	740	+;[PJSC v1.01] fuelTrim2rpmBins = array, U08, 84,[ 6], "RPM", 100.0, 0.0, 0, 25500, 0
	741	+;[PJSC v1.01]#if SPEED_DENSITY
	742	+;[PJSC v1.01] fuelTrim2loadBins = array, U08, 90,[ 6], "kPa", 2.0, 0.0, 0.0, 511.0, 0
	743	+;[PJSC v1.01]#elif ALPHA_N
	744	+;[PJSC v1.01] fuelTrim2loadBins = array, U08, 90,[ 6], "TPS", 2.0, 0.0, 0.0, 100.0, 0
	745	+;[PJSC v1.01]#endif
	746	+;[PJSC v1.01]
	747	+;[PJSC v1.01] fuelTrim3Table = array, U08, 96,[6x6], "%", 1.0, -128, -50, 50, 0
	748	+;[PJSC v1.01] fuelTrim3rpmBins = array, U08, 132,[ 6], "RPM", 100.0, 0.0, 0, 25500, 0
	749	+;[PJSC v1.01]#if SPEED_DENSITY
	750	+;[PJSC v1.01] fuelTrim3loadBins = array, U08, 138,[ 6], "kPa", 2.0, 0.0, 0.0, 511.0, 0
	751	+;[PJSC v1.01]#elif ALPHA_N
	752	+;[PJSC v1.01] fuelTrim3loadBins = array, U08, 138,[ 6], "TPS", 2.0, 0.0, 0.0, 100.0, 0
	753	+;[PJSC v1.01]#endif
	754	+;[PJSC v1.01]
	755	+;[PJSC v1.01] fuelTrim4Table = array, U08, 144,[6x6], "%", 1.0, -128, -50, 50, 0
	756	+;[PJSC v1.01] fuelTrim4rpmBins = array, U08, 180,[ 6], "RPM", 100.0, 0.0, 0, 25500, 0
	757	+;[PJSC v1.01]#if SPEED_DENSITY
	758	+;[PJSC v1.01] fuelTrim4loadBins = array, U08, 186,[ 6], "kPa", 2.0, 0.0, 0.0, 511.0, 0
	759	+;[PJSC v1.01]#elif ALPHA_N
	760	+;[PJSC v1.01] fuelTrim4loadBins = array, U08, 186,[ 6], "TPS", 2.0, 0.0, 0.0, 100.0, 0
	761	+;[PJSC v1.01]#endif
762	762
763	763	;--------------------------------------------------
764	764	;CANBUS control and Auxillary io(Page 9)
765	765	;--------------------------------------------------
766		-;[PJSC v1.10]page = 9
767		-page = 8 ;[PJSC v1.10]
	766	+;[PJSC v1.01]page = 9
	767	+page = 8 ;[PJSC v1.01]
768	768	enable_secondarySerial = bits, U08, 0, [0:0], "Disable", "Enable"
769	769	intcan_available = bits, U08, 0, [1:1], "Disable", "Enable"
770	770	enable_intcan = bits, U08, 0, [2:2], "Disable", "Enable"

		@@ -1048,8 +1048,8 @@
1048	1048	unused10_190 = scalar, U08, 190, "", 1, 0, 0, 255, 0
1049	1049	blankfield = bits, U08, 191, [0:0], "",""
1050	1050
1051		-;[PJSC v1.10]page = 10
1052		-page = 9 ;[PJSC v1.10]
	1051	+;[PJSC v1.01]page = 10
	1052	+page = 9 ;[PJSC v1.01]
1053	1053	#if CELSIUS
1054	1054	crankingEnrichBins = array, U08, 0, [4], "C", 1.0, -40, -40, 215, 0
1055	1055	#else

		@@ -1141,10 +1141,10 @@
1141	1141	unused11_122_191 = array, U08, 122,[69],"RPM", 100.0, 0.0, 100, 25500, 0
1142	1142
1143	1143	;-------------------------------------------------------
1144		-;Page 11 is the fuel map and axis bins only [PJSC v1.10]
	1144	+;Page 11 is the fuel map and axis bins only [PJSC v1.01]
1145	1145	;-------------------------------------------------------
1146		-;[PJSC v1.10]page = 11
1147		-page = 10 ;[PJSC v1.10]
	1146	+;[PJSC v1.01]page = 11
	1147	+page = 10 ;[PJSC v1.01]
1148	1148	; name = bits, type, offset, bits
1149	1149	; name = array, type, offset, shape, units, scale, translate, lo, hi, digits
1150	1150	; name = scalar, type, offset, units, scale, translate, lo, hi, digits

		@@ -1153,10 +1153,10 @@
1153	1153	fuelLoadBins2 = array, U08, 272, [ 16], { bitStringValue(algorithmUnits2 , algorithm2) }, 1.0, 0.0, 0.0, {fuelLoadMax}, 0
1154	1154
1155	1155	;-------------------------------------------------------
1156		-;Page 12 is the fuel map and axis bins only [PJSC v1.10]
	1156	+;Page 12 is the fuel map and axis bins only [PJSC v1.01]
1157	1157	;-------------------------------------------------------
1158		-;[PJSC v1.10]page = 12
1159		-page = 11 ;[PJSC v1.10]
	1158	+;[PJSC v1.01]page = 12
	1159	+page = 11 ;[PJSC v1.01]
1160	1160	; name = bits, type, offset, bits
1161	1161	; name = array, type, offset, shape, units, scale, translate, lo, hi, digits
1162	1162	; name = scalar, type, offset, units, scale, translate, lo, hi, digits

		@@ -1217,14 +1217,14 @@
1217	1217	requiresPowerCycle = exValveCaptureEnabled ; \|
1218	1218	requiresPowerCycle = dutyPulseCaptureEnabled ; V
1219	1219	requiresPowerCycle = dutyPulseCaptureEnabled2 ;[PJSC]
1220		- requiresPowerCycle = muxout1selection ;[PJSC v1.10]
1221		- requiresPowerCycle = muxout2selection ;[PJSC v1.10]
1222		- requiresPowerCycle = muxout3selection ;[PJSC v1.01c]
1223		- requiresPowerCycle = muxout4selection ;[PJSC v1.01c]
1224		- requiresPowerCycle = algorithm2 ;[PJSC v1.10]
1225		- requiresPowerCycle = algorithm3 ;[PJSC v1.10]
1226		- requiresPowerCycle = secondaryFuelUsage ;[PJSC v1.10]
1227		- requiresPowerCycle = table4Usage ;[PJSC v1.10]
	1220	+ requiresPowerCycle = muxout1selection ;[PJSC v1.01]
	1221	+ requiresPowerCycle = muxout2selection ;[PJSC v1.01]
	1222	+ requiresPowerCycle = muxout3selection ;[PJSC v1.01]
	1223	+ requiresPowerCycle = muxout4selection ;[PJSC v1.01]
	1224	+ requiresPowerCycle = algorithm2 ;[PJSC v1.01]
	1225	+ requiresPowerCycle = algorithm3 ;[PJSC v1.01]
	1226	+ requiresPowerCycle = secondaryFuelUsage ;[PJSC v1.01]
	1227	+ requiresPowerCycle = table4Usage ;[PJSC v1.01]
1228	1228
1229	1229	requiresPowerCycle = caninput_sel0a
1230	1230	requiresPowerCycle = caninput_sel0b

		@@ -1333,10 +1333,9 @@
1333	1333	defaultValue = veMapSelection4_2Sec, 0 ; \|
1334	1334	defaultValue = exTrigModeSelect, 0 ; \|
1335	1335	defaultValue = exValveCaptureEnabled, 1 ; \|
1336		- defaultValue = dutyPulseCaptureEnabled, 0 ; \|
1337		- defaultValue = dutyPulseCaptureEnabled2, 0 ; V
1338		- defaultValue = exValveCalibrationMode, 0 ;[PJSC]
1339		- defaultValue = exValveCalibrationMode, 0 ;[PJSC v1.10]
	1336	+ defaultValue = dutyPulseCaptureEnabled, 0 ; V
	1337	+ defaultValue = dutyPulseCaptureEnabled2, 0 ;[PJSC]
	1338	+ defaultValue = exValveCalibrationMode, 0 ;[PJSC v1.01]
1340	1339	defaultValue = exValvePosMin, 0 ; \|
1341	1340	defaultValue = exValvePosMax, 100 ; \|
1342	1341	defaultValue = exTrigHysteresis, 10 ; \|

		@@ -1361,19 +1360,19 @@
1361	1360	defaultValue = testpw, 0 ; \|
1362	1361	defaultValue = testinjcnt, 0 ; \|
1363	1362	defaultValue = muxout1selection, 0 ; V
1364		- defaultValue = muxout2selection, 0 ;[PJSC v1.10]
1365		- defaultValue = muxout3selection, 0 ;[PJSC v1.01c]
1366		- defaultValue = muxout4selection, 0 ;[PJSC v1.01c]
1367		-#if table4_fuel ;[PJSC v1.10] For switching table4
1368		- defaultValue = table4Usage, 0 ;[PJSC v1.10]
1369		-#endif ;[PJSC v1.10] For switching table4
1370		-#if table4_spark ;[PJSC v1.10] For switching table4
1371		- defaultValue = table4Usage, 1 ;[PJSC v1.10]
1372		-#endif ;[PJSC v1.10] For switching table4
1373		- defaultValue = inj1SquirtStartEnd, 0 ;[PJSC v1.01c]
1374		- defaultValue = inj2SquirtStartEnd, 0 ;[PJSC v1.01c]
1375		- defaultValue = inj3SquirtStartEnd, 0 ;[PJSC v1.01c]
1376		- defaultValue = inj4SquirtStartEnd, 0 ;[PJSC v1.01c]
	1363	+ defaultValue = muxout2selection, 0 ;[PJSC v1.01]
	1364	+ defaultValue = muxout3selection, 0 ;[PJSC v1.01]
	1365	+ defaultValue = muxout4selection, 0 ;[PJSC v1.01]
	1366	+#if table4_fuel ;[PJSC v1.01] For switching table4
	1367	+ defaultValue = table4Usage, 0 ;[PJSC v1.01]
	1368	+#endif ;[PJSC v1.01] For switching table4
	1369	+#if table4_spark ;[PJSC v1.01] For switching table4
	1370	+ defaultValue = table4Usage, 1 ;[PJSC v1.01]
	1371	+#endif ;[PJSC v1.01] For switching table4
	1372	+ defaultValue = inj1SquirtStartEnd, 0 ;[PJSC v1.01]
	1373	+ defaultValue = inj2SquirtStartEnd, 0 ;[PJSC v1.01]
	1374	+ defaultValue = inj3SquirtStartEnd, 0 ;[PJSC v1.01]
	1375	+ defaultValue = inj4SquirtStartEnd, 0 ;[PJSC v1.01]
1377	1376
1378	1377	;Default pins
1379	1378	defaultValue = fanPin, 0

		@@ -1407,16 +1406,16 @@
1407	1406
1408	1407	;These are the limits for each of the load algorithms (Refer to the PC Variables section)
1409	1408	;Order is: MAP TPS IMAP/EMAP ITB UNUSED UNUSED UNUSED UNUSED
1410		-;[PJSC v1.10] defaultValue = algorithmLimits, 511 100 511 511 100 100 100 100
	1409	+;[PJSC v1.01] defaultValue = algorithmLimits, 511 100 511 511 100 100 100 100
1411	1410	defaultValue = algorithmLimits, 255 100 255 255 100 100 100 100
1412	1411	#if SPEED_DENSITY
1413		-;[PJSC v1.10] defaultValue = fuelLoadMax, 511
1414		-;[PJSC v1.10] defaultValue = ignLoadMax, 511
	1412	+;[PJSC v1.01] defaultValue = fuelLoadMax, 511
	1413	+;[PJSC v1.01] defaultValue = ignLoadMax, 511
1415	1414	defaultValue = fuelLoadMax, 255
1416	1415	defaultValue = ignLoadMax, 255
1417	1416	#else
1418		-;[PJSC v1.10] defaultValue = fuelLoadMax, 511
1419		-;[PJSC v1.10] defaultValue = ignLoadMax, 511
	1417	+;[PJSC v1.01] defaultValue = fuelLoadMax, 511
	1418	+;[PJSC v1.01] defaultValue = ignLoadMax, 511
1420	1419	defaultValue = fuelLoadMax, 255
1421	1420	defaultValue = ignLoadMax, 255
1422	1421	#endif

		@@ -1470,40 +1469,40 @@
1470	1469
1471	1470	menu = "Settings"
1472	1471	subMenu = engine_constants, "Engine Constants"
1473		-;[PJSC v1.01c] subMenu = injChars, "Injector Characteristics"
	1472	+;[PJSC v1.01] subMenu = injChars, "Injector Characteristics"
1474	1473	subMenu = triggerSettings, "Trigger Setup"
1475	1474	;subMenu = OLED, "OLED Setup"
1476	1475	subMenu = airdensity_curve, "IAT Density"
1477		- subMenu = barodensity_curve, "Baro Density", { baroCorr } ;[PJSC v1.10]
	1476	+ subMenu = barodensity_curve, "Baro Density", { baroCorr } ;[PJSC v1.01]
1478	1477	subMenu = reset_control, "Reset Control"
1479	1478
1480	1479
1481	1480	menu = "&Tuning"
1482	1481	subMenu = std_realtime, "Realtime Display"
1483		- subMenu = std_separator ;[PJSC v1.01c]
1484		- subMenu = injChars, "Injector Characteristics" ;[PJSC v1.01c]
	1482	+ subMenu = std_separator ;[PJSC v1.01]
	1483	+ subMenu = injChars, "Injector Characteristics" ;[PJSC v1.01]
1485	1484	subMenu = accelEnrichments, "Acceleration Enrichment"
1486	1485	subMenu = egoControl, "AFR/O2", 3
1487		-#if table4_spark ;[PJSC v1.10] For switching table4
	1486	+#if table4_spark ;[PJSC v1.01] For switching table4
1488	1487	subMenu = RevLimiterS, "Limiters", 2
1489		-#endif ;[PJSC v1.10] For switching table4
	1488	+#endif ;[PJSC v1.01] For switching table4
1490	1489	;[PJSC] subMenu = flexFueling, "Flex Fuel", 2
1491	1490	;[PJSC] subMenu = veTableDialog, "VE Table", 0
1492	1491	;[PJSC] subMenu = sparkTbl, "Spark Table", 2
1493		- subMenu = std_separator ;[PJSC v1.01c]
	1492	+ subMenu = std_separator ;[PJSC v1.01]
1494	1493	subMenu = veMapSelectDialog, "VE Table configuration" ;[PJSC]
1495	1494	subMenu = veTable1Dialog, "&VE Table 1", 0 ; V
1496	1495	subMenu = veTable2Dialog, "&VE Table 2", 0, { multiVEmapEnabled } ;[PJSC]
1497		- subMenu = veTable3Dialog, "&VE Table 3", 0, { multiVEmapEnabled } ;[PJSC v1.10]
1498		-#if table4_fuel ;[PJSC v1.10] For switching table4
1499		- subMenu = veTable4Dialog, "&VE Table 4", 0, { multiVEmapEnabled } ;[PJSC v1.10]
1500		-#endif ;[PJSC v1.10] For switching table4
	1496	+ subMenu = veTable3Dialog, "&VE Table 3", 0, { multiVEmapEnabled } ;[PJSC v1.01]
	1497	+#if table4_fuel ;[PJSC v1.01] For switching table4
	1498	+ subMenu = veTable4Dialog, "&VE Table 4", 0, { multiVEmapEnabled } ;[PJSC v1.01]
	1499	+#endif ;[PJSC v1.01] For switching table4
1501	1500	subMenu = afrTable1Tbl, "AFR Table", 5
1502	1501	subMenu = std_separator
1503		-;[PJSC v1.10] subMenu = inj_trimad, "Sequential fuel trim", 9
	1502	+;[PJSC v1.01] subMenu = inj_trimad, "Sequential fuel trim", 9
1504	1503	subMenu = stagingTableDialog, "Staged Injection", 10, { nCylinders <= 4 } ; Can't do staging on more than 4 cylinder engines
1505	1504
1506		-#if table4_spark ;[PJSC v1.10] For switching table4
	1505	+#if table4_spark ;[PJSC v1.01] For switching table4
1507	1506	menu = "&Spark"
1508	1507	subMenu = sparkSettings, "Spark Settings"
1509	1508	subMenu = sparkTbl, "Spark Table", 2

		@@ -1512,43 +1511,43 @@
1512	1511	subMenu = iat_retard_curve, "IAT Retard"
1513	1512	;subMenu = knockSettings, "Knock Settings"
1514	1513	subMenu = rotary_ignition, "Rotary Ignition", { sparkMode == 4 }
1515		-#endif ;[PJSC v1.10] For switching table4
	1514	+#endif ;[PJSC v1.01] For switching table4
1516	1515
1517	1516	menu = "&Starting/Idle"
1518	1517	subMenu = crankPW, "Cranking Settings"
1519	1518	subMenu = warmup, "Warmup Enrichment"
1520	1519	subMenu = std_separator
1521		-;[PJSC v1.10] subMenu = idleSettings, "Idle Control"
1522		-;[PJSC v1.10] subMenu = iacClosedLoop_curve, "Idle - Closed loop targets", 7, { iacAlgorithm == 3 \|\| iacAlgorithm == 5 }
1523		-;[PJSC v1.10] subMenu = iacPwm_curve, "Idle - PWM Duty Cycle", 7, { iacAlgorithm == 2 }
1524		-;[PJSC v1.10] subMenu = iacPwmCrank_curve, "Idle - PWM Cranking Duty Cycle", 7, { iacAlgorithm == 2 }
1525		-;[PJSC v1.10] subMenu = iacStep_curve, "Idle - Stepper Motor", 7, { iacAlgorithm == 4 }
1526		-;[PJSC v1.10] subMenu = iacStepCrank_curve, "Idle - Stepper Motor Cranking", 7, { iacAlgorithm == 4 }
1527		-;[PJSC v1.10] subMenu = std_separator
1528		-;[PJSC v1.10] subMenu = idleUpSettings, "Idle Up Settings", { iacAlgorithm == 2 \|\| iacAlgorithm == 3 \|\| iacAlgorithm == 4 \|\| iacAlgorithm == 5 }
1529		- subMenu = idleSettings, "Idle Control", { muxout1selection == 1 \|\| muxout2selection == 1 } ;[PJSC v1.10] For MUX selection
	1520	+;[PJSC v1.01] subMenu = idleSettings, "Idle Control"
	1521	+;[PJSC v1.01] subMenu = iacClosedLoop_curve, "Idle - Closed loop targets", 7, { iacAlgorithm == 3 \|\| iacAlgorithm == 5 }
	1522	+;[PJSC v1.01] subMenu = iacPwm_curve, "Idle - PWM Duty Cycle", 7, { iacAlgorithm == 2 }
	1523	+;[PJSC v1.01] subMenu = iacPwmCrank_curve, "Idle - PWM Cranking Duty Cycle", 7, { iacAlgorithm == 2 }
	1524	+;[PJSC v1.01] subMenu = iacStep_curve, "Idle - Stepper Motor", 7, { iacAlgorithm == 4 }
	1525	+;[PJSC v1.01] subMenu = iacStepCrank_curve, "Idle - Stepper Motor Cranking", 7, { iacAlgorithm == 4 }
	1526	+;[PJSC v1.01] subMenu = std_separator
	1527	+;[PJSC v1.01] subMenu = idleUpSettings, "Idle Up Settings", { iacAlgorithm == 2 \|\| iacAlgorithm == 3 \|\| iacAlgorithm == 4 \|\| iacAlgorithm == 5 }
	1528	+ subMenu = idleSettings, "Idle Control", { muxout1selection == 1 \|\| muxout2selection == 1 } ;[PJSC v1.01] For MUX selection
1530	1529	subMenu = iacClosedLoop_curve, "Idle - Closed loop targets", 7, { (iacAlgorithm == 3 \|\| iacAlgorithm == 5) && (muxout1selection == 1 \|\| muxout2selection == 1) } ; \|
1531	1530	subMenu = iacPwm_curve, "Idle - PWM Duty Cycle", 7, { iacAlgorithm == 2 && (muxout1selection == 1 \|\| muxout2selection == 1) } ; V
1532		- subMenu = iacPwmCrank_curve, "Idle - PWM Cranking Duty Cycle", 7, { iacAlgorithm == 2 && (muxout1selection == 1 \|\| muxout2selection == 1) } ;[PJSC v1.10] For MUX selection
	1531	+ subMenu = iacPwmCrank_curve, "Idle - PWM Cranking Duty Cycle", 7, { iacAlgorithm == 2 && (muxout1selection == 1 \|\| muxout2selection == 1) } ;[PJSC v1.01] For MUX selection
1533	1532
1534	1533	menu = "&Accessories"
1535		- subMenu = muxoutSetting, "MUX Output Port Setting" ;[PJSC v1.10]
1536		- subMenu = std_separator ;[PJSC v1.10]
1537		-;[PJSC v1.10] subMenu = fanSettings, "Thermo Fan"
1538		-#if table4_spark ;[PJSC v1.10] For switching table4
	1534	+ subMenu = muxoutSetting, "MUX Output Port Setting" ;[PJSC v1.01]
	1535	+ subMenu = std_separator ;[PJSC v1.01]
	1536	+;[PJSC v1.01] subMenu = fanSettings, "Thermo Fan"
	1537	+#if table4_spark ;[PJSC v1.01] For switching table4
1539	1538	subMenu = LaunchControl, "Launch Control / Flat Shift"
1540		-;[PJSC v1.10] subMenu = fuelpump, "Fuel Pump"
	1539	+;[PJSC v1.01] subMenu = fuelpump, "Fuel Pump"
1541	1540	subMenu = NitrousControl, "Nitrous"
1542		-#endif ;[PJSC v1.10] For switching table4
1543		-;[PJSC v1.10] subMenu = std_separator
1544		-;[PJSC v1.10] subMenu = boostSettings, "Boost Control"
1545		-;[PJSC v1.10] subMenu = boostLoad, "Boost Targets/Load", 8, { boostEnabled }
1546		-;[PJSC v1.10] subMenu = std_separator
1547		-;[PJSC v1.10] subMenu = vvtSettings, "VVT Control"
1548		-;[PJSC v1.10] subMenu = vvtTbl, "VVT duty cycle", 8, { vvtEnabled }
1549		-;[PJSC v1.10] subMenu = std_separator
1550		-;[PJSC v1.10] subMenu = tacho, "Tacho Output"
1551		- subMenu = fanSettings, "Thermo Fan", { muxout1selection == 2 \|\| muxout2selection == 2 } ;[PJSC v1.10] For MUX selection
	1541	+#endif ;[PJSC v1.01] For switching table4
	1542	+;[PJSC v1.01] subMenu = std_separator
	1543	+;[PJSC v1.01] subMenu = boostSettings, "Boost Control"
	1544	+;[PJSC v1.01] subMenu = boostLoad, "Boost Targets/Load", 8, { boostEnabled }
	1545	+;[PJSC v1.01] subMenu = std_separator
	1546	+;[PJSC v1.01] subMenu = vvtSettings, "VVT Control"
	1547	+;[PJSC v1.01] subMenu = vvtTbl, "VVT duty cycle", 8, { vvtEnabled }
	1548	+;[PJSC v1.01] subMenu = std_separator
	1549	+;[PJSC v1.01] subMenu = tacho, "Tacho Output"
	1550	+ subMenu = fanSettings, "Thermo Fan", { muxout1selection == 2 \|\| muxout2selection == 2 } ;[PJSC v1.01] For MUX selection
1552	1551	subMenu = fuelpump, "Fuel Pump", { muxout1selection == 4 \|\| muxout2selection == 4 } ; \|
1553	1552	subMenu = std_separator ; \|
1554	1553	subMenu = boostSettings, "Boost Control", { muxout1selection == 5 \|\| muxout2selection == 5 } ; \|

		@@ -1557,7 +1556,7 @@
1557	1556	subMenu = vvtSettings, "VVT Control", { muxout1selection == 6 \|\| muxout2selection == 6 } ; \|
1558	1557	subMenu = vvtTbl, "VVT duty cycle", 8, { vvtEnabled && (muxout1selection == 6 \|\| muxout2selection == 6) } ; \|
1559	1558	subMenu = std_separator ; V
1560		- subMenu = tacho, "Tacho Output", { muxout1selection == 7 \|\| muxout2selection == 7 } ;[PJSC v1.10] For MUX selection
	1559	+ subMenu = tacho, "Tacho Output", { muxout1selection == 7 \|\| muxout2selection == 7 } ;[PJSC v1.01] For MUX selection
1561	1560
1562	1561	subMenu = std_separator ;[PJSC]
1563	1562	subMenu = inputPortSetting, "Input Port Setting" ;[PJSC]

		@@ -1591,22 +1590,22 @@
1591	1590	;[PJSC] subMenu = sparkMap, "Spark Table", 3
1592	1591	subMenu = veTable1Map, "Fuel Table 1" ;[PJSC]
1593	1592	subMenu = veTable2Map, "Fuel Table 2" ;[PJSC]
1594		- subMenu = veTable3Map, "Fuel Table 3" ;[PJSC v1.10] For switching table4
1595		-#if table4_fuel ;[PJSC v1.10] For switching table4
1596		- subMenu = sparkMap, "Fuel Table 4" ;[PJSC v1.10] For switching table4
1597		-#endif ;[PJSC v1.10] For switching table4
	1593	+ subMenu = veTable3Map, "Fuel Table 3" ;[PJSC v1.01] For switching table4
	1594	+#if table4_fuel ;[PJSC v1.01] For switching table4
	1595	+ subMenu = sparkMap, "Fuel Table 4" ;[PJSC v1.01] For switching table4
	1596	+#endif ;[PJSC v1.01] For switching table4
1598	1597	subMenu = afrTable1Map, "AFR Target Table"
1599		-#if table4_spark ;[PJSC v1.10] For switching table4
1600		- subMenu = sparkMap, "Spark Table", 3 ;[PJSC v1.10] For switching table4
1601		-#endif ;[PJSC v1.10] For switching table4
	1598	+#if table4_spark ;[PJSC v1.01] For switching table4
	1599	+ subMenu = sparkMap, "Spark Table", 3 ;[PJSC v1.01] For switching table4
	1600	+#endif ;[PJSC v1.01] For switching table4
1602	1601
1603	1602
1604	1603	#if enablehardware_test
1605	1604	menuDialog = main
1606	1605	menu = "Hardware Testing"
1607		-;[PJSC v1.10] subMenu = outputtest1, "Test Output Hardware"
1608		- subMenu = outputtest1, "Output Test Mode - PWM" ;[PJSC v1.10]
1609		- subMenu = outputtest2, "Output Test Mode - Pulse" ;[PJSC v1.10]
	1606	+;[PJSC v1.01] subMenu = outputtest1, "Test Output Hardware"
	1607	+ subMenu = outputtest1, "Output Test Mode - PWM" ;[PJSC v1.01]
	1608	+ subMenu = outputtest2, "Output Test Mode - Pulse" ;[PJSC v1.01]
1610	1609	#endif
1611	1610
1612	1611	menu = "Help"

		@@ -1885,15 +1884,15 @@
1885	1884	panel = engine_constants_west, West
1886	1885	panel = engine_constants_east, East
1887	1886
1888		- dialog = muxWarningMessage, "" ;[PJSC v1.10]
	1887	+ dialog = muxWarningMessage, "" ;[PJSC v1.01]
1889	1888	field = "Don't select the same function for MUX out1 and MUX out2!" ; \|
1890	1889	; \|
1891	1890	dialog = muxoutSetting, "MUX Output Port Setting" ; \|
1892		- field = "MUX out1", muxout1selection ; V
1893		- field = "MUX out2", muxout2selection ;[PJSC v1.10]
1894		- field = "MUX out3", muxout3selection, { pinLayout == 64 } ;[PJSC v1.01c]
1895		- field = "MUX out4", muxout4selection, { pinLayout == 64 } ;[PJSC v1.01c]
1896		- panel = muxWarningMessage, ;[PJSC v1.10]
	1891	+ field = "MUX out1", muxout1selection ; \|
	1892	+ field = "MUX out2", muxout2selection ; \|
	1893	+ field = "MUX out3", muxout3selection, { pinLayout == 64 } ; \|
	1894	+ field = "MUX out4", muxout4selection, { pinLayout == 64 } ; V
	1895	+ panel = muxWarningMessage, ;[PJSC v1.01]
1897	1896
1898	1897	dialog = captExValveSetting, "Capture Exhaust Valve Position Control" ;[PJSC]
1899	1898	field = "Exhaust valve calibration mode", exValveCalibrationMode ; \|

		@@ -1908,7 +1907,7 @@
1908	1907	field = "Duty pulse ON Level ch1", dutyPulseOnLevel ; V
1909	1908	field = "Duty pulse ON Level ch2", dutyPulseOnLevel2 ;[PJSC]
1910	1909
1911		- dialog = analogInputPort1select, "" ;[PJSC v1.10]
	1910	+ dialog = analogInputPort1select, "" ;[PJSC v1.01]
1912	1911	field = "", exValveCaptureEnabled ; \|
1913	1912	; \|
1914	1913	dialog = digitalInputPort1select, "" ; \|

		@@ -1954,10 +1953,10 @@
1954	1953	panel = captDutyPulseSettingCh2, East, { dutyPulseCaptureEnabled2 == 1 } ; \|
1955	1954	; \|
1956	1955	dialog = inputPortSetting, "Input Port Setting", yAxis ; \|
1957		- panel = analogInputPort1 ; \|
1958		- panel = digitalInputPort1 ; \|
1959		-;[PJSCv1.01] panel = digitalInputPort2 ; V
1960		-;[PJSCv1.01] panel = digitalInputPort3 ;[PJSC v1.10]
	1956	+ panel = analogInputPort1 ; V
	1957	+ panel = digitalInputPort1 ;[PJSC v1.01]
	1958	+;[PJSCv1.01] panel = digitalInputPort2 ;[PJSC v1.01]
	1959	+;[PJSCv1.01] panel = digitalInputPort3 ;[PJSC v1.01]
1961	1960
1962	1961	; Flex fuel stuff
1963	1962	dialog = flexFuelSettings, "", yAxis

		@@ -2055,12 +2054,12 @@
2055	2054	panel = accelEnrichments_center, Center
2056	2055	panel = accelEnrichments_south, South
2057	2056
2058		- dialog = veCorrectionSetting, "VE correction setting" ;[PJSC v1.01c]
	2057	+ dialog = veCorrectionSetting, "VE correction setting" ;[PJSC v1.01]
2059	2058	field = "Multiply VE value by MAP:Baro ratio", multiplyMAP ; \|
2060	2059	field = "Multiply by ratio of AFR to Target AFR", includeAFR, { egoType == 2 } ; V
2061		- field = "Barometric correction", baroCorr, { useExtBaro } ;[PJSC v1.01c]
	2060	+ field = "Barometric correction", baroCorr, { useExtBaro } ;[PJSC v1.01]
2062	2061
2063		- dialog = veMapSelectionSet1Pri, "Primary Table" ;[PJSC v1.10]
	2062	+ dialog = veMapSelectionSet1Pri, "Primary Table" ;[PJSC v1.01]
2064	2063	field = "Injector 1", veMapSelection1Pri ; \|
2065	2064	field = "Injector 2", veMapSelection2Pri, { multiVEmapEnabled && mapSeparationEnabled } ; \|
2066	2065	field = "Injector 3", veMapSelection3Pri, { multiVEmapEnabled && mapSeparationEnabled } ; \|

		@@ -2116,9 +2115,9 @@
2116	2115	panel = veFuelLoadSelection ; \|
2117	2116	; \|
2118	2117	dialog = veMapSelectDialog, "VE Table configration" ; \|
2119		- panel = veCorrectionSetting ; \|[PJSC v1.01c]
	2118	+ panel = veCorrectionSetting ; \|
2120	2119	panel = veMapSelectConfig ; V
2121		- panel = veMapSelectionDialog ;[PJSC v1.10]
	2120	+ panel = veMapSelectionDialog ;[PJSC v1.01]
2122	2121
2123	2122	;[PJSC] dialog = veTableDialog_north, ""
2124	2123	;[PJSC] panel = veTable1Tbl

		@@ -2126,7 +2125,7 @@
2126	2125	;[PJSC] dialog = veTableDialog, "VE Table"
2127	2126	;[PJSC] panel = veTableDialog_north, North
2128	2127	;[PJSC] panel = veTableDialog_south, South
2129		- dialog = veTable1Dialog, "VE Table 1" ;[PJSC v1.01c]
	2128	+ dialog = veTable1Dialog, "VE Table 1" ;[PJSC v1.01]
2130	2129	panel = veTable1Tbl ; \|
2131	2130	; \|
2132	2131	dialog = veTable2Dialog, "VE Table 2" ; \|

		@@ -2136,25 +2135,25 @@
2136	2135	panel = veTable3Tbl ; \|
2137	2136	; \|
2138	2137	dialog = veTable4Dialog, "VE Table 4" ; V
2139		- panel = sparkTbl ;[PJSC v1.01c]
	2138	+ panel = sparkTbl ;[PJSC v1.01]
2140	2139
2141		- dialog = injCloseAngles_west, "" ;[PJSC v1.01c]
	2140	+ dialog = injCloseAngles_west, "" ;[PJSC v1.01]
2142	2141	field = "Channel 1", inj1SquirtStartEnd, { squirtDeviceType == 0 } ; \|
2143	2142	field = "Channel 2", inj2SquirtStartEnd, { (nCylinders > 1 \|\| nInjectors > 1) && indInjAng && squirtDeviceType == 0 } ; \|
2144	2143	field = "Channel 3", inj3SquirtStartEnd, { indInjAng && (nCylinders > 4 \|\| nCylinders == 3 \|\| nInjectors > 2 \|\| ((nCylinders == 4) && (injLayout == 3))) && squirtDeviceType == 0 } ; V
2145		- field = "Channel 4", inj4SquirtStartEnd, { indInjAng && (nCylinders > 4 \|\| ((nCylinders == 4 \|\| nInjectors > 3) && (injLayout > 0))) && squirtDeviceType == 0 } ;[PJSC v1.01c]
	2144	+ field = "Channel 4", inj4SquirtStartEnd, { indInjAng && (nCylinders > 4 \|\| ((nCylinders == 4 \|\| nInjectors > 3) && (injLayout > 0))) && squirtDeviceType == 0 } ;[PJSC v1.01]
2146	2145
2147		- dialog = injCloseAngles_east, "" ;[PJSC v1.01c]
	2146	+ dialog = injCloseAngles_east, "" ;[PJSC v1.01]
2148	2147	field = "", inj1Ang, { squirtDeviceType == 0 } ; \|
2149	2148	field = "", inj2Ang, { (nCylinders > 1 \|\| nInjectors > 1) && indInjAng && squirtDeviceType == 0 } ; \|
2150	2149	field = "", inj3Ang, { indInjAng && (nCylinders > 4 \|\| nCylinders == 3 \|\| nInjectors > 2 \|\| ((nCylinders == 4) && (injLayout == 3))) && squirtDeviceType == 0 } ; V
2151		- field = "", inj4Ang, { indInjAng && (nCylinders > 4 \|\| ((nCylinders == 4 \|\| nInjectors > 3) && (injLayout > 0))) && squirtDeviceType == 0 } ;[PJSC v1.01c]
	2150	+ field = "", inj4Ang, { indInjAng && (nCylinders > 4 \|\| ((nCylinders == 4 \|\| nInjectors > 3) && (injLayout > 0))) && squirtDeviceType == 0 } ;[PJSC v1.01]
2152	2151
2153		- dialog = injCloseAngles, "Injector squirt angle", xAxis ;[PJSC v1.01c]
	2152	+ dialog = injCloseAngles, "Injector squirt angle", xAxis ;[PJSC v1.01]
2154	2153	panel = injCloseAngles_west ; V
2155		- panel = injCloseAngles_east ;[PJSC v1.01c]
	2154	+ panel = injCloseAngles_east ;[PJSC v1.01]
2156	2155
2157		- dialog = injChars, "Injector Characteristics" ;[PJSC v1.01c]
	2156	+ dialog = injChars, "Injector Characteristics" ;[PJSC v1.01]
2158	2157	field = "Squirt Device", squirtDeviceType ; \|
2159	2158	field = "PJSC solenoid freq.", pjscFreq, { squirtDeviceType == 1 } ; \|
2160	2159	field = "Injector Open Time", injOpen, { squirtDeviceType == 0 } ; \|

		@@ -2161,21 +2160,21 @@
2161	2160	field = "Injector Duty Limit", dutyLim, { squirtDeviceType == 0 } ; \|
2162	2161	field = "Individual channel setting", indInjAng, { squirtDeviceType == 0 } ; \|
2163	2162	panel = injCloseAngles ; V
2164		- panel = injector_voltage_curve ;[PJSC v1.01c]
	2163	+ panel = injector_voltage_curve ;[PJSC v1.01]
2165	2164
2166		-;[PJSC v1.01c] dialog = injChars, "Injector Characteristics" ;[PJSC]
2167		-;[PJSC v1.01c] field = "Squirt Device", squirtDeviceType ; \|
2168		-;[PJSC v1.01c] field = "PJSC solenoid freq.", pjscFreq, { squirtDeviceType == 1 } ; \|
2169		-;[PJSC v1.01c] field = "Injector Open Time", injOpen, { squirtDeviceType == 0 } ; \|
2170		-;[PJSC v1.01c] field = "Injector close angle", { squirtDeviceType == 0 } ; \|
2171		-;[PJSC v1.01c] field = "", inj1Ang, { indInjAng == 0 && squirtDeviceType == 0 } ; \|
2172		-;[PJSC v1.01c] field = "Individual channel setting", indInjAng, { squirtDeviceType == 0 } ; \|
2173		-;[PJSC v1.01c] field = "Channel 1", inj1Ang, { indInjAng && squirtDeviceType == 0 } ; \|
2174		-;[PJSC v1.01c] field = "Channel 2", inj2Ang, { (nCylinders > 1 \|\| nInjectors > 1) && indInjAng && squirtDeviceType == 0 } ; \|[PJSC v1.01c]
2175		-;[PJSC v1.01c] field = "Channel 3", inj3Ang, { indInjAng && (nCylinders > 4 \|\| nCylinders == 3 \|\| nInjectors > 2 \|\| ((nCylinders == 4) && (injLayout == 3))) && squirtDeviceType == 0 } ; \|[PJSC v1.01c]
2176		-;[PJSC v1.01c] field = "Channel 4", inj4Ang, { indInjAng && (nCylinders > 6 \|\| ((nCylinders == 4 \|\| nInjectors > 3) && (injLayout == 3))) && squirtDeviceType == 0 } ; \|[PJSC v1.01c]
2177		-;[PJSC v1.01c] field = "Injector Duty Limit", dutyLim, { squirtDeviceType == 0 } ; V
2178		-;[PJSC v1.01c] panel = injector_voltage_curve ;[PJSC]
	2165	+;[PJSC v1.01] dialog = injChars, "Injector Characteristics" ;[PJSC]
	2166	+;[PJSC v1.01] field = "Squirt Device", squirtDeviceType ; \|
	2167	+;[PJSC v1.01] field = "PJSC solenoid freq.", pjscFreq, { squirtDeviceType == 1 } ; \|
	2168	+;[PJSC v1.01] field = "Injector Open Time", injOpen, { squirtDeviceType == 0 } ; \|
	2169	+;[PJSC v1.01] field = "Injector close angle", { squirtDeviceType == 0 } ; \|
	2170	+;[PJSC v1.01] field = "", inj1Ang, { indInjAng == 0 && squirtDeviceType == 0 } ; \|
	2171	+;[PJSC v1.01] field = "Individual channel setting", indInjAng, { squirtDeviceType == 0 } ; \|
	2172	+;[PJSC v1.01] field = "Channel 1", inj1Ang, { indInjAng && squirtDeviceType == 0 } ; \|
	2173	+;[PJSC v1.01] field = "Channel 2", inj2Ang, { (nCylinders > 1 \|\| nInjectors > 1) && indInjAng && squirtDeviceType == 0 } ; \|[PJSC v1.01]
	2174	+;[PJSC v1.01] field = "Channel 3", inj3Ang, { indInjAng && (nCylinders > 4 \|\| nCylinders == 3 \|\| nInjectors > 2 \|\| ((nCylinders == 4) && (injLayout == 3))) && squirtDeviceType == 0 } ; \|[PJSC v1.01]
	2175	+;[PJSC v1.01] field = "Channel 4", inj4Ang, { indInjAng && (nCylinders > 6 \|\| ((nCylinders == 4 \|\| nInjectors > 3) && (injLayout == 3))) && squirtDeviceType == 0 } ; \|[PJSC v1.01]
	2176	+;[PJSC v1.01] field = "Injector Duty Limit", dutyLim, { squirtDeviceType == 0 } ; V
	2177	+;[PJSC v1.01] panel = injector_voltage_curve ;[PJSC]
2179	2178
2180	2179	;[PJSC] dialog = injChars, "Injector Characteristics"
2181	2180	;[PJSC] field = "Injector Open Time", injOpen

		@@ -2221,7 +2220,7 @@
2221	2220	field = "Stepper Inverted", iacStepperInv, { iacAlgorithm == 4 \|\| iacAlgorithm == 5 }
2222	2221
2223	2222	dialog = pwm_idle, "PWM Idle"
2224		-;[PJSC v1.10] field = "Number of outputs", iacChannels, { iacAlgorithm == 2 \|\| iacAlgorithm == 3 }
	2223	+;[PJSC v1.01] field = "Number of outputs", iacChannels, { iacAlgorithm == 2 \|\| iacAlgorithm == 3 }
2225	2224	field = "Idle valve frequency", idleFreq, { iacAlgorithm == 2 \|\| iacAlgorithm == 3 }
2226	2225	field = "Idle valve direction", iacPWMdir, { iacAlgorithm == 2 \|\| iacAlgorithm == 3 }
2227	2226

		@@ -2301,7 +2300,7 @@
2301	2300	field = "Trigger Filter", TrigFilter, { TrigPattern != 13 }
2302	2301	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
2303	2302
2304		-#if table4_spark ;[PJSC v1.10] For switching table4
	2303	+#if table4_spark ;[PJSC v1.01] For switching table4
2305	2304	dialog = sparkSettings,"Spark Settings",4
2306	2305	field = "Ignition load source", ignAlgorithm
2307	2306	field = "Spark output mode", sparkMode

		@@ -2335,7 +2334,7 @@
2335	2334	dialog = rotary_ignition, "Rotary Ignition", 4
2336	2335	field = "Ignition Configuration", rotaryType
2337	2336	panel = rotaryTrailing_curve
2338		-#endif ;[PJSC v1.10] For switching table4
	2337	+#endif ;[PJSC v1.01] For switching table4
2339	2338
2340	2339	dialog = boostCut, "Boost Cut"
2341	2340	field = "Boost Cut", boostCutType

		@@ -2586,38 +2585,38 @@
2586	2585	; clickOnClose - the command will be sent on dialog close always
2587	2586	commandButton = "Stop Test Mode", cmdStopTestMode,{testactive}, clickOnCloseIfEnabled
2588	2587
2589		- dialog = enablefuelpumpbuttons, "Fuel pump", xAxis ;[PJSC v1.10]
2590		- commandButton = "Fuel Pump On", cmdfpon, { muxout1selection == 4 \|\| muxout2selection == 4 } ;[PJSC v1.01c]
2591		- commandButton = "Fuel Pump Off", cmdfpoff, { muxout1selection == 4 \|\| muxout2selection == 4 } ;[PJSC v1.01c]
	2588	+ dialog = enablefuelpumpbuttons, "Fuel pump", xAxis ;[PJSC v1.01]
	2589	+ commandButton = "Fuel Pump On", cmdfpon, { muxout1selection == 4 \|\| muxout2selection == 4 } ;[PJSC v1.01]
	2590	+ commandButton = "Fuel Pump Off", cmdfpoff, { muxout1selection == 4 \|\| muxout2selection == 4 } ;[PJSC v1.01]
2592	2591
2593	2592	dialog = outputtestinj1, "Injector CH1", yAxis
2594	2593	commandButton = "Off", cmdtestinj1off,{testactive}
2595		-;[PJSC v1.10] commandButton = "50% DC", cmdtestinj150dc,{!testenabled & testactive}
	2594	+;[PJSC v1.01] commandButton = "50% DC", cmdtestinj150dc,{!testenabled & testactive}
2596	2595	commandButton = "On", cmdtestinj1on,{!testenabled & testactive}
2597		- commandButton = "PWM", cmdtestinj150dc, {!testenabled & testactive} ;[PJSC v1.10]
2598		- field = "PWM freq.", dutyFreqTst1, {!testenabled & testactive} ;[PJSC v1.10]
2599		- field = "Duty ratio", dutyRatioTst1, {!testenabled & testactive} ;[PJSC v1.10]
	2596	+ commandButton = "PWM", cmdtestinj150dc, {!testenabled & testactive} ;[PJSC v1.01]
	2597	+ field = "PWM freq.", dutyFreqTst1, {!testenabled & testactive} ;[PJSC v1.01]
	2598	+ field = "Duty ratio", dutyRatioTst1, {!testenabled & testactive} ;[PJSC v1.01]
2600	2599	dialog = outputtestinj2, "Injector CH2", yAxis
2601	2600	commandButton = "Off", cmdtestinj2off,{testactive}
2602		-;[PJSC v1.10] commandButton = "50% DC", cmdtestinj250dc,{!testenabled &testactive}
	2601	+;[PJSC v1.01] commandButton = "50% DC", cmdtestinj250dc,{!testenabled &testactive}
2603	2602	commandButton = "On", cmdtestinj2on,{!testenabled & testactive}
2604		- commandButton = "PWM", cmdtestinj250dc, {!testenabled & testactive} ;[PJSC v1.10]
2605		- field = "PWM freq.", dutyFreqTst2, {!testenabled & testactive} ;[PJSC v1.10]
2606		- field = "Duty ratio", dutyRatioTst2, {!testenabled & testactive} ;[PJSC v1.10]
	2603	+ commandButton = "PWM", cmdtestinj250dc, {!testenabled & testactive} ;[PJSC v1.01]
	2604	+ field = "PWM freq.", dutyFreqTst2, {!testenabled & testactive} ;[PJSC v1.01]
	2605	+ field = "Duty ratio", dutyRatioTst2, {!testenabled & testactive} ;[PJSC v1.01]
2607	2606	dialog = outputtestinj3, "Injector CH3", yAxis
2608	2607	commandButton = "Off", cmdtestinj3off,{testactive}
2609		-;[PJSC v1.10] commandButton = "50% DC", cmdtestinj350dc,{!testenabled & testactive}
	2608	+;[PJSC v1.01] commandButton = "50% DC", cmdtestinj350dc,{!testenabled & testactive}
2610	2609	commandButton = "On", cmdtestinj3on,{!testenabled & testactive}
2611		- commandButton = "PWM", cmdtestinj350dc, {!testenabled & testactive} ;[PJSC v1.10]
2612		- field = "PWM freq.", dutyFreqTst3, {!testenabled & testactive} ;[PJSC v1.10]
2613		- field = "Duty ratio", dutyRatioTst3, {!testenabled & testactive} ;[PJSC v1.10]
	2610	+ commandButton = "PWM", cmdtestinj350dc, {!testenabled & testactive} ;[PJSC v1.01]
	2611	+ field = "PWM freq.", dutyFreqTst3, {!testenabled & testactive} ;[PJSC v1.01]
	2612	+ field = "Duty ratio", dutyRatioTst3, {!testenabled & testactive} ;[PJSC v1.01]
2614	2613	dialog = outputtestinj4, "Injector CH4", yAxis
2615	2614	commandButton = "Off", cmdtestinj4off,{testactive}
2616		-;[PJSC v1.10] commandButton = "50% DC", cmdtestinj450dc,{!testenabled & testactive}
	2615	+;[PJSC v1.01] commandButton = "50% DC", cmdtestinj450dc,{!testenabled & testactive}
2617	2616	commandButton = "On", cmdtestinj4on ,{!testenabled & testactive}
2618		- commandButton = "PWM", cmdtestinj450dc, {!testenabled & testactive} ;[PJSC v1.10]
2619		- field = "PWM freq.", dutyFreqTst4, {!testenabled & testactive} ;[PJSC v1.10]
2620		- field = "Duty ratio", dutyRatioTst4, {!testenabled & testactive} ;[PJSC v1.10]
	2617	+ commandButton = "PWM", cmdtestinj450dc, {!testenabled & testactive} ;[PJSC v1.01]
	2618	+ field = "PWM freq.", dutyFreqTst4, {!testenabled & testactive} ;[PJSC v1.01]
	2619	+ field = "Duty ratio", dutyRatioTst4, {!testenabled & testactive} ;[PJSC v1.01]
2621	2620
2622	2621	dialog = outputtest_injectors, "Injector Driver Output Test", xAxis
2623	2622	panel = outputtestinj1

		@@ -2648,7 +2647,7 @@
2648	2647	panel = outputtestspk3
2649	2648	panel = outputtestspk4
2650	2649
2651		- dialog = outputtestmux1, "MUX1", yAxis ;[PJSC v1.01c]
	2650	+ dialog = outputtestmux1, "MUX1", yAxis ;[PJSC v1.01]
2652	2651	commandButton = "Off", cmdtestmux1off, {testactive} ; \|
2653	2652	commandButton = "On", cmdtestmux1on, {!testenabled && testactive && muxout1selection == 0 } ; \|
2654	2653	commandButton = "PWM", cmdtestmux150dc, {!testenabled && testactive && muxout1selection == 0 } ; \|

		@@ -2677,22 +2676,22 @@
2677	2676	panel = outputtestmux1 ; \|
2678	2677	panel = outputtestmux2 ; \|
2679	2678	panel = outputtestmux3, { pinLayout == 64 } ; V
2680		- panel = outputtestmux4, { pinLayout == 64 } ;[PJSC v1.01c]
	2679	+ panel = outputtestmux4, { pinLayout == 64 } ;[PJSC v1.01]
2681	2680
2682		-;[PJSC v1.10] dialog = outputtest1,"Test Output Hardware"
2683		- dialog = outputtest1,"Output Test Mode - PWM" ;[PJSC v1.10]
	2681	+;[PJSC v1.01] dialog = outputtest1,"Test Output Hardware"
	2682	+ dialog = outputtest1,"Output Test Mode - PWM" ;[PJSC v1.01]
2684	2683	topicHelp = "http://speeduino.com/wiki/index.php/Hardware_testing_page"
2685	2684	panel = enableoutputtestbuttons
2686		- panel = enablefuelpumpbuttons ;[PJSC v1.10]
	2685	+ panel = enablefuelpumpbuttons ;[PJSC v1.01]
2687	2686	panel = outputtest_injectors
2688		-#if table4_spark ;[PJSC v1.10] For switching table4
	2687	+#if table4_spark ;[PJSC v1.01] For switching table4
2689	2688	panel = outputtest_spark
2690		-#endif ;[PJSC v1.10] For switching table4
2691		- panel = outputtest_mux ;[PJSC v1.01c]
	2689	+#endif ;[PJSC v1.01] For switching table4
	2690	+ panel = outputtest_mux ;[PJSC v1.01]
2692	2691	;panel = outputtest_io2
2693	2692	panel = outputtest_warningmessage
2694	2693
2695		-;[PJSC v1.10] For test mode - outputs pulse =========================================================================
	2694	+;[PJSC v1.01] For test mode - outputs pulse =========================================================================
2696	2695	dialog = outputTestbuttons1a, "", xAxis
2697	2696	;commandButton = "Label Text", command, { Enabled Condition }, optionalFlags
2698	2697	; The rem > 0 expression is just for testing.. It works when the MS is on the Stim with rpm.

		@@ -2750,7 +2749,7 @@
2750	2749	panel = outputtest_controls
2751	2750	panel = outputtest_r
2752	2751
2753		-;[PJSC v1.10] For test mode - outputs pulse =========================================================================
	2752	+;[PJSC v1.01] For test mode - outputs pulse =========================================================================
2754	2753
2755	2754	dialog = Auxin_north
2756	2755	displayOnlyField = #"Secondary Serial ENABLED", blankfield, {enable_secondarySerial},{enable_secondarySerial}

		@@ -3287,10 +3286,10 @@
3287	3286	cmdtestinj4on = "E\x02\x0A"
3288	3287	cmdtestinj4off = "E\x02\x0B"
3289	3288	cmdtestinj450dc = "E\x02\x0C"
3290		-cmdfpon = "E\x02\x11" ;[PJSC v1.10]
3291		-cmdfpoff = "E\x02\x12" ;[PJSC v1.10]
3292		-cmdtestinjstart = "E\x02\x13" ;[PJSC v1.10]
3293		-cmdtestinjstop = "E\x02\x14" ;[PJSC v1.10]
	3289	+cmdfpon = "E\x02\x11" ;[PJSC v1.01]
	3290	+cmdfpoff = "E\x02\x12" ;[PJSC v1.01]
	3291	+cmdtestinjstart = "E\x02\x13" ;[PJSC v1.01]
	3292	+cmdtestinjstop = "E\x02\x14" ;[PJSC v1.01]
3294	3293
3295	3294	cmdtestspk1on = "E\x03\x01"
3296	3295	cmdtestspk1off = "E\x03\x02"

		@@ -3305,7 +3304,7 @@
3305	3304	cmdtestspk4off = "E\x03\x0B"
3306	3305	cmdtestspk450dc = "E\x03\x0C"
3307	3306
3308		-cmdtestmux1on = "E\x04\x01" ;[PJSC v1.01c] Test mode command for MUX output
	3307	+cmdtestmux1on = "E\x04\x01" ;[PJSC v1.01] Test mode command for MUX output
3309	3308	cmdtestmux1off = "E\x04\x02" ; \|
3310	3309	cmdtestmux150dc = "E\x04\x03" ; \|
3311	3310	cmdtestmux2on = "E\x04\x04" ; \|

		@@ -3316,7 +3315,7 @@
3316	3315	cmdtestmux350dc = "E\x04\x09" ; \|
3317	3316	cmdtestmux4on = "E\x04\x0A" ; \|
3318	3317	cmdtestmux4off = "E\x04\x0B" ; V
3319		-cmdtestmux450dc = "E\x04\x0C" ;[PJSC v1.01c]
	3318	+cmdtestmux450dc = "E\x04\x0C" ;[PJSC v1.01]
3320	3319
3321	3320	; -------------------------------------------------------------
3322	3321	; Help down here

		@@ -3515,7 +3514,7 @@
3515	3514	gridOrient = 250, 0, 340
3516	3515	upDownLabel = "(RICHER)", "(LEANER)"
3517	3516
3518		-#if table4_spark //[PJSC v1.10]
	3517	+#if table4_spark //[PJSC v1.01]
3519	3518	table = sparkTbl, sparkMap, "Ignition Advance Table", 3
3520	3519	xBins = rpmBins2, rpm
3521	3520	;yBins = ignLoadBins, ignLoad

		@@ -3524,7 +3523,7 @@
3524	3523	zBins = advTable1
3525	3524	gridHeight = 3.0
3526	3525	upDownLabel = "ADVANCING", "RETARDING"
3527		-#endif //[PJSC v1.10]
	3526	+#endif //[PJSC v1.01]
3528	3527
3529	3528	;table = afrTbl, afrTableMap, "AFR Table", 5
3530	3529	table = afrTable1Tbl, afrTable1Map, "AFR Table", 5

		@@ -3570,61 +3569,61 @@
3570	3569	upDownLabel = "HIGHER", "LOWER"
3571	3570
3572	3571	;--------- Sequential fuel trim maps -----------
3573		-;[PJSC v1.10] table = fuelTrimTable1Tbl, fuelTrimTable1Map, "Fuel trim Table 1", 9
3574		-;[PJSC v1.10] topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
3575		-;[PJSC v1.10] xBins = fuelTrim1rpmBins, rpm
3576		-;[PJSC v1.10] #if SPEED_DENSITY
3577		-;[PJSC v1.10] yBins = fuelTrim1loadBins, map
3578		-;[PJSC v1.10] #else
3579		-;[PJSC v1.10] yBins = fuelTrim1loadBins, throttle
3580		-;[PJSC v1.10] #endif
3581		-;[PJSC v1.10] zBins = fuelTrim1Table
3582		-;[PJSC v1.10]
3583		-;[PJSC v1.10] gridHeight = 2.0
3584		-;[PJSC v1.10] gridOrient = 250, 0, 340
3585		-;[PJSC v1.10] upDownLabel = "(RICHER)", "(LEANER)"
3586		-;[PJSC v1.10]
3587		-;[PJSC v1.10] table = fuelTrimTable2Tbl, fuelTrimTable2Map, "Fuel trim Table 2", 9
3588		-;[PJSC v1.10] topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
3589		-;[PJSC v1.10] xBins = fuelTrim2rpmBins, rpm
3590		-;[PJSC v1.10] #if SPEED_DENSITY
3591		-;[PJSC v1.10] yBins = fuelTrim2loadBins, map
3592		-;[PJSC v1.10] #else
3593		-;[PJSC v1.10] yBins = fuelTrim2loadBins, throttle
3594		-;[PJSC v1.10] #endif
3595		-;[PJSC v1.10] zBins = fuelTrim2Table
3596		-;[PJSC v1.10]
3597		-;[PJSC v1.10] gridHeight = 2.0
3598		-;[PJSC v1.10] gridOrient = 250, 0, 340
3599		-;[PJSC v1.10] upDownLabel = "(RICHER)", "(LEANER)"
3600		-;[PJSC v1.10]
3601		-;[PJSC v1.10] table = fuelTrimTable3Tbl, fuelTrimTable3Map, "Fuel trim Table 3", 9
3602		-;[PJSC v1.10] topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
3603		-;[PJSC v1.10] xBins = fuelTrim3rpmBins, rpm
3604		-;[PJSC v1.10] #if SPEED_DENSITY
3605		-;[PJSC v1.10] yBins = fuelTrim3loadBins, map
3606		-;[PJSC v1.10] #else
3607		-;[PJSC v1.10] yBins = fuelTrim3loadBins, throttle
3608		-;[PJSC v1.10] #endif
3609		-;[PJSC v1.10] zBins = fuelTrim3Table
3610		-;[PJSC v1.10]
3611		-;[PJSC v1.10] gridHeight = 2.0
3612		-;[PJSC v1.10] gridOrient = 250, 0, 340
3613		-;[PJSC v1.10] upDownLabel = "(RICHER)", "(LEANER)"
3614		-;[PJSC v1.10]
3615		-;[PJSC v1.10] table = fuelTrimTable4Tbl, fuelTrimTable4Map, "Fuel trim Table 4", 9
3616		-;[PJSC v1.10] topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
3617		-;[PJSC v1.10] xBins = fuelTrim4rpmBins, rpm
3618		-;[PJSC v1.10] #if SPEED_DENSITY
3619		-;[PJSC v1.10] yBins = fuelTrim4loadBins, map
3620		-;[PJSC v1.10] #else
3621		-;[PJSC v1.10] yBins = fuelTrim4loadBins, throttle
3622		-;[PJSC v1.10] #endif
3623		-;[PJSC v1.10] zBins = fuelTrim4Table
3624		-;[PJSC v1.10]
3625		-;[PJSC v1.10] gridHeight = 2.0
3626		-;[PJSC v1.10] gridOrient = 250, 0, 340
3627		-;[PJSC v1.10] upDownLabel = "(RICHER)", "(LEANER)"
	3572	+;[PJSC v1.01] table = fuelTrimTable1Tbl, fuelTrimTable1Map, "Fuel trim Table 1", 9
	3573	+;[PJSC v1.01] topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
	3574	+;[PJSC v1.01] xBins = fuelTrim1rpmBins, rpm
	3575	+;[PJSC v1.01] #if SPEED_DENSITY
	3576	+;[PJSC v1.01] yBins = fuelTrim1loadBins, map
	3577	+;[PJSC v1.01] #else
	3578	+;[PJSC v1.01] yBins = fuelTrim1loadBins, throttle
	3579	+;[PJSC v1.01] #endif
	3580	+;[PJSC v1.01] zBins = fuelTrim1Table
	3581	+;[PJSC v1.01]
	3582	+;[PJSC v1.01] gridHeight = 2.0
	3583	+;[PJSC v1.01] gridOrient = 250, 0, 340
	3584	+;[PJSC v1.01] upDownLabel = "(RICHER)", "(LEANER)"
	3585	+;[PJSC v1.01]
	3586	+;[PJSC v1.01] table = fuelTrimTable2Tbl, fuelTrimTable2Map, "Fuel trim Table 2", 9
	3587	+;[PJSC v1.01] topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
	3588	+;[PJSC v1.01] xBins = fuelTrim2rpmBins, rpm
	3589	+;[PJSC v1.01] #if SPEED_DENSITY
	3590	+;[PJSC v1.01] yBins = fuelTrim2loadBins, map
	3591	+;[PJSC v1.01] #else
	3592	+;[PJSC v1.01] yBins = fuelTrim2loadBins, throttle
	3593	+;[PJSC v1.01] #endif
	3594	+;[PJSC v1.01] zBins = fuelTrim2Table
	3595	+;[PJSC v1.01]
	3596	+;[PJSC v1.01] gridHeight = 2.0
	3597	+;[PJSC v1.01] gridOrient = 250, 0, 340
	3598	+;[PJSC v1.01] upDownLabel = "(RICHER)", "(LEANER)"
	3599	+;[PJSC v1.01]
	3600	+;[PJSC v1.01] table = fuelTrimTable3Tbl, fuelTrimTable3Map, "Fuel trim Table 3", 9
	3601	+;[PJSC v1.01] topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
	3602	+;[PJSC v1.01] xBins = fuelTrim3rpmBins, rpm
	3603	+;[PJSC v1.01] #if SPEED_DENSITY
	3604	+;[PJSC v1.01] yBins = fuelTrim3loadBins, map
	3605	+;[PJSC v1.01] #else
	3606	+;[PJSC v1.01] yBins = fuelTrim3loadBins, throttle
	3607	+;[PJSC v1.01] #endif
	3608	+;[PJSC v1.01] zBins = fuelTrim3Table
	3609	+;[PJSC v1.01]
	3610	+;[PJSC v1.01] gridHeight = 2.0
	3611	+;[PJSC v1.01] gridOrient = 250, 0, 340
	3612	+;[PJSC v1.01] upDownLabel = "(RICHER)", "(LEANER)"
	3613	+;[PJSC v1.01]
	3614	+;[PJSC v1.01] table = fuelTrimTable4Tbl, fuelTrimTable4Map, "Fuel trim Table 4", 9
	3615	+;[PJSC v1.01] topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
	3616	+;[PJSC v1.01] xBins = fuelTrim4rpmBins, rpm
	3617	+;[PJSC v1.01] #if SPEED_DENSITY
	3618	+;[PJSC v1.01] yBins = fuelTrim4loadBins, map
	3619	+;[PJSC v1.01] #else
	3620	+;[PJSC v1.01] yBins = fuelTrim4loadBins, throttle
	3621	+;[PJSC v1.01] #endif
	3622	+;[PJSC v1.01] zBins = fuelTrim4Table
	3623	+;[PJSC v1.01]
	3624	+;[PJSC v1.01] gridHeight = 2.0
	3625	+;[PJSC v1.01] gridOrient = 250, 0, 340
	3626	+;[PJSC v1.01] upDownLabel = "(RICHER)", "(LEANER)"
3628	3627
3629	3628	;[PJSC]------------------------------------------------------------------------
3630	3629	table = veTable2Tbl, veTable2Map, "VE Table 2", 10

		@@ -3641,7 +3640,7 @@
3641	3640
3642	3641	;[PJSC]-------------------------------------------------------------------------
3643	3642
3644		-;[PJSC v1.10]-------------------------------------------------------------------
	3643	+;[PJSC v1.01]-------------------------------------------------------------------
3645	3644	table = veTable3Tbl, veTable3Map, "VE Table 3", 11
3646	3645	topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
3647	3646	; constant, variable

		@@ -3668,7 +3667,7 @@
3668	3667	gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
3669	3668	upDownLabel = "(RICHER)", "(LEANER)"
3670	3669	#endif
3671		-;[PJSC v1.10]-------------------------------------------------------------------
	3670	+;[PJSC v1.01]-------------------------------------------------------------------
3672	3671
3673	3672	;-------------------------------------------------------------------------------
3674	3673

		@@ -3702,12 +3701,12 @@
3702	3701
3703	3702	gammaEnrichGauge = gammaEnrich, "Gamma Enrichment", "%", 50, 150, -1, -1, 151, 151, 0, 0
3704	3703	pulseWidthGauge = pulseWidth, "Pulse Width", "mSec", 0, 35.0, 1.0, 1.2, 20, 25, 3, 3
3705		-;[PJSC v1.10] tachometer = rpm, "Engine Speed", "RPM", 0, 8000, 300, 600, 3000, 5000, 0, 0
3706		- tachometer = rpm, "Engine Speed", "RPM", 0, 13000, 600, 1000,11000,12000, 0, 0 ;[PJSC v1.10]
	3704	+;[PJSC v1.01] tachometer = rpm, "Engine Speed", "RPM", 0, 8000, 300, 600, 3000, 5000, 0, 0
	3705	+ tachometer = rpm, "Engine Speed", "RPM", 0, 13000, 600, 1000,11000,12000, 0, 0 ;[PJSC v1.01]
3707	3706	veGauge = veCurr, "VE Current", "%", 0, 120, -1, -1, 999, 999, 0, 0
3708	3707	veGauge2 = veCurr2, "VE2 Current", "%", 0, 120, -1, -1, 999, 999, 0, 0 ;[PJSC]
3709		- veGauge3 = veCurr3, "VE3 Current", "%", 0, 120, -1, -1, 999, 999, 0, 0 ;[PJSC v1.10]
3710		- veGauge4 = veCurr4, "VE4 Current", "%", 0, 120, -1, -1, 999, 999, 0, 0 ;[PJSC v1.10]
	3708	+ veGauge3 = veCurr3, "VE3 Current", "%", 0, 120, -1, -1, 999, 999, 0, 0 ;[PJSC v1.01]
	3709	+ veGauge4 = veCurr4, "VE4 Current", "%", 0, 120, -1, -1, 999, 999, 0, 0 ;[PJSC v1.01]
3711	3710	warmupEnrichGauge = warmupEnrich, "Warmup Enrichment", "%", 100, 200, 130, 140, 140, 150, 0, 0
3712	3711	aseEnrichGauge = ase_enrich, "Afterstart Enrichment","%", 0, 200, 130, 140, 140, 150, 0, 0
3713	3712	batCorrectGauge = batCorrection, "Voltage Correction", "%", 0, 200, 130, 140, 140, 150, 0, 0

		@@ -3737,7 +3736,7 @@
3737	3736	dutyFreqGauge2 = dutyFreq2, "Duty Pulse Frequency 2", "Hz", 0, 100, 5, 10, 90, 95, 0, 0 ;[PJSC]For capturing duty pulse
3738	3737	dutyRatioGauge2 = dutyRatio2, "Duty Ratio 2", "%", 0, 100, 5, 10, 90, 95, 0, 0 ;[PJSC]For capturing duty pulse
3739	3738	baroGauge = baro, "Barometric Pressure", "kPa", 0, 200, 20, 60, 140, 180, 1, 0 ;[PJSC]Add the gage for barometric sensor
3740		- injcountGauge = testCnt, "Injection Count", "pulses", 0, 1000, 65535, 65535,65535, 65535,0, 0 ;[PJSC v1.10] For test mode
	3739	+ injcountGauge = testCnt, "Injection Count", "pulses", 0, 1000, 65535, 65535,65535, 65535,0, 0 ;[PJSC v1.01] For test mode
3741	3740
3742	3741	#if CELSIUS
3743	3742	cltGauge = coolant, "Coolant Temp", "TEMP", -40, 215, -15, 0, 95, 105, 0, 0

		@@ -3836,7 +3835,7 @@
3836	3835
3837	3836	ochGetCommand = "r\$tsCanId\x30%2o%2c"
3838	3837	;[PJSC] ochBlockSize = 90
3839		- ochBlockSize = 112 ;[PJSC v1.10] Extend block size for Test mode
	3838	+ ochBlockSize = 112 ;[PJSC v1.01] Extend block size for Test mode
3840	3839
3841	3840	secl = scalar, U08, 0, "sec", 1.000, 0.000
3842	3841	status1 = scalar, U08, 1, "bits", 1.000, 0.000

		@@ -3898,9 +3897,9 @@
3898	3897	testoutputs = scalar, U08, 38, "bits", 1.000, 0.000
3899	3898	testenabled = bits, U08, 38, [0:0]
3900	3899	testactive = bits, U08, 38, [1:1]
3901		-;[PJSC v1.10] afr2 = scalar, U08, 39, "O2", 0.100, 0.000
3902		-;[PJSC v1.10] baro = scalar, U08, 40, "kpa", 1.000, 0.000
3903		- baro = scalar, U16, 39, "kpa", 1.000, 0.000 ;[PJSC v1.10]
	3900	+;[PJSC v1.01] afr2 = scalar, U08, 39, "O2", 0.100, 0.000
	3901	+;[PJSC v1.01] baro = scalar, U08, 40, "kpa", 1.000, 0.000
	3902	+ baro = scalar, U16, 39, "kpa", 1.000, 0.000 ;[PJSC v1.01]
3904	3903	auxin_gauge0 = scalar, U16, 41, "", 1.000, 0.000
3905	3904	auxin_gauge1 = scalar, U16, 43, "", 1.000, 0.000
3906	3905	auxin_gauge2 = scalar, U16, 45, "", 1.000, 0.000

		@@ -3946,10 +3945,10 @@
3946	3945	dutyRatio = scalar, U16, 99, "%", 1.000, 0.000 ;[PJSC]For capturing duty pulse
3947	3946	dutyFreq2 = scalar, U16, 101, "Hz", 1.000, 0.000 ;[PJSC]For capturing duty pulse
3948	3947	dutyRatio2 = scalar, U16, 103, "%", 1.000, 0.000 ;[PJSC]For capturing duty pulse
3949		- testCnt = scalar, U16, 105, "", 1.000, 0.000 ;[PJSC v1.10]For test mode
3950		- afr2 = scalar, U08, 107, "O2", 0.100, 0.000 ;[PJSC v1.10]
3951		- fuelLoad2 = scalar, S16, 108, { bitStringValue( algorithmUnits2 , algorithm2 ) }, 1.000, 0.000 ;[PJSC v1.10]For dual fuel load
3952		- fuelLoad3 = scalar, S16, 110, { bitStringValue( algorithmUnits2 , algorithm3 ) }, 1.000, 0.000 ;[PJSC v1.10]For dual fuel load
	3948	+ testCnt = scalar, U16, 105, "", 1.000, 0.000 ;[PJSC v1.01]For test mode
	3949	+ afr2 = scalar, U08, 107, "O2", 0.100, 0.000 ;[PJSC v1.01]
	3950	+ fuelLoad2 = scalar, S16, 108, { bitStringValue( algorithmUnits2 , algorithm2 ) }, 1.000, 0.000 ;[PJSC v1.01]For dual fuel load
	3951	+ fuelLoad3 = scalar, S16, 110, { bitStringValue( algorithmUnits2 , algorithm3 ) }, 1.000, 0.000 ;[PJSC v1.01]For dual fuel load
3953	3952
3954	3953
3955	3954	#if CELSIUS

		@@ -3987,8 +3986,8 @@
3987	3986	map_vacboost = { map < baro ? -map_inhg : map_psi }
3988	3987
3989	3988	;fuelLoadMax = { arrayValue(algorithmLimits , algorithm) } ;Doesn't work, no idea why.
3990		-;[PJSC vv1.10] fuelLoadMax = { (algorithm == 0 \|\| algorithm == 2) ? 511 : 100 }
3991		-;[PJSC vv1.10] ignLoadMax = { (ignAlgorithm == 0 \|\| ignAlgorithm == 2) ? 511 : 100 }
	3989	+;[PJSC vv1.01] fuelLoadMax = { (algorithm == 0 \|\| algorithm == 2) ? 511 : 100 }
	3990	+;[PJSC vv1.01] ignLoadMax = { (ignAlgorithm == 0 \|\| ignAlgorithm == 2) ? 511 : 100 }
3992	3991	fuelLoadMax = { (algorithm == 0 \|\| algorithm == 2) ? 255 : 100 }
3993	3992	ignLoadMax = { (ignAlgorithm == 0 \|\| ignAlgorithm == 2) ? 255 : 100 }
3994	3993

		@@ -4034,8 +4033,8 @@
4034	4033	entry = accelEnrich, "Accel Enrich", int, "%d"
4035	4034	entry = veCurr, "VE", int, "%d"
4036	4035	entry = veCurr2, "VE2", int, "%d", { multiVEmapEnabled } ;[PJSC]
4037		- entry = veCurr3, "VE3", int, "%d", { multiVEmapEnabled } ;[PJSC v1.10]
4038		- entry = veCurr4, "VE4", int, "%d", { multiVEmapEnabled } ;[PJSC v1.10]
	4036	+ entry = veCurr3, "VE3", int, "%d", { multiVEmapEnabled } ;[PJSC v1.01]
	4037	+ entry = veCurr4, "VE4", int, "%d", { multiVEmapEnabled } ;[PJSC v1.01]
4039	4038	entry = pulseWidth, "PW", float, "%.1f"
4040	4039	entry = afrTarget, "AFR Target", float, "%.3f"
4041	4040	entry = pulseWidth, "PW2", float, "%.1f"

		@@ -4126,8 +4125,8 @@
4126	4125	[Tools]
4127	4126	;addTool = toolName, PanelName
4128	4127	addTool = veTableGenerator, "VE Table Generator", veTable1Tbl
4129		- addTool = veTableGenerator, "VE Table Generator", veTable2Tbl ;[PJSC v1.10]
4130		- addTool = veTableGenerator, "VE Table Generator", veTable3Tbl ;[PJSC v1.10]
	4128	+ addTool = veTableGenerator, "VE Table Generator", veTable2Tbl ;[PJSC v1.01]
	4129	+ addTool = veTableGenerator, "VE Table Generator", veTable3Tbl ;[PJSC v1.01]
4131	4130	addTool = afrTableGenerator, "AFR Table Generator", afrTable1Tbl
4132	4131
4133	4132

		@@ -4168,7 +4167,7 @@
4168	4167	; filter = maxTPSFilter, "High Throttle", tps, < , 15, , true
4169	4168	;------------- WUE VEAL not currently working ----------------
4170	4169
4171		-;[PJSC v1.10]------------------------------------------------------------------------
	4170	+;[PJSC v1.01]------------------------------------------------------------------------
4172	4171	; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition
4173	4172	veAnalyzeMap = veTable2Tbl, afrTable1Tbl, afr, egoCorrection
4174	4173	lambdaTargetTables = afrTable1Tbl, afrTSCustom,

		@@ -4230,4 +4229,4 @@
4230	4229	filter = overrunFilter, "Overrun" , pulseWidth, = , 0, , false
4231	4230	filter = std_Custom ; Standard Custom Expression Filter.
4232	4231	#endif
4233		-;[PJSC v1.10]-------------------------------------------------------------------------
	4232	+;[PJSC v1.01]-------------------------------------------------------------------------

--- branches/Ver1.01/speeduino/board_avr2560.h (revision 81)

+++ branches/Ver1.01/speeduino/board_avr2560.h (revision 82)

		@@ -123,7 +123,7 @@
123	123	#define VVT_TIMER_COMPARE OCR1B
124	124	#define VVT_TIMER_COUNTER TCNT1
125	125
126		- #define MUX1_TIMER_ENABLE() TIMSK1 \|= (1 << OCIE1A) //[PJSC v1.01c]
	126	+ #define MUX1_TIMER_ENABLE() TIMSK1 \|= (1 << OCIE1A) //[PJSC v1.01]
127	127	#define MUX1_TIMER_DISABLE() TIMSK1 &= ~(1 << OCIE1A) // \|
128	128	#define MUX2_TIMER_ENABLE() TIMSK1 \|= (1 << OCIE1B) // \|
129	129	#define MUX2_TIMER_DISABLE() TIMSK1 &= ~(1 << OCIE1B) // \|

		@@ -139,7 +139,7 @@
139	139	#define MUX3_COMPARE OCR1A // \|
140	140	#define MUX3_COUNTER TCNT1 // \|
141	141	#define MUX4_COMPARE OCR1B // V
142		- #define MUX4_COUNTER TCNT1 //[PJSC v1.01c]
	142	+ #define MUX4_COUNTER TCNT1 //[PJSC v1.01]
143	143
144	144	/*
145	145	***********************************************************************************************************

--- branches/Ver1.01/speeduino/comms.h (revision 81)

+++ branches/Ver1.01/speeduino/comms.h (revision 82)

		@@ -8,18 +8,18 @@
8	8	#define afrMapPage 5
9	9	#define afrSetPage 6//Config Page 3
10	10	#define boostvvtPage 7
11		-//[PJSC v1.10]#define seqFuelPage 8
12		-//[PJSC v1.10]#define canbusPage 9//Config Page 9
13		-//[PJSC v1.10]#define warmupPage 10 //Config Page 10
14		-//[PJSC v1.10]#define ve2MapPage 11 //[PJSC] Config Page 11
15		-//[PJSC v1.10]#define ve3MapPage 12 //[PJSC v1.10] Config Page 12
	11	+//[PJSC v1.01]#define seqFuelPage 8
	12	+//[PJSC v1.01]#define canbusPage 9//Config Page 9
	13	+//[PJSC v1.01]#define warmupPage 10 //Config Page 10
	14	+//[PJSC v1.01]#define ve2MapPage 11 //[PJSC] Config Page 11
	15	+//[PJSC v1.01]#define ve3MapPage 12 //[PJSC v1.01] Config Page 12
16	16	#define canbusPage 8//Config Page 9
17	17	#define warmupPage 9 //Config Page 10
18	18	#define ve2MapPage 10 //[PJSC] Config Page 11
19		-#define ve3MapPage 11 //[PJSC v1.10] Config Page 12
	19	+#define ve3MapPage 11 //[PJSC v1.01] Config Page 12
20	20
21	21	//[PJSC]#define SERIAL_PACKET_SIZE 90 //Must match ochBlockSize in ini file
22		-#define SERIAL_PACKET_SIZE 112 //[PJSC v1.10] Extend serial packet block size for Test mode
	22	+#define SERIAL_PACKET_SIZE 112 //[PJSC v1.01] Extend serial packet block size for Test mode
23	23
24	24	byte currentPage = 1;//Not the same as the speeduino config page numbers
25	25	bool isMap = true;

		@@ -48,7 +48,7 @@
48	48	"\nVVT Map\0"//102-No need to put a trailing null because it's the last string and the compliler does it for you.
49	49	"\nPg 10 Config"
50	50	"\nVE2 Map\0" //[PJSC]
51		- "\nVE3 Map\0" //[PJSC v1.10]
	51	+ "\nVE3 Map\0" //[PJSC v1.01]
52	52	};
53	53
54	54	void command();//This is the heart of the Command Line Interpeter. All that needed to be done was to make it human readable.

--- branches/Ver1.01/speeduino/globals.h (revision 81)

+++ branches/Ver1.01/speeduino/globals.h (revision 82)

		@@ -137,12 +137,12 @@
137	137	#define BIT_STATUS3_NSQUIRTS2 6
138	138	#define BIT_STATUS3_NSQUIRTS3 7
139	139
140		-//[PJSC v1.10] Define masks for Test mode
	140	+//[PJSC v1.01] Define masks for Test mode
141	141	#define BIT_TEST_ON 0 //ON/OFF
142	142	#define BIT_TEST_PWM 1 //Outputs PWM signal
143	143	#define BIT_TEST_PULSE 2 //Outputs Pulse
144	144
145		-//[PJSC v1.10] Define masks for Test mode active
	145	+//[PJSC v1.01] Define masks for Test mode active
146	146	#define BIT_TEST_INJ1 0 //inj1
147	147	#define BIT_TEST_INJ2 1 //inj2
148	148	#define BIT_TEST_INJ3 2 //inj3

		@@ -152,7 +152,7 @@
152	152	#define BIT_TEST_IGN3 6 //coil3
153	153	#define BIT_TEST_IGN4 7 //coil4
154	154
155		-//[PJSC v1.10] Define argument for Injector channel
	155	+//[PJSC v1.01] Define argument for Injector channel
156	156	#define CH_INJ1 0 //inj1
157	157	#define CH_INJ2 1 //inj2
158	158	#define CH_INJ3 2 //inj3

		@@ -251,7 +251,7 @@
251	251	const byte data_structure_version = 2; //This identifies the data structure when reading / writing.
252	252	//const byte page_size = 64;
253	253	//[PJSC]const int16_t npage_size[11] PROGMEM = {0,288,128,288,128,288,128,240,192,192,192};
254		-const int16_t npage_size[12] PROGMEM = {0,288,128,288,128,288,128,240,192,192,288,288}; //[PJSC v1.10]
	254	+const int16_t npage_size[12] PROGMEM = {0,288,128,288,128,288,128,240,192,192,288,288}; //[PJSC v1.01]
255	255	//const byte page11_size = 128;
256	256	#define MAP_PAGE_SIZE 288
257	257

		@@ -258,37 +258,37 @@
258	258	#define NUM_SQUIRT_DEVICE 4 //[PJSC]
259	259	#define SELECT_VE1 0 //[PJSC]
260	260	#define SELECT_VE2 1 //[PJSC]
261		-#define SELECT_VE3 2 //[PJSC v1.10]
262		-#define SELECT_VE4 3 //[PJSC v1.10]
263		-#define MULTI_VE_COUNT 4 //[PJSC v1.10]
264		-#define SINGLE_VE_COUNT 1 //[PJSC v1.10]
	261	+#define SELECT_VE3 2 //[PJSC v1.01]
	262	+#define SELECT_VE4 3 //[PJSC v1.01]
	263	+#define MULTI_VE_COUNT 4 //[PJSC v1.01]
	264	+#define SINGLE_VE_COUNT 1 //[PJSC v1.01]
265	265
266		-#define EXTRIG_SPARK_DISABLE 0 //[PJSC v1.10] For MAP switching
	266	+#define EXTRIG_SPARK_DISABLE 0 //[PJSC v1.01] For MAP switching
267	267	#define EXTRIG_SPARK_CAPTURE 1 // V
268		-#define EXTRIG_MAP_SELECT 2 //[PJSC v1.10] For MAP switching
269		-#define EXTRIG_SPARK_DISABLE 0 //[PJSC v1.10] For MAP switching
	268	+#define EXTRIG_MAP_SELECT 2 //[PJSC v1.01] For MAP switching
	269	+#define EXTRIG_SPARK_DISABLE 0 //[PJSC v1.01] For MAP switching
270	270
271		-#define MUXOUT_OFF 0 //[PJSC v1.10] MUX output selection
272		-#define MUXOUT_IDLE 1 //[PJSC v1.10] MUX output selection
273		-#define MUXOUT_FAN 2 //[PJSC v1.10] MUX output selection
274		-#define MUXOUT_LAUNCH 3 //[PJSC v1.10] MUX output selection
275		-#define MUXOUT_FUELPUMP 4 //[PJSC v1.10] MUX output selection
276		-#define MUXOUT_BOOST 5 //[PJSC v1.10] MUX output selection
277		-#define MUXOUT_VVT 6 //[PJSC v1.10] MUX output selection
278		-#define MUXOUT_TACH 7 //[PJSC v1.10] MUX output selection
	271	+#define MUXOUT_OFF 0 //[PJSC v1.01] MUX output selection
	272	+#define MUXOUT_IDLE 1 //[PJSC v1.01] MUX output selection
	273	+#define MUXOUT_FAN 2 //[PJSC v1.01] MUX output selection
	274	+#define MUXOUT_LAUNCH 3 //[PJSC v1.01] MUX output selection
	275	+#define MUXOUT_FUELPUMP 4 //[PJSC v1.01] MUX output selection
	276	+#define MUXOUT_BOOST 5 //[PJSC v1.01] MUX output selection
	277	+#define MUXOUT_VVT 6 //[PJSC v1.01] MUX output selection
	278	+#define MUXOUT_TACH 7 //[PJSC v1.01] MUX output selection
279	279
280	280	struct table3D fuelTable; //16x16 fuel map
281	281	struct table3D fuelTable2; //16x16 fuel map2 [PJSC]
282		-struct table3D fuelTable3; //16x16 fuel map3 [PJSC v1.10]
	282	+struct table3D fuelTable3; //16x16 fuel map3 [PJSC v1.01]
283	283	struct table3D ignitionTable; //16x16 ignition map
284	284	struct table3D afrTable; //16x16 afr target map
285	285	struct table3D stagingTable; //8x8 fuel staging table
286	286	struct table3D boostTable; //8x8 boost map
287	287	struct table3D vvtTable; //8x8 vvt map
288		-//[PJSC v1.10]struct table3D trim1Table; //6x6 Fuel trim 1 map
289		-//[PJSC v1.10]struct table3D trim2Table; //6x6 Fuel trim 2 map
290		-//[PJSC v1.10]struct table3D trim3Table; //6x6 Fuel trim 3 map
291		-//[PJSC v1.10]struct table3D trim4Table; //6x6 Fuel trim 4 map
	288	+//[PJSC v1.01]struct table3D trim1Table; //6x6 Fuel trim 1 map
	289	+//[PJSC v1.01]struct table3D trim2Table; //6x6 Fuel trim 2 map
	290	+//[PJSC v1.01]struct table3D trim3Table; //6x6 Fuel trim 3 map
	291	+//[PJSC v1.01]struct table3D trim4Table; //6x6 Fuel trim 4 map
292	292	struct table2D taeTable; //4 bin TPS Acceleration Enrichment map (2D)
293	293	struct table2D WUETable; //10 bin Warm Up Enrichment map (2D)
294	294	struct table2D crankingEnrichTable; //4 bin cranking Enrichment map (2D)

		@@ -350,8 +350,8 @@
350	350
351	351	volatile byte captureDutyPulseInterrupt; //[PJSC] For capture duty pulse
352	352	volatile byte captureDutyPulseInterrupt2; //[PJSC] For capture duty pulse
353		-volatile byte tempVEvalue[4]; //[PJSC v1.10] Multi VE Map support
354		-volatile unsigned int dualFuelLoadVE; //[PJSC v1.10] Dual Fuel Load support
	353	+volatile byte tempVEvalue[4]; //[PJSC v1.01] Multi VE Map support
	354	+volatile unsigned int dualFuelLoadVE; //[PJSC v1.01] Dual Fuel Load support
355	355
356	356	//These need to be here as they are used in both speeduino.ino and scheduler.ino
357	357	bool channel1InjEnabled = true;

		@@ -407,8 +407,8 @@
407	407	long MAP; //Has to be a long for PID calcs (Boost control)
408	408	int16_t EMAP;
409	409	int16_t EMAPADC;
410		-//[PJSC v1.10] byte baro; //Barometric pressure is simply the inital MAP reading, taken before the engine is running. Alternatively, can be taken from an external sensor
411		- int baro; //[PJSC v1.10] Barometric pressure is simply the inital MAP reading, taken before the engine is running. Alternatively, can be taken from an external sensor
	410	+//[PJSC v1.01] byte baro; //Barometric pressure is simply the inital MAP reading, taken before the engine is running. Alternatively, can be taken from an external sensor
	411	+ int baro; //[PJSC v1.01] Barometric pressure is simply the inital MAP reading, taken before the engine is running. Alternatively, can be taken from an external sensor
412	412	byte TPS; //The current TPS reading (0% - 100%)
413	413	byte TPSlast; //The previous TPS reading
414	414	unsigned long TPS_time; //The time the TPS sample was taken

		@@ -418,8 +418,8 @@
418	418	volatile int rpmDOT;
419	419	byte VE;
420	420	byte VE2; //[PJSC]
421		- byte VE3; //[PJSC v1.10]
422		- byte VE4; //[PJSC v1.10]
	421	+ byte VE3; //[PJSC v1.01]
	422	+ byte VE4; //[PJSC v1.01]
423	423	byte O2;
424	424	byte O2_2;
425	425	int coolant;

		@@ -483,9 +483,9 @@
483	483	byte nSquirts;
484	484	byte nChannels; //Number of fuel and ignition channels
485	485	int16_t fuelLoad;
486		- int16_t fuelLoad2; //[PJSC v1.10] For Secondary Fuel Load
487		- int16_t fuelLoad3; //[PJSC v1.10] For x4 VE table support
488		- int16_t fuelLoad4; //[PJSC v1.10] For x4 VE table support
	486	+ int16_t fuelLoad2; //[PJSC v1.01] For Secondary Fuel Load
	487	+ int16_t fuelLoad3; //[PJSC v1.01] For x4 VE table support
	488	+ int16_t fuelLoad4; //[PJSC v1.01] For x4 VE table support
489	489	int16_t ignLoad;
490	490	bool fuelPumpOn; //The current status of the fuel pump
491	491	byte syncLossCounter;

		@@ -515,14 +515,14 @@
515	515	unsigned long dutyOFFlast_time2; //[PJSC] For capturing duty pulse
516	516	unsigned long cycle_t2; //[PJSC] For capturing duty pulse
517	517	unsigned long on_t2; //[PJSC] For capturing duty pulse
518		- byte testMode; //[PJSC v1.10] For test mode
519		- byte testModeActive; //[PJSC v1.10] For test mode
520		- int16_t testCnt; //[PJSC v1.10] For test mode
521		- boolean mapSelectSw; //[PJSC v1.10] For MAP switching
522		- byte veMapSelectionSw1Pri[4]; //[PJSC v1.10] For x4 Fuel table support
523		- byte veMapSelectionSw1Sec[4]; //[PJSC v1.10] \|
524		- byte veMapSelectionSw2Pri[4]; //[PJSC v1.10] V
525		- byte veMapSelectionSw2Sec[4]; //[PJSC v1.10] For x4 Fuel table support
	518	+ byte testMode; //[PJSC v1.01] For test mode
	519	+ byte testModeActive; //[PJSC v1.01] For test mode
	520	+ int16_t testCnt; //[PJSC v1.01] For test mode
	521	+ boolean mapSelectSw; //[PJSC v1.01] For MAP switching
	522	+ byte veMapSelectionSw1Pri[4]; //[PJSC v1.01] For x4 Fuel table support
	523	+ byte veMapSelectionSw1Sec[4]; //[PJSC v1.01] \|
	524	+ byte veMapSelectionSw2Pri[4]; //[PJSC v1.01] V
	525	+ byte veMapSelectionSw2Sec[4]; //[PJSC v1.01] For x4 Fuel table support
526	526
527	527	//Helpful bitwise operations:
528	528	//Useful reference: http://playground.arduino.cc/Code/BitMath

		@@ -646,7 +646,7 @@
646	646	byte mapSwitchingEnabled: 1; // \|
647	647	byte dualFuelEnabled: 1; // \|
648	648	byte secondaryFuelUsage: 1; // \|
649		- byte fuelCorrectionEnabled: 1; // \|[PJSC v1.01c]
	649	+ byte fuelCorrectionEnabled: 1; // \|[PJSC v1.01]
650	650	byte unused2_75: 1; // \|
651	651	byte exTrigModeSelect : 2; // \| For External Trigger
652	652	byte externalTrigEdge: 1; // \| 0: Rising, 1: Falling

		@@ -674,9 +674,9 @@
674	674	byte veMapSelectionInj3_2Sec: 4; //[PJSCv1.10] \|
675	675	byte veMapSelectionInj4_2Pri: 4; //[PJSCv1.10] V
676	676	byte veMapSelectionInj4_2Sec: 4; //[PJSCv1.10] For x4 Fuel table support
677		-//[PJSC v1.01c] byte dutyFreqTst[4]; //[PJSC v1.10] For test mode
678		-//[PJSC v1.01c] byte dutyRatioTst[4]; // \|
679		- byte dutyFreqTst[12]; //[PJSC v1.10] For test mode
	677	+//[PJSC v1.01] byte dutyFreqTst[4]; //[PJSC v1.01] For test mode
	678	+//[PJSC v1.01] byte dutyRatioTst[4]; // \|
	679	+ byte dutyFreqTst[12]; //[PJSC v1.01] For test mode
680	680	byte dutyRatioTst[12]; // \|
681	681	byte testop_fp: 1; // \|
682	682	byte testop_inj: 2; // \|

		@@ -688,22 +688,22 @@
688	688	uint16_t testinjcnt; // \|
689	689	byte muxout1Selection: 4; // \| MUX output1 selection
690	690	byte muxout2Selection: 4; // \| MUX output2 selection
691		- byte muxout3Selection: 4; // \|[PJSC v1.01c] MUX output3 selection
692		- byte muxout4Selection: 4; // \|[PJSC v1.01c] MUX output4 selection
693		-//[PJSC v1.01c] byte baroDenBins[9]; // \| For Barometric extend correnction
694		-//[PJSC v1.01c] byte baroDenRates[9]; // \| For Barometric extend correnction
695		- byte fuelAlgorithm2: 3; //[PJSC v1.10] For Secondary Fuel Algorithm
	691	+ byte muxout3Selection: 4; // \|[PJSC v1.01] MUX output3 selection
	692	+ byte muxout4Selection: 4; // \|[PJSC v1.01] MUX output4 selection
	693	+//[PJSC v1.01] byte baroDenBins[9]; // \| For Barometric extend correnction
	694	+//[PJSC v1.01] byte baroDenRates[9]; // \| For Barometric extend correnction
	695	+ byte fuelAlgorithm2: 3; //[PJSC v1.01] For Secondary Fuel Algorithm
696	696	byte fuelAlgorithm3: 3; // \|
697	697	byte unused2_118: 2; // \|
698	698	byte table4Usage: 1; // \| For switching usage of 3rd table Ignition/Fuel
699	699	byte unused2_119: 7; // V
700		-//[PJSC v1.01c] byte unused2_122[6]; //[PJSC v1.10] For test mode
701		- byte inj1SquirtStartEnd: 1; //[PJSC v1.01c]
	700	+//[PJSC v1.01] byte unused2_122[6]; //[PJSC v1.01] For test mode
	701	+ byte inj1SquirtStartEnd: 1; //[PJSC v1.01]
702	702	byte inj2SquirtStartEnd: 1; // \|
703	703	byte inj3SquirtStartEnd: 1; // \|
704	704	byte inj4SquirtStartEnd: 1; // \|
705	705	byte unused2_121: 4; // V
706		- byte unused2_122[6]; //[PJSC v1.01c]
	706	+ byte unused2_122[6]; //[PJSC v1.01]
707	707
708	708	#if defined(CORE_AVR)
709	709	};

		@@ -777,9 +777,9 @@
777	777	byte ADCFILTER_MAP; //This is only used on Instantaneous MAP readings and is intentionally very weak to allow for faster response
778	778	byte ADCFILTER_BARO;
779	779
780		-//[PJSC v1.01c] byte unused2_64[57];
781		- byte baroDenBins[9]; //[PJSC v1.01c] For Barometric extend correnction
782		- byte baroDenRates[9]; //[PJSC v1.01c] For Barometric extend correnction
	780	+//[PJSC v1.01] byte unused2_64[57];
	781	+ byte baroDenBins[9]; //[PJSC v1.01] For Barometric extend correnction
	782	+ byte baroDenRates[9]; //[PJSC v1.01] For Barometric extend correnction
783	783	byte unused2_82[39];
784	784
785	785	#if defined(CORE_AVR)

		@@ -1112,16 +1112,16 @@
1112	1112	byte pinExValve; //[PJSC] Exhaust valve position input pin
1113	1113	byte pinCaptureDuty1; //[PJSC] For capturing duty pulse
1114	1114	byte pinCaptureDuty2; //[PJSC] For capturing duty pulse
1115		-byte pinMuxout1; //[PJSC v1.10] For MUX output setting
1116		-byte pinMuxout2; //[PJSC v1.10] For MUX output setting
1117		-byte pinMuxout3; //[PJSC v1.01c] For MUX output setting
1118		-byte pinMuxout4; //[PJSC v1.01c] For MUX output setting
	1115	+byte pinMuxout1; //[PJSC v1.01] For MUX output setting
	1116	+byte pinMuxout2; //[PJSC v1.01] For MUX output setting
	1117	+byte pinMuxout3; //[PJSC v1.01] For MUX output setting
	1118	+byte pinMuxout4; //[PJSC v1.01] For MUX output setting
1119	1119
1120	1120	// global variables // from speeduino.ino
1121	1121	extern struct statuses currentStatus; // from speeduino.ino
1122	1122	extern struct table3D fuelTable; //16x16 fuel map
1123	1123	extern struct table3D fuelTable2; //16x16 fuel map2 [PJSC]
1124		-extern struct table3D fuelTable3; //16x16 fuel map2 [PJSC v1.10]
	1124	+extern struct table3D fuelTable3; //16x16 fuel map2 [PJSC v1.01]
1125	1125	extern struct table3D ignitionTable; //16x16 ignition map
1126	1126	extern struct table3D afrTable; //16x16 afr target map
1127	1127	extern struct table3D stagingTable; //8x8 afr target map

--- branches/Ver1.01/speeduino/init.h (revision 81)

+++ branches/Ver1.01/speeduino/init.h (revision 82)

		@@ -5,7 +5,7 @@
5	5	void initialiseTriggers();
6	6	void setPinMapping(byte);
7	7	void initialiseExternalTrigger(); //[PJSC] For External Trigger Interruot
8		-void changeMapSelectSw(); //[PJSC v1.10] For MAP switch
	8	+void changeMapSelectSw(); //[PJSC v1.01] For MAP switch
9	9	void initialiseCaptureDutyPulse(); //[PJSC] For capturing duty pulse
10	10	void initialiseCaptureDutyPulse2(); //[PJSC] For capturing duty pulse
11	11

--- branches/Ver1.01/speeduino/scheduler.h (revision 81)

+++ branches/Ver1.01/speeduino/scheduler.h (revision 82)

		@@ -214,28 +214,28 @@
214	214
215	215	//[PJSC] For PJSC
216	216	void pjscControl();
217		-//[PJSC v1.01c]byte pjscDuty[4];
218		-//[PJSC v1.01c]unsigned int pjsc_pwm_max_count[4];
219		-byte pjscDuty[12]; //[PJSC v1.01c]
220		-unsigned int pjsc_pwm_max_count[12]; //[PJSC v1.01c]
221		-volatile unsigned int pjsc_pwm_cur_value[12]; //[PJSC v1.01c]
222		-long pjsc_pwm_target_value[12]; //[PJSC v1.01c]
223		-volatile bool pjsc_pwm_state[12]; //[PJSC v1.01c]
224		-//[PJSC v1.01c]volatile bool pjsc1_pwm_state;
225		-//[PJSC v1.01c]volatile bool pjsc2_pwm_state;
226		-//[PJSC v1.01c]volatile bool pjsc3_pwm_state;
227		-//[PJSC v1.01c]volatile bool pjsc4_pwm_state;
228		-//[PJSC v1.01c]volatile unsigned int pjsc1_pwm_cur_value;
229		-//[PJSC v1.01c]volatile unsigned int pjsc2_pwm_cur_value;
230		-//[PJSC v1.01c]volatile unsigned int pjsc3_pwm_cur_value;
231		-//[PJSC v1.01c]volatile unsigned int pjsc4_pwm_cur_value;
232		-//[PJSC v1.01c]long pjsc1_pwm_target_value;
233		-//[PJSC v1.01c]long pjsc2_pwm_target_value;
234		-//[PJSC v1.01c]long pjsc3_pwm_target_value;
235		-//[PJSC v1.01c]long pjsc4_pwm_target_value;
	217	+//[PJSC v1.01]byte pjscDuty[4];
	218	+//[PJSC v1.01]unsigned int pjsc_pwm_max_count[4];
	219	+byte pjscDuty[12]; //[PJSC v1.01]
	220	+unsigned int pjsc_pwm_max_count[12]; //[PJSC v1.01]
	221	+volatile unsigned int pjsc_pwm_cur_value[12]; //[PJSC v1.01]
	222	+long pjsc_pwm_target_value[12]; //[PJSC v1.01]
	223	+volatile bool pjsc_pwm_state[12]; //[PJSC v1.01]
	224	+//[PJSC v1.01]volatile bool pjsc1_pwm_state;
	225	+//[PJSC v1.01]volatile bool pjsc2_pwm_state;
	226	+//[PJSC v1.01]volatile bool pjsc3_pwm_state;
	227	+//[PJSC v1.01]volatile bool pjsc4_pwm_state;
	228	+//[PJSC v1.01]volatile unsigned int pjsc1_pwm_cur_value;
	229	+//[PJSC v1.01]volatile unsigned int pjsc2_pwm_cur_value;
	230	+//[PJSC v1.01]volatile unsigned int pjsc3_pwm_cur_value;
	231	+//[PJSC v1.01]volatile unsigned int pjsc4_pwm_cur_value;
	232	+//[PJSC v1.01]long pjsc1_pwm_target_value;
	233	+//[PJSC v1.01]long pjsc2_pwm_target_value;
	234	+//[PJSC v1.01]long pjsc3_pwm_target_value;
	235	+//[PJSC v1.01]long pjsc4_pwm_target_value;
236	236	//[PJSC] For PJSC
237	237
238		-//[PJSC v1.10]
	238	+//[PJSC v1.01]
239	239	void pjsc1Toggle();
240	240	void pjsc2Toggle();
241	241	void pjsc3Toggle();

		@@ -244,7 +244,7 @@
244	244	void setPjsc2Duty();
245	245	void setPjsc3Duty();
246	246	void setPjsc4Duty();
247		-void setCoil1Duty(); //[PJSC v1.01c]
	247	+void setCoil1Duty(); //[PJSC v1.01]
248	248	void setCoil2Duty(); // \|
249	249	void setCoil3Duty(); // \|
250	250	void setCoil4Duty(); // \|

		@@ -255,7 +255,7 @@
255	255	void setMux1Duty(); // \|
256	256	void setMux2Duty(); // \|
257	257	void setMux3Duty(); // V
258		-void setMux4Duty(); //[PJSC v1.01c]
	258	+void setMux4Duty(); //[PJSC v1.01]
259	259	void injTstPulseToggle1();
260	260	void injTstPulseToggle2();
261	261	void injTstPulseToggle3();

		@@ -264,6 +264,6 @@
264	264	void injTstControlPulse(byte injCh);
265	265
266	266	#define DISABLE_TIMER_FUEL1TO4() FUEL1_TIMER_DISABLE(); FUEL2_TIMER_DISABLE(); FUEL3_TIMER_DISABLE(); FUEL4_TIMER_DISABLE()
267		-//[PJSC v1.10]
	267	+//[PJSC v1.01]
268	268
269	269	#endif // SCHEDULER_H

--- branches/Ver1.01/speeduino/speeduino.h (revision 81)

+++ branches/Ver1.01/speeduino/speeduino.h (revision 82)

		@@ -3,18 +3,18 @@
3	3
4	4	uint16_t PW(int REQ_FUEL, byte VE, long MAP, int corrections, int injOpen);
5	5	byte getVE();
6		-byte getVE2(); //[PJSC v1.10]Multi VE Map support
7		-byte getVE3(); //[PJSC v1.10]Multi VE Map support
8		-byte getVE4(); //[PJSC v1.10]Multi VE Map support
	6	+byte getVE2(); //[PJSC v1.01]Multi VE Map support
	7	+byte getVE3(); //[PJSC v1.01]Multi VE Map support
	8	+byte getVE4(); //[PJSC v1.01]Multi VE Map support
9	9	byte getAdvance();
10	10
11		-byte selectVE(byte); //[PJSC v1.10]Multi VE Map support
	11	+byte selectVE(byte); //[PJSC v1.01]Multi VE Map support
12	12
13	13	uint16_t calculateInjector2StartAngle(unsigned int);
14	14	uint16_t calculateInjector3StartAngle(unsigned int);
15	15	uint16_t calculateInjector4StartAngle(unsigned int);
16		-//[PJSC v1.01c]uint16_t calculateInjector4StartAngle(unsigned int);
17		-uint16_t calculateInjector5StartAngle(unsigned int); //[PJSC v1.01c]
	16	+//[PJSC v1.01]uint16_t calculateInjector4StartAngle(unsigned int);
	17	+uint16_t calculateInjector5StartAngle(unsigned int); //[PJSC v1.01]
18	18
19	19	struct config2 configPage2;
20	20	struct config4 configPage4; //Done

--- branches/Ver1.01/speeduino/storage.h (revision 81)

+++ branches/Ver1.01/speeduino/storage.h (revision 82)

		@@ -119,7 +119,7 @@
119	119	#define EEPROM_CONFIG7_XBINS3 1485
120	120	#define EEPROM_CONFIG7_YBINS3 1493
121	121	#define EEPROM_CONFIG7_END 1501
122		-/* [PJSC v1.10] Change EEPROM layout for preparing VE table 4 support
	122	+/* [PJSC v1.01] Change EEPROM layout for preparing VE table 4 support
123	123	#define EEPROM_CONFIG8_XSIZE1 1501
124	124	#define EEPROM_CONFIG8_YSIZE1 1502
125	125	#define EEPROM_CONFIG8_MAP1 1503

		@@ -153,7 +153,7 @@
153	153	*/
154	154
155	155	//=============================================
156		-//[PJSC v1.10] New EEPROM layout for preparing VE table 4 support
	156	+//[PJSC v1.01] New EEPROM layout for preparing VE table 4 support
157	157	#define EEPROM_CONFIG9_START 1501
158	158	#define EEPROM_CONFIG9_END 1693
159	159	#define EEPROM_CONFIG10_START 1693

--- branches/Ver1.01/speeduino/table.h (revision 81)

+++ branches/Ver1.01/speeduino/table.h (revision 82)

		@@ -5,8 +5,8 @@
5	5	#define TABLE_H
6	6
7	7	#define TABLE_RPM_MULTIPLIER 100
8		-//[PJSC v1.10]#define TABLE_LOAD_MULTIPLIER 2
9		-#define TABLE_LOAD_MULTIPLIER 1 //[PJSC v1.10]
	8	+//[PJSC v1.01]#define TABLE_LOAD_MULTIPLIER 2
	9	+#define TABLE_LOAD_MULTIPLIER 1 //[PJSC v1.01]
10	10
11	11	/*
12	12	The 2D table can contain either 8-bit (byte) or 16-bit (int) values

PJSC

提交

標籤

Frequently used words (click to add to your profile)

Commit MetaInfo

Log Message

Change Summary

差異