Commit: head - PJSC (svn)

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

Commit MetaInfo

• Revision: 155 (tree)
• Time: 2023-12-09 03:20:15
• Author: maharu

Log Message

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

Change Summary

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

Incremental Difference

--- branches/PJSC_SPARK/reference/PJSC.ini	(revision 154)
+++ branches/PJSC_SPARK/reference/PJSC.ini	(revision 155)
@@ -1635,9 +1635,10 @@
       numSpeedPulsePerRev           = scalar, U08,   161,           "pulse",       1,         0,     0,     255,      0
       tireCircumference             = scalar, U16,   162,           "mm",          1,         0,     0,   65535,      0
 
-      dfcoTPSdotEnabled             = bits,   U08,   164,   [0:0],  "Off",      "On"                                  
-      isolateNumTooth               = bits,   U08,   164,   [1:1],  "Yes",       "No"                                 
-      unused15_164                  = bits,   U08,   164,   [2:7]                                                     
+      dfcoTPSdotEnabled             = bits,   U08,   164,   [0:0],  "Off",      "On"                                   
+      isolateNumTooth               = bits,   U08,   164,   [1:1],  "Yes",      "No"                                   
+      triggerWheelSelectable        = bits,   U08,   164,   [2:2],  "No",       "Yes"                                  
+      unused15_164                  = bits,   U08,   164,   [3:7]                                                      
       dfcoTPSdotThresh              = scalar, S16,   165,           "%/s",       1.0,       0.0, -2000,       0,      0
       dfcoTPSdotMulti               = scalar, U08,   167,           "%",         1.0,       0.0,   0.0,   100.0,      0
       dfcoTPSdotDuration            = scalar, U08,   168,           "ms",        1.0,       0.0,   0.0,    2550,      0
@@ -1749,6 +1750,8 @@
     requiresPowerCycle = vvtCLminDuty
     requiresPowerCycle = vvtCLmaxDuty
     requiresPowerCycle = useMAPasSync            ;[PJSC v1.10]
+    requiresPowerCycle = isolateNumTooth         ;[PJSC v1.10]
+    requiresPowerCycle = triggerWheelSelectable  ;[PJSC v1.10]
     requiresPowerCycle = ecuMode                 ;[PJSC v1.10]
     requiresPowerCycle = pullupTrigger           ;[PJSC v1.10]
     requiresPowerCycle = pullupTrigger2          ;[PJSC v1.10]
@@ -3525,12 +3528,16 @@
     dialog = triggerSettings,"Trigger Settings",4
         topicHelp = "http://wiki.speeduino.com/en/decoders"
         field = "Trigger Pattern",                TrigPattern
-        field = "Num of tooth equal num cylinder", isolateNumTooth, { TrigPattern == 1 }        ;[PJSC v1.10]
-        field = "VR1 Internal pullup", pullupTrigger                                            ;[PJSC v1.10]
-        field = "VR2 Internal pullup", pullupTrigger2                                           ;[PJSC v1.10]
 ;[PJSC v1.10]        field = "Primary base teeth",             numTeeth,       { TrigPattern == 0 || TrigPattern == 2 || TrigPattern == 11 || TrigPattern == 18 || TrigPattern == 19  || TrigPattern == 21 }
-        field = "Primary base teeth",             numTeeth,       { TrigPattern == 0 || (TrigPattern == 1 && isolateNumTooth == 1) || TrigPattern == 2 || TrigPattern == 11 || TrigPattern == 18 || TrigPattern == 19  || TrigPattern == 21 }    ;[PJSC v1.10]
-        field = "Primary trigger speed",          TrigSpeed,      { TrigPattern == 0 || TrigPattern == 2 }
+;[PJSC v1.10]        field = "Primary trigger speed",          TrigSpeed,      { TrigPattern == 0 || TrigPattern == 2 }
+        ;****************************** [PJSC v1.10] ****************************************
+        field = "VR1 Internal pullup", pullupTrigger
+        field = "VR2 Internal pullup", pullupTrigger2
+        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 == 1 && isolateNumTooth == 1) || TrigPattern == 2 || TrigPattern == 11 || TrigPattern == 18 || TrigPattern == 19  || TrigPattern == 21 }
+        field = "Primary trigger speed",          TrigSpeed,      { TrigPattern == 0 || (TrigPattern == 1 && triggerWheelSelectable == 1) || TrigPattern == 2 }
+        ;****************************** [PJSC v1.10] ****************************************
         field = "Missing teeth",                  missingTeeth,   { TrigPattern == 0 }
         field = "Trigger angle multiplier",       TrigAngMul,     { TrigPattern == 11 }
         field = "Trigger Angle ",                 TrigAng

--- branches/PJSC_SPARK/speeduino/globals.h	(revision 154)
+++ branches/PJSC_SPARK/speeduino/globals.h	(revision 155)
@@ -1734,7 +1734,8 @@
 
   byte dfcoTPSdotEnabled: 1;         //164
   byte isolateNumTooth: 1;
-  byte unused15_164: 6;
+  byte triggerWheelSelectable: 1;
+  byte unused15_164: 5;
   int16_t dfcoTPSdotThresh;          //165
   byte dfcoTPSdotMulti;              //167
   byte dfcoTPSdotDuration;           //168