• 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

Revision47 (tree)
Time2019-02-22 18:29:17
Authormaharu

Log Message

Prepare Barometric correnction.

Change Summary

Incremental Difference

--- branches/Ver1.00_base/reference/PJSC.ini (revision 46)
+++ branches/Ver1.00_base/reference/PJSC.ini (revision 47)
@@ -270,8 +270,7 @@
270270 engineType = bits, U08, 38, [0:0], "Even fire", "Odd fire"
271271 flexEnabled = bits, U08, 38, [1:1], "Off", "On"
272272 unused2_38c = bits, U08, 38, [2:2], "Speed Density", "Alpha-N"
273-;[PJSC v1.10] baroCorr = bits, U08, 38, [3:3], "Off", "On"
274- unused2_32d = bits, U08, 38, [3:3], "Off", "On"
273+ baroCorr = bits, U08, 38, [3:3], "Off", "On"
275274 injLayout = bits, U08, 38, [4:5], "Paired", "Semi-Sequential", "INVALID", "Sequential"
276275 perToothIgn = bits, U08, 38, [6:6], "No", "Yes"
277276 dfcoEnabled = bits, U08, 38, [7:7], "Off", "On"
@@ -357,9 +356,8 @@
357356 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"
358357 baroDenBins = array, U08, 101, [9], "kPa", 1.0, 0.0, 0.0, 255.0, 0 ;[PJSC v1.10] Bins for the Barometric density correction curve
359358 baroDenRates = array, U08, 110, [9], "%", 1.0, 0.0, 0.0, 255.0, 0 ;[PJSC v1.10] Values for the \Barometric density correction curve
360- baroCorr = bits, U08, 119, [0:1], "Off", "Multiply MAP raio", "Use Baro correction table", "INVALID" ;[PJSC v1.10]
361- table3Usage = bits, U08, 119, [2:2], "Ignition", "Fuel" ;[PJSC v1.10]
362- unused2_119 = bits, U08, 119, [3:7] ;[PJSC v1.10]
359+ table3Usage = bits, U08, 119, [0:0], "Ignition", "Fuel" ;[PJSC v1.10]
360+ unused2_119 = bits, U08, 119, [1:7] ;[PJSC v1.10]
363361 unused2_120 = array, U08, 120, [8], "%", 1.0, 0.0, 0.0, 255, 0 ;[PJSC v1.10]
364362
365363
@@ -1342,7 +1340,7 @@
13421340 subMenu = triggerSettings, "Trigger Setup"
13431341 ;subMenu = OLED, "OLED Setup"
13441342 subMenu = airdensity_curve, "IAT Density"
1345- subMenu = barodensity_curve, "Baro Density", { baroCorr == 2 } ;[PJSC v1.10]
1343+ subMenu = barodensity_curve, "Baro Density", { baroCorr } ;[PJSC v1.10]
13461344 subMenu = reset_control, "Reset Control"
13471345
13481346
@@ -1919,6 +1917,7 @@
19191917 dialog = veTable1Dialog_south, "" ;[PJSC]
19201918 field = "Multiply VE value by MAP:Baro ratio", multiplyMAP
19211919 field = "Multiply by ratio of AFR to Target AFR", includeAFR, { egoType == 2 }
1920+ field = "Barometric correction", baroCorr, { useExtBaro } ;[PJSC v1.10] For Barometric correnction
19221921
19231922 ;[PJSC] dialog = veTableDialog, "VE Table"
19241923 ;[PJSC] panel = veTableDialog_north, North
@@ -1933,6 +1932,7 @@
19331932 dialog = veTable2Dialog_south, "" ; |
19341933 field = "Multiply VE value by MAP:Baro ratio", multiplyMAP ; |
19351934 field = "Multiply by ratio of AFR to Target AFR", includeAFR, { egoType == 2 } ; |
1935+ field = "Barometric correction", baroCorr, { useExtBaro } ; |[PJSC v1.10] For Barometric correnction
19361936 ; |
19371937 dialog = veTable2Dialog, "VE Table 2" ; |
19381938 panel = veTable2Dialog_north, North ; V
@@ -1944,6 +1944,7 @@
19441944 dialog = veTable3Dialog_south, "" ; |
19451945 field = "Multiply VE value by MAP:Baro ratio", multiplyMAP ; |
19461946 field = "Multiply by ratio of AFR to Target AFR", includeAFR, { egoType == 2 } ; |
1947+ field = "Barometric correction", baroCorr, { useExtBaro } ; |For Barometric correnction
19471948 ; |
19481949 dialog = veTable3Dialog, "VE Table 3" ; |
19491950 panel = veTable3Dialog_north, North ; V
--- branches/Ver1.00_base/speeduino/globals.h (revision 46)
+++ branches/Ver1.00_base/speeduino/globals.h (revision 47)
@@ -574,8 +574,7 @@
574574 byte engineType : 1;
575575 byte flexEnabled : 1;
576576 byte unused2_38c : 1; //"Speed Density", "Alpha-N"
577-//[PJSC v1.10] byte baroCorr : 1;
578- byte unused2_38d : 1; //[PJSC v1.10]
577+ byte baroCorr : 1;
579578 byte injLayout : 2;
580579 byte perToothIgn : 1;
581580 byte dfcoEnabled : 1; //Whether or not DFCO is turned on
@@ -651,9 +650,8 @@
651650 byte muxout2Selection: 4; // | MUX output2 selection
652651 byte baroDenBins[9]; // | For Barometric extend correnction
653652 byte baroDenRates[9]; // | For Barometric extend correnction
654- byte baroCorr : 2; // | For Barometric extend correnction
655653 byte table3Usage: 1; // | For switching usage of 3rd table Ignition/Fuel
656- byte unused2_119: 5; // V
654+ byte unused2_119: 7; // V
657655 byte unused2_120[8]; //[PJSC v1.10] For test mode
658656
659657 #if defined(CORE_AVR)
--- branches/Ver1.00_base/speeduino/storage.h (revision 46)
+++ branches/Ver1.00_base/speeduino/storage.h (revision 47)
@@ -139,8 +139,8 @@
139139 #define EEPROM_CONFIG8_MAP4 1653
140140 #define EEPROM_CONFIG8_XBINS4 1689
141141 #define EEPROM_CONFIG8_YBINS4 1695
142-#define EEPROM_CONFIG9_START 1710
143-#define EEPROM_CONFIG9_END 1902
142+#define EEPROM_CONFIG9_START 1710
143+#define EEPROM_CONFIG9_END 1902
144144 #define EEPROM_CONFIG10_START 1902
145145 #define EEPROM_CONFIG10_END 2094
146146 #define EEPROM_CONFIG12_XSIZE 2094 //[PJSC]