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