• 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

Revision76 (tree)
Time2019-08-03 21:37:57
Authormaharu

Log Message

[PJSC v1.01] Change default gauge cluster.

Change Summary

Incremental Difference

--- branches/Ver1.00_base/reference/PJSC.ini (revision 75)
+++ branches/Ver1.00_base/reference/PJSC.ini (revision 76)
@@ -1805,10 +1805,14 @@
18051805
18061806 cmdEnableTestMode = "Click this to enable test mode. This will not be available if the engine is running"
18071807 cmdStopTestMode = "Click this to disable test mode"
1808- cmdtestinj150dc = "this will cycle the output at 50% Duty cycle"
1809- cmdtestinj250dc = "this will cycle the output at 50% Duty cycle"
1810- cmdtestinj350dc = "this will cycle the output at 50% Duty cycle"
1811- cmdtestinj450dc = "this will cycle the output at 50% Duty cycle"
1808+;[PJSC v1.01] cmdtestinj150dc = "this will cycle the output at 50% Duty cycle"
1809+;[PJSC v1.01] cmdtestinj250dc = "this will cycle the output at 50% Duty cycle"
1810+;[PJSC v1.01] cmdtestinj350dc = "this will cycle the output at 50% Duty cycle"
1811+;[PJSC v1.01] cmdtestinj450dc = "this will cycle the output at 50% Duty cycle"
1812+ cmdtestinj150dc = "this will outputs the PWM signal with inputed duty ratio." ;[PJSC v1.01]
1813+ cmdtestinj250dc = "this will outputs the PWM signal with inputed duty ratio." ; |
1814+ cmdtestinj350dc = "this will outputs the PWM signal with inputed duty ratio." ; V
1815+ cmdtestinj450dc = "this will outputs the PWM signal with inputed duty ratio." ;[PJSC v1.01]
18121816 cmdtestspk150dc = "this will cycle the output at 50% Duty cycle"
18131817 cmdtestspk250dc = "this will cycle the output at 50% Duty cycle"
18141818 cmdtestspk350dc = "this will cycle the output at 50% Duty cycle"
@@ -1922,11 +1926,18 @@
19221926 dialog = captDutyPulseSettingCh2, "Capture Duty Pulse Control" ; |
19231927 field = "Duty pulse ON Level ch2", dutyPulseOnLevel2 ; |
19241928 ; |
1925- dialog = analogInputPort1, "Analog Input Port1", border ; |
1929+ dialog = analogInputPort1_controls, "Analog Input Port1", border ; |
19261930 panel = analogInputPort1select, West ; |
19271931 field = "" ; |
19281932 panel = captExValveSetting, East, { exValveCaptureEnabled == 1 } ; |
19291933 ; |
1934+ dialog = analogInputPort1_r, "Reference ADC Gauges" ; |
1935+ gauge = exValveADCGauge ; |
1936+ ; |
1937+ dialog = analogInputPort1,"Analog Input Port1", xAxis ; |
1938+ panel = analogInputPort1_controls ; |
1939+ panel = analogInputPort1_r ; |
1940+ ; |
19301941 dialog = digitalInputPort1, "Digital Input Port1", border ; |
19311942 panel = digitalInputPort1select, West ; |
19321943 field = "" ; |
@@ -1944,7 +1955,7 @@
19441955 ; |
19451956 dialog = inputPortSetting, "Input Port Setting", yAxis ; |
19461957 panel = analogInputPort1 ; |
1947-;[PJSCv1.01] panel = digitalInputPort1 ; |
1958+ panel = digitalInputPort1 ; |
19481959 ;[PJSCv1.01] panel = digitalInputPort2 ; V
19491960 ;[PJSCv1.01] panel = digitalInputPort3 ;[PJSC v1.10]
19501961
@@ -2131,13 +2142,13 @@
21312142 field = "Channel 1", inj1SquirtStartEnd, { squirtDeviceType == 0 } ; |
21322143 field = "Channel 2", inj2SquirtStartEnd, { (nCylinders > 1 || nInjectors > 1) && indInjAng && squirtDeviceType == 0 } ; |
21332144 field = "Channel 3", inj3SquirtStartEnd, { indInjAng && (nCylinders > 4 || nCylinders == 3 || nInjectors > 2 || ((nCylinders == 4) && (injLayout == 3))) && squirtDeviceType == 0 } ; V
2134- field = "Channel 4", inj4SquirtStartEnd, { indInjAng && (nCylinders > 6 || ((nCylinders == 4 || nInjectors > 3) && (injLayout == 3))) && squirtDeviceType == 0 } ;[PJSC v1.01c]
2145+ field = "Channel 4", inj4SquirtStartEnd, { indInjAng && (nCylinders > 4 || ((nCylinders == 4 || nInjectors > 3) && (injLayout > 0))) && squirtDeviceType == 0 } ;[PJSC v1.01c]
21352146
21362147 dialog = injCloseAngles_east, "" ;[PJSC v1.01c]
21372148 field = "", inj1Ang, { squirtDeviceType == 0 } ; |
21382149 field = "", inj2Ang, { (nCylinders > 1 || nInjectors > 1) && indInjAng && squirtDeviceType == 0 } ; |
21392150 field = "", inj3Ang, { indInjAng && (nCylinders > 4 || nCylinders == 3 || nInjectors > 2 || ((nCylinders == 4) && (injLayout == 3))) && squirtDeviceType == 0 } ; V
2140- field = "", inj4Ang, { indInjAng && (nCylinders > 6 || ((nCylinders == 4 || nInjectors > 3) && (injLayout == 3))) && squirtDeviceType == 0 } ;[PJSC v1.01c]
2151+ field = "", inj4Ang, { indInjAng && (nCylinders > 4 || ((nCylinders == 4 || nInjectors > 3) && (injLayout > 0))) && squirtDeviceType == 0 } ;[PJSC v1.01c]
21412152
21422153 dialog = injCloseAngles, "Injector squirt angle", xAxis ;[PJSC v1.01c]
21432154 panel = injCloseAngles_west ; V
@@ -3481,7 +3492,7 @@
34813492 yBins = knock_window_dur
34823493 size = 400, 200
34833494
3484-; Correction curve for air Density vs Barometric pressure
3495+; Correction curve for air Density vs Barometric pressure [PJSC v1.01]
34853496 curve = barodensity_curve, "Barometric density correction"
34863497 columnLabel = "Barometric pressure", "Fuel Amount"
34873498 xAxis = 0, 110, 9
@@ -3773,15 +3784,24 @@
37733784 ; 1 2 3 4
37743785 ; 5 6 7 8
37753786
3776- gauge1 = tachometer
3777- gauge2 = throttleGauge
3778- gauge3 = pulseWidthGauge
3779- gauge4 = dutyCycleGauge
3780- gauge5 = mapGauge
3781- gauge6 = iatGauge
3782- gauge7 = cltGauge
3783- gauge8 = gammaEnrichGauge
3787+;[PJSC v1.01] gauge1 = tachometer
3788+;[PJSC v1.01] gauge2 = throttleGauge
3789+;[PJSC v1.01] gauge3 = pulseWidthGauge
3790+;[PJSC v1.01] gauge4 = dutyCycleGauge
3791+;[PJSC v1.01] gauge5 = mapGauge
3792+;[PJSC v1.01] gauge6 = iatGauge
3793+;[PJSC v1.01] gauge7 = cltGauge
3794+;[PJSC v1.01] gauge8 = gammaEnrichGauge
37843795
3796+ gauge1 = tachometer ;[PJSC v1.01]
3797+ gauge2 = throttleGauge ;[PJSC v1.01]
3798+ gauge3 = pulseWidthGauge ;[PJSC v1.01]
3799+ gauge4 = afrGauge ;[PJSC v1.01]
3800+ gauge5 = mapGauge ;[PJSC v1.01]
3801+ gauge6 = iatGauge ;[PJSC v1.01]
3802+ gauge7 = cltGauge ;[PJSC v1.01]
3803+ gauge8 = batteryVoltage ;[PJSC v1.01]
3804+
37853805 ;----------------------------------------------------------------------------
37863806 ; Indicators
37873807 ; expr off-label on-label, off-bg, off-fg, on-bg, on-fg
--- branches/Ver1.00_base/speeduino/auxiliaries.h (revision 75)
+++ branches/Ver1.00_base/speeduino/auxiliaries.h (revision 76)
@@ -24,7 +24,7 @@
2424 #define N2O_STAGE2_PIN_HIGH() *n2o_stage2_pin_port |= (n2o_stage2_pin_mask)
2525 #define READ_N2O_ARM_PIN() ((*n2o_arming_pin_port & n2o_arming_pin_mask) ? true : false)
2626
27-#define openMux1() *mux1_pin_port |= (mux1_pin_mask); //[PJSC v1.01c] For MUX output test mode
27+#define openMux1() *mux1_pin_port |= (mux1_pin_mask); //[PJSC v1.01] For MUX output test mode
2828 #define closeMux1() *mux1_pin_port &= ~(mux1_pin_mask); // |
2929 #define openMux2() *mux2_pin_port |= (mux2_pin_mask); // |
3030 #define closeMux2() *mux2_pin_port &= ~(mux2_pin_mask); // |
@@ -31,7 +31,7 @@
3131 #define openMux3() *mux3_pin_port |= (mux3_pin_mask); // |
3232 #define closeMux3() *mux3_pin_port &= ~(mux3_pin_mask); // |
3333 #define openMux4() *mux4_pin_port |= (mux4_pin_mask); // V
34-#define closeMux4() *mux4_pin_port &= ~(mux4_pin_mask); //[PJSC v1.01c] For MUX output test mode
34+#define closeMux4() *mux4_pin_port &= ~(mux4_pin_mask); //[PJSC v1.01] For MUX output test mode
3535
3636 volatile PORT_TYPE *boost_pin_port;
3737 volatile byte boost_pin_mask;
@@ -46,7 +46,7 @@
4646 volatile PORT_TYPE *n2o_arming_pin_port;
4747 volatile byte n2o_arming_pin_mask;
4848
49-volatile PORT_TYPE *mux1_pin_port; //[PJSC v1.01c]
49+volatile PORT_TYPE *mux1_pin_port; //[PJSC v1.01]
5050 volatile byte mux1_pin_mask; // |
5151 volatile PORT_TYPE *mux2_pin_port; // |
5252 volatile byte mux2_pin_mask; // |
@@ -53,7 +53,7 @@
5353 volatile PORT_TYPE *mux3_pin_port; // |
5454 volatile byte mux3_pin_mask; // |
5555 volatile PORT_TYPE *mux4_pin_port; // V
56-volatile byte mux4_pin_mask; //[PJSC v1.01c]
56+volatile byte mux4_pin_mask; //[PJSC v1.01]
5757
5858 volatile bool boost_pwm_state;
5959 unsigned int boost_pwm_max_count; //Used for variable PWM frequency