PJSC(Pump Jet Solenoid Controller)はArduinoを使用したバイク用燃料噴射コントローラです。このプロジェクトは、オープンソースECUプロジェクト『Speeduino』をベースにしています。
Preparing for Simple menu.
| @@ -35,6 +35,10 @@ | ||
| 35 | 35 | ;[PJSC v1.01]For debug settingOption = table4_spark, "Spark advance table" ;[PJSC v1.01] For switching 4th table |
| 36 | 36 | settingOption = table4_fuel, "VE table4" ;[PJSC v1.01] For switching 4th table |
| 37 | 37 | |
| 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 | + | |
| 38 | 42 | [PcVariables] |
| 39 | 43 | ; valid types: boolean, double, int, list |
| 40 | 44 | ; |
| @@ -1489,10 +1493,12 @@ | ||
| 1489 | 1493 | menuDialog = main |
| 1490 | 1494 | |
| 1491 | 1495 | menu = "Settings" |
| 1496 | +#if full_option ;[PJSC v1.02] For menu option | |
| 1492 | 1497 | subMenu = engine_constants, "Engine Constants" |
| 1493 | 1498 | ;[PJSC v1.01] subMenu = injChars, "Injector Characteristics" |
| 1494 | 1499 | subMenu = triggerSettings, "Trigger Setup" |
| 1495 | 1500 | ;subMenu = OLED, "OLED Setup" |
| 1501 | +#endif ;[PJSC v1.02] For menu option | |
| 1496 | 1502 | subMenu = airdensity_curve, "IAT Density" |
| 1497 | 1503 | subMenu = barodensity_curve, "Baro Density", { baroCorr } ;[PJSC v1.01] |
| 1498 | 1504 | subMenu = reset_control, "Reset Control" |
| @@ -1524,8 +1530,10 @@ | ||
| 1524 | 1530 | #endif ;[PJSC v1.01] For switching table4 |
| 1525 | 1531 | subMenu = afrTable1Tbl, "AFR Table", 5 |
| 1526 | 1532 | subMenu = std_separator |
| 1533 | +#if full_option ;[PJSC v1.02] For menu option | |
| 1527 | 1534 | ;[PJSC v1.01] subMenu = inj_trimad, "Sequential fuel trim", 9 |
| 1528 | 1535 | 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 | |
| 1529 | 1537 | |
| 1530 | 1538 | #if table4_spark ;[PJSC v1.01] For switching table4 |
| 1531 | 1539 | menu = "&Spark" |
| @@ -1541,6 +1549,7 @@ | ||
| 1541 | 1549 | menu = "&Starting/Idle" |
| 1542 | 1550 | subMenu = crankPW, "Cranking Settings" |
| 1543 | 1551 | subMenu = warmup, "Warmup Enrichment" |
| 1552 | +#if full_option ;[PJSC v1.02] For menu option | |
| 1544 | 1553 | subMenu = std_separator |
| 1545 | 1554 | ;[PJSC v1.01] subMenu = idleSettings, "Idle Control" |
| 1546 | 1555 | ;[PJSC v1.01] subMenu = iacClosedLoop_curve, "Idle - Closed loop targets", 7, { iacAlgorithm == 3 || iacAlgorithm == 5 } |
| @@ -1554,6 +1563,7 @@ | ||
| 1554 | 1563 | subMenu = iacClosedLoop_curve, "Idle - Closed loop targets", 7, { (iacAlgorithm == 3 || iacAlgorithm == 5) && (muxout1selection == 1 || muxout2selection == 1) } ; | |
| 1555 | 1564 | subMenu = iacPwm_curve, "Idle - PWM Duty Cycle", 7, { iacAlgorithm == 2 && (muxout1selection == 1 || muxout2selection == 1) } ; V |
| 1556 | 1565 | 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 | |
| 1557 | 1567 | |
| 1558 | 1568 | menu = "&Accessories" |
| 1559 | 1569 | subMenu = muxoutSetting, "MUX Output Port Setting" ;[PJSC v1.01] |
| @@ -1583,6 +1593,7 @@ | ||
| 1583 | 1593 | subMenu = std_separator ; V |
| 1584 | 1594 | subMenu = tacho, "Tacho Output", { muxout1selection == 7 || muxout2selection == 7 } ;[PJSC v1.01] For MUX selection |
| 1585 | 1595 | |
| 1596 | +#if full_option ;[PJSC v1.02] For menu option | |
| 1586 | 1597 | subMenu = std_separator ;[PJSC] |
| 1587 | 1598 | subMenu = inputPortSetting, "Input Port Setting" ;[PJSC] |
| 1588 | 1599 |
| @@ -1601,6 +1612,7 @@ | ||
| 1601 | 1612 | subMenu = Canin_config, "External Auxillary Input Channel Configuration", {enable_secondarySerial || (enable_intcan && intcan_available)} |
| 1602 | 1613 | subMenu = Auxin_config, "Local Auxillary Input Channel Configuration" |
| 1603 | 1614 | #endif |
| 1615 | +#endif ;[PJSC v1.02] For menu option | |
| 1604 | 1616 | |
| 1605 | 1617 | menuDialog = main |
| 1606 | 1618 | menu = "Tools" |
| @@ -3766,8 +3778,10 @@ | ||
| 3766 | 3778 | batCorrectGauge = batCorrection, "Voltage Correction", "%", 0, 200, 130, 140, 140, 150, 0, 0 |
| 3767 | 3779 | iatCorrectGauge = airCorrection, "IAT Correction", "%", 0, 200, 130, 140, 140, 150, 0, 0 |
| 3768 | 3780 | flexEnrich, = flexFuelCor, "Flex Correction", "%", 0, 200, 130, 140, 140, 150, 0, 0 |
| 3781 | +#if table4_spark ;[PJSC v1.02] | |
| 3769 | 3782 | advanceGauge = advance, "Spark Advance", "deg BTDC", 50, -10, 0, 0, 35, 45, 0, 0 |
| 3770 | 3783 | dwellGauge = dwell, "Ign Dwell", "mSec", 0, 35.0, 1.0, 1.2, 20, 25, 3, 3 |
| 3784 | +#endif ;[PJSC v1.02] | |
| 3771 | 3785 | boostTargetGauge = boostTarget, "Target Boost", "kPa", 0, {maphigh}, 0, 20, {mapwarn}, {mapdang}, 0, 0 ;[PJSC v1.02] |
| 3772 | 3786 | boostDutyGauge = boostDuty, "Boost Duty Cycle", "%", 0, 100, -1, -1, 101, 110, 1, 1 ;[PJSC v1.02] |
| 3773 | 3787 | afrTargetGauge = afrTarget, "Target AFR", "", 7, 25, 12, 13, 15, 16, 2, 2 ;[PJSC v1.02] |
| @@ -3777,7 +3791,6 @@ | ||
| 3777 | 3791 | mapGauge_psi = map_psi, "Engine MAP (PSI)", "PSI", -15, 100, 0, 20, 200, 245, 0, 0 |
| 3778 | 3792 | mapGauge_bar = map_bar, "Engine MAP (BAR)", "Bar", -1, 3, -1, -1, 5, 5, 2, 2 |
| 3779 | 3793 | 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] | |
| 3781 | 3794 | batteryVoltage = batteryVoltage,"Battery Voltage", "volts", 0, 25, 8, 9, 15, 16, 2, 2 |
| 3782 | 3795 | |
| 3783 | 3796 | tpsADCGauge = tpsADC, "TPS ADC", "", 0, 255, -1, -1, 256, 256, 0, 0 |
| @@ -3793,7 +3806,7 @@ | ||
| 3793 | 3806 | dutyRatioGauge = dutyRatio, "Duty Ratio", "%", 0, 100, 5, 10, 90, 95, 0, 0 ;[PJSC]For capturing duty pulse |
| 3794 | 3807 | dutyFreqGauge2 = dutyFreq2, "Duty Pulse Frequency 2", "Hz", 0, 100, 5, 10, 90, 95, 0, 0 ;[PJSC]For capturing duty pulse |
| 3795 | 3808 | 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] | |
| 3797 | 3810 | injcountGauge = testCnt, "Injection Count", "pulses", 0, 1000, 65535, 65535,65535, 65535,0, 0 ;[PJSC v1.01] For test mode |
| 3798 | 3811 | afrAnalyzeGauge1 = afr_analyze1, "Air:Fuel Ratio for VE1", "", 7, 25, 12, 13, 15, 16, 2, 2 ;[PJSC v1.02] For AFR sensor selection |
| 3799 | 3812 | 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 @@ | ||
| 4108 | 4121 | entry = dutyCycle, "DutyCycle1", float, "%.1f" |
| 4109 | 4122 | entry = dutyCycle, "DutyCycle2", float, "%.1f" |
| 4110 | 4123 | entry = TPSdot, "TPS DOT", int, "%d" |
| 4124 | +#if table4_spark ;[PJSC v1.02] | |
| 4111 | 4125 | entry = advance, "Advance", int, "%d" |
| 4112 | 4126 | entry = dwell, "Dwell", float, "%.1f" |
| 4127 | +#endif ;[PJSC v1.02] | |
| 4113 | 4128 | entry = batteryVoltage, "Battery V", float, "%.1f" |
| 4114 | 4129 | entry = rpmDOT, "rpm/s", int, "%d" |
| 4115 | 4130 | entry = flex, "Eth %", int, "%d", { flexEnabled } |