Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
bbe4f7926b
|
@ -75,13 +75,14 @@ void SimplePwm::setSimplePwmDutyCycle(float dutyCycle) {
|
|||
warning(CUSTOM_PWM_DUTY_TOO_HIGH, "%s duty %.2f", name, dutyCycle);
|
||||
dutyCycle = 1;
|
||||
}
|
||||
if (dutyCycle == 0.0f && stateChangeCallback != NULL) {
|
||||
/**
|
||||
* set the pin low just to be super sure
|
||||
* this custom handling of zero value comes from CJ125 heater code
|
||||
* TODO: is this really needed? cover by unit test?
|
||||
*/
|
||||
|
||||
// Handle zero and full duty cycle. This will cause the PWM output to behave like a plain digital output.
|
||||
if (dutyCycle == 0.0f && stateChangeCallback) {
|
||||
// Manually fire falling edge
|
||||
stateChangeCallback(0, arg);
|
||||
} else if (dutyCycle == 1.0f && stateChangeCallback) {
|
||||
// Manually fire rising edge
|
||||
stateChangeCallback(1, arg);
|
||||
}
|
||||
|
||||
if (dutyCycle < ZERO_PWM_THRESHOLD) {
|
||||
|
|
|
@ -89,7 +89,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 07 13:45:58 EDT 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 03:45:38 EDT 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
@ -1430,8 +1430,6 @@ page = 1
|
|||
|
||||
[OutputChannels]
|
||||
|
||||
fileVersion = { 20200310 }
|
||||
|
||||
ochGetCommand = "O%2o%2c"
|
||||
|
||||
; see TS_OUTPUT_SIZE in console source code
|
||||
|
@ -1557,7 +1555,7 @@ fileVersion = { 20200310 }
|
|||
seconds = scalar, U32, 112, "sec", 1, 0.0
|
||||
engineMode = scalar, U32, 116, "em", 1, 0.0;
|
||||
firmwareVersion = scalar, U32, 120,"version_f", 1, 0
|
||||
firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0
|
||||
|
||||
|
||||
; calibation helpers
|
||||
calibrationValue = scalar, F32, 128, "", 1, 0
|
||||
|
@ -2312,7 +2310,6 @@ gaugeCategory = Sensors - Raw
|
|||
; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg
|
||||
; important status
|
||||
indicator = { ind_hasFatalError }, "", "CRITICAL ERROR", white, black, red, black
|
||||
indicator = { firmwareTsVersion == fileVersion }, "WRONG VERSION", "version ok", red, black, white, black
|
||||
indicator = { ind_isWarnNow }, "", "WARNING", white, black, yellow, black
|
||||
indicator = { ind_check_engine }, "", "Check Engine", white, black, red, black
|
||||
indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", yellow, black, white, black
|
||||
|
|
|
@ -89,7 +89,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 07 13:46:02 EDT 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 03:45:51 EDT 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
@ -1430,8 +1430,6 @@ page = 1
|
|||
|
||||
[OutputChannels]
|
||||
|
||||
fileVersion = { 20200310 }
|
||||
|
||||
ochGetCommand = "O%2o%2c"
|
||||
|
||||
; see TS_OUTPUT_SIZE in console source code
|
||||
|
@ -1557,7 +1555,7 @@ fileVersion = { 20200310 }
|
|||
seconds = scalar, U32, 112, "sec", 1, 0.0
|
||||
engineMode = scalar, U32, 116, "em", 1, 0.0;
|
||||
firmwareVersion = scalar, U32, 120,"version_f", 1, 0
|
||||
firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0
|
||||
|
||||
|
||||
; calibation helpers
|
||||
calibrationValue = scalar, F32, 128, "", 1, 0
|
||||
|
@ -2312,7 +2310,6 @@ gaugeCategory = Sensors - Raw
|
|||
; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg
|
||||
; important status
|
||||
indicator = { ind_hasFatalError }, "", "CRITICAL ERROR", white, black, red, black
|
||||
indicator = { firmwareTsVersion == fileVersion }, "WRONG VERSION", "version ok", red, black, white, black
|
||||
indicator = { ind_isWarnNow }, "", "WARNING", white, black, yellow, black
|
||||
indicator = { ind_check_engine }, "", "Check Engine", white, black, red, black
|
||||
indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", yellow, black, white, black
|
||||
|
|
|
@ -89,7 +89,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Fri May 08 16:32:39 EDT 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat May 09 03:45:55 EDT 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
@ -1430,8 +1430,6 @@ page = 1
|
|||
|
||||
[OutputChannels]
|
||||
|
||||
fileVersion = { 20200310 }
|
||||
|
||||
ochGetCommand = "O%2o%2c"
|
||||
|
||||
; see TS_OUTPUT_SIZE in console source code
|
||||
|
@ -1557,7 +1555,7 @@ fileVersion = { 20200310 }
|
|||
seconds = scalar, U32, 112, "sec", 1, 0.0
|
||||
engineMode = scalar, U32, 116, "em", 1, 0.0;
|
||||
firmwareVersion = scalar, U32, 120,"version_f", 1, 0
|
||||
firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0
|
||||
|
||||
|
||||
; calibation helpers
|
||||
calibrationValue = scalar, F32, 128, "", 1, 0
|
||||
|
@ -2312,7 +2310,6 @@ gaugeCategory = Sensors - Raw
|
|||
; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg
|
||||
; important status
|
||||
indicator = { ind_hasFatalError }, "", "CRITICAL ERROR", white, black, red, black
|
||||
indicator = { firmwareTsVersion == fileVersion }, "WRONG VERSION", "version ok", red, black, white, black
|
||||
indicator = { ind_isWarnNow }, "", "WARNING", white, black, yellow, black
|
||||
indicator = { ind_check_engine }, "", "Check Engine", white, black, red, black
|
||||
indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", yellow, black, white, black
|
||||
|
|
|
@ -89,7 +89,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 07 13:46:01 EDT 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 03:45:49 EDT 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
@ -1430,8 +1430,6 @@ page = 1
|
|||
|
||||
[OutputChannels]
|
||||
|
||||
fileVersion = { 20200310 }
|
||||
|
||||
ochGetCommand = "O%2o%2c"
|
||||
|
||||
; see TS_OUTPUT_SIZE in console source code
|
||||
|
@ -1557,7 +1555,7 @@ fileVersion = { 20200310 }
|
|||
seconds = scalar, U32, 112, "sec", 1, 0.0
|
||||
engineMode = scalar, U32, 116, "em", 1, 0.0;
|
||||
firmwareVersion = scalar, U32, 120,"version_f", 1, 0
|
||||
firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0
|
||||
|
||||
|
||||
; calibation helpers
|
||||
calibrationValue = scalar, F32, 128, "", 1, 0
|
||||
|
@ -2312,7 +2310,6 @@ gaugeCategory = Sensors - Raw
|
|||
; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg
|
||||
; important status
|
||||
indicator = { ind_hasFatalError }, "", "CRITICAL ERROR", white, black, red, black
|
||||
indicator = { firmwareTsVersion == fileVersion }, "WRONG VERSION", "version ok", red, black, white, black
|
||||
indicator = { ind_isWarnNow }, "", "WARNING", white, black, yellow, black
|
||||
indicator = { ind_check_engine }, "", "Check Engine", white, black, red, black
|
||||
indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", yellow, black, white, black
|
||||
|
|
|
@ -89,7 +89,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 07 13:46:03 EDT 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 03:45:52 EDT 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
@ -1430,8 +1430,6 @@ page = 1
|
|||
|
||||
[OutputChannels]
|
||||
|
||||
fileVersion = { 20200310 }
|
||||
|
||||
ochGetCommand = "O%2o%2c"
|
||||
|
||||
; see TS_OUTPUT_SIZE in console source code
|
||||
|
@ -1557,7 +1555,7 @@ fileVersion = { 20200310 }
|
|||
seconds = scalar, U32, 112, "sec", 1, 0.0
|
||||
engineMode = scalar, U32, 116, "em", 1, 0.0;
|
||||
firmwareVersion = scalar, U32, 120,"version_f", 1, 0
|
||||
firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0
|
||||
|
||||
|
||||
; calibation helpers
|
||||
calibrationValue = scalar, F32, 128, "", 1, 0
|
||||
|
@ -2312,7 +2310,6 @@ gaugeCategory = Sensors - Raw
|
|||
; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg
|
||||
; important status
|
||||
indicator = { ind_hasFatalError }, "", "CRITICAL ERROR", white, black, red, black
|
||||
indicator = { firmwareTsVersion == fileVersion }, "WRONG VERSION", "version ok", red, black, white, black
|
||||
indicator = { ind_isWarnNow }, "", "WARNING", white, black, yellow, black
|
||||
indicator = { ind_check_engine }, "", "Check Engine", white, black, red, black
|
||||
indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", yellow, black, white, black
|
||||
|
|
|
@ -89,7 +89,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 07 13:46:05 EDT 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 03:45:53 EDT 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
@ -1430,8 +1430,6 @@ page = 1
|
|||
|
||||
[OutputChannels]
|
||||
|
||||
fileVersion = { 20200310 }
|
||||
|
||||
ochGetCommand = "O%2o%2c"
|
||||
|
||||
; see TS_OUTPUT_SIZE in console source code
|
||||
|
@ -1557,7 +1555,7 @@ fileVersion = { 20200310 }
|
|||
seconds = scalar, U32, 112, "sec", 1, 0.0
|
||||
engineMode = scalar, U32, 116, "em", 1, 0.0;
|
||||
firmwareVersion = scalar, U32, 120,"version_f", 1, 0
|
||||
firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0
|
||||
|
||||
|
||||
; calibation helpers
|
||||
calibrationValue = scalar, F32, 128, "", 1, 0
|
||||
|
@ -2312,7 +2310,6 @@ gaugeCategory = Sensors - Raw
|
|||
; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg
|
||||
; important status
|
||||
indicator = { ind_hasFatalError }, "", "CRITICAL ERROR", white, black, red, black
|
||||
indicator = { firmwareTsVersion == fileVersion }, "WRONG VERSION", "version ok", red, black, white, black
|
||||
indicator = { ind_isWarnNow }, "", "WARNING", white, black, yellow, black
|
||||
indicator = { ind_check_engine }, "", "Check Engine", white, black, red, black
|
||||
indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", yellow, black, white, black
|
||||
|
|
Loading…
Reference in New Issue