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

enable hardware ci (#34) 

* add openocd cfg

* enable hw ci

* yaml picky indenting

* s

* serial port

* reset_config none separate

* luaformatter submodule

* vcc

* I can't type
This commit is contained in:
Matthew Kennedy 2023-02-23 01:57:09 -08:00 committed by GitHub
parent 97901297d9
commit b1634f052b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
.github/workflows/hardware-ci.yaml.disable → .github/workflows/hardware-ci.yaml vendored
View File

@ -8,26 +8,33 @@ jobs:
# Let all builds finish even if one fails early
fail-fast: false
matrix:
build-target: [f407-discovery, proteus_f4]
include:
# - build-target: f407-discovery
# script: hardware_ci_f4_discovery
# runs-on: hw-ci-f4-discovery
# test-suite: com.rusefi.HwCiF4Discovery
# folder: config/boards/f407-discovery
# config-name: all
# openocd-script: ../.github/workflows/openocd_ci_f4_discovery.cfg
# serial-device: /dev/serial/by-id/usb-rusEFI_LLC_rusEFI_Engine_Management_ECU_2B003B000A51343033393930-if01
- build-target: f407-discovery
script: hardware_ci_f4_discovery
runs-on: hw-ci-f4-discovery
runs-on: hw-ci-f4-discovery-2
test-suite: com.rusefi.HwCiF4Discovery
folder: config/boards/f407-discovery
config-name: all
openocd-script: ../.github/workflows/openocd_ci_f4_discovery.cfg
serial-device: /dev/serial/by-id/usb-rusEFI_LLC_rusEFI_Engine_Management_ECU_2B003B000A51343033393930-if01
openocd-script: ../.github/workflows/openocd_ci_f4_discovery_2.cfg
serial-device: /dev/serial/by-id/usb-rusEFI_LLC_rusEFI_Engine_Management_ECU_1E0032000851353238333131-if01
- build-target: proteus_f4
script: hardware_ci_proteus
runs-on: hw-ci-proteus
test-suite: com.rusefi.HwCiF4Proteus
folder: config/boards/proteus
config-name: proteus_f4
openocd-script: ../.github/workflows/openocd_ci_proteus.cfg
serial-device: /dev/serial/by-id/usb-rusEFI_LLC_rusEFI_Engine_Management_ECU_41003D000451383037343335-if01
# - build-target: proteus_f4
# script: hardware_ci_proteus
# runs-on: hw-ci-proteus
# test-suite: com.rusefi.HwCiF4Proteus
# folder: config/boards/proteus
# config-name: proteus_f4
# openocd-script: ../.github/workflows/openocd_ci_proteus.cfg
# serial-device: /dev/serial/by-id/usb-rusEFI_LLC_rusEFI_Engine_Management_ECU_41003D000451383037343335-if01
runs-on: ${{matrix.runs-on}}
@ -43,6 +50,7 @@ jobs:
git submodule update --init --depth=1 firmware/ext/uzlib
git submodule update --init --depth=1 firmware/controllers/lua/luaaa
git submodule update --init --depth=1 firmware/controllers/can/wideband_firmware
git submodule update --init --depth=1 java_console/luaformatter
- name: Identify Agent
run: uname -a
@ -99,6 +107,9 @@ jobs:
working-directory: ./java_tools
run: ./gradlew :autotest:shadowJar
- name: List serial services
run: ls /dev/serial/by-id/
# This both compiles and runs HW CI tests
- name: Run Hardware CI
working-directory: ./java_console

2
.github/workflows/openocd_ci_f4_discovery.cfg vendored
View File

@ -12,4 +12,4 @@ set CHIPNAME F4_DISCOVERY
source [find target/stm32f4x.cfg]
reset_config srst_only
reset_config none separate

15
.github/workflows/openocd_ci_f4_discovery_2.cfg vendored Normal file
View File

@ -0,0 +1,15 @@
# Openocd script for STM32F4 Discovery Hardware CI
source [find interface/stlink.cfg]
hla_serial 066BFF575450707267053549
transport select hla_swd
# increase working area to 128KB
set WORKAREASIZE 0x20000
# chip name
set CHIPNAME F4_DISCOVERY
source [find target/stm32f4x.cfg]
reset_config none separate

2
.github/workflows/openocd_ci_proteus.cfg vendored
View File

@ -12,4 +12,4 @@ set CHIPNAME PROTEUS
source [find target/stm32f4x.cfg]
reset_config srst_only
reset_config none separate

4
firmware/controllers/algo/engine_configuration.cpp
View File

@ -580,7 +580,7 @@ static void setDefaultEngineConfiguration() {
setEgoSensor(ES_14Point7_Free);
engineConfiguration->globalFuelCorrection = 1;
engineConfiguration->adcVcc = 3.0;
engineConfiguration->adcVcc = 3.3f;
engineConfiguration->map.sensor.type = MT_MPX4250;
@ -995,7 +995,7 @@ void resetConfigurationExt(engine_type_e engineType) {
void validateConfiguration() {
if (engineConfiguration->adcVcc > 5.0f || engineConfiguration->adcVcc < 1.0f) {
engineConfiguration->adcVcc = 3.0f;
engineConfiguration->adcVcc = 3.3f;
}
if (engineConfiguration->instantRpmRange == 0) {
// todo: extract constant in instant_rpm_calculator.h?