• 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

Revision96 (tree)
Time2020-06-08 11:27:39
Authormaharu

Log Message

Preparing for Simple menu.

Change Summary

Incremental Difference

--- branches/Ver1.02/reference/PJSC.ini (revision 95)
+++ branches/Ver1.02/reference/PJSC.ini (revision 96)
@@ -35,6 +35,10 @@
3535 ;[PJSC v1.01]For debug settingOption = table4_spark, "Spark advance table" ;[PJSC v1.01] For switching 4th table
3636 settingOption = table4_fuel, "VE table4" ;[PJSC v1.01] For switching 4th table
3737
38+ settingGroup = menu_option, "Menu Option" ;[PJSC v1.02] For menu option
39+ settingOption = simple_menu, "Simple menu" ;[PJSC v1.02] For menu option
40+ settingOption = full_option, "Full option" ;[PJSC v1.02] For menu option
41+
3842 [PcVariables]
3943 ; valid types: boolean, double, int, list
4044 ;
@@ -1489,10 +1493,12 @@
14891493 menuDialog = main
14901494
14911495 menu = "Settings"
1496+#if full_option ;[PJSC v1.02] For menu option
14921497 subMenu = engine_constants, "Engine Constants"
14931498 ;[PJSC v1.01] subMenu = injChars, "Injector Characteristics"
14941499 subMenu = triggerSettings, "Trigger Setup"
14951500 ;subMenu = OLED, "OLED Setup"
1501+#endif ;[PJSC v1.02] For menu option
14961502 subMenu = airdensity_curve, "IAT Density"
14971503 subMenu = barodensity_curve, "Baro Density", { baroCorr } ;[PJSC v1.01]
14981504 subMenu = reset_control, "Reset Control"
@@ -1524,8 +1530,10 @@
15241530 #endif ;[PJSC v1.01] For switching table4
15251531 subMenu = afrTable1Tbl, "AFR Table", 5
15261532 subMenu = std_separator
1533+#if full_option ;[PJSC v1.02] For menu option
15271534 ;[PJSC v1.01] subMenu = inj_trimad, "Sequential fuel trim", 9
15281535 subMenu = stagingTableDialog, "Staged Injection", 10, { nCylinders <= 4 } ; Can't do staging on more than 4 cylinder engines
1536+#endif ;[PJSC v1.02] For menu option
15291537
15301538 #if table4_spark ;[PJSC v1.01] For switching table4
15311539 menu = "&Spark"
@@ -1541,6 +1549,7 @@
15411549 menu = "&Starting/Idle"
15421550 subMenu = crankPW, "Cranking Settings"
15431551 subMenu = warmup, "Warmup Enrichment"
1552+#if full_option ;[PJSC v1.02] For menu option
15441553 subMenu = std_separator
15451554 ;[PJSC v1.01] subMenu = idleSettings, "Idle Control"
15461555 ;[PJSC v1.01] subMenu = iacClosedLoop_curve, "Idle - Closed loop targets", 7, { iacAlgorithm == 3 || iacAlgorithm == 5 }
@@ -1554,6 +1563,7 @@
15541563 subMenu = iacClosedLoop_curve, "Idle - Closed loop targets", 7, { (iacAlgorithm == 3 || iacAlgorithm == 5) && (muxout1selection == 1 || muxout2selection == 1) } ; |
15551564 subMenu = iacPwm_curve, "Idle - PWM Duty Cycle", 7, { iacAlgorithm == 2 && (muxout1selection == 1 || muxout2selection == 1) } ; V
15561565 subMenu = iacPwmCrank_curve, "Idle - PWM Cranking Duty Cycle", 7, { iacAlgorithm == 2 && (muxout1selection == 1 || muxout2selection == 1) } ;[PJSC v1.01] For MUX selection
1566+#endif ;[PJSC v1.02] For menu option
15571567
15581568 menu = "&Accessories"
15591569 subMenu = muxoutSetting, "MUX Output Port Setting" ;[PJSC v1.01]
@@ -1583,6 +1593,7 @@
15831593 subMenu = std_separator ; V
15841594 subMenu = tacho, "Tacho Output", { muxout1selection == 7 || muxout2selection == 7 } ;[PJSC v1.01] For MUX selection
15851595
1596+#if full_option ;[PJSC v1.02] For menu option
15861597 subMenu = std_separator ;[PJSC]
15871598 subMenu = inputPortSetting, "Input Port Setting" ;[PJSC]
15881599
@@ -1601,6 +1612,7 @@
16011612 subMenu = Canin_config, "External Auxillary Input Channel Configuration", {enable_secondarySerial || (enable_intcan && intcan_available)}
16021613 subMenu = Auxin_config, "Local Auxillary Input Channel Configuration"
16031614 #endif
1615+#endif ;[PJSC v1.02] For menu option
16041616
16051617 menuDialog = main
16061618 menu = "Tools"
@@ -3766,8 +3778,10 @@
37663778 batCorrectGauge = batCorrection, "Voltage Correction", "%", 0, 200, 130, 140, 140, 150, 0, 0
37673779 iatCorrectGauge = airCorrection, "IAT Correction", "%", 0, 200, 130, 140, 140, 150, 0, 0
37683780 flexEnrich, = flexFuelCor, "Flex Correction", "%", 0, 200, 130, 140, 140, 150, 0, 0
3781+#if table4_spark ;[PJSC v1.02]
37693782 advanceGauge = advance, "Spark Advance", "deg BTDC", 50, -10, 0, 0, 35, 45, 0, 0
37703783 dwellGauge = dwell, "Ign Dwell", "mSec", 0, 35.0, 1.0, 1.2, 20, 25, 3, 3
3784+#endif ;[PJSC v1.02]
37713785 boostTargetGauge = boostTarget, "Target Boost", "kPa", 0, {maphigh}, 0, 20, {mapwarn}, {mapdang}, 0, 0 ;[PJSC v1.02]
37723786 boostDutyGauge = boostDuty, "Boost Duty Cycle", "%", 0, 100, -1, -1, 101, 110, 1, 1 ;[PJSC v1.02]
37733787 afrTargetGauge = afrTarget, "Target AFR", "", 7, 25, 12, 13, 15, 16, 2, 2 ;[PJSC v1.02]
@@ -3777,7 +3791,6 @@
37773791 mapGauge_psi = map_psi, "Engine MAP (PSI)", "PSI", -15, 100, 0, 20, 200, 245, 0, 0
37783792 mapGauge_bar = map_bar, "Engine MAP (BAR)", "Bar", -1, 3, -1, -1, 5, 5, 2, 2
37793793 mapGauge_vacBoost = map_vacboost, "Engine MAP (in-Hg/PSI)", "in-Hg/PSI", -30, 30, -30, -30, 30, 30, 1, 1
3780- baroGauge = baro, "Baro Pressure", "kPa", 0,{maphigh}, 0, 20,{mapwarn},{mapdang}, 0, 0 ;[PJSC v1.02]
37813794 batteryVoltage = batteryVoltage,"Battery Voltage", "volts", 0, 25, 8, 9, 15, 16, 2, 2
37823795
37833796 tpsADCGauge = tpsADC, "TPS ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
@@ -3793,7 +3806,7 @@
37933806 dutyRatioGauge = dutyRatio, "Duty Ratio", "%", 0, 100, 5, 10, 90, 95, 0, 0 ;[PJSC]For capturing duty pulse
37943807 dutyFreqGauge2 = dutyFreq2, "Duty Pulse Frequency 2", "Hz", 0, 100, 5, 10, 90, 95, 0, 0 ;[PJSC]For capturing duty pulse
37953808 dutyRatioGauge2 = dutyRatio2, "Duty Ratio 2", "%", 0, 100, 5, 10, 90, 95, 0, 0 ;[PJSC]For capturing duty pulse
3796- baroGauge = baro, "Barometric Pressure", "kPa", 0, 200, 20, 60, 140, 180, 1, 0 ;[PJSC]Add the gage for barometric sensor
3809+ baroGauge = baro, "Baro Pressure", "kPa", 0,{maphigh}, 20, 60,{mapwarn},{mapdang}, 1, 0 ;[PJSC v1.02]
37973810 injcountGauge = testCnt, "Injection Count", "pulses", 0, 1000, 65535, 65535,65535, 65535,0, 0 ;[PJSC v1.01] For test mode
37983811 afrAnalyzeGauge1 = afr_analyze1, "Air:Fuel Ratio for VE1", "", 7, 25, 12, 13, 15, 16, 2, 2 ;[PJSC v1.02] For AFR sensor selection
37993812 afrAnalyzeGauge2 = afr_analyze2, "Air:Fuel Ratio for VE2", "", 7, 25, 12, 13, 15, 16, 2, 2 ;[PJSC v1.02] For AFR sensor selection
@@ -4108,8 +4121,10 @@
41084121 entry = dutyCycle, "DutyCycle1", float, "%.1f"
41094122 entry = dutyCycle, "DutyCycle2", float, "%.1f"
41104123 entry = TPSdot, "TPS DOT", int, "%d"
4124+#if table4_spark ;[PJSC v1.02]
41114125 entry = advance, "Advance", int, "%d"
41124126 entry = dwell, "Dwell", float, "%.1f"
4127+#endif ;[PJSC v1.02]
41134128 entry = batteryVoltage, "Battery V", float, "%.1f"
41144129 entry = rpmDOT, "rpm/s", int, "%d"
41154130 entry = flex, "Eth %", int, "%d", { flexEnabled }