Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

riot-rs-boards: make "dummy" a (non-default) choice #26

Merged
merged 4 commits into from
Dec 13, 2023
Merged

riot-rs-boards: make "dummy" a (non-default) choice #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c123d71
riot-rs-boards: make dummy board non-default
kaspar030 Dec 13, 2023
d2ed61e
riot-rs-boards: add `microbit-v2` to boards dispatch
kaspar030 Dec 13, 2023
1309a76
bump Cargo.lock
kaspar030 Dec 13, 2023
15e7b95
ci: also build for microbit-v2
kaspar030 Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
run: |
sccache --start-server || true # work around https://github.com/ninja-build/ninja/issues/2052

laze build --partition hash:${{ matrix.partition }} --builders nrf52840dk,rpi-pico -g
laze build --partition hash:${{ matrix.partition }} --builders microbit-v2,nrf52840dk,rpi-pico -g

CI-success:
if: ${{ always() }}
Expand Down
26 changes: 12 additions & 14 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions src/riot-rs-boards/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

use cfg_if::cfg_if;

pub mod dummy {
pub fn init() {}
}

cfg_if! {
if #[cfg(feature = "nrf52dk")] {
pub use nrf52dk as board;
Expand All @@ -17,14 +13,16 @@ cfg_if! {
pub use nrf52840_mdk as board;
} else if #[cfg(feature = "microbit")] {
pub use microbit as board;
} else if #[cfg(feature = "microbit-v2")] {
pub use microbit_v2 as board;
} else if #[cfg(feature = "nucleo-f401re")] {
pub use nucleo_f401re as board;
} else if #[cfg(feature = "lm3s6965evb")] {
pub use lm3s6965evb as board;
} else if #[cfg(feature = "rpi-pico")] {
pub use rpi_pico as board;
} else {
pub use dummy as board;
compile_error!("no board feature selected");
}
}

Expand Down
Loading