Commit: 143 - PJSC (svn)

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

Commit MetaInfo

• Revision: 143 (tree)
• Time: 2023-09-16 00:46:23
• Author: maharu

Log Message

- PJSC.iniファイルをベーシックディストリビューターのトリガー数設定オプション対応に修正

Change Summary

• modified: branches/Ver1.03/reference/PJSC.ini
• modified: branches/Ver1.03/speeduino/cancomms.ino
• modified: branches/Ver1.03/speeduino/comms.ino
• modified: branches/Ver1.03/speeduino/globals.h
• modified: branches/Ver1.03/speeduino/init.ino

Incremental Difference

--- branches/Ver1.03/reference/PJSC.ini	(revision 142)
+++ branches/Ver1.03/reference/PJSC.ini	(revision 143)
@@ -458,7 +458,8 @@
 ;[PJSC v1.03]      unused2_119              = bits,   U08, 119, [7:7]                                                                         ;[PJSC v1.03]
       table4Usage              = bits,   U08, 120, [0:0], "Fuel", "Spark"                                                        ;[PJSC v1.01]
       useMAPasSync             = bits,   U08, 120, [1:1],  "No", "Yes"                                                           ;[PJSC v1.03]
-      unused2_120              = bits,   U08, 120, [2:7]                                                                         ;[PJSC v1.01]
+      isolateNumTooth          = bits,   U08, 120, [2:2],  "Yes",      "No"                                                      ;[PJSC v1.03] For trigger wheels with different number of triggers and number of cylinders
+      unused2_120              = bits,   U08, 120, [3:7]                                                                         ;[PJSC v1.03] For trigger wheels with different number of triggers and number of cylinders
       inj1SquirtStartEnd       = bits,   U08, 121, [0:0], "End angle", "Start angle"                                             ;[PJSC v1.01]
       inj2SquirtStartEnd       = bits,   U08, 121, [1:1], "End angle", "Start angle"                                             ;[PJSC v1.01]
       inj3SquirtStartEnd       = bits,   U08, 121, [2:2], "End angle", "Start angle"                                             ;[PJSC v1.01]
@@ -2493,7 +2494,9 @@
     dialog = triggerSettings,"Trigger Settings",4
         topicHelp = "http://speeduino.com/wiki/index.php/Decoders"
         field = "Trigger Pattern",                TrigPattern
-        field = "Primary base teeth",             numTeeth,       { TrigPattern == 0 || TrigPattern == 2 || TrigPattern == 11 }
+        field = "Num of tooth equal num cylinder", isolateNumTooth, { TrigPattern == 1 }        ;[PJSC v1.03] For trigger wheels with different number of triggers and number of cylinders
+;[PJSC v1.03]        field = "Primary base teeth",             numTeeth,       { TrigPattern == 0 || TrigPattern == 2 || TrigPattern == 11 }
+        field = "Primary base teeth",             numTeeth,       { TrigPattern == 0 || TrigPattern == 2 || TrigPattern == 11 || (TrigPattern == 1 && isolateNumTooth == 1) }
         field = "Primary trigger speed",          TrigSpeed,      { TrigPattern == 0 }
         field = "Missing teeth",                  missingTeeth,   { TrigPattern == 0 }
         field = "Trigger angle multiplier",       TrigAngMul,     { TrigPattern == 11 }

--- branches/Ver1.03/speeduino/globals.h	(revision 142)
+++ branches/Ver1.03/speeduino/globals.h	(revision 143)
@@ -737,7 +737,8 @@
 //[PJSC v1.03]  byte unused2_118: 1;               // |[PJSC v1.03]
   byte table4Usage: 1;               // | For switching usage of 3rd table Ignition/Fuel
   byte useMAPasSync: 1;              // |[PJSC v1.03]
-  byte unused2_119: 6;               // |
+  byte isolateNumTooth: 1;           // |[PJSC v1.03] For trigger wheels with different number of triggers and number of cylinders
+  byte unused2_119: 5;               // |
   byte inj1SquirtStartEnd: 1;        // |
   byte inj2SquirtStartEnd: 1;        // |
   byte inj3SquirtStartEnd: 1;        // V