FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
rusefillc 2021-02-02 09:50:37 -05:00
parent 0f49d48a42 11e2486f8f
commit 4fc95cd9c4
24 changed files with 86 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/hardware-ci-f4-discovery.yaml vendored
View File

@ -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

6
firmware/config/boards/proteus/board_configuration.cpp
View File

@ -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
}

6
firmware/controllers/algo/auto_generated_enums.cpp
View File

@ -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:

4
firmware/controllers/algo/rusefi_enums.h
View File

@ -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;

2
firmware/controllers/generated/fsio_enums_generated.def
View File

@ -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,

2
firmware/controllers/generated/fsio_getters.def
View File

@ -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:

2
firmware/controllers/generated/fsio_names.def
View File

@ -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");

2
firmware/controllers/generated/fsio_strings.def
View File

@ -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:

4
firmware/controllers/generated/signature_all.h
View File

@ -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"

4
firmware/controllers/generated/signature_frankenso_na6.h
View File

@ -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"

4
firmware/controllers/generated/signature_hellen72.h
View File

@ -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"

4
firmware/controllers/generated/signature_hellen_cypress.h
View File

@ -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"

4
firmware/controllers/generated/signature_kin.h
View File

@ -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"

4
firmware/controllers/generated/signature_mre_f4.h
View File

@ -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"

4
firmware/controllers/generated/signature_mre_f7.h
View File

@ -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"

4
firmware/controllers/generated/signature_prometheus_405.h
View File

@ -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"

4
firmware/controllers/generated/signature_prometheus_469.h
View File

@ -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"

4
firmware/controllers/generated/signature_proteus_f4.h
View File

@ -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"

4
firmware/controllers/generated/signature_proteus_f7.h
View File

@ -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"

10
firmware/controllers/sensors/map.cpp
View File

@ -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:

2
firmware/integration/rusefi_config.txt
View File

@ -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

2
java_console/build.xml
View File

@ -187,7 +187,7 @@
</target>
<target name="real_hardware_functional_test" depends="jar">
<target name="hardware_ci_f4_discovery" depends="jar">
<mkdir dir="${hw_tests}"/>
<junit fork="no"
maxmemory="512m"

2
misc/jenkins/functional_test_and_build_bundle/hw_test.sh
View File

@ -30,7 +30,7 @@ which java
which javac
echo Sleeping few seconds to give OS time to connect VCP driver
sleep 20s
ant real_hardware_functional_test
ant hardware_ci_f4_discovery
[ $? -eq 0 ] || { echo "ERROR DETECTED"; exit 1; }

30
unit_tests/triggers.txt
View File

@ -3279,3 +3279,33 @@ event 540 1 1 0.00
event 541 1 0 0.00
event 542 1 1 0.00
event 543 1 0 0.00
TRIGGERTYPE 54 28 TT_GM_60_2_2_2 0.00
# duty 0.90 0.00
event 0 0 1 0.00
event 1 0 0 5.00
event 2 0 1 60.00
event 3 0 0 65.00
event 4 0 1 120.00
event 5 0 0 125.00
event 6 0 1 180.00
event 7 0 0 185.00
event 8 0 1 240.00
event 9 0 0 245.00
event 10 0 1 290.00
event 11 0 0 295.00
event 12 0 1 300.00
event 13 0 0 305.00
event 14 0 1 360.00
event 15 0 0 365.00
event 16 0 1 420.00
event 17 0 0 425.00
event 18 0 1 480.00
event 19 0 0 485.00
event 20 0 1 540.00
event 21 0 0 545.00
event 22 0 1 600.00
event 23 0 0 605.00
event 24 0 1 650.00
event 25 0 0 655.00
event 26 0 1 660.00
event 27 0 0 665.00