Skip to content

Commit

Permalink
clean up project, switch to c2usb as zephyr module
Browse files Browse the repository at this point in the history
  • Loading branch information
benedekkupper committed Oct 28, 2024
1 parent 04fefb9 commit 8f9726f
Show file tree
Hide file tree
Showing 21 changed files with 23 additions and 2,966 deletions.
27 changes: 11 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, macos-13, macos-14, windows-2022]
os: [ubuntu-22.04]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v4
with:
path: example-application
path: usb-keyboard

- name: Set up Python
uses: actions/setup-python@v5
Expand All @@ -27,23 +27,18 @@ jobs:
- name: Setup Zephyr project
uses: zephyrproject-rtos/action-zephyr-setup@v1
with:
app-path: example-application
app-path: usb-keyboard
toolchains: arm-zephyr-eabi

- name: Build firmware
working-directory: example-application
working-directory: usb-keyboard
shell: bash
run: |
if [ "${{ runner.os }}" = "Windows" ]; then
EXTRA_TWISTER_FLAGS="--short-build-path -O/tmp/twister-out"
fi
west twister -T app -v --inline-logs --integration $EXTRA_TWISTER_FLAGS
west build -b nrf52840dk/nrf52840 usb-keyboard
- name: Twister Tests
working-directory: example-application
shell: bash
run: |
if [ "${{ runner.os }}" = "Windows" ]; then
EXTRA_TWISTER_FLAGS="--short-build-path -O/tmp/twister-out"
fi
west twister -T tests -v --inline-logs --integration $EXTRA_TWISTER_FLAGS
- name: Archive firmware
uses: actions/upload-artifact@v4
with:
name: fw-nrf52840dk
path: |
build/zephyr/zephyr.hex
61 changes: 0 additions & 61 deletions .github/workflows/docs.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
# build
/build*
/twister-out*
*/build

__pycache__/

Expand Down
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# until https://github.com/zephyrproject-rtos/zephyr/pull/69490 is merged
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")

add_subdirectory(lib)
1 change: 0 additions & 1 deletion Kconfig

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ This repository contains a c2usb Zephyr example application.
## Initialization

The first step is to initialize the workspace folder (``my-workspace``) where
the ``example-application`` and all Zephyr modules will be cloned. Run the following
the ``usb-keyboard`` and all Zephyr modules will be cloned. Run the following
command:

```shell
# initialize my-workspace for the example-application (main branch)
west init -m https://github.com/IntergatedCircuits/c2usb-zephyr-examples.git my-workspace
# initialize my-workspace for the usb-keyboard (main branch)
west init -m https://github.com/IntergatedCircuits/c2usb-zephyr-examples my-workspace
# update Zephyr modules
cd my-workspace
west update
Expand Down
Loading

0 comments on commit 8f9726f

Please sign in to comment.