jannik/esp32-c_its-companion
1
0
Fork 0
Code Issues 2 Pull requests 4 Projects Releases Activity Actions

WIP: Add BLE transmission #3

Draft
jannik wants to merge 3 commits from feat/ble into main
pull from: feat/ble
merge into: jannik:main
Conversation 0 Commits 3 Files changed 5 +390 -2
jannik commented 2026-06-13 10:10:45 +00:00
Owner
Copy link

TODO: Make it actually work
TODO: Rebase onto #2

TODO: Make it actually work TODO: Rebase onto #2
This pull request has changes conflicting with the target branch.
  • Cargo.lock
  • Cargo.toml
  • src/main.rs
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feat/ble:feat/ble
git switch feat/ble

Merge

Merge the changes and update on Forgejo.
git switch main
git merge --no-ff feat/ble
git switch feat/ble
git rebase main
git switch main
git merge --ff-only feat/ble
git switch feat/ble
git rebase main
git switch main
git merge --no-ff feat/ble
git switch main
git merge --squash feat/ble
git switch main
git merge --ff-only feat/ble
git switch main
git merge feat/ble
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug
Something is not working

  
duplicate
This issue or pull request already exists

  
enhancement
New feature

  
help wanted
Need some help

  
invalid
Something is wrong

  
question
More information is needed

  
wontfix
This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
jannik/esp32-c_its-companion!3
No description provided.