Skip to content

Commit

Permalink
Merge pull request #83 from AEFeinstein/main
Browse files Browse the repository at this point in the history
Update working with full moton
  • Loading branch information
cnlohr authored Sep 24, 2023
2 parents a3458cf + 6c769d3 commit 85ae221
Show file tree
Hide file tree
Showing 629 changed files with 29,517 additions and 1,806 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"features": {
"ghcr.io/rocker-org/devcontainer-features/apt-packages:1": {
"upgradePackages": true,
"packages": "build-essential,xorg-dev,libx11-dev,libxinerama-dev,libxext-dev,mesa-common-dev,libglu1-mesa-dev,libasound2-dev,libpulse-dev,libasan8,clang-format,cppcheck,doxygen,python3,python3-pip,python3-venv,cmake,libusb-1.0-0-dev"
"packages": "build-essential,xorg-dev,libx11-dev,libxinerama-dev,libxext-dev,mesa-common-dev,libglu1-mesa-dev,libasound2-dev,libpulse-dev,libasan8,clang-format,cppcheck,doxygen,python3,python3-pip,python3-venv,cmake,libusb-1.0-0-dev,lcov"
}
},
"customizations": {
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-firmware-and-emulator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Set up the IDF
run: |
git clone -b v5.1 --recurse-submodules https://github.com/espressif/esp-idf.git ${{ runner.temp }}/esp-idf -j2
git clone -b v5.1.1 --recurse-submodules https://github.com/espressif/esp-idf.git ${{ runner.temp }}/esp-idf -j2
${{ runner.temp }}/esp-idf/install.ps1
- name: Compile the firmware
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
- name: Post to a Slack channel
if: (github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true) || (github.event_name == 'push' && github.ref_name == 'main')
id: slack
uses: slackapi/slack-github-action@v1.23.0
uses: slackapi/slack-github-action@v1.24.0
with:
# Slack channel id, channel name, or user id to post message.
# See also: https://api.slack.com/methods/chat.postMessage#channels
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ jobs:
sudo apt update
sudo apt install graphviz default-jre
sudo apt remove doxygen
wget -q -P ~ https://www.doxygen.nl/files/doxygen-1.9.6.linux.bin.tar.gz
tar -xf ~/doxygen-1.9.6.linux.bin.tar.gz -C ~
export PATH="$PATH:$HOME/doxygen-1.9.6/bin"
wget -q -P ~ https://www.doxygen.nl/files/doxygen-1.9.8.linux.bin.tar.gz
tar -xf ~/doxygen-1.9.8.linux.bin.tar.gz -C ~
export PATH="$PATH:$HOME/doxygen-1.9.8/bin"
make docs
- name: Setup Pages
uses: actions/configure-pages@v3
Expand Down
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
*.obj
*.elf

# Coverage files
*.gcda
*.gcno

# Linker output
*.ilk
*.map
Expand Down Expand Up @@ -54,6 +58,7 @@ dkms.conf
build
sdkconfig.old
docs/html
docs/*.pu

.vscode/c_cpp_properties.json
.vscode/settings.json
Expand All @@ -67,3 +72,12 @@ version.txt
plantuml.jar
swadge_emulator
crash-*.txt
screenshot-*.bmp
rec-*.csv

*.pyc
tools/rayMapEditor/autosave.rmd
perf.data
*.stackdump
coverage/
coverage.info
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/swadge_emulator",
"args": [],
"args": ["-t"],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",
"environment": [],
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# For more information about build system see
# https://docs.espressif.com/projects/esp-idf/en/v5.1/esp32s2/api-guides/build-system.html
# https://docs.espressif.com/projects/esp-idf/en/v5.1.1/esp32s2/api-guides/build-system.html
# The following five lines of boilerplate have to be in your project's
# CMakeLists in this exact order for cmake to work correctly
cmake_minimum_required(VERSION 3.16)
Expand Down
Loading

0 comments on commit 85ae221

Please sign in to comment.