• 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

Revision64 (tree)
Time2019-07-08 09:59:46
Authormaharu

Log Message

PJSC ver1.01: Preparing for MUX output test mode.

Change Summary

Incremental Difference

--- branches/Ver1.00_base/reference/PJSC.ini (revision 63)
+++ branches/Ver1.00_base/reference/PJSC.ini (revision 64)
@@ -1577,8 +1577,8 @@
15771577 menuDialog = main
15781578 menu = "Hardware Testing"
15791579 ;[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]
15821582 #endif
15831583
15841584 menu = "Help"
@@ -2547,7 +2547,7 @@
25472547 commandButton = "Fuel Pump On", cmdfpon ;[PJSC v1.10]
25482548 commandButton = "Fuel Pump Off", cmdfpoff ;[PJSC v1.10]
25492549
2550- dialog = outputtestinj1, "Injector CH1", yAxis
2550+ dialog = outputtestinj1, "Injector CH1", yAxis
25512551 commandButton = "Off", cmdtestinj1off,{testactive}
25522552 ;[PJSC v1.10] commandButton = "50% DC", cmdtestinj150dc,{!testenabled & testactive}
25532553 commandButton = "On", cmdtestinj1on,{!testenabled & testactive}
@@ -2605,6 +2605,37 @@
26052605 panel = outputtestspk3
26062606 panel = outputtestspk4
26072607
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+
26082639 ;[PJSC v1.10] dialog = outputtest1,"Test Output Hardware"
26092640 dialog = outputtest1,"Output Test Mode - PWM" ;[PJSC v1.10]
26102641 topicHelp = "http://speeduino.com/wiki/index.php/Hardware_testing_page"
@@ -2611,9 +2642,10 @@
26112642 panel = enableoutputtestbuttons
26122643 panel = enablefuelpumpbuttons ;[PJSC v1.10]
26132644 panel = outputtest_injectors
2614-#if table4_spark ;[PJSC v1.10] For switching table4
2645+#if table4_spark ;[PJSC v1.10] For switching table4
26152646 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]
26172649 ;panel = outputtest_io2
26182650 panel = outputtest_warningmessage
26192651
@@ -3230,6 +3262,19 @@
32303262 cmdtestspk4off = "E\x03\x0B"
32313263 cmdtestspk450dc = "E\x03\x0C"
32323264
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+
32333278 ; -------------------------------------------------------------
32343279 ; Help down here
32353280 [SettingContextHelp]
--- branches/Ver1.00_base/speeduino/globals.h (revision 63)
+++ branches/Ver1.00_base/speeduino/globals.h (revision 64)
@@ -157,6 +157,14 @@
157157 #define CH_INJ2 1 //inj2
158158 #define CH_INJ3 2 //inj3
159159 #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
160168
161169 #define VALID_MAP_MAX 1022 //The largest ADC value that is valid for the MAP sensor
162170 #define VALID_MAP_MIN 2 //The smallest ADC value that is valid for the MAP sensor
--- branches/Ver1.00_base/speeduino/scheduler.h (revision 63)
+++ branches/Ver1.00_base/speeduino/scheduler.h (revision 64)
@@ -215,7 +215,8 @@
215215 //[PJSC] For PJSC
216216 void pjscControl();
217217 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]
219220 volatile bool pjsc1_pwm_state;
220221 volatile bool pjsc2_pwm_state;
221222 volatile bool pjsc3_pwm_state;