Skip to content

Commit 2eca227

Browse files
committed
update workflow and make
1 parent 8662ea3 commit 2eca227

File tree

5 files changed

+30
-13
lines changed

5 files changed

+30
-13
lines changed

.github/workflows/pre-release.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ jobs:
1919
run: sudo apt -y install gcc-arm-none-eabi
2020
- name: check toolchain
2121
run: arm-none-eabi-gcc --version
22-
- name: build varmint
23-
run: mkdir varmint_build && cd varmint_build && cmake .. -DBOARD_TO_BUILD=varmint && make
22+
- name: build varmint_10X
23+
run: mkdir varmint_10X_build && cd varmint_10X_build && cmake .. -DBOARD_TO_BUILD=varmint_10X && make
24+
- name: build varmint_11X
25+
run: mkdir varmint_11X_build && cd varmint_11X_build && cmake .. -DBOARD_TO_BUILD=varmint_11X && make
2426
- name: build pixracer pro
2527
run: mkdir pixracer_pro_build && cd pixracer_pro_build && cmake .. -DBOARD_TO_BUILD=pixracer_pro && make
2628

@@ -31,6 +33,7 @@ jobs:
3133
prerelease: true
3234
title: "Development Build"
3335
files: |
34-
varmint_build/varmint_10X.hex
36+
varmint_10X_build/varmint_10X.hex
37+
varmint_11X_build/varmint_11X.hex
3538
pixracer_pro_build/pixracer_pro.hex
3639

.github/workflows/release.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ jobs:
1919
run: sudo apt -y install gcc-arm-none-eabi
2020
- name: check toolchain
2121
run: arm-none-eabi-gcc --version
22-
- name: build varmint
23-
run: mkdir varmint_build && cd varmint_build && cmake .. -DBOARD_TO_BUILD=varmint && make
22+
- name: build varmint_10X
23+
run: mkdir varmint_10X_build && cd varmint_10X_build && cmake .. -DBOARD_TO_BUILD=varmint_10X && make
24+
- name: build varmint_11X
25+
run: mkdir varmint_11X_build && cd varmint_11X_build && cmake .. -DBOARD_TO_BUILD=varmint_11X && make
2426
- name: build pixracer pro
2527
run: mkdir pixracer_pro_build && cd pixracer_pro_build && cmake .. -DBOARD_TO_BUILD=pixracer_pro && make
2628

@@ -29,5 +31,6 @@ jobs:
2931
repo_token: "${{ secrets.GITHUB_TOKEN }}"
3032
prerelease: false
3133
files: |
32-
varmint_build/varmint_10X.hex
34+
varmint_10X_build/varmint_10X.hex
35+
varmint_11X_build/varmint_11X.hex
3336
pixracer_pro_build/pixracer_pro.hex

.github/workflows/varmint_firmware.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ jobs:
1515
run: sudo apt -y install gcc-arm-none-eabi
1616
- name: check toolchain
1717
run: arm-none-eabi-gcc --version
18-
- name: build varmint
19-
run: mkdir varmint_build && cd varmint_build && cmake .. -DBOARD_TO_BUILD=varmint && make
18+
- name: build varmint_10X
19+
run: mkdir varmint_10X_build && cd varmint_10X_build && cmake .. -DBOARD_TO_BUILD=varmint_10X && make
20+
- name: build varmint_11X
21+
run: mkdir varmint_11X_build && cd varmint_11X_build && cmake .. -DBOARD_TO_BUILD=varmint_11X && make
2022
- name: build pixracer pro
2123
run: mkdir pixracer_pro_build && cd pixracer_pro_build && cmake .. -DBOARD_TO_BUILD=pixracer_pro && make

CMakeLists.txt

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,26 @@ file(GLOB_RECURSE ROSFLIGHT_SOURCES
6161
### select boards to compile ###
6262

6363
set(BOARD_TO_BUILD "" CACHE STRING "Select the board to build")
64-
if("${BOARD_TO_BUILD}" STREQUAL "varmint")
65-
message("===== Selecting varmint board target. =====")
64+
if("${BOARD_TO_BUILD}" STREQUAL "varmint_10X")
65+
message("===== Selecting varmint_10X board target. =====")
6666
set(TARGET_NAME "varmint_10X")
6767
add_subdirectory(boards/varmint_h7/varmint_10X)
68+
69+
elseif("${BOARD_TO_BUILD}" STREQUAL "varmint_11X")
70+
message("===== Selecting varmint_11X board target. =====")
71+
set(TARGET_NAME "varmint_11X")
72+
add_subdirectory(boards/varmint_h7/varmint_11X)
73+
6874
elseif("${BOARD_TO_BUILD}" STREQUAL "pixracer_pro")
6975
message("===== Selecting pixracer pro board target. =====")
7076
set(TARGET_NAME "pixracer_pro")
7177
add_subdirectory(boards/varmint_h7/pixracer_pro)
78+
7279
elseif("${BOARD_TO_BUILD}" STREQUAL "test")
7380
message("===== Selecting test board target. ======")
7481
add_subdirectory(test)
82+
7583
else()
76-
message(FATAL_ERROR "No valid board selected! Please select the varmint, pixracer pro, or test board with -DBOARD_TO_BUILD=varmint, -DBOARD_TO_BUILD=pixracer_pro, OR -DBOARD_TO_BUILD=test.")
77-
endif()
84+
message(FATAL_ERROR "No valid board selected! Please select the varmint_10X, varmint_11X, pixracer pro, or test board with -DBOARD_TO_BUILD=varmint_10X, -DBOARD_TO_BUILD=varmint_11X, -DBOARD_TO_BUILD=pixracer_pro, OR -DBOARD_TO_BUILD=test.")
85+
86+
endif()

boards/varmint_h7/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ STM32H753VIHX_FLASH.ld
1313
build/
1414
*/Debug/
1515
cmake_install.cmake
16-
varmint_11x/
16+
#varmint_11x/
1717
varmint_11x_test/
1818
varmint_12x/
1919
Liv4f.*

0 commit comments

Comments
 (0)