Skip to content

Revert accidental merge of maintenance-10.x into maintenance-9.x #11606

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

Merged
sensei-hacker merged 4 commits into from
May 31, 2026
Merged

Revert accidental merge of maintenance-10.x into maintenance-9.x #11606

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
900a88b
chore: remove accidentally tracked build_hw/ directory (1.1GB of cmak…
daijoubu May 24, 2026
7a9b7bb
Revert lib/ HAL and DroneCAN library changes from bad merge of mainte…
sensei-hacker May 31, 2026
2db9595
Revert stm32cubef7_extract/ changes from bad merge of maintenance-10.x
sensei-hacker May 31, 2026
d5ac9bb
Revert "Merge branch 'maintenance-10.x' into maintenance-9.x"
sensei-hacker May 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 4 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ launch.json
# Assitnow token and files for test script
tokens.yaml
*.ubx
/testing/
/.idea/

# Build output directories (catch-all for ad-hoc build dirs)
/build_*/
/build_hw/

# Local development files
.semgrepignore
Expand Down
Empty file removed .gitmodules
View file
Open in desktop
Empty file.
8 changes: 4 additions & 4 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
"version": "2.0.0",
"tasks": [
{
"label": "Build MATEKH743",
"label": "Build AOCODARCH7DUAL",
"type": "shell",
"command": "ninja MATEKH743",
"command": "make AOCODARCH7DUAL",
"group": "build",
"problemMatcher": [],
"options": {
"cwd": "${workspaceFolder}/build"
}
},
{
"label": "Build MATEKH743",
"label": "Build AOCODARCH7DUAL",
"type": "shell",
"command": "ninja MATEKH743",
"command": "make AOCODARCH7DUAL",
"group": {
"kind": "build",
"isDefault": true
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ get_git_head_revision(GIT_REFSPEC GIT_SHA1)
string(SUBSTRING ${GIT_SHA1} 0 8 GIT_REV)

# Load settings related functions, so the tests can use them
include(dsdlc_generated)
include(main)
include(settings)

Expand Down
Loading
Loading