frank/ruvnet--RuView
1
0
Fork 0
mirror of https://github.com/ruvnet/RuView synced 2026-08-08 20:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge: main into adr-110-esp32c6 — resolve lib.rs / esp32_parser / tracker_bridge conflicts

Browse Source 
3 conflict points, all clean resolutions:

  v2/crates/wifi-densepose-hardware/src/lib.rs
    Conflict 1: mod declarations.
      HEAD added `pub mod sync_packet;` (iter 14).
      main re-ordered the existing mods alphabetically.
      Resolution: take main's ordering + append sync_packet at the end.

    Conflict 2: re-exports.
      HEAD added `pub use sync_packet::{SyncPacket, …}` block (iter 14).
      main moved bridge::CsiData earlier.
      Resolution: keep main's CsiData position; add my sync_packet
      re-export immediately before the radio_ops re-export.

  v2/crates/wifi-densepose-hardware/src/esp32_parser.rs
    HEAD has ADR-110 byte 18-19 PpduType + Adr018Flags parsing (iter 14).
    main still has the pre-ADR-110 "Reserved (offset 18, 2 bytes)" skip.
    Resolution: take HEAD — main hasn't pulled in ADR-110 work yet,
    that's exactly why this PR exists.

  v2/crates/wifi-densepose-sensing-server/src/tracker_bridge.rs
    HEAD has my iter-35 import cleanup (use { TrackLifecycleState, TrackId,
    NUM_KEYPOINTS }).
    main has the equivalent cleanup with a different import ordering
    (use { TrackId, TrackLifecycleState, NUM_KEYPOINTS }) + the
    pose_tracker::PoseTracker import on the line above.
    Resolution: take main's version — same end state, no behavioral
    difference, less diff churn.

Verification:
  cargo check -p wifi-densepose-hardware -p wifi-densepose-sensing-server
    --no-default-features → green
  cargo test -p wifi-densepose-hardware --no-default-features --lib sync_packet
    → 15/15 passed (122 filtered)

The 38-iter ADR-110 work is intact post-merge.

Co-Authored-By: claude-flow <ruv@ruv.net>
This commit is contained in:
ruv
2026-05-23 15:34:29 -04:00
parent a11537c00c 5d544126ee
commit ab1c90c106
253 changed files with 13831 additions and 5890 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+6
View File
@@ -591,6 +591,12 @@ Verify the plugin structure: `bash plugins/ruview/scripts/smoke.sh`. Full detail
MIT License — see [LICENSE](LICENSE) for details.
## 🤝 Creator Affiliate Program
**For TikTok · Instagram · YouTube creators** — earn **25% on every Cognitum sale** you refer. The RuFlo, RuView, and RuVector videos you're already making have done millions of views; get paid for the orders they drive. Click-tracking activates instantly; commissions activate after a quick manual review (usually under 24 hours).
[Apply now → cognitum.one/affiliate](https://cognitum.one/affiliate)
## 📞 Support
[GitHub Issues](https://github.com/ruvnet/RuView/issues) | [Discussions](https://github.com/ruvnet/RuView/discussions) | [PyPI](https://pypi.org/project/wifi-densepose/)