diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 193cbb38a3..65bef80169 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Nov 25 18:21:22 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Nov 26 22:29:35 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3777,4 +3777,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Nov 25 18:21:22 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Nov 26 22:29:35 UTC 2020 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index ee82d85cd4..5f2c3c9635 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -255,6 +255,7 @@ #define CMD_INJECTION "injection" #define CMD_MIL_BENCH "milbench" #define CMD_PINS "pins" +#define CMD_PWM "pwm" #define CMD_REBOOT "reboot" #define CMD_REBOOT_DFU "reboot_dfu" #define CMD_RESET_ENGINE_SNIFFER "reset_engine_chart" @@ -1210,8 +1211,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 4200326349 +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 2590151221 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1541,7 +1542,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.25.hellen_cypress.4200326349" +#define TS_SIGNATURE "rusEFI 2020.11.26.hellen_cypress.2590151221" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index abd7e9c571..e0fe9c6439 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Nov 25 18:21:20 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Nov 26 22:29:33 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3777,4 +3777,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Nov 25 18:21:20 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Nov 26 22:29:33 UTC 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index c500ad4da4..7c948006e6 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -255,6 +255,7 @@ #define CMD_INJECTION "injection" #define CMD_MIL_BENCH "milbench" #define CMD_PINS "pins" +#define CMD_PWM "pwm" #define CMD_REBOOT "reboot" #define CMD_REBOOT_DFU "reboot_dfu" #define CMD_RESET_ENGINE_SNIFFER "reset_engine_chart" @@ -1210,8 +1211,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 2873613879 +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 3414075599 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1541,7 +1542,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.25.kin.2873613879" +#define TS_SIGNATURE "rusEFI 2020.11.26.kin.3414075599" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/config/engines/bmw_e34.cpp b/firmware/config/engines/bmw_e34.cpp index 00b3aeaac3..0d1ec0bf42 100644 --- a/firmware/config/engines/bmw_e34.cpp +++ b/firmware/config/engines/bmw_e34.cpp @@ -97,7 +97,11 @@ void setBmwE34(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->malfunctionIndicatorPin = GPIO_UNASSIGNED; +/* + * this configuration is used on HW CI - in HW CI 'inverted' would rightfully fail unless there is pull-up engineConfiguration->injectionPinMode = OM_INVERTED; + */ + engineConfiguration->injectionPins[0] = GPIOB_8; // #1 engineConfiguration->injectionPins[1] = GPIOE_2; // #2 engineConfiguration->injectionPins[2] = GPIOE_3; // #3 @@ -105,7 +109,10 @@ void setBmwE34(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->injectionPins[4] = GPIOE_5; // #5 engineConfiguration->injectionPins[5] = GPIOE_6; // #6 + /* + * this configuration is used on HW CI - in HW CI 'inverted' would rightfully fail unless there is pull-up engineConfiguration->ignitionPinMode = OM_INVERTED; +*/ engineConfiguration->ignitionPins[0] = GPIOB_5; // #1 engineConfiguration->ignitionPins[2] = GPIOB_6; // #3 @@ -125,7 +132,10 @@ void setBmwE34(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // idle engineConfiguration->idle.solenoidPin = GPIOC_14; + /* + * this configuration is used on HW CI - in HW CI 'inverted' would rightfully fail unless there is pull-up engineConfiguration->idle.solenoidPinMode = OM_INVERTED; +*/ engineConfiguration->idle.solenoidFrequency = 300; engineConfiguration->manIdlePosition = 50; // set_idle_pwm 50 diff --git a/firmware/config/engines/rover_v8.cpp b/firmware/config/engines/rover_v8.cpp index e2e3eeae3c..cfca77d50a 100644 --- a/firmware/config/engines/rover_v8.cpp +++ b/firmware/config/engines/rover_v8.cpp @@ -55,7 +55,10 @@ void setRoverv8(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // set ignition_mode 2 engineConfiguration->ignitionMode = IM_WASTED_SPARK; + /* + * this configuration is used on HW CI - in HW CI 'inverted' would rightfully fail unless there is pull-up engineConfiguration->ignitionPinMode = OM_INVERTED; +*/ // set_ignition_channels engineConfiguration->ignitionPins[0] = GPIOE_8; // Frankenstein: low side - out #x (?) diff --git a/firmware/controllers/actuators/aux_pid.cpp b/firmware/controllers/actuators/aux_pid.cpp index c68c4cb6bd..ec065d8c26 100644 --- a/firmware/controllers/actuators/aux_pid.cpp +++ b/firmware/controllers/actuators/aux_pid.cpp @@ -134,7 +134,7 @@ void startAuxPins(void) { void stopAuxPins(void) { #if EFI_PROD_CODE for (int i = 0;i < AUX_PID_COUNT;i++) { - brain_pin_markUnused(activeConfiguration.auxPidPins[i]); + efiSetPadUnused(activeConfiguration.auxPidPins[i]); } #endif /* EFI_PROD_CODE */ } diff --git a/firmware/controllers/actuators/boost_control.cpp b/firmware/controllers/actuators/boost_control.cpp index eea5454126..95ac8b1e69 100644 --- a/firmware/controllers/actuators/boost_control.cpp +++ b/firmware/controllers/actuators/boost_control.cpp @@ -212,7 +212,7 @@ void startBoostPin() { void stopBoostPin() { #if !EFI_UNIT_TEST - brain_pin_markUnused(activeConfiguration.boostControlPin); + efiSetPadUnused(activeConfiguration.boostControlPin); #endif /* EFI_UNIT_TEST */ } diff --git a/firmware/controllers/actuators/idle_hardware.cpp b/firmware/controllers/actuators/idle_hardware.cpp index 350e31310a..ef4fb2fb5c 100644 --- a/firmware/controllers/actuators/idle_hardware.cpp +++ b/firmware/controllers/actuators/idle_hardware.cpp @@ -124,14 +124,10 @@ bool isIdleMotorBusy(DECLARE_ENGINE_PARAMETER_SIGNATURE) { void stopIdleHardware(DECLARE_ENGINE_PARAMETER_SIGNATURE) { #if EFI_PROD_CODE - brain_pin_markUnused(activeConfiguration.stepperEnablePin); - brain_pin_markUnused(activeConfiguration.idle.stepperStepPin); - brain_pin_markUnused(activeConfiguration.idle.solenoidPin); - brain_pin_markUnused(activeConfiguration.secondSolenoidPin); -// brain_pin_markUnused(activeConfiguration.idle.); -// brain_pin_markUnused(activeConfiguration.idle.); -// brain_pin_markUnused(activeConfiguration.idle.); -// brain_pin_markUnused(activeConfiguration.idle.); + efiSetPadUnused(activeConfiguration.stepperEnablePin); + efiSetPadUnused(activeConfiguration.idle.stepperStepPin); + efiSetPadUnused(activeConfiguration.idle.solenoidPin); + efiSetPadUnused(activeConfiguration.secondSolenoidPin); #endif /* EFI_PROD_CODE */ } diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h index 6acd9ccade..6a58816a7f 100644 --- a/firmware/controllers/algo/engine.h +++ b/firmware/controllers/algo/engine.h @@ -79,6 +79,7 @@ class Engine final : public TriggerStateListener { public: explicit Engine(persistent_config_s *config); Engine(); + bool isPwmEnabled = true; IEtbController *etbControllers[ETB_COUNT] = {nullptr}; IFuelComputer *fuelComputer = nullptr; diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 38ad59b02e..c9854de39a 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:20:57 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:07 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3777,4 +3777,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:20:57 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:07 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 36620f0d27..42abac791b 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:20:57 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:07 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index dafcd30140..d9bf5932de 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:20:57 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:07 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index c0bb21f6a2..41c098703e 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:20:57 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:07 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 7509cec2f0..0e36c28a30 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:20:57 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:07 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 345f40b4d1..54809063c1 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -255,6 +255,7 @@ #define CMD_INJECTION "injection" #define CMD_MIL_BENCH "milbench" #define CMD_PINS "pins" +#define CMD_PWM "pwm" #define CMD_REBOOT "reboot" #define CMD_REBOOT_DFU "reboot_dfu" #define CMD_RESET_ENGINE_SNIFFER "reset_engine_chart" @@ -1210,8 +1211,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 866796046 +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 1402156278 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1541,7 +1542,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.25.all.866796046" +#define TS_SIGNATURE "rusEFI 2020.11.26.all.1402156278" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index f94ba6a74e..b6fd64c610 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 822932680 -#define TS_SIGNATURE "rusEFI 2020.11.25.all.822932680" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 1402156278 +#define TS_SIGNATURE "rusEFI 2020.11.26.all.1402156278" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 6e05f1ae40..5c9b87c6ff 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 2809939251 -#define TS_SIGNATURE "rusEFI 2020.11.25.frankenso_na6.2809939251" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 3320022285 +#define TS_SIGNATURE "rusEFI 2020.11.26.frankenso_na6.3320022285" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 3d4809ed4d..45d6d9f7a9 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 4177351179 -#define TS_SIGNATURE "rusEFI 2020.11.25.hellen_cypress.4177351179" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 2590151221 +#define TS_SIGNATURE "rusEFI 2020.11.26.hellen_cypress.2590151221" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 392d40b68a..438e239b6b 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 2850121969 -#define TS_SIGNATURE "rusEFI 2020.11.25.kin.2850121969" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 3414075599 +#define TS_SIGNATURE "rusEFI 2020.11.26.kin.3414075599" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index b1abf06a4a..9869cfaee4 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 651963057 -#define TS_SIGNATURE "rusEFI 2020.11.25.mre_f4.651963057" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 1145301647 +#define TS_SIGNATURE "rusEFI 2020.11.26.mre_f4.1145301647" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 7a39930173..624a38b053 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 651963057 -#define TS_SIGNATURE "rusEFI 2020.11.25.mre_f7.651963057" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 1145301647 +#define TS_SIGNATURE "rusEFI 2020.11.26.mre_f7.1145301647" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 6dcb196cee..f696447ca7 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 1943335577 -#define TS_SIGNATURE "rusEFI 2020.11.25.prometheus_405.1943335577" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 290140839 +#define TS_SIGNATURE "rusEFI 2020.11.26.prometheus_405.290140839" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 07edbc63f7..0c56802584 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 1943335577 -#define TS_SIGNATURE "rusEFI 2020.11.25.prometheus_469.1943335577" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 290140839 +#define TS_SIGNATURE "rusEFI 2020.11.26.prometheus_469.290140839" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 62e92acc1b..c4d8caf23f 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 4171677206 -#define TS_SIGNATURE "rusEFI 2020.11.25.proteus_f4.4171677206" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 2587459112 +#define TS_SIGNATURE "rusEFI 2020.11.26.proteus_f4.2587459112" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index d802749c00..f9993202a6 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2020.11.25 -#define SIGNATURE_HASH 4171677206 -#define TS_SIGNATURE "rusEFI 2020.11.25.proteus_f7.4171677206" +#define SIGNATURE_DATE 2020.11.26 +#define SIGNATURE_HASH 2587459112 +#define TS_SIGNATURE "rusEFI 2020.11.26.proteus_f7.2587459112" diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 9904f0eee1..88a7621f5d 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -898,6 +898,8 @@ static void enableOrDisable(const char *param, bool isEnabled) { engineConfiguration->canWriteEnabled = isEnabled; } else if (strEqualCaseInsensitive(param, CMD_INJECTION)) { engineConfiguration->isInjectionEnabled = isEnabled; + } else if (strEqualCaseInsensitive(param, CMD_PWM)) { + engine->isPwmEnabled = isEnabled; } else if (strEqualCaseInsensitive(param, "trigger_details")) { engineConfiguration->verboseTriggerSynchDetails = isEnabled; } else if (strEqualCaseInsensitive(param, "vvt_details")) { diff --git a/firmware/controllers/system/efi_gpio.cpp b/firmware/controllers/system/efi_gpio.cpp index 52a7f6c5fe..ddfd173f73 100644 --- a/firmware/controllers/system/efi_gpio.cpp +++ b/firmware/controllers/system/efi_gpio.cpp @@ -551,7 +551,7 @@ void OutputPin::initPin(const char *msg, brain_pin_e brainPin, const pin_output_ actualValue = !actualValue; } if (actualValue) { - firmwareError(OBD_PCM_Processor_Fault, "startup pin state %s %d %d", hwPortname(brainPin), actualValue, *outputMode); + firmwareError(OBD_PCM_Processor_Fault, "%s: startup pin state %s value=%d mode=%s", msg, hwPortname(brainPin), actualValue, getPin_output_mode_e(*outputMode)); } } } diff --git a/firmware/controllers/system/timer/pwm_generator_logic.cpp b/firmware/controllers/system/timer/pwm_generator_logic.cpp index 8e7e446936..84ad78ef57 100644 --- a/firmware/controllers/system/timer/pwm_generator_logic.cpp +++ b/firmware/controllers/system/timer/pwm_generator_logic.cpp @@ -13,9 +13,12 @@ #include "pwm_generator_logic.h" #include "perf_trace.h" +EXTERN_ENGINE; + #if EFI_PROD_CODE #include "mpu_util.h" -#endif +#include "engine.h" +#endif // EFI_PROD_CODE // 1% duty cycle #define ZERO_PWM_THRESHOLD 0.01 @@ -375,6 +378,16 @@ void startSimplePwmHard(SimplePwm *state, const char *msg, * This method takes ~350 ticks. */ void applyPinState(int stateIndex, PwmConfig *state) /* pwm_gen_callback */ { +#if EFI_PROD_CODE + if (!engine->isPwmEnabled) { + for (int channelIndex = 0; channelIndex < state->multiChannelStateSequence.waveCount; channelIndex++) { + OutputPin *output = state->outputPins[channelIndex]; + output->setValue(0); + } + return; + } +#endif // EFI_PROD_CODE + efiAssertVoid(CUSTOM_ERR_6663, stateIndex < PWM_PHASE_MAX_COUNT, "invalid stateIndex"); efiAssertVoid(CUSTOM_ERR_6664, state->multiChannelStateSequence.waveCount <= PWM_PHASE_MAX_WAVE_PER_PWM, "invalid waveCount"); for (int channelIndex = 0; channelIndex < state->multiChannelStateSequence.waveCount; channelIndex++) { diff --git a/firmware/hw_layer/debounce.cpp b/firmware/hw_layer/debounce.cpp index 9444f801c2..af9307aa3e 100644 --- a/firmware/hw_layer/debounce.cpp +++ b/firmware/hw_layer/debounce.cpp @@ -60,7 +60,7 @@ void ButtonDebounce::stopConfiguration () { if (*m_pin != active_pin || *m_mode != active_mode || (isActiveConfigurationVoid && (*m_pin != 0 || *m_mode != 0))) { #endif /* EFI_ACTIVE_CONFIGURATION_IN_FLASH */ #ifndef EFI_UNIT_TEST - brain_pin_markUnused(active_pin); + efiSetPadUnused(active_pin); needsInit = true; #endif /* EFI_UNIT_TEST */ } diff --git a/firmware/hw_layer/digital_input/digital_input_icu.cpp b/firmware/hw_layer/digital_input/digital_input_icu.cpp index 37e4536b69..542c390503 100644 --- a/firmware/hw_layer/digital_input/digital_input_icu.cpp +++ b/firmware/hw_layer/digital_input/digital_input_icu.cpp @@ -217,7 +217,7 @@ void stopDigitalCapture(const char *msg, brain_pin_e brainPin) { if (brainPin == GPIO_UNASSIGNED) { return; } - brain_pin_markUnused(brainPin); + efiSetPadUnused(brainPin); ICUDriver *driver = getInputCaptureDriver(msg, brainPin); if (driver == NULL) { diff --git a/firmware/hw_layer/drivers/can/can_hw.cpp b/firmware/hw_layer/drivers/can/can_hw.cpp index 88f69eb88e..fca0e7ac74 100644 --- a/firmware/hw_layer/drivers/can/can_hw.cpp +++ b/firmware/hw_layer/drivers/can/can_hw.cpp @@ -156,8 +156,8 @@ static brain_pin_e currentTxPin = GPIO_UNASSIGNED; static brain_pin_e currentRxPin = GPIO_UNASSIGNED; void stopCanPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) { - brain_pin_markUnused(currentTxPin); - brain_pin_markUnused(currentRxPin); + efiSetPadUnused(currentTxPin); + efiSetPadUnused(currentRxPin); } void startCanPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) { diff --git a/firmware/hw_layer/drivers/serial/serial_hw.cpp b/firmware/hw_layer/drivers/serial/serial_hw.cpp index f61d1fbfa2..a3b619c1f7 100644 --- a/firmware/hw_layer/drivers/serial/serial_hw.cpp +++ b/firmware/hw_layer/drivers/serial/serial_hw.cpp @@ -50,8 +50,8 @@ void enableAuxSerial(DECLARE_ENGINE_PARAMETER_SIGNATURE) { } void stopAuxSerialPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) { - brain_pin_markUnused(activeConfiguration.auxSerialTxPin); - brain_pin_markUnused(activeConfiguration.auxSerialRxPin); + efiSetPadUnused(activeConfiguration.auxSerialTxPin); + efiSetPadUnused(activeConfiguration.auxSerialRxPin); } void startAuxSerialPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) { @@ -90,4 +90,4 @@ void initAuxSerial(void) { serialRead.Start(); } -#endif // EFI_AUX_SERIAL \ No newline at end of file +#endif // EFI_AUX_SERIAL diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp index 7695dd826d..634659795d 100644 --- a/firmware/hw_layer/hardware.cpp +++ b/firmware/hw_layer/hardware.cpp @@ -291,9 +291,9 @@ void stopSpi(spi_device_e device) { return; // not turned on } isSpiInitialized[device] = false; - brain_pin_markUnused(getSckPin(device)); - brain_pin_markUnused(getMisoPin(device)); - brain_pin_markUnused(getMosiPin(device)); + efiSetPadUnused(getSckPin(device)); + efiSetPadUnused(getMisoPin(device)); + efiSetPadUnused(getMosiPin(device)); #endif /* HAL_USE_SPI */ } @@ -371,7 +371,7 @@ void applyNewHardwareSettings(void) { stopBoostPin(); #endif if (isPinOrModeChanged(clutchUpPin, clutchUpPinMode)) { - brain_pin_markUnused(activeConfiguration.clutchUpPin); + efiSetPadUnused(activeConfiguration.clutchUpPin); } enginePins.unregisterPins(); diff --git a/firmware/hw_layer/lcd/lcd_HD44780.cpp b/firmware/hw_layer/lcd/lcd_HD44780.cpp index 1f10a36155..910c4a032b 100644 --- a/firmware/hw_layer/lcd/lcd_HD44780.cpp +++ b/firmware/hw_layer/lcd/lcd_HD44780.cpp @@ -169,12 +169,12 @@ static void lcdInfo(DECLARE_ENGINE_PARAMETER_SIGNATURE) { } void stopHD44780_pins() { - brain_pin_markUnused(activeConfiguration.HD44780_rs); - brain_pin_markUnused(activeConfiguration.HD44780_e); - brain_pin_markUnused(activeConfiguration.HD44780_db4); - brain_pin_markUnused(activeConfiguration.HD44780_db5); - brain_pin_markUnused(activeConfiguration.HD44780_db6); - brain_pin_markUnused(activeConfiguration.HD44780_db7); + efiSetPadUnused(activeConfiguration.HD44780_rs); + efiSetPadUnused(activeConfiguration.HD44780_e); + efiSetPadUnused(activeConfiguration.HD44780_db4); + efiSetPadUnused(activeConfiguration.HD44780_db5); + efiSetPadUnused(activeConfiguration.HD44780_db6); + efiSetPadUnused(activeConfiguration.HD44780_db7); } void startHD44780_pins() { diff --git a/firmware/hw_layer/sensors/hip9011.cpp b/firmware/hw_layer/sensors/hip9011.cpp index 98cf196d87..80aaa90fc1 100644 --- a/firmware/hw_layer/sensors/hip9011.cpp +++ b/firmware/hw_layer/sensors/hip9011.cpp @@ -386,8 +386,8 @@ static msg_t hipThread(void *arg) { void stopHip9001_pins() { #if EFI_PROD_CODE - brain_pin_markUnused(activeConfiguration.hip9011IntHoldPin); - brain_pin_markUnused(activeConfiguration.hip9011CsPin); + efiSetPadUnused(activeConfiguration.hip9011IntHoldPin); + efiSetPadUnused(activeConfiguration.hip9011CsPin); #endif /* EFI_PROD_CODE */ } diff --git a/firmware/hw_layer/sensors/joystick.cpp b/firmware/hw_layer/sensors/joystick.cpp index 9c72411725..488e74f311 100644 --- a/firmware/hw_layer/sensors/joystick.cpp +++ b/firmware/hw_layer/sensors/joystick.cpp @@ -95,9 +95,9 @@ static bool isJoystickEnabled() { } void stopJoystickPins() { - brain_pin_markUnused(activeConfiguration.joystickCenterPin); - brain_pin_markUnused(activeConfiguration.joystickAPin); - brain_pin_markUnused(activeConfiguration.joystickDPin); + efiSetPadUnused(activeConfiguration.joystickCenterPin); + efiSetPadUnused(activeConfiguration.joystickAPin); + efiSetPadUnused(activeConfiguration.joystickDPin); } void startJoystickPins() { diff --git a/firmware/hw_layer/smart_gpio.cpp b/firmware/hw_layer/smart_gpio.cpp index ead3204341..1f291a9d59 100644 --- a/firmware/hw_layer/smart_gpio.cpp +++ b/firmware/hw_layer/smart_gpio.cpp @@ -260,16 +260,16 @@ void initSmartGpio() { #if (BOARD_EXT_GPIOCHIPS > 0) void stopSmartCsPins() { #if (BOARD_TLE8888_COUNT > 0) - brain_pin_markUnused(activeConfiguration.tle8888_cs); + efiSetPadUnused(activeConfiguration.tle8888_cs); #endif /* BOARD_TLE8888_COUNT */ #if (BOARD_TLE6240_COUNT > 0) - brain_pin_markUnused(activeConfiguration.tle6240_cs); + efiSetPadUnused(activeConfiguration.tle6240_cs); #endif /* BOARD_TLE6240_COUNT */ #if (BOARD_MC33972_COUNT > 0) - brain_pin_markUnused(activeConfiguration.mc33972_cs); + efiSetPadUnused(activeConfiguration.mc33972_cs); #endif /* BOARD_MC33972_COUNT */ #if (BOARD_DRV8860_COUNT > 0) - brain_pin_markUnused(activeConfiguration.drv8860_cs); + efiSetPadUnused(activeConfiguration.drv8860_cs); #endif /* BOARD_DRV8860_COUNT */ } diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index c8172ba5e9..c6c4689822 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1713,6 +1713,7 @@ end_struct #define CMD_ENGINE_TYPE "engine_type" #define CMD_INJECTION "injection" #define CMD_IGNITION "ignition" +#define CMD_PWM "pwm" #define CMD_TRIGGERINFO "triggerinfo" #define CMD_WRITECONFIG "writeconfig" #define CMD_DATE "date" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 0f96af4c5c..e3e0589b37 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 546cf9f5e6..a0e0a8b344 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.25.all.822932680" + signature = "rusEFI 2020.11.26.all.1402156278" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.25.all.822932680" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.26.all.1402156278" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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.sh integration/rusefi_config.txt Wed Nov 25 21:45:54 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:07 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 8ee6f5e4ef..d8b10c0642 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.25.frankenso_na6.2809939251" + signature = "rusEFI 2020.11.26.frankenso_na6.3320022285" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.25.frankenso_na6.2809939251" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.26.frankenso_na6.3320022285" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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.sh integration/rusefi_config.txt Wed Nov 25 21:46:00 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:14 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 9b80fba517..7835bad5d7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.25.hellen_cypress.4177351179" + signature = "rusEFI 2020.11.26.hellen_cypress.2590151221" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.25.hellen_cypress.4177351179" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.26.hellen_cypress.2590151221" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Nov 25 21:46:12 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Nov 26 22:29:35 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 8c9fb16ef6..0fa98096e9 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.25.kin.2850121969" + signature = "rusEFI 2020.11.26.kin.3414075599" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.25.kin.2850121969" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.26.kin.3414075599" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 kinetis_gen_config.bat integration/rusefi_config.txt Wed Nov 25 21:46:10 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Nov 26 22:29:33 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index cd4135d3c4..4a6f5e22a0 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.25.mre_f4.651963057" + signature = "rusEFI 2020.11.26.mre_f4.1145301647" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.25.mre_f4.651963057" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.26.mre_f4.1145301647" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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.sh integration/rusefi_config.txt Wed Nov 25 21:45:58 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:12 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index fd80d46e66..e4a3d65fd5 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.25.mre_f7.651963057" + signature = "rusEFI 2020.11.26.mre_f7.1145301647" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.25.mre_f7.651963057" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.26.mre_f7.1145301647" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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.sh integration/rusefi_config.txt Wed Nov 25 21:45:56 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:10 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index fe651be25f..60b8ea49ff 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.25.prometheus_405.1943335577" + signature = "rusEFI 2020.11.26.prometheus_405.290140839" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.25.prometheus_405.1943335577" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.26.prometheus_405.290140839" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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.sh integration/rusefi_config.txt Wed Nov 25 21:46:04 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:19 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 7c496d3299..b10370e292 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.25.prometheus_469.1943335577" + signature = "rusEFI 2020.11.26.prometheus_469.290140839" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.25.prometheus_469.1943335577" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.26.prometheus_469.290140839" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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.sh integration/rusefi_config.txt Wed Nov 25 21:46:02 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:16 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 6adfdcf77d..2113563738 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.25.proteus_f4.4171677206" + signature = "rusEFI 2020.11.26.proteus_f4.2587459112" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.25.proteus_f4.4171677206" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.26.proteus_f4.2587459112" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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.sh integration/rusefi_config.txt Wed Nov 25 21:46:08 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:31 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 28371fbfd0..67fec54db7 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.25.proteus_f7.4171677206" + signature = "rusEFI 2020.11.26.proteus_f7.2587459112" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.25.proteus_f7.4171677206" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.26.proteus_f7.2587459112" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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.sh integration/rusefi_config.txt Wed Nov 25 21:46:06 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:28 UTC 2020 pageSize = 20000 page = 1 diff --git a/java_console/autotest/src/com/rusefi/functional_tests/BaseTest.java b/java_console/autotest/src/com/rusefi/functional_tests/BaseTest.java index 1fb08c7e6a..2169e330aa 100644 --- a/java_console/autotest/src/com/rusefi/functional_tests/BaseTest.java +++ b/java_console/autotest/src/com/rusefi/functional_tests/BaseTest.java @@ -59,15 +59,23 @@ public class BaseTest { log.info("AUTOTEST setEngineType " + type); currentEngineType = type; // sendCommand(CMD_PINS); + /* + * we need to stop all activity - that means: + * - stopping input event + * - waiting for scheduled actuator actions to run out + * - disabling PWM + */ sendCommand(getDisableCommand(Fields.CMD_SELF_STIMULATION)); sendCommand(getDisableCommand(Fields.CMD_INJECTION)); sendCommand(getDisableCommand(Fields.CMD_IGNITION)); + sendCommand(getDisableCommand(Fields.CMD_PWM)); // changing engine type while engine is running does not work well - we rightfully // get invalid configuration critical errors sleepSeconds(2); sendCommand("set " + Fields.CMD_ENGINE_TYPE + " " + type, COMPLEX_COMMAND_RETRY, Timeouts.SET_ENGINE_TIMEOUT); // TODO: document the reason for this sleep?! sleepSeconds(3); + sendCommand(getEnableCommand(Fields.CMD_PWM)); sendCommand(getEnableCommand(Fields.CMD_SELF_STIMULATION)); } } diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 772b9d8e2a..1945354e8a 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 25 18:20:57 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 26 22:29:07 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -245,6 +245,7 @@ public class Fields { public static final String CMD_INJECTION = "injection"; public static final String CMD_MIL_BENCH = "milbench"; public static final String CMD_PINS = "pins"; + public static final String CMD_PWM = "pwm"; public static final String CMD_REBOOT = "reboot"; public static final String CMD_REBOOT_DFU = "reboot_dfu"; public static final String CMD_RESET_ENGINE_SNIFFER = "reset_engine_chart"; @@ -1165,7 +1166,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; - public static final int SIGNATURE_HASH = 866796046; + public static final int SIGNATURE_HASH = 1402156278; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1445,7 +1446,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.11.25.all.866796046"; + public static final String TS_SIGNATURE = "rusEFI 2020.11.26.all.1402156278"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_60_2_VW = 20; public static final int TT_TT_ONE = 18; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 49f20d0d12..9c61e24cb9 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +