Skip to content

Commit 0fd1d3a

Browse files
authored
245 switch to cavl2 (#250)
closes #245
1 parent cd195ec commit 0fd1d3a

9 files changed

Lines changed: 539 additions & 1788 deletions

File tree

.github/workflows/main.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ jobs:
9696
sudo apt-get update -y && sudo apt-get upgrade -y
9797
sudo apt-get install gcc-avr avr-libc
9898
avr-gcc --version
99-
- run: avr-gcc libcanard/*.c -c -std=c99 -mmcu=${{ env.mcu }} ${{ env.flags }}
100-
- run: avr-gcc libcanard/*.c -c -std=c11 -mmcu=${{ env.mcu }} ${{ env.flags }}
101-
- run: avr-gcc libcanard/*.c -c -std=gnu99 -mmcu=${{ env.mcu }} ${{ env.flags }}
102-
- run: avr-gcc libcanard/*.c -c -std=gnu11 -mmcu=${{ env.mcu }} ${{ env.flags }}
99+
- run: avr-gcc libcanard/*.c -isystem lib/cavl2 -c -std=c99 -mmcu=${{ env.mcu }} ${{ env.flags }}
100+
- run: avr-gcc libcanard/*.c -isystem lib/cavl2 -c -std=c11 -mmcu=${{ env.mcu }} ${{ env.flags }}
101+
- run: avr-gcc libcanard/*.c -isystem lib/cavl2 -c -std=gnu99 -mmcu=${{ env.mcu }} ${{ env.flags }}
102+
- run: avr-gcc libcanard/*.c -isystem lib/cavl2 -c -std=gnu11 -mmcu=${{ env.mcu }} ${{ env.flags }}
103103

104104
arm:
105105
if: github.event_name == 'push'
@@ -111,8 +111,8 @@ jobs:
111111
- run: |
112112
sudo apt-get update -y && sudo apt-get upgrade -y
113113
sudo apt-get install -y gcc-arm-none-eabi
114-
- run: arm-none-eabi-gcc libcanard/*.c -c -std=c99 ${{ env.flags }}
115-
- run: arm-none-eabi-gcc libcanard/*.c -c -std=c11 ${{ env.flags }}
114+
- run: arm-none-eabi-gcc libcanard/*.c -isystem lib/cavl2 -c -std=c99 ${{ env.flags }}
115+
- run: arm-none-eabi-gcc libcanard/*.c -isystem lib/cavl2 -c -std=c11 ${{ env.flags }}
116116

117117
style_check:
118118
if: github.event_name == 'push'
@@ -195,7 +195,6 @@ jobs:
195195
--define sonar.projectName=libcanard
196196
--define sonar.projectKey=libcanard
197197
--define sonar.sources=libcanard
198-
--define sonar.exclusions=libcanard/_canard_cavl.h
199198
--define sonar.cfamily.gcov.reportsPath=.
200199
--define sonar.cfamily.compile-commands="${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json"
201200
--define sonar.host.url="${{ env.SONAR_SERVER_URL }}"

esp_metadata/package_esp_component.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ cp LICENSE package/libcanard/LICENSE
1111
cp README.md package/libcanard/README.md
1212

1313
cp libcanard/canard.c package/libcanard/canard.c
14-
cp libcanard/_canard_cavl.h package/libcanard/_canard_cavl.h
1514
cp libcanard/canard.h package/libcanard/include/canard.h
1615

1716
cp esp_metadata/CMakeLists.txt package/libcanard/CMakeLists.txt

lib/cavl2/cavl2.h

Lines changed: 468 additions & 0 deletions
Large diffs are not rendered by default.

libcanard/_canard_cavl.h

Lines changed: 0 additions & 337 deletions
This file was deleted.

0 commit comments

Comments
 (0)