提交: 153 - PJSC (svn)

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

Commit MetaInfo

• 修订版: 153 (tree)
• 时间: 2023-11-18 14:55:51
• 作者: maharu

Log Message

[PJSC v1.03]ベーシックディストリビューターのトリガー数指定オプションのバグ修正

更改概述

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

差异

--- branches/Ver1.03/reference/PJSC.ini	(revision 152)
+++ branches/Ver1.03/reference/PJSC.ini	(revision 153)
@@ -465,7 +465,7 @@
 ;[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]
-      isolateNumTooth          = bits,   U08, 120, [2:2],  "Yes",      "No"                                                      ;[PJSC v1.03] For trigger wheels with different number of triggers and number of cylinders
+      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]
@@ -4051,6 +4051,7 @@
     loopGauge         = loopsPerSecond,"Main loop speed",    "Loops/S" , 0,  70000,    -1,   500, 1800, 4000, 0, 0
     memoryGauge       = freeRAM,       "Free memory",        "bytes" ,   0,  8000,     -1,  1000, 8000, 1000, 0, 0
     reqFuelGauge      = req_fuel,       "Req. Fuel",          "ms",      0,  35.0,    1.0,   1.2,   20,   25, 2, 2
+    reqFuelUsGauge    = req_fuel_uS,    "Req. Fuel us",       "us",      0,  3000,      0,     0, 3000, 3000, 0, 0
     injOpenGauge      = inj_open,       "Injector Open Time", "ms",      0,  35.0,    1.0,   1.2,   20,   25, 1, 1
     mapMultiplyGauge  = map_multiply_amt, "MAP Multiply",     "%",       0,   200,    130,   140,  140,  150, 0, 0
     nSquirtsGauge     = nSquirts,       "# Squirts",          "",        0,    10,    130,   140,  140,  150, 0, 0
@@ -4119,7 +4120,7 @@
    ochGetCommand    = "r\$tsCanId\x30%2o%2c"
 ;[PJSC]   ochBlockSize     =  90
 ;[PJSC v1.03]   ochBlockSize     =  116          ;[PJSC v1.02] Extend block size
-   ochBlockSize     =  136          ;[PJSC v1.03] Extend block size
+   ochBlockSize     =  138          ;[PJSC v1.03] Extend block size
 
    secl             = scalar, U08,  0, "sec",    1.000, 0.000
    status1          = scalar, U08,  1, "bits",   1.000, 0.000
@@ -4252,8 +4253,8 @@
    dutyPulseOn_T    = scalar,   U16,   131, "ms",     0.001, 0.000                                             ;[PJSC v1.03]For capturing duty pulse
    dutyPulseOn_T2   = scalar,   U16,   133, "ms",     0.001, 0.000                                             ;[PJSC v1.03]For capturing duty pulse
    advance          = scalar,   S08,   135, "deg",    1.000, 0.000                                             ;[PJSC v1.03]
+   req_fuel_uS      = scalar,   U16,   136, "us",     1.000, 0.000                                             ;[PJSC v1.03]
 
-
 #if CELSIUS
    coolant          = { coolantRaw - 40                               } ; Temperature readings are offset by 40 to allow for negatives
    iat              = { iatRaw - 40                                   } ; Temperature readings are offset by 40 to allow for negatives

--- branches/Ver1.03/speeduino/cancomms.h	(revision 152)
+++ branches/Ver1.03/speeduino/cancomms.h	(revision 153)
@@ -2,7 +2,7 @@
 #define CANCOMMS_H
 
 //[PJSC v1.03]#define CAN_PACKET_SIZE   75
-#define CAN_PACKET_SIZE   136       //[PJSC v1.03]
+#define CAN_PACKET_SIZE   138       //[PJSC v1.03]
 
 uint8_t currentcanCommand;
 uint8_t currentCanPage = 1;//Not the same as the speeduino config page numbers

--- branches/Ver1.03/speeduino/comms.h	(revision 152)
+++ branches/Ver1.03/speeduino/comms.h	(revision 153)
@@ -20,7 +20,7 @@
 
 //[PJSC]#define SERIAL_PACKET_SIZE   90 //Must match ochBlockSize in ini file
 //[PJSC v1.03]#define SERIAL_PACKET_SIZE   116 //[PJSC v1.02] Extend serial packet block size
-#define SERIAL_PACKET_SIZE   136 //[PJSC v1.03] Extend serial packet block size
+#define SERIAL_PACKET_SIZE   138 //[PJSC v1.03] Extend serial packet block size
 
 byte currentPage = 1;//Not the same as the speeduino config page numbers
 bool isMap = true;