PJSC(Pump Jet Solenoid Controller)はArduinoを使用したバイク用燃料噴射コントローラです。このプロジェクトは、オープンソースECUプロジェクト『Speeduino』をベースにしています。
Prepare x4 VE table support.
| @@ -161,8 +161,8 @@ | ||
| 161 | 161 | ;[PJSC] nPages = 10 |
| 162 | 162 | ;pageSize = 288, 128, 288, 128, 288, 128, 240, 192, 192, 192 |
| 163 | 163 | ;[PJSC] pageSize = 128, 288, 288, 128, 288, 128, 240, 192, 192, 192 |
| 164 | - nPages = 11 ;[PJSC] | |
| 165 | - pageSize = 128, 288, 288, 128, 288, 128, 240, 192, 192, 192, 288 ;[PJSC] | |
| 164 | + nPages = 12 ;[PJSC] | |
| 165 | + pageSize = 128, 288, 288, 64, 288, 128, 240, 192, 156, 156, 288, 288 ;[PJSC v1.10] | |
| 166 | 166 | |
| 167 | 167 | ;burnCommand = "B" |
| 168 | 168 | ;pageActivate = "P\001", "P\002", "P\003", "P\004", "P\005", "P\006", "P\007", "P\010", "P\011", "P\012", "P\013" |
| @@ -178,11 +178,11 @@ | ||
| 178 | 178 | ;[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" |
| 179 | 179 | |
| 180 | 180 | ;[PJSC] New commands for PJSC |
| 181 | - pageIdentifier = "\$tsCanId\x01", "\$tsCanId\x02", "\$tsCanId\x03", "\$tsCanId\x04", "\$tsCanId\x05", "\$tsCanId\x06", "\$tsCanId\x07", "\$tsCanId\x08", "\$tsCanId\x09", "\$tsCanId\x0A", "\$tsCanId\x0B" | |
| 182 | - burnCommand = "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i", "b%2i" | |
| 183 | - pageReadCommand = "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v" ;[PJSC] | |
| 184 | - 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] | |
| 185 | - 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] | |
| 181 | + pageIdentifier = "\$tsCanId\x01", "\$tsCanId\x02", "\$tsCanId\x03", "\$tsCanId\x04", "\$tsCanId\x05", "\$tsCanId\x06", "\$tsCanId\x07", "\$tsCanId\x08", "\$tsCanId\x09", "\$tsCanId\x0A", "\$tsCanId\x0B", "\$tsCanId\x0C" ;[PJSC v1.10] | |
| 182 | + burnCommand = "b%2i", "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] | |
| 183 | + pageReadCommand = "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v", "p%2i%2o%2c%v" ;[PJSC v1.10] | |
| 184 | + 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", "w%2i%2o%2c%v" ;[PJSC v1.10] | |
| 185 | + 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", "w%2i%2o%2c%v" ;[PJSC v1.10] | |
| 186 | 186 | |
| 187 | 187 | blockingFactor = 2048 |
| 188 | 188 | tableBlockingFactor = 2048 |
| @@ -501,7 +501,8 @@ | ||
| 501 | 501 | ADCFILTER_MAP = scalar, U08, 69, "%", 1.0, 0.0, 0, 240, 0 |
| 502 | 502 | ADCFILTER_BARO = scalar, U08, 70, "%", 1.0, 0.0, 0, 240, 0 |
| 503 | 503 | |
| 504 | - unused4-64 = array, U08, 71, [56], "%", 1.0, 0.0, 0.0, 255, 0 | |
| 504 | +;[PJSC v1.10] unused4-64 = array, U08, 71, [56], "%", 1.0, 0.0, 0.0, 255, 0 | |
| 505 | + unused4-64 = array, U08, 71, [9], "%", 1.0, 0.0, 0.0, 255, 0 ;[PJSC v1.10] | |
| 505 | 506 | ;-------------------------------------------------- |
| 506 | 507 | ;Start AFR page |
| 507 | 508 | ;-------------------------------------------------- |
| @@ -954,42 +955,42 @@ | ||
| 954 | 955 | |
| 955 | 956 | unused10_154 = scalar, U08, 154, "", 1, 0, 0, 255, 0 |
| 956 | 957 | unused10_155 = scalar, U08, 155, "", 1, 0, 0, 255, 0 |
| 957 | - unused10_156 = scalar, U08, 156, "", 1, 0, 0, 255, 0 | |
| 958 | - unused10_157 = scalar, U08, 157, "", 1, 0, 0, 255, 0 | |
| 959 | - unused10_158 = scalar, U08, 158, "", 1, 0, 0, 255, 0 | |
| 960 | - unused10_159 = scalar, U08, 159, "", 1, 0, 0, 255, 0 | |
| 961 | - unused10_160 = scalar, U08, 160, "", 1, 0, 0, 255, 0 | |
| 962 | - unused10_161 = scalar, U08, 161, "", 1, 0, 0, 255, 0 | |
| 963 | - unused10_162 = scalar, U08, 162, "", 1, 0, 0, 255, 0 | |
| 964 | - unused10_163 = scalar, U08, 163, "", 1, 0, 0, 255, 0 | |
| 965 | - unused10_164 = scalar, U08, 164, "", 1, 0, 0, 255, 0 | |
| 966 | - unused10_165 = scalar, U08, 165, "", 1, 0, 0, 255, 0 | |
| 967 | - unused10_166 = scalar, U08, 166, "", 1, 0, 0, 255, 0 | |
| 968 | - unused10_167 = scalar, U08, 167, "", 1, 0, 0, 255, 0 | |
| 969 | - unused10_168 = scalar, U08, 168, "", 1, 0, 0, 255, 0 | |
| 970 | - unused10_169 = scalar, U08, 169, "", 1, 0, 0, 255, 0 | |
| 971 | - unused10_170 = scalar, U08, 170, "", 1, 0, 0, 255, 0 | |
| 972 | - unused10_171 = scalar, U08, 171, "", 1, 0, 0, 255, 0 | |
| 973 | - unused10_172 = scalar, U08, 172, "", 1, 0, 0, 255, 0 | |
| 974 | - unused10_173 = scalar, U08, 173, "", 1, 0, 0, 255, 0 | |
| 975 | - unused10_174 = scalar, U08, 174, "", 1, 0, 0, 255, 0 | |
| 976 | - unused10_175 = scalar, U08, 175, "", 1, 0, 0, 255, 0 | |
| 977 | - unused10_176 = scalar, U08, 176, "", 1, 0, 0, 255, 0 | |
| 978 | - unused10_177 = scalar, U08, 177, "", 1, 0, 0, 255, 0 | |
| 979 | - unused10_178 = scalar, U08, 178, "", 1, 0, 0, 255, 0 | |
| 980 | - unused10_179 = scalar, U08, 179, "", 1, 0, 0, 255, 0 | |
| 981 | - unused10_180 = scalar, U08, 180, "", 1, 0, 0, 255, 0 | |
| 982 | - unused10_181 = scalar, U08, 181, "", 1, 0, 0, 255, 0 | |
| 983 | - unused10_182 = scalar, U08, 182, "", 1, 0, 0, 255, 0 | |
| 984 | - unused10_183 = scalar, U08, 183, "", 1, 0, 0, 255, 0 | |
| 985 | - unused10_184 = scalar, U08, 184, "", 1, 0, 0, 255, 0 | |
| 986 | - unused10_185 = scalar, U08, 185, "", 1, 0, 0, 255, 0 | |
| 987 | - unused10_186 = scalar, U08, 186, "", 1, 0, 0, 255, 0 | |
| 988 | - unused10_187 = scalar, U08, 187, "", 1, 0, 0, 255, 0 | |
| 989 | - unused10_188 = scalar, U08, 188, "", 1, 0, 0, 255, 0 | |
| 990 | - unused10_189 = scalar, U08, 189, "", 1, 0, 0, 255, 0 | |
| 991 | - unused10_190 = scalar, U08, 190, "", 1, 0, 0, 255, 0 | |
| 992 | - blankfield = bits, U08, 191, [0:0], "","" | |
| 958 | +;[PJSC v1.10] unused10_156 = scalar, U08, 156, "", 1, 0, 0, 255, 0 | |
| 959 | +;[PJSC v1.10] unused10_157 = scalar, U08, 157, "", 1, 0, 0, 255, 0 | |
| 960 | +;[PJSC v1.10] unused10_158 = scalar, U08, 158, "", 1, 0, 0, 255, 0 | |
| 961 | +;[PJSC v1.10] unused10_159 = scalar, U08, 159, "", 1, 0, 0, 255, 0 | |
| 962 | +;[PJSC v1.10] unused10_160 = scalar, U08, 160, "", 1, 0, 0, 255, 0 | |
| 963 | +;[PJSC v1.10] unused10_161 = scalar, U08, 161, "", 1, 0, 0, 255, 0 | |
| 964 | +;[PJSC v1.10] unused10_162 = scalar, U08, 162, "", 1, 0, 0, 255, 0 | |
| 965 | +;[PJSC v1.10] unused10_163 = scalar, U08, 163, "", 1, 0, 0, 255, 0 | |
| 966 | +;[PJSC v1.10] unused10_164 = scalar, U08, 164, "", 1, 0, 0, 255, 0 | |
| 967 | +;[PJSC v1.10] unused10_165 = scalar, U08, 165, "", 1, 0, 0, 255, 0 | |
| 968 | +;[PJSC v1.10] unused10_166 = scalar, U08, 166, "", 1, 0, 0, 255, 0 | |
| 969 | +;[PJSC v1.10] unused10_167 = scalar, U08, 167, "", 1, 0, 0, 255, 0 | |
| 970 | +;[PJSC v1.10] unused10_168 = scalar, U08, 168, "", 1, 0, 0, 255, 0 | |
| 971 | +;[PJSC v1.10] unused10_169 = scalar, U08, 169, "", 1, 0, 0, 255, 0 | |
| 972 | +;[PJSC v1.10] unused10_170 = scalar, U08, 170, "", 1, 0, 0, 255, 0 | |
| 973 | +;[PJSC v1.10] unused10_171 = scalar, U08, 171, "", 1, 0, 0, 255, 0 | |
| 974 | +;[PJSC v1.10] unused10_172 = scalar, U08, 172, "", 1, 0, 0, 255, 0 | |
| 975 | +;[PJSC v1.10] unused10_173 = scalar, U08, 173, "", 1, 0, 0, 255, 0 | |
| 976 | +;[PJSC v1.10] unused10_174 = scalar, U08, 174, "", 1, 0, 0, 255, 0 | |
| 977 | +;[PJSC v1.10] unused10_175 = scalar, U08, 175, "", 1, 0, 0, 255, 0 | |
| 978 | +;[PJSC v1.10] unused10_176 = scalar, U08, 176, "", 1, 0, 0, 255, 0 | |
| 979 | +;[PJSC v1.10] unused10_177 = scalar, U08, 177, "", 1, 0, 0, 255, 0 | |
| 980 | +;[PJSC v1.10] unused10_178 = scalar, U08, 178, "", 1, 0, 0, 255, 0 | |
| 981 | +;[PJSC v1.10] unused10_179 = scalar, U08, 179, "", 1, 0, 0, 255, 0 | |
| 982 | +;[PJSC v1.10] unused10_180 = scalar, U08, 180, "", 1, 0, 0, 255, 0 | |
| 983 | +;[PJSC v1.10] unused10_181 = scalar, U08, 181, "", 1, 0, 0, 255, 0 | |
| 984 | +;[PJSC v1.10] unused10_182 = scalar, U08, 182, "", 1, 0, 0, 255, 0 | |
| 985 | +;[PJSC v1.10] unused10_183 = scalar, U08, 183, "", 1, 0, 0, 255, 0 | |
| 986 | +;[PJSC v1.10] unused10_184 = scalar, U08, 184, "", 1, 0, 0, 255, 0 | |
| 987 | +;[PJSC v1.10] unused10_185 = scalar, U08, 185, "", 1, 0, 0, 255, 0 | |
| 988 | +;[PJSC v1.10] unused10_186 = scalar, U08, 186, "", 1, 0, 0, 255, 0 | |
| 989 | +;[PJSC v1.10] unused10_187 = scalar, U08, 187, "", 1, 0, 0, 255, 0 | |
| 990 | +;[PJSC v1.10] unused10_188 = scalar, U08, 188, "", 1, 0, 0, 255, 0 | |
| 991 | +;[PJSC v1.10] unused10_189 = scalar, U08, 189, "", 1, 0, 0, 255, 0 | |
| 992 | +;[PJSC v1.10] unused10_190 = scalar, U08, 190, "", 1, 0, 0, 255, 0 | |
| 993 | +;[PJSC v1.10] blankfield = bits, U08, 191, [0:0], "","" | |
| 993 | 994 | ;unused10_191 = scalar, U08, 191, "", 1, 0, 0, 255, 0 |
| 994 | 995 | |
| 995 | 996 | page = 10 |
| @@ -1081,11 +1082,12 @@ | ||
| 1081 | 1082 | knock_recoveryStepTime = scalar, U08, 120, "Sec", 0.1, 0.0, 0.0, 2.5, 1 |
| 1082 | 1083 | knock_recoveryStep = scalar, U08, 121, "Deg", 1.0, 0.0, 0.0, 50, 0 |
| 1083 | 1084 | |
| 1084 | - unused11_122_191 = array, U08, 122,[69],"RPM", 100.0, 0.0, 100, 25500, 0 | |
| 1085 | +;[PJSC v1.10] unused11_122_191 = array, U08, 122,[69],"RPM", 100.0, 0.0, 100, 25500, 0 | |
| 1086 | + unused11_122_191 = array, U08, 122,[33],"RPM", 100.0, 0.0, 100, 25500, 0 ;[PJSC v1.10] | |
| 1085 | 1087 | |
| 1086 | -;-------------------------------------------------- | |
| 1087 | -;Page 12 is the fuel map and axis bins only [PJSC] | |
| 1088 | -;-------------------------------------------------- | |
| 1088 | +;------------------------------------------------------- | |
| 1089 | +;Page 11 is the fuel map and axis bins only [PJSC v1.10] | |
| 1090 | +;------------------------------------------------------- | |
| 1089 | 1091 | page = 11 |
| 1090 | 1092 | ; name = bits, type, offset, bits |
| 1091 | 1093 | ; name = array, type, offset, shape, units, scale, translate, lo, hi, digits |
| @@ -1094,6 +1096,17 @@ | ||
| 1094 | 1096 | rpmBinsVE2 = array, U08, 256, [ 16], "RPM", 100.0, 0.0, 100.0, 25500.0, 0 |
| 1095 | 1097 | fuelLoadBins2 = array, U08, 272, [ 16], { bitStringValue(algorithmUnits2 , algorithm2) }, 1.0, 0.0, 0.0, {fuelLoadMax}, 0 |
| 1096 | 1098 | |
| 1099 | +;------------------------------------------------------- | |
| 1100 | +;Page 12 is the fuel map and axis bins only [PJSC v1.10] | |
| 1101 | +;------------------------------------------------------- | |
| 1102 | +page = 12 | |
| 1103 | + ; name = bits, type, offset, bits | |
| 1104 | + ; name = array, type, offset, shape, units, scale, translate, lo, hi, digits | |
| 1105 | + ; name = scalar, type, offset, units, scale, translate, lo, hi, digits | |
| 1106 | + veTable3 = array, U08, 0, [16x16],"%", 1.0, 0.0, 0.0, 255.0, 0 | |
| 1107 | + rpmBinsVE3 = array, U08, 256, [ 16], "RPM", 100.0, 0.0, 100.0, 25500.0, 0 | |
| 1108 | + fuelLoadBins3 = array, U08, 272, [ 16], { bitStringValue(algorithmUnits3 , algorithm3) }, 1.0, 0.0, 0.0, {fuelLoadMax}, 0 | |
| 1109 | + | |
| 1097 | 1110 | ;------------------------------------------------------------------------------- |
| 1098 | 1111 | |
| 1099 | 1112 | [ConstantsExtensions] |
| @@ -1447,9 +1460,11 @@ | ||
| 1447 | 1460 | subMenu = muxoutSetting, "MUX Output Port Setting" ;[PJSC v1.10] |
| 1448 | 1461 | subMenu = std_separator ;[PJSC v1.10] |
| 1449 | 1462 | ;[PJSC v1.10] subMenu = fanSettings, "Thermo Fan" |
| 1450 | -;[PJSC v1.10] subMenu = LaunchControl, "Launch Control / Flat Shift" | |
| 1463 | +#if table3_spark ;[PJSC v1.10] For switching table3 | |
| 1464 | + subMenu = LaunchControl, "Launch Control / Flat Shift" | |
| 1451 | 1465 | ;[PJSC v1.10] subMenu = fuelpump, "Fuel Pump" |
| 1452 | -;[PJSC v1.10] subMenu = NitrousControl, "Nitrous" | |
| 1466 | + subMenu = NitrousControl, "Nitrous" | |
| 1467 | +#endif ;[PJSC v1.10] For switching table3 | |
| 1453 | 1468 | ;[PJSC v1.10] subMenu = std_separator |
| 1454 | 1469 | ;[PJSC v1.10] subMenu = boostSettings, "Boost Control" |
| 1455 | 1470 | ;[PJSC v1.10] subMenu = boostLoad, "Boost Targets/Load", 8, { boostEnabled } |
| @@ -2510,28 +2525,28 @@ | ||
| 2510 | 2525 | panel = outputtestinj3 |
| 2511 | 2526 | panel = outputtestinj4 |
| 2512 | 2527 | |
| 2513 | -;[PJSC] dialog = outputtestspk1, "Spark CH1 ", yAxis | |
| 2514 | -;[PJSC] commandButton = "Off", cmdtestspk1off,{testactive} | |
| 2515 | -;[PJSC] commandButton = "50% DC", cmdtestspk150dc,{!testenabled & testactive} | |
| 2516 | -;[PJSC] commandButton = "On", cmdtestspk1on,{!testenabled & testactive} | |
| 2517 | -;[PJSC] dialog = outputtestspk2, "Spark CH2", yAxis | |
| 2518 | -;[PJSC] commandButton = "Off", cmdtestspk2off,{testactive} | |
| 2519 | -;[PJSC] commandButton = "50% DC", cmdtestspk250dc,{!testenabled & testactive} | |
| 2520 | -;[PJSC] commandButton = "On", cmdtestspk2on,{!testenabled & testactive} | |
| 2521 | -;[PJSC] dialog = outputtestspk3, "Spark CH3", yAxis | |
| 2522 | -;[PJSC] commandButton = "Off", cmdtestspk3off,{testactive} | |
| 2523 | -;[PJSC] commandButton = "50% DC", cmdtestspk350dc,{!testenabled & testactive} | |
| 2524 | -;[PJSC] commandButton = "On", cmdtestspk3on,{!testenabled & testactive} | |
| 2525 | -;[PJSC] dialog = outputtestspk4, "Spark CH4", yAxis | |
| 2526 | -;[PJSC] commandButton = "Off", cmdtestspk4off,{testactive} | |
| 2527 | -;[PJSC] commandButton = "50% DC", cmdtestspk450dc,{!testenabled & testactive} | |
| 2528 | -;[PJSC] commandButton = "On", cmdtestspk4on,{!testenabled & testactive} | |
| 2528 | + dialog = outputtestspk1, "Spark CH1 ", yAxis | |
| 2529 | + commandButton = "Off", cmdtestspk1off,{testactive} | |
| 2530 | + commandButton = "50% DC", cmdtestspk150dc,{!testenabled & testactive} | |
| 2531 | + commandButton = "On", cmdtestspk1on,{!testenabled & testactive} | |
| 2532 | + dialog = outputtestspk2, "Spark CH2", yAxis | |
| 2533 | + commandButton = "Off", cmdtestspk2off,{testactive} | |
| 2534 | + commandButton = "50% DC", cmdtestspk250dc,{!testenabled & testactive} | |
| 2535 | + commandButton = "On", cmdtestspk2on,{!testenabled & testactive} | |
| 2536 | + dialog = outputtestspk3, "Spark CH3", yAxis | |
| 2537 | + commandButton = "Off", cmdtestspk3off,{testactive} | |
| 2538 | + commandButton = "50% DC", cmdtestspk350dc,{!testenabled & testactive} | |
| 2539 | + commandButton = "On", cmdtestspk3on,{!testenabled & testactive} | |
| 2540 | + dialog = outputtestspk4, "Spark CH4", yAxis | |
| 2541 | + commandButton = "Off", cmdtestspk4off,{testactive} | |
| 2542 | + commandButton = "50% DC", cmdtestspk450dc,{!testenabled & testactive} | |
| 2543 | + commandButton = "On", cmdtestspk4on,{!testenabled & testactive} | |
| 2529 | 2544 | |
| 2530 | -;[PJSC] dialog = outputtest_spark, "Spark Driver Output Test", xAxis | |
| 2531 | -;[PJSC] panel = outputtestspk1 | |
| 2532 | -;[PJSC] panel = outputtestspk2 | |
| 2533 | -;[PJSC] panel = outputtestspk3 | |
| 2534 | -;[PJSC] panel = outputtestspk4 | |
| 2545 | + dialog = outputtest_spark, "Spark Driver Output Test", xAxis | |
| 2546 | + panel = outputtestspk1 | |
| 2547 | + panel = outputtestspk2 | |
| 2548 | + panel = outputtestspk3 | |
| 2549 | + panel = outputtestspk4 | |
| 2535 | 2550 | |
| 2536 | 2551 | ;[PJSC v1.10] dialog = outputtest1,"Test Output Hardware" |
| 2537 | 2552 | dialog = outputtest1,"Output Test Mode - PWM" ;[PJSC v1.10] |
| @@ -2539,7 +2554,9 @@ | ||
| 2539 | 2554 | panel = enableoutputtestbuttons |
| 2540 | 2555 | panel = enablefuelpumpbuttons ;[PJSC v1.10] |
| 2541 | 2556 | panel = outputtest_injectors |
| 2542 | -;[PJSC] panel = outputtest_spark | |
| 2557 | +#if table3_spark ;[PJSC v1.10] For switching table3 | |
| 2558 | + panel = outputtest_spark | |
| 2559 | +#endif ;[PJSC v1.10] For switching table3 | |
| 2543 | 2560 | ;panel = outputtest_io2 |
| 2544 | 2561 | panel = outputtest_warningmessage |
| 2545 | 2562 |
| @@ -3648,7 +3665,7 @@ | ||
| 3648 | 3665 | |
| 3649 | 3666 | ochGetCommand = "r\$tsCanId\x30%2o%2c" |
| 3650 | 3667 | ;[PJSC] ochBlockSize = 90 |
| 3651 | - ochBlockSize = 110 ;[PJSC v1.10] Extend block size for Test mode | |
| 3668 | + ochBlockSize = 112 ;[PJSC v1.10] Extend block size for Test mode | |
| 3652 | 3669 | |
| 3653 | 3670 | secl = scalar, U08, 0, "sec", 1.000, 0.000 |
| 3654 | 3671 | status1 = scalar, U08, 1, "bits", 1.000, 0.000 |
| @@ -3761,6 +3778,7 @@ | ||
| 3761 | 3778 | testCnt = scalar, U16, 105, "", 1.000, 0.000 ;[PJSC v1.10]For test mode |
| 3762 | 3779 | afr2 = scalar, U08, 107, "O2", 0.100, 0.000 ;[PJSC v1.10] |
| 3763 | 3780 | fuelLoad2 = scalar, S16, 108, { bitStringValue( algorithmUnits2 , algorithm2 ) }, 1.000, 0.000 ;[PJSC v1.10]For dual fuel load |
| 3781 | + fuelLoad3 = scalar, S16, 108, { bitStringValue( algorithmUnits3 , algorithm3 ) }, 1.000, 0.000 ;[PJSC v1.10]For dual fuel load | |
| 3764 | 3782 | |
| 3765 | 3783 | |
| 3766 | 3784 | #if CELSIUS |
| @@ -12,10 +12,10 @@ | ||
| 12 | 12 | #define canbusPage 9//Config Page 9 |
| 13 | 13 | #define warmupPage 10 //Config Page 10 |
| 14 | 14 | #define ve2MapPage 11 //[PJSC] Config Page 11 |
| 15 | -#define ve2SetPage 12 //[PJSC] Config Page 12 | |
| 15 | +#define ve3MapPage 12 //[PJSC v1.10] Config Page 12 | |
| 16 | 16 | |
| 17 | 17 | //[PJSC]#define SERIAL_PACKET_SIZE 90 //Must match ochBlockSize in ini file |
| 18 | -#define SERIAL_PACKET_SIZE 110 //[PJSC v1.10] Extend serial packet block size for Test mode | |
| 18 | +#define SERIAL_PACKET_SIZE 112 //[PJSC v1.10] Extend serial packet block size for Test mode | |
| 19 | 19 | |
| 20 | 20 | byte currentPage = 1;//Not the same as the speeduino config page numbers |
| 21 | 21 | bool isMap = true; |
| @@ -45,6 +45,8 @@ | ||
| 45 | 45 | "\nPg 10 Config" |
| 46 | 46 | "\nVE2 Map\0" //[PJSC] |
| 47 | 47 | "\nPg 11 Config\0"//[PJSC] |
| 48 | + "\nVE3 Map\0" //[PJSC v1.10] | |
| 49 | + "\nPg 12 Config\0"//[PJSC v1.10] | |
| 48 | 50 | }; |
| 49 | 51 | |
| 50 | 52 | void command();//This is the heart of the Command Line Interpeter. All that needed to be done was to make it human readable. |
| @@ -253,6 +253,7 @@ | ||
| 253 | 253 | #define SELECT_VE3 2 //[PJSC v1.10] |
| 254 | 254 | #define SELECT_VE4 3 //[PJSC v1.10] |
| 255 | 255 | #define MULTI_VE_COUNT 4 //[PJSC v1.10] |
| 256 | +#define SINGLE_VE_COUNT 1 //[PJSC v1.10] | |
| 256 | 257 | |
| 257 | 258 | #define EXTRIG_SPARK_DISABLE 0 //[PJSC v1.10] For MAP switching |
| 258 | 259 | #define EXTRIG_SPARK_CAPTURE 1 // V |
| @@ -270,6 +271,7 @@ | ||
| 270 | 271 | |
| 271 | 272 | struct table3D fuelTable; //16x16 fuel map |
| 272 | 273 | struct table3D fuelTable2; //16x16 fuel map2 [PJSC] |
| 274 | +struct table3D fuelTable3; //16x16 fuel map3 [PJSC v1.10] | |
| 273 | 275 | struct table3D ignitionTable; //16x16 ignition map |
| 274 | 276 | struct table3D afrTable; //16x16 afr target map |
| 275 | 277 | struct table3D stagingTable; //8x8 fuel staging table |
| @@ -756,7 +758,8 @@ | ||
| 756 | 758 | byte ADCFILTER_MAP; //This is only used on Instantaneous MAP readings and is intentionally very weak to allow for faster response |
| 757 | 759 | byte ADCFILTER_BARO; |
| 758 | 760 | |
| 759 | - byte unused2_64[57]; | |
| 761 | +//[PJSC v1.10] byte unused2_64[57]; | |
| 762 | + byte unused2_71[9]; | |
| 760 | 763 | |
| 761 | 764 | #if defined(CORE_AVR) |
| 762 | 765 | }; |
| @@ -893,7 +896,7 @@ | ||
| 893 | 896 | byte unused10_153; |
| 894 | 897 | byte unused10_154; |
| 895 | 898 | byte unused10_155; |
| 896 | - byte unused10_156; | |
| 899 | +/* [PJSC v1.10] byte unused10_156; | |
| 897 | 900 | byte unused10_157; |
| 898 | 901 | byte unused10_158; |
| 899 | 902 | byte unused10_159; |
| @@ -929,7 +932,9 @@ | ||
| 929 | 932 | byte unused10_189; |
| 930 | 933 | byte unused10_190; |
| 931 | 934 | byte unused10_191; |
| 932 | - | |
| 935 | +*/ | |
| 936 | +//[PJSC v1.10] | |
| 937 | + | |
| 933 | 938 | #if defined(CORE_AVR) |
| 934 | 939 | }; |
| 935 | 940 | #else |
| @@ -1016,7 +1021,8 @@ | ||
| 1016 | 1021 | byte knock_recoveryStepTime; |
| 1017 | 1022 | byte knock_recoveryStep; |
| 1018 | 1023 | |
| 1019 | - byte unused11_122_191[69]; | |
| 1024 | +//[PJSC v1.10] byte unused11_122_191[69]; | |
| 1025 | + byte unused11_122_155[33]; //[PJSC v1.10] | |
| 1020 | 1026 | |
| 1021 | 1027 | #if defined(CORE_AVR) |
| 1022 | 1028 | }; |
| @@ -1096,6 +1102,7 @@ | ||
| 1096 | 1102 | extern struct statuses currentStatus; // from speeduino.ino |
| 1097 | 1103 | extern struct table3D fuelTable; //16x16 fuel map |
| 1098 | 1104 | extern struct table3D fuelTable2; //16x16 fuel map2 [PJSC] |
| 1105 | +extern struct table3D fuelTable3; //16x16 fuel map2 [PJSC v1.10] | |
| 1099 | 1106 | extern struct table3D ignitionTable; //16x16 ignition map |
| 1100 | 1107 | extern struct table3D afrTable; //16x16 afr target map |
| 1101 | 1108 | extern struct table3D stagingTable; //8x8 afr target map |
| @@ -93,6 +93,7 @@ | ||
| 93 | 93 | #define EEPROM_CONFIG3_XBINS 677 |
| 94 | 94 | #define EEPROM_CONFIG3_YBINS 693 |
| 95 | 95 | #define EEPROM_CONFIG4_START 709 |
| 96 | +/* [PJSC v1.10] Change EEPROM layout for preparing VE table 4 support | |
| 96 | 97 | #define EEPROM_CONFIG4_END 837 |
| 97 | 98 | #define EEPROM_CONFIG5_XSIZE 837 |
| 98 | 99 | #define EEPROM_CONFIG5_YSIZE 838 |
| @@ -149,7 +150,74 @@ | ||
| 149 | 150 | #define EEPROM_CONFIG12_XBINS 2352 // | |
| 150 | 151 | #define EEPROM_CONFIG12_YBINS 2368 // V |
| 151 | 152 | #define EEPROM_CONFIG12_END 2384 //[PJSC] |
| 153 | +*/ | |
| 152 | 154 | |
| 155 | +//============================================= | |
| 156 | +//[PJSC v1.10] New EEPROM layout for preparing VE table 4 support | |
| 157 | +#define EEPROM_CONFIG4_END 789 | |
| 158 | +#define EEPROM_CONFIG5_XSIZE 789 | |
| 159 | +#define EEPROM_CONFIG5_YSIZE 790 | |
| 160 | +#define EEPROM_CONFIG5_MAP 791 | |
| 161 | +#define EEPROM_CONFIG5_XBINS 1047 | |
| 162 | +#define EEPROM_CONFIG5_YBINS 1063 | |
| 163 | +#define EEPROM_CONFIG6_START 1079 | |
| 164 | +#define EEPROM_CONFIG6_END 1207 | |
| 165 | +#define EEPROM_CONFIG7_XSIZE1 1207 | |
| 166 | +#define EEPROM_CONFIG7_YSIZE1 1208 | |
| 167 | +#define EEPROM_CONFIG7_MAP1 1209 | |
| 168 | +#define EEPROM_CONFIG7_XBINS1 1273 | |
| 169 | +#define EEPROM_CONFIG7_YBINS1 1281 | |
| 170 | +#define EEPROM_CONFIG7_XSIZE2 1289 | |
| 171 | +#define EEPROM_CONFIG7_YSIZE2 1290 | |
| 172 | +#define EEPROM_CONFIG7_MAP2 1291 | |
| 173 | +#define EEPROM_CONFIG7_XBINS2 1355 | |
| 174 | +#define EEPROM_CONFIG7_YBINS2 1363 | |
| 175 | + | |
| 176 | +#define EEPROM_CONFIG7_XSIZE3 1371 | |
| 177 | +#define EEPROM_CONFIG7_YSIZE3 1372 | |
| 178 | +#define EEPROM_CONFIG7_MAP3 1373 | |
| 179 | + | |
| 180 | +#define EEPROM_CONFIG7_XBINS3 1437 | |
| 181 | +#define EEPROM_CONFIG7_YBINS3 1445 | |
| 182 | +#define EEPROM_CONFIG7_END 1453 | |
| 183 | +#define EEPROM_CONFIG8_XSIZE1 1453 | |
| 184 | +#define EEPROM_CONFIG8_YSIZE1 1454 | |
| 185 | +#define EEPROM_CONFIG8_MAP1 1455 | |
| 186 | +#define EEPROM_CONFIG8_XBINS1 1491 | |
| 187 | +#define EEPROM_CONFIG8_YBINS1 1497 | |
| 188 | +#define EEPROM_CONFIG8_XSIZE2 1503 | |
| 189 | +#define EEPROM_CONFIG8_YSIZE2 1504 | |
| 190 | +#define EEPROM_CONFIG8_MAP2 1505 | |
| 191 | +#define EEPROM_CONFIG8_XBINS2 1541 | |
| 192 | +#define EEPROM_CONFIG8_YBINS2 1547 | |
| 193 | +#define EEPROM_CONFIG8_XSIZE3 1553 | |
| 194 | +#define EEPROM_CONFIG8_YSIZE3 1554 | |
| 195 | +#define EEPROM_CONFIG8_MAP3 1555 | |
| 196 | +#define EEPROM_CONFIG8_XBINS3 1591 | |
| 197 | +#define EEPROM_CONFIG8_YBINS3 1597 | |
| 198 | +#define EEPROM_CONFIG8_XSIZE4 1603 | |
| 199 | +#define EEPROM_CONFIG8_YSIZE4 1604 | |
| 200 | +#define EEPROM_CONFIG8_MAP4 1605 | |
| 201 | +#define EEPROM_CONFIG8_XBINS4 1641 | |
| 202 | +#define EEPROM_CONFIG8_YBINS4 1647 | |
| 203 | +#define EEPROM_CONFIG9_START 1662 | |
| 204 | +#define EEPROM_CONFIG9_END 1818 | |
| 205 | +#define EEPROM_CONFIG10_START 1818 | |
| 206 | +#define EEPROM_CONFIG10_END 1974 | |
| 207 | +#define EEPROM_CONFIG11_XSIZE 1974 | |
| 208 | +#define EEPROM_CONFIG11_YSIZE 1975 | |
| 209 | +#define EEPROM_CONFIG11_MAP 1976 | |
| 210 | +#define EEPROM_CONFIG11_XBINS 2232 | |
| 211 | +#define EEPROM_CONFIG11_YBINS 2248 | |
| 212 | +#define EEPROM_CONFIG11_END 2264 | |
| 213 | +#define EEPROM_CONFIG12_XSIZE 2264 | |
| 214 | +#define EEPROM_CONFIG12_YSIZE 2265 | |
| 215 | +#define EEPROM_CONFIG12_MAP 2266 | |
| 216 | +#define EEPROM_CONFIG12_XBINS 2522 | |
| 217 | +#define EEPROM_CONFIG12_YBINS 2538 | |
| 218 | +#define EEPROM_CONFIG12_END 2554 | |
| 219 | +//============================================= | |
| 220 | + | |
| 153 | 221 | //Calibration data is stored at the end of the EEPROM (This is in case any further calibration tables are needed as they are large blocks) |
| 154 | 222 | //[PJSC ver1.10]#define EEPROM_LAST_BARO 2558 |
| 155 | 223 | #define EEPROM_LAST_BARO 2557 //[PJSC ver1.10] |