diff --git a/.github/workflows/hardware-ci-f4-discovery.yaml b/.github/workflows/hardware-ci-f4-discovery.yaml index 829b078d1c..dddee78daa 100644 --- a/.github/workflows/hardware-ci-f4-discovery.yaml +++ b/.github/workflows/hardware-ci-f4-discovery.yaml @@ -41,7 +41,7 @@ jobs: - name: Build Firmware working-directory: ./firmware - run: make -j16 + run: make -j16 EXTRA_PARAMS="-DHARDWARE_CI" - name: OpenOCD wipe & flash STM32 working-directory: ./firmware @@ -50,4 +50,4 @@ jobs: # This both compiles and runs HW CI tests - name: Run Hardware CI working-directory: ./java_console - run: ant real_hardware_functional_test + run: ant hardware_ci_f4_discovery diff --git a/firmware/config/boards/proteus/board_configuration.cpp b/firmware/config/boards/proteus/board_configuration.cpp index ef3fa10eb0..cc18f333e0 100644 --- a/firmware/config/boards/proteus/board_configuration.cpp +++ b/firmware/config/boards/proteus/board_configuration.cpp @@ -211,4 +211,10 @@ void setBoardConfigurationOverrides(void) { CONFIG(mainRelayPin) = GPIOB_9;// "Lowside 13" # pin 10/black35 CONFIG(fanPin) = GPIOE_1;// "Lowside 15" # pin 12/black35 CONFIG(fuelPumpPin) = GPIOE_2;// "Lowside 16" # pin 23/black35 + + // If we're running as hardware CI, borrow a few extra pins for that +#ifdef HARDWARE_CI + engineConfiguration->triggerSimulatorPins[0] = GPIOG_3; + engineConfiguration->triggerSimulatorPins[1] = GPIOG_2; +#endif } diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index cdcee0897d..1c80b05d3b 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Feb 01 22:55:06 EST 2021 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Tue Feb 02 14:16:47 UTC 2021 // see also gen_config_and_enums.bat @@ -121,6 +121,10 @@ case MT_DENSO183: return "MT_DENSO183"; case MT_DODGE_NEON_2003: return "MT_DODGE_NEON_2003"; +case MT_GM_1_BAR: + return "MT_GM_1_BAR"; +case MT_GM_2_BAR: + return "MT_GM_2_BAR"; case MT_GM_3_BAR: return "MT_GM_3_BAR"; case MT_HONDA3BAR: diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 1586b6bcc3..95199485bf 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -832,6 +832,10 @@ typedef enum { MT_MAZDA_1_BAR = 11, + MT_GM_2_BAR = 12, + + MT_GM_1_BAR = 13, + Force_4_bytes_size_cranking_map_type = ENUM_32_BITS, } air_pressure_sensor_type_e; diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index e5b3e24ce5..6284a54bdd 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 Tue Feb 02 04:21:19 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Feb 02 14:16:48 UTC 2021 // 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 9204044f6e..4ba000ae2a 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 Tue Feb 02 04:21:19 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Feb 02 14:16:48 UTC 2021 // 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 01bf535186..7f90a2bede 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 Tue Feb 02 04:21:19 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Feb 02 14:16:48 UTC 2021 // 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 90d202450a..b956af1293 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 Tue Feb 02 04:21:19 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Feb 02 14:16:48 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 4eb8b44058..b7a1a231bb 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 1978516617 -#define TS_SIGNATURE "rusEFI 2021.02.02.all.1978516617" +#define SIGNATURE_HASH 937064025 +#define TS_SIGNATURE "rusEFI 2021.02.02.all.937064025" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 06a21a3238..f15aaea671 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 4053264666 -#define TS_SIGNATURE "rusEFI 2021.02.02.frankenso_na6.4053264666" +#define SIGNATURE_HASH 3013630922 +#define TS_SIGNATURE "rusEFI 2021.02.02.frankenso_na6.3013630922" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 5705fb735c..04d9e9c78b 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen72 #define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 1740217393 -#define TS_SIGNATURE "rusEFI 2021.02.02.hellen72.1740217393" +#define SIGNATURE_HASH 630075105 +#define TS_SIGNATURE "rusEFI 2021.02.02.hellen72.630075105" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index d8539f2932..b9b4c58337 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 932257625 -#define TS_SIGNATURE "rusEFI 2021.02.02.hellen_cypress.932257625" +#define SIGNATURE_HASH 1973857673 +#define TS_SIGNATURE "rusEFI 2021.02.02.hellen_cypress.1973857673" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 5dd24817ee..1b73eb7986 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 932257625 -#define TS_SIGNATURE "rusEFI 2021.02.02.kin.932257625" +#define SIGNATURE_HASH 1973857673 +#define TS_SIGNATURE "rusEFI 2021.02.02.kin.1973857673" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index c711c25b27..e3c5a8149a 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 1529591395 -#define TS_SIGNATURE "rusEFI 2021.02.02.mre_f4.1529591395" +#define SIGNATURE_HASH 421266611 +#define TS_SIGNATURE "rusEFI 2021.02.02.mre_f4.421266611" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index e5f3323cb9..6c0ae893dd 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 1529591395 -#define TS_SIGNATURE "rusEFI 2021.02.02.mre_f7.1529591395" +#define SIGNATURE_HASH 421266611 +#define TS_SIGNATURE "rusEFI 2021.02.02.mre_f7.421266611" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 11bdc2d9fc..7af0bbc0f4 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 1736165055 -#define TS_SIGNATURE "rusEFI 2021.02.02.prometheus_405.1736165055" +#define SIGNATURE_HASH 625767535 +#define TS_SIGNATURE "rusEFI 2021.02.02.prometheus_405.625767535" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 3fdb135c77..aa6b81a935 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 1736165055 -#define TS_SIGNATURE "rusEFI 2021.02.02.prometheus_469.1736165055" +#define SIGNATURE_HASH 625767535 +#define TS_SIGNATURE "rusEFI 2021.02.02.prometheus_469.625767535" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index b92be7d41b..81c1b7ad50 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 316411046 -#define TS_SIGNATURE "rusEFI 2021.02.02.proteus_f4.316411046" +#define SIGNATURE_HASH 1357626998 +#define TS_SIGNATURE "rusEFI 2021.02.02.proteus_f4.1357626998" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 1139e24341..0ef62f287b 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 316411046 -#define TS_SIGNATURE "rusEFI 2021.02.02.proteus_f7.316411046" +#define SIGNATURE_HASH 1357626998 +#define TS_SIGNATURE "rusEFI 2021.02.02.proteus_f7.1357626998" diff --git a/firmware/controllers/sensors/map.cpp b/firmware/controllers/sensors/map.cpp index 95c0a060dc..cc509556e4 100644 --- a/firmware/controllers/sensors/map.cpp +++ b/firmware/controllers/sensors/map.cpp @@ -54,6 +54,10 @@ static FastInterpolation subyDenso(0, 0, 5, 200); static FastInterpolation gm3bar(0.631, 40, 4.914, 304); +static FastInterpolation gm2bar(0, 8.8, 5, 208); + +static FastInterpolation gm1bar(0, 10, 5, 105); + static FastInterpolation mpx4250(0, 8, 5, 260); static FastInterpolation mpx4250A(0.25, 20, 4.875, 250); @@ -102,6 +106,8 @@ float decodePressure(float voltage, air_pressure_sensor_config_s * mapConfig DEC case MT_DODGE_NEON_2003: case MT_SUBY_DENSO: case MT_GM_3_BAR: + case MT_GM_2_BAR: + case MT_GM_1_BAR: case MT_TOYOTA_89420_02010: case MT_MPX4100: case MT_BOSCH_2_5: @@ -205,6 +211,10 @@ static FastInterpolation *getDecoder(air_pressure_sensor_type_e type) { return &subyDenso; case MT_GM_3_BAR: return &gm3bar; + case MT_GM_2_BAR: + return &gm2bar; + case MT_GM_1_BAR: + return &gm1bar; case MT_TOYOTA_89420_02010: return &densoToyota; case MT_MAZDA_1_BAR: diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 290e2b7016..c138140361 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -346,7 +346,7 @@ struct gppwm_channel gppwm_table_t table; end_struct -custom air_pressure_sensor_type_e 4 bits, U32, @OFFSET@, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "type12", "type13", "INVALID", "INVALID" +custom air_pressure_sensor_type_e 4 bits, U32, @OFFSET@, [0:3], "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "GM 2 Bar", "GM 1 Bar", "INVALID", "INVALID" ! ! lower 16 values are used on stm32 rusEfi, values above 16 are related to Kinetis work in progress diff --git a/java_console/build.xml b/java_console/build.xml index 353e4aa426..f1dd33458e 100644 --- a/java_console/build.xml +++ b/java_console/build.xml @@ -187,7 +187,7 @@ - +