Skip to content

Merge robdobsn/main into Robotical raftjs - #8

Closed
NikTheGeek1 wants to merge 4 commits into
mainfrom
sync/robdobsn-main-20260519
Closed

NikTheGeek1 wants to merge 4 commits into
mainfrom
sync/robdobsn-main-20260519

Conversation

@NikTheGeek1

Copy link
Copy Markdown

Summary

This PR merges the current robdobsn/raftjs:main changes into Robotical's main branch via sync/robdobsn-main-20260519.

It brings in Rob's upstream updates for system-device role support, the package version update, and the dashboard disconnect fix. The conflict resolution keeps Robotical package identity and preserves Robotical's devbin compatibility parser while adding upstream device-id typeinfo support with fallback to the existing bus/type endpoint.

Conflict Resolution Notes

  • Kept @robotical/raftjs package metadata and regenerated the lockfile.
  • Kept Robotical's bounded current/legacy devbin parsing and malformed-sample skipping.
  • Added upstream diagnostic context to attribute decoding without weakening sample-bound checks.
  • Added upstream deviceid typeinfo lookup while retaining bus/type fallback for simulator and older firmware.
  • Kept upstream role/name fields in device type info.

Validation

  • npm run build
  • npm run build:phone
  • npx jest --runInBand

@NikTheGeek1

Copy link
Copy Markdown
Author

Closing this draft PR because the intended target is upstream robdobsn/raftjs:main.

@NikTheGeek1
NikTheGeek1 deleted the sync/robdobsn-main-20260519 branch May 21, 2026 12:18
@NikTheGeek1
NikTheGeek1 restored the sync/robdobsn-main-20260519 branch May 21, 2026 13:07
NikTheGeek1 added a commit that referenced this pull request May 21, 2026
…tions

Clean up subscriptions before disconnect
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants