From ed2321875996ee7974eeed73a0bde3f51a06152a Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Mon, 17 Oct 2022 12:36:02 -0700 Subject: [PATCH] enable proteus, select compiler in script (#4675) * enable proteus, select compiler in script * do it the new way * blah * old fashioned printf debugging * sleep longer so we get battery voltage, and not on proteus * firmware yaml * remove print, it works! --- .github/workflows/build-firmware.yaml | 2 +- .github/workflows/hardware-ci.yaml | 19 +++++++++++-------- firmware/init/sensor/init_sensors.cpp | 5 ++--- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml index a1619a14a4..0336f75ec0 100644 --- a/.github/workflows/build-firmware.yaml +++ b/.github/workflows/build-firmware.yaml @@ -317,7 +317,7 @@ jobs: run: | # Compiler hosted on our other git repo - avoids having to download from the nice folks at ARM every time wget 'https://github.com/rusefi/build_support/raw/master/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.xz' -O compiler.tar.xz tar -xvf compiler.tar.xz - echo "::add-path::`pwd`/gcc-arm-none-eabi-9-2020-q2-update/bin" + echo "`pwd`/gcc-arm-none-eabi-9-2020-q2-update/bin" >> $GITHUB_PATH # Make sure the compiler we just downloaded works - just print out the version - name: Test Compiler diff --git a/.github/workflows/hardware-ci.yaml b/.github/workflows/hardware-ci.yaml index 8d8e240fd3..6eb590cba8 100644 --- a/.github/workflows/hardware-ci.yaml +++ b/.github/workflows/hardware-ci.yaml @@ -8,7 +8,7 @@ jobs: # Let all builds finish even if one fails early fail-fast: false matrix: - build-target: [f407-discovery] + build-target: [f407-discovery, proteus_f4] include: - build-target: f407-discovery @@ -18,12 +18,12 @@ jobs: config-name: all ini-file: rusefi_f4-disco.ini -# - build-target: proteus_f4 -# script: hardware_ci_proteus -# runs-on: hw-ci-proteus -# folder: proteus -# config-name: proteus_f4 -# ini-file: rusefi_proteus_f4.ini + - build-target: proteus_f4 + script: hardware_ci_proteus + runs-on: hw-ci-proteus + folder: proteus + config-name: proteus_f4 + ini-file: rusefi_proteus_f4.ini runs-on: ${{matrix.runs-on}} @@ -52,8 +52,11 @@ jobs: working-directory: ./firmware/ run: ./gen_live_documentation.sh + - name: Add compiler to PATH + run: echo "$HOME/.rusefi-tools/gcc-arm-none-eabi-9-2020-q2-update/bin" >> $GITHUB_PATH + # Make sure the compiler works - - name: Test Compiler + - name: Test/Identify Compiler run: arm-none-eabi-gcc -v # We aren't guaranteed a clean machine every time, so manually clean the output diff --git a/firmware/init/sensor/init_sensors.cpp b/firmware/init/sensor/init_sensors.cpp index d492627eb3..42db66eeba 100644 --- a/firmware/init/sensor/init_sensors.cpp +++ b/firmware/init/sensor/init_sensors.cpp @@ -74,9 +74,8 @@ void initNewSensors() { // Init CLI functionality for sensors (mocking) initSensorCli(); -#ifdef HARDWARE_CI - - chThdSleepMilliseconds(10); +#if defined(HARDWARE_CI) && !defined(HW_PROTEUS) + chThdSleepMilliseconds(100); if (Sensor::getOrZero(SensorType::BatteryVoltage) < 8) { // Fake that we have battery voltage, some tests rely on it