• R/O
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

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

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


Commit MetaInfo

Revision45 (tree)
Time2019-02-21 18:58:59
Authormaharu

Log Message

Prepare 3rd VE Table

Change Summary

Incremental Difference

--- branches/Ver1.00_base/reference/PJSC.ini (revision 44)
+++ branches/Ver1.00_base/reference/PJSC.ini (revision 45)
@@ -354,7 +354,9 @@
354354 testinjcnt = scalar, U16, 98, "", 1, 0, 0, 65535, 0, noLocalUpdate
355355 muxout1selection = bits, U08, 100, [0:3], "Disable", "IDLE control", "Thermo Fan control", "Launch control", "Fuel pump control", "Boost control", "VVT control", "Tach output", "INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
356356 muxout2selection = bits, U08, 100, [4:7], "Disable", "IDLE control", "Thermo Fan control", "Launch control", "Fuel pump control", "Boost control", "VVT control", "Tach output", "INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
357- unused2-100 = array, U08, 101, [27], "%", 1.0, 0.0, 0.0, 255, 0 ;[PJSC v1.10]
357+ table3Usage = bits, U08, 101, [0:0], "Ignition", "Fuel" ;[PJSC v1.10]
358+ unused2-101 = bits, U08, 101, [1:7] ;[PJSC v1.10]
359+ unused2-102 = array, U08, 102, [26], "%", 1.0, 0.0, 0.0, 255, 0 ;[PJSC v1.10]
358360
359361
360362 ;Page 2 is the fuel map and axis bins only
@@ -531,8 +533,8 @@
531533
532534 ; Launch Control
533535 launchPin = bits , U08, 48, [0:5], "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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
534- launchEnable= bits, U08, 48, [6:6], "No", "Yes"
535- launchHiLo = bits, U08, 48, [7:7], "LOW", "HIGH"
536+ launchEnable= bits, U08, 48, [6:6], "No", "Yes"
537+ launchHiLo = bits, U08, 48, [7:7], "LOW", "HIGH"
536538
537539 lnchSoftLim = scalar, U08, 49, "rpm", 100, 0.0, 100, 25500, 0
538540 lnchRetard = scalar, S08, 50, "deg", 1.0, 0.0, -30, 40, 0
@@ -1112,6 +1114,9 @@
11121114 requiresPowerCycle = dutyPulseCaptureEnabled2 ;[PJSC]
11131115 requiresPowerCycle = muxout1selection ;[PJSC v1.10]
11141116 requiresPowerCycle = muxout2selection ;[PJSC v1.10]
1117+ requiresPowerCycle = algorithm2 ;[PJSC v1.10]
1118+ requiresPowerCycle = secondaryFuelUsage ;[PJSC v1.10]
1119+ requiresPowerCycle = table3Usage ;[PJSC v1.10]
11151120
11161121 requiresPowerCycle = caninput_sel0a
11171122 requiresPowerCycle = caninput_sel0b
@@ -1237,6 +1242,7 @@
12371242 defaultValue = testinjcnt, 0 ; |
12381243 defaultValue = muxout1selection, 0 ; V
12391244 defaultValue = muxout2selection, 0 ;[PJSC v1.10]
1245+ defaultValue = table3Usage, 0 ;[PJSC v1.10]
12401246
12411247 ;Default pins
12421248 defaultValue = fanPin, 0
@@ -1346,6 +1352,7 @@
13461352 subMenu = veMapSelectDialog, "VE Table select" ;[PJSC]
13471353 subMenu = veTable1Dialog, "&VE Table 1", 0 ; V
13481354 subMenu = veTable2Dialog, "&VE Table 2", 0, { multiVEmapEnabled >= 1 } ;[PJSC]
1355+ subMenu = veTable3Dialog, "&VE Table 3", 0, { 3rdTableUsage == 1 } ;[PJSC v1.10]
13491356 subMenu = afrTable1Tbl, "AFR Table", 5
13501357 subMenu = std_separator
13511358 subMenu = inj_trimad, "Sequential fuel trim", 9
@@ -1926,6 +1933,17 @@
19261933 panel = veTable2Dialog_north, North ; V
19271934 panel = veTable2Dialog_south, South ;[PJSC]
19281935
1936+ dialog = veTable3Dialog_north, "" ;[PJSC v1.10]
1937+ panel = veTable3Tbl ; |
1938+ ; |
1939+ dialog = veTable3Dialog_south, "" ; |
1940+ field = "Multiply VE value by MAP:Baro ratio", multiplyMAP ; |
1941+ field = "Multiply by ratio of AFR to Target AFR", includeAFR, { egoType == 2 } ; |
1942+ ; |
1943+ dialog = veTable3Dialog, "VE Table 3" ; |
1944+ panel = veTable3Dialog_north, North ; V
1945+ panel = veTable3Dialog_south, South ;[PJSC v1.10]
1946+
19291947 dialog = injChars, "Injector Characteristics" ;[PJSC]
19301948 field = "Squirt Device", squirtDeviceType ; |
19311949 field = "PJSC solenoid freq.", pjscFreq, { squirtDeviceType == 1 } ; |
@@ -3343,6 +3361,20 @@
33433361
33443362 ;[PJSC]-------------------------------------------------------------------------
33453363
3364+;[PJSC v1.10]-------------------------------------------------------------------
3365+ table = veTable3Tbl, veTable3Map, "VE Table 3", 12
3366+ topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
3367+ ; constant, variable
3368+ xBins = rpmBinsVE3, rpm
3369+ yBins = fuelLoadBins3, fuelLoad
3370+ zBins = veTable3
3371+
3372+ gridHeight = 2.0
3373+ gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
3374+ upDownLabel = "(RICHER)", "(LEANER)"
3375+
3376+;[PJSC v1.10]-------------------------------------------------------------------
3377+
33463378 ;-------------------------------------------------------------------------------
33473379
33483380 [GaugeConfigurations]
--- branches/Ver1.00_base/speeduino/globals.h (revision 44)
+++ branches/Ver1.00_base/speeduino/globals.h (revision 45)
@@ -647,8 +647,10 @@
647647 uint16_t testpw; // |
648648 uint16_t testinjcnt; // |
649649 byte muxout1Selection: 4; // | MUX output1 selection
650- byte muxout2Selection: 4; // V MUX output2 selection
651- byte unused1_101[27]; //[PJSC v1.10] For test mode
650+ byte muxout2Selection: 4; // | MUX output2 selection
651+ byte table3Usage: 1; // | For switching usage of 3rd table Ignition/Fuel
652+ byte unused1_101: 7; // V
653+ byte unused1_102[26]; //[PJSC v1.10] For test mode
652654
653655 #if defined(CORE_AVR)
654656 };