• 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

Revision125 (tree)
Time2021-05-19 01:30:18
Authormaharu

Log Message

[PJSC v1.03]デュアルフューエルロード有効時に加算または乗算後のVE値(Dual VE)をログに追加

Change Summary

Incremental Difference

--- branches/Ver1.03/reference/PJSC.ini (revision 124)
+++ branches/Ver1.03/reference/PJSC.ini (revision 125)
@@ -3904,6 +3904,10 @@
39043904 veGauge2 = veCurr2, "VE2 Current", "%", 0, 120, -1, -1, 999, 999, 0, 0 ;[PJSC]
39053905 veGauge3 = veCurr3, "VE3 Current", "%", 0, 120, -1, -1, 999, 999, 0, 0 ;[PJSC v1.01]
39063906 veGauge4 = veCurr4, "VE4 Current", "%", 0, 120, -1, -1, 999, 999, 0, 0 ;[PJSC v1.01]
3907+ dualVEGauge1 = dualVE1, "Dual VE1", "%", 0, 120, -1, -1, 999, 999, 0, 0 ;[PJSC v1.03]
3908+ dualVEGauge2 = dualVE2, "Dual VE2", "%", 0, 120, -1, -1, 999, 999, 0, 0 ;[PJSC v1.03]
3909+ dualVEGauge3 = dualVE3, "Dual VE3", "%", 0, 120, -1, -1, 999, 999, 0, 0 ;[PJSC v1.03]
3910+ dualVEGauge4 = dualVE4, "Dual VE4", "%", 0, 120, -1, -1, 999, 999, 0, 0 ;[PJSC v1.03]
39073911 warmupEnrichGauge = warmupEnrich, "Warmup Enrichment", "%", 100, 200, 130, 140, 140, 150, 0, 0
39083912 aseEnrichGauge = ase_enrich, "Afterstart Enrichment","%", 0, 200, 130, 140, 140, 150, 0, 0
39093913 batCorrectGauge = batCorrection, "Voltage Correction", "%", 0, 200, 130, 140, 140, 150, 0, 0
@@ -4045,7 +4049,7 @@
40454049 ochGetCommand = "r\$tsCanId\x30%2o%2c"
40464050 ;[PJSC] ochBlockSize = 90
40474051 ;[PJSC v1.03] ochBlockSize = 116 ;[PJSC v1.02] Extend block size
4048- ochBlockSize = 118 ;[PJSC v1.03] Extend block size
4052+ ochBlockSize = 122 ;[PJSC v1.03] Extend block size
40494053
40504054 secl = scalar, U08, 0, "sec", 1.000, 0.000
40514055 status1 = scalar, U08, 1, "bits", 1.000, 0.000
@@ -4164,8 +4168,12 @@
41644168 afr_analyze3 = scalar, U08, 114, "O2 for VE Table 3", 0.100, 0.000 ;[PJSC v1.02]For AFR sensor selection
41654169 afr_analyze4 = scalar, U08, 115, "O2 for VE Table 4", 0.100, 0.000 ;[PJSC v1.02]For AFR sensor selection
41664170 EGTADC = scalar, U16, 116, "ADC", 1.000, 0.000 ;[PJSC v1.03]For Exhaust Gas Temperature
4167-
4171+ dualVE1 = scalar, U08, 118, "%", 1.000, 0.000 ;[PJSC v1.03]For Dual Fuel Load
4172+ dualVE2 = scalar, U08, 119, "%", 1.000, 0.000 ;[PJSC v1.03]For Dual Fuel Load
4173+ dualVE3 = scalar, U08, 120, "%", 1.000, 0.000 ;[PJSC v1.03]For Dual Fuel Load
4174+ dualVE4 = scalar, U08, 121, "%", 1.000, 0.000 ;[PJSC v1.03]For Dual Fuel Load
41684175
4176+
41694177 #if CELSIUS
41704178 coolant = { coolantRaw - 40 } ; Temperature readings are offset by 40 to allow for negatives
41714179 iat = { iatRaw - 40 } ; Temperature readings are offset by 40 to allow for negatives
@@ -4292,6 +4300,10 @@
42924300 entry = dutyRatio2, "Duty Ratio2", int, "%d", { dutyPulseCaptureEnabled2 } ;[PJSC]
42934301 entry = fuelLoad, "Load", int, "%d", ;[PJSC v1.03]
42944302 entry = EGT, "EGT", int, "%d", ;[PJSC v1.03]
4303+ entry = dualVE1, "Dual VE1", int, "%d", { dualFuelEnabled } ;[PJSC v1.03]
4304+ entry = dualVE2, "Dual VE2", int, "%d", { dualFuelEnabled } ;[PJSC v1.03]
4305+ entry = dualVE3, "Dual VE3", int, "%d", { dualFuelEnabled } ;[PJSC v1.03]
4306+ entry = dualVE4, "Dual VE4", int, "%d", { dualFuelEnabled } ;[PJSC v1.03]
42954307
42964308 entry = auxin_gauge0, "AuxIn CH0", int, "%d"
42974309 entry = auxin_gauge1, "AuxIn CH1", int, "%d"
--- branches/Ver1.03/speeduino/comms.h (revision 124)
+++ branches/Ver1.03/speeduino/comms.h (revision 125)
@@ -20,7 +20,7 @@
2020
2121 //[PJSC]#define SERIAL_PACKET_SIZE 90 //Must match ochBlockSize in ini file
2222 //[PJSC v1.03]#define SERIAL_PACKET_SIZE 116 //[PJSC v1.02] Extend serial packet block size
23-#define SERIAL_PACKET_SIZE 118 //[PJSC v1.03] Extend serial packet block size
23+#define SERIAL_PACKET_SIZE 122 //[PJSC v1.03] Extend serial packet block size
2424
2525 byte currentPage = 1;//Not the same as the speeduino config page numbers
2626 bool isMap = true;
--- branches/Ver1.03/speeduino/globals.h (revision 124)
+++ branches/Ver1.03/speeduino/globals.h (revision 125)
@@ -536,6 +536,10 @@
536536 byte afr_analyze3; // V
537537 byte afr_analyze4; //[PJSC v1.02] For AFR sensor selection
538538 int EGTADC; //[PJSC v1.03] For Exhaust Gas Temperature input
539+ byte dualVE1; //[PJSC v1.03] For Dual Fuel Load
540+ byte dualVE2; //[PJSC v1.03] For Dual Fuel Load
541+ byte dualVE3; //[PJSC v1.03] For Dual Fuel Load
542+ byte dualVE4; //[PJSC v1.03] For Dual Fuel Load
539543
540544 //Helpful bitwise operations:
541545 //Useful reference: http://playground.arduino.cc/Code/BitMath