Skip to content

Commit 95f4b3d

Browse files
committed
Merge branch 'main' into fix_lightning_sensor
2 parents 163c750 + a893274 commit 95f4b3d

9 files changed

Lines changed: 173 additions & 113 deletions

File tree

.github/workflows/format-check.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ jobs:
77
name: Check format of C
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
11-
with:
12-
submodules: recursive
10+
- uses: actions/checkout@v6
1311
- name: Run clang-format style check for C/C++ sources
1412
uses: Northeastern-Electric-Racing/clang-format-action@main
1513
with:

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "dev/OpenOCD"]
2+
path = dev/OpenOCD
3+
url = https://github.com/STMicroelectronics/OpenOCD

dev/.clang-format-ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
OpenOCD/*

dev/.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Dockerfile

dev/Dockerfile

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ RUN apt-get update && apt-get install -y \
1010
build-essential \
1111
wget \
1212
curl \
13-
openocd \
1413
git \
1514
gdb-multiarch \
1615
minicom \
@@ -26,16 +25,17 @@ RUN apt-get update && apt-get install -y \
2625
python3-pip \
2726
ruby
2827

28+
2929
RUN wget https://github.com/renode/renode/releases/download/v1.15.3/renode-1.15.3.linux-portable.tar.gz
30-
RUN mkdir renode_portable && tar -xvf renode-*.linux-portable.tar.gz -C renode_portable --strip-components=1
30+
RUN mkdir renode_portable && tar -xvf renode-*.linux-portable.tar.gz -C renode_portable --strip-components=1 && rm renode-*.linux-portable.tar.gz
3131
ENV PATH $PATH:/renode_portable
3232

3333
RUN wget https://github.com/ThrowTheSwitch/CMock/archive/refs/tags/v2.6.0.tar.gz -O cmock.tar.gz
34-
RUN mkdir cmock_portable && tar -xvf cmock.tar.gz -C cmock_portable --strip-components=1
34+
RUN mkdir cmock_portable && tar -xvf cmock.tar.gz -C cmock_portable --strip-components=1 && rm cmock.tar.gz
3535
ENV PATH $PATH:/cmock_portable
3636

3737
RUN wget https://github.com/ThrowTheSwitch/Unity/archive/refs/tags/v2.6.1.tar.gz -O unity.tar.gz
38-
RUN mkdir -p /cmock_portable/vendor/unity && tar -xvf unity.tar.gz -C /cmock_portable/vendor/unity --strip-components=1
38+
RUN mkdir -p /cmock_portable/vendor/unity && tar -xvf unity.tar.gz -C /cmock_portable/vendor/unity --strip-components=1 && rm unity.tar.gz
3939

4040
# Set up a development tools directory
4141
WORKDIR /home/dev
@@ -53,6 +53,13 @@ RUN wget -qO- https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/bi
5353

5454
ENV PATH $PATH:/home/dev/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi/bin
5555

56+
# build and install customized openocd
57+
RUN apt-get install -y libtool libusb-1.0.0-dev
58+
RUN git clone https://github.com/STMicroelectronics/OpenOCD
59+
RUN cd ./OpenOCD && ./bootstrap && ./configure --enable-stlink
60+
RUN cd ./OpenOCD && make && make install
61+
RUN rm -r ./OpenOCD
62+
5663
WORKDIR /home/app
5764

5865
# Set up safe directory

dev/OpenOCD

Submodule OpenOCD added at 0de861e

0 commit comments

Comments
 (0)