Commit: 154 - PJSC (svn)

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

Commit MetaInfo

• Revision: 154 (tree)
• Time: 2023-12-09 03:19:45
• Author: maharu

Log Message

[PJSC v1.03]ベーシックディストリビューターデコーダーで、クランクホイールスピードを選択出来るオプションを追加

Change Summary

• modified: branches/Ver1.03/reference/PJSC.ini
• modified: branches/Ver1.03/speeduino/decoders.ino
• modified: branches/Ver1.03/speeduino/globals.h

Incremental Difference

--- branches/Ver1.03/reference/PJSC.ini	(revision 153)
+++ branches/Ver1.03/reference/PJSC.ini	(revision 154)
@@ -464,9 +464,10 @@
       exValveCalibrationMode   = bits,   U08, 119, [7:7], "Off",      "On"                                                       ;[PJSC v1.03]
 ;[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]
+      useMAPasSync             = bits,   U08, 120, [1:1],  "No",  "Yes"                                                          ;[PJSC v1.03]
       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
+      triggerWheelSelectable   = bits,   U08, 120, [3:3],  "No",  "Yes"                                                          ;[PJSC v1.03]
+      unused2_120              = bits,   U08, 120, [4: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]
@@ -1293,6 +1294,8 @@
     requiresPowerCycle = secondaryFuelUsage         ;[PJSC v1.01]
     requiresPowerCycle = table4Usage                ;[PJSC v1.01]
     requiresPowerCycle = useMAPasSync               ;[PJSC v1.03]
+    requiresPowerCycle = isolateNumTooth            ;[PJSC v1.03]
+    requiresPowerCycle = triggerWheelSelectable     ;[PJSC v1.03]
 
 	requiresPowerCycle = caninput_sel0a
 	requiresPowerCycle = caninput_sel0b
@@ -2501,10 +2504,14 @@
     dialog = triggerSettings,"Trigger Settings",4
         topicHelp = "http://speeduino.com/wiki/index.php/Decoders"
         field = "Trigger Pattern",                TrigPattern
-        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 }
+;[PJSC v1.03]        field = "Primary trigger speed",          TrigSpeed,      { TrigPattern == 0 }
+        ;****************************** [PJSC v1.03] ****************************************
+        field = "Num of tooth equal num cylinder", isolateNumTooth,         { TrigPattern == 1 }
+        field = "Trigger wheel is selectable",     triggerWheelSelectable,  { TrigPattern == 1 }
         field = "Primary base teeth",             numTeeth,       { TrigPattern == 0 || TrigPattern == 2 || TrigPattern == 11 || (TrigPattern == 1 && isolateNumTooth == 1) }
-        field = "Primary trigger speed",          TrigSpeed,      { TrigPattern == 0 }
+        field = "Primary trigger speed",          TrigSpeed,      { TrigPattern == 0 || (TrigPattern == 1 && triggerWheelSelectable == 1)  }
+        ;****************************** [PJSC v1.03] ****************************************
         field = "Missing teeth",                  missingTeeth,   { TrigPattern == 0 }
         field = "Trigger angle multiplier",       TrigAngMul,     { TrigPattern == 11 }
         field = "Trigger Angle ",                 TrigAng

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