PJSC(Pump Jet Solenoid Controller)はArduinoを使用したバイク用燃料噴射コントローラです。このプロジェクトは、オープンソースECUプロジェクト『Speeduino』をベースにしています。
PJSC ver1.01: Preparing for MUX output test mode.
| @@ -1577,8 +1577,8 @@ | ||
| 1577 | 1577 | menuDialog = main |
| 1578 | 1578 | menu = "Hardware Testing" |
| 1579 | 1579 | ;[PJSC v1.10] subMenu = outputtest1, "Test Output Hardware" |
| 1580 | - subMenu = outputtest1, "Output Test Mode - PWM" ;[PJSC v1.10] | |
| 1581 | - subMenu = outputtest2, "Output Test Mode - Pulse" ;[PJSC v1.10] | |
| 1580 | + subMenu = outputtest1, "Output Test Mode - PWM" ;[PJSC v1.10] | |
| 1581 | + subMenu = outputtest2, "Output Test Mode - Pulse" ;[PJSC v1.10] | |
| 1582 | 1582 | #endif |
| 1583 | 1583 | |
| 1584 | 1584 | menu = "Help" |
| @@ -2547,7 +2547,7 @@ | ||
| 2547 | 2547 | commandButton = "Fuel Pump On", cmdfpon ;[PJSC v1.10] |
| 2548 | 2548 | commandButton = "Fuel Pump Off", cmdfpoff ;[PJSC v1.10] |
| 2549 | 2549 | |
| 2550 | - dialog = outputtestinj1, "Injector CH1", yAxis | |
| 2550 | + dialog = outputtestinj1, "Injector CH1", yAxis | |
| 2551 | 2551 | commandButton = "Off", cmdtestinj1off,{testactive} |
| 2552 | 2552 | ;[PJSC v1.10] commandButton = "50% DC", cmdtestinj150dc,{!testenabled & testactive} |
| 2553 | 2553 | commandButton = "On", cmdtestinj1on,{!testenabled & testactive} |
| @@ -2605,6 +2605,37 @@ | ||
| 2605 | 2605 | panel = outputtestspk3 |
| 2606 | 2606 | panel = outputtestspk4 |
| 2607 | 2607 | |
| 2608 | + dialog = outputtestmux1, "MUX1", yAxis ;[PJSC v1.01c] | |
| 2609 | + commandButton = "Off", cmdtestmux1off,{testactive} ; | | |
| 2610 | + commandButton = "On", cmdtestmux1on,{!testenabled & testactive} ; | | |
| 2611 | + commandButton = "PWM", cmdtestmux150dc, {!testenabled & testactive} ; | | |
| 2612 | + field = "PWM freq.", dutyFreqTst1, {!testenabled & testactive} ; | | |
| 2613 | + field = "Duty ratio", dutyRatioTst1, {!testenabled & testactive} ; | | |
| 2614 | + dialog = outputtestmux2, "MUX2", yAxis ; | | |
| 2615 | + commandButton = "Off", cmdtestmux2off,{testactive} ; | | |
| 2616 | + commandButton = "On", cmdtestmux2on,{!testenabled & testactive} ; | | |
| 2617 | + commandButton = "PWM", cmdtestmux250dc, {!testenabled & testactive} ; | | |
| 2618 | + field = "PWM freq.", dutyFreqTst2, {!testenabled & testactive} ; | | |
| 2619 | + field = "Duty ratio", dutyRatioTst2, {!testenabled & testactive} ; | | |
| 2620 | + dialog = outputtestmux3, "MUX3", yAxis ; | | |
| 2621 | + commandButton = "Off", cmdtestmux3off,{testactive} ; | | |
| 2622 | + commandButton = "On", cmdtestmux3on,{!testenabled & testactive} ; | | |
| 2623 | + commandButton = "PWM", cmdtestmux350dc, {!testenabled & testactive} ; | | |
| 2624 | + field = "PWM freq.", dutyFreqTst3, {!testenabled & testactive} ; | | |
| 2625 | + field = "Duty ratio", dutyRatioTst3, {!testenabled & testactive} ; | | |
| 2626 | + dialog = outputtestmux4, "MUX4", yAxis ; | | |
| 2627 | + commandButton = "Off", cmdtestmux4off,{testactive} ; | | |
| 2628 | + commandButton = "On", cmdtestmux4on ,{!testenabled & testactive} ; | | |
| 2629 | + commandButton = "PWM", cmdtestmux450dc, {!testenabled & testactive} ; | | |
| 2630 | + field = "PWM freq.", dutyFreqTst4, {!testenabled & testactive} ; | | |
| 2631 | + field = "Duty ratio", dutyRatioTst4, {!testenabled & testactive} ; | | |
| 2632 | + ; | | |
| 2633 | + dialog = outputtest_mux, "MUX Output Test", xAxis ; | | |
| 2634 | + panel = outputtestmux1 ; | | |
| 2635 | + panel = outputtestmux2 ; | | |
| 2636 | + panel = outputtestmux3 ; V | |
| 2637 | + panel = outputtestmux4 ;[PJSC v1.01c] | |
| 2638 | + | |
| 2608 | 2639 | ;[PJSC v1.10] dialog = outputtest1,"Test Output Hardware" |
| 2609 | 2640 | dialog = outputtest1,"Output Test Mode - PWM" ;[PJSC v1.10] |
| 2610 | 2641 | topicHelp = "http://speeduino.com/wiki/index.php/Hardware_testing_page" |
| @@ -2611,9 +2642,10 @@ | ||
| 2611 | 2642 | panel = enableoutputtestbuttons |
| 2612 | 2643 | panel = enablefuelpumpbuttons ;[PJSC v1.10] |
| 2613 | 2644 | panel = outputtest_injectors |
| 2614 | -#if table4_spark ;[PJSC v1.10] For switching table4 | |
| 2645 | +#if table4_spark ;[PJSC v1.10] For switching table4 | |
| 2615 | 2646 | panel = outputtest_spark |
| 2616 | -#endif ;[PJSC v1.10] For switching table4 | |
| 2647 | +#endif ;[PJSC v1.10] For switching table4 | |
| 2648 | + panel = outputtest_mux ;[PJSC v1.01c] | |
| 2617 | 2649 | ;panel = outputtest_io2 |
| 2618 | 2650 | panel = outputtest_warningmessage |
| 2619 | 2651 |
| @@ -3230,6 +3262,19 @@ | ||
| 3230 | 3262 | cmdtestspk4off = "E\x03\x0B" |
| 3231 | 3263 | cmdtestspk450dc = "E\x03\x0C" |
| 3232 | 3264 | |
| 3265 | +cmdtestmux1on = "E\x04\x01" ;[PJSC v1.01c] Test mode command for MUX output | |
| 3266 | +cmdtestmux1off = "E\x04\x02" ; | | |
| 3267 | +cmdtestmux150dc = "E\x04\x03" ; | | |
| 3268 | +cmdtestmux2on = "E\x04\x04" ; | | |
| 3269 | +cmdtestmux2off = "E\x04\x05" ; | | |
| 3270 | +cmdtestmux250dc = "E\x04\x06" ; | | |
| 3271 | +cmdtestmux3on = "E\x04\x07" ; | | |
| 3272 | +cmdtestmux3off = "E\x04\x08" ; | | |
| 3273 | +cmdtestmux350dc = "E\x04\x09" ; | | |
| 3274 | +cmdtestmux4on = "E\x04\x0A" ; | | |
| 3275 | +cmdtestmux4off = "E\x04\x0B" ; V | |
| 3276 | +cmdtestmux450dc = "E\x04\x0C" ;[PJSC v1.01c] | |
| 3277 | + | |
| 3233 | 3278 | ; ------------------------------------------------------------- |
| 3234 | 3279 | ; Help down here |
| 3235 | 3280 | [SettingContextHelp] |
| @@ -157,6 +157,14 @@ | ||
| 157 | 157 | #define CH_INJ2 1 //inj2 |
| 158 | 158 | #define CH_INJ3 2 //inj3 |
| 159 | 159 | #define CH_INJ4 3 //inj4 |
| 160 | +#define CH_IGN1 4 //coil1 | |
| 161 | +#define CH_IGN2 5 //coil2 | |
| 162 | +#define CH_IGN3 6 //coli3 | |
| 163 | +#define CH_IGN4 7 //coil4 | |
| 164 | +#define CH_MUX1 8 //MUX output1 | |
| 165 | +#define CH_MUX2 9 //MUX output2 | |
| 166 | +#define CH_MUX3 10 //MUX output3 | |
| 167 | +#define CH_MUX4 11 //MUX output4 | |
| 160 | 168 | |
| 161 | 169 | #define VALID_MAP_MAX 1022 //The largest ADC value that is valid for the MAP sensor |
| 162 | 170 | #define VALID_MAP_MIN 2 //The smallest ADC value that is valid for the MAP sensor |
| @@ -215,7 +215,8 @@ | ||
| 215 | 215 | //[PJSC] For PJSC |
| 216 | 216 | void pjscControl(); |
| 217 | 217 | byte pjscDuty[4]; |
| 218 | -unsigned int pjsc_pwm_max_count[4]; | |
| 218 | +//[PJSC v1.01c]unsigned int pjsc_pwm_max_count[4]; | |
| 219 | +unsigned int pjsc_pwm_max_count[12]; //[PJSC v1.01c] | |
| 219 | 220 | volatile bool pjsc1_pwm_state; |
| 220 | 221 | volatile bool pjsc2_pwm_state; |
| 221 | 222 | volatile bool pjsc3_pwm_state; |