• 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

Revision94 (tree)
Time2020-05-16 23:58:31
Authormaharu

Log Message

AFRセンサーキャリブレーションを実行すると、VEテーブルが上書きされてしまう問題の修正

Change Summary

Incremental Difference

--- branches/Ver1.02/reference/PJSC.ini (revision 93)
+++ branches/Ver1.02/reference/PJSC.ini (revision 94)
@@ -2150,13 +2150,15 @@
21502150 dialog = injCloseAngles_west, "" ;[PJSC v1.01]
21512151 field = "Channel 1", inj1SquirtStartEnd, { squirtDeviceType == 0 } ; |
21522152 field = "Channel 2", inj2SquirtStartEnd, { (nCylinders > 1 || nInjectors > 1) && indInjAng && squirtDeviceType == 0 } ; |
2153- field = "Channel 3", inj3SquirtStartEnd, { indInjAng && (nCylinders > 4 || nCylinders == 3 || nInjectors > 2 || ((nCylinders == 4) && (injLayout == 3))) && squirtDeviceType == 0 } ; V
2153+;[PJSC v1.02] field = "Channel 3", inj3SquirtStartEnd, { indInjAng && (nCylinders > 4 || nCylinders == 3 || nInjectors > 2 || ((nCylinders == 4) && (injLayout == 3))) && squirtDeviceType == 0 } ; V
2154+ field = "Channel 3", inj3SquirtStartEnd, { indInjAng && (nCylinders > 2 || nInjectors > 2 && (injLayout > 0)) && squirtDeviceType == 0 } ; V [PJSC v1.02]
21542155 field = "Channel 4", inj4SquirtStartEnd, { indInjAng && (nCylinders > 4 || ((nCylinders == 4 || nInjectors > 3) && (injLayout > 0))) && squirtDeviceType == 0 } ;[PJSC v1.01]
21552156
21562157 dialog = injCloseAngles_east, "" ;[PJSC v1.01]
21572158 field = "", inj1Ang, { squirtDeviceType == 0 } ; |
21582159 field = "", inj2Ang, { (nCylinders > 1 || nInjectors > 1) && indInjAng && squirtDeviceType == 0 } ; |
2159- field = "", inj3Ang, { indInjAng && (nCylinders > 4 || nCylinders == 3 || nInjectors > 2 || ((nCylinders == 4) && (injLayout == 3))) && squirtDeviceType == 0 } ; V
2160+;[PJSC v1.02] field = "", inj3Ang, { indInjAng && (nCylinders > 4 || nCylinders == 3 || nInjectors > 2 || ((nCylinders == 4) && (injLayout == 3))) && squirtDeviceType == 0 } ; V
2161+ field = "", inj3Ang, { indInjAng && (nCylinders > 2 || nInjectors > 2 && (injLayout > 0)) && squirtDeviceType == 0 } ; V [PJSC v1.02]
21602162 field = "", inj4Ang, { indInjAng && (nCylinders > 4 || ((nCylinders == 4 || nInjectors > 3) && (injLayout > 0))) && squirtDeviceType == 0 } ;[PJSC v1.01]
21612163
21622164 dialog = injCloseAngles, "Injector squirt angle", xAxis ;[PJSC v1.01]
@@ -2306,9 +2308,9 @@
23062308 field = "cranking before the injectors and coils are fired"
23072309 field = "Trigger edge", TrigEdge { TrigPattern != 4 } ;4G63 uses both edges
23082310 field = "Secondary trigger edge", TrigEdgeSec, { (TrigPattern == 0 && TrigSpeed == 0) || TrigPattern == 2 || TrigPattern == 9 || TrigPattern == 12 } ;Missing tooth, dual wheel and Miata 9905
2309- field = "Missing Tooth Secondary type" trigPatternSec, { (TrigPattern == 0&& TrigSpeed == 0) }
2311+ field = "Missing Tooth Secondary type" trigPatternSec, { (TrigPattern == 0&& TrigSpeed == 0) }
23102312 field = "Trigger Filter", TrigFilter, { TrigPattern != 13 }
2311- field = "Trigger Filter during cranking", crankingFilter, { TrigPattern != 13 } ;[PJSC v1.02]
2313+ field = "Trigger Filter during cranking", crankingFilter, { TrigPattern != 13 } ;[PJSC v1.02]
23122314 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
23132315
23142316 #if table4_spark ;[PJSC v1.01] For switching table4
--- branches/Ver1.02/speeduino/globals.h (revision 93)
+++ branches/Ver1.02/speeduino/globals.h (revision 94)
@@ -277,6 +277,10 @@
277277 #define MUXOUT_VVT 6 //[PJSC v1.01] MUX output selection
278278 #define MUXOUT_TACH 7 //[PJSC v1.01] MUX output selection
279279
280+#define ANALOG_INPUT_OFF 0 //[PJSC v1.02] Analog input selection
281+#define ANALOG_EXVALVE 1 //[PJSC v1.02] Analog input selection
282+#define ANALOG_O2_SEC 2 //[PJSC v1.02] Analog input selection
283+
280284 struct table3D fuelTable; //16x16 fuel map
281285 struct table3D fuelTable2; //16x16 fuel map2 [PJSC]
282286 struct table3D fuelTable3; //16x16 fuel map3 [PJSC v1.01]
@@ -649,10 +653,12 @@
649653 byte fuelCorrectionEnabled: 1; // |[PJSC v1.01]
650654 byte unused2_75: 1; // |
651655 byte exTrigModeSelect : 2; // | For External Trigger
652- byte externalTrigEdge: 1; // | 0: Rising, 1: Falling
653- byte exValveCaptureEnabled: 1; // | For capturing Exhaust valve position
654- byte exValveCalibrationMode: 1; //[PJSC] Support Exhaust Valve calibrationmode
655- byte unused2_76: 3; // |
656+ byte externalTrigEdge: 1; // | 0: Rising, 1: Falling
657+//[PJSC v1.02] byte exValveCaptureEnabled: 1; // | For capturing Exhaust valve position
658+ byte exValveCalibrationMode: 1; // | For support Exhaust Valve calibrationmode
659+//[PJSC v1.02] byte unused2_76: 3; // |
660+ byte analogInputPortSelection: 2; // |[PJSC v1.02] For Analog input port selection
661+ byte unused2_76: 2; // |[PJSC v1.02]
656662 byte dutyPulseCaptureEnabled: 1; // | For capturing duty pulse ch1
657663 byte dutyPulseCaptureEnabled2: 1; // | For capturing duty pulse ch2
658664 byte dutyPulseOnLevel: 1; // | For capturing duty pulse ch1, 0: high, 1: low
@@ -780,7 +786,10 @@
780786 //[PJSC v1.01] byte unused2_64[57];
781787 byte baroDenBins[9]; //[PJSC v1.01] For Barometric extend correnction
782788 byte baroDenRates[9]; //[PJSC v1.01] For Barometric extend correnction
783- byte unused2_82[39];
789+//[PJSC v1.02] byte unused2_82[39];
790+ byte crankingFilter : 1; //[PJSC v1.02]
791+ byte unused2_82 : 7; //[PJSC v1.02]
792+ byte unused2_83[38]; //[PJSC v1.02]
784793
785794 #if defined(CORE_AVR)
786795 };
@@ -1116,6 +1125,7 @@
11161125 byte pinMuxout2; //[PJSC v1.01] For MUX output setting
11171126 byte pinMuxout3; //[PJSC v1.01] For MUX output setting
11181127 byte pinMuxout4; //[PJSC v1.01] For MUX output setting
1128+byte pinAnalogInput1; //[PJSC v1.02] For Analog input selection
11191129
11201130 // global variables // from speeduino.ino
11211131 extern struct statuses currentStatus; // from speeduino.ino
--- branches/Ver1.02/speeduino/storage.h (revision 93)
+++ branches/Ver1.02/speeduino/storage.h (revision 94)
@@ -12,7 +12,8 @@
1212 //These are utility functions that prevent other files from having to use EEPROM.h directly
1313 byte readLastBaro();
1414 void storeLastBaro(byte);
15-void storeCalibrationValue(byte, byte);
15+//[PJSC v1.02]void storeCalibrationValue(byte, byte);
16+void storeCalibrationValue(uint16_t, byte); //[PJSC v1.02]
1617 byte readEEPROMVersion();
1718 void storeEEPROMVersion(byte);
1819