Repository navigation
Conversation
…teway AI-assisted: Claude Opus 5.5
Needs a marilib that ships marilib.sim, which no release does yet. World files lose slot_duration_ms and mqtt_latency_ms: both are now ignored, and the slotframe comes from the mari schedule instead. AI-assisted: Claude Opus 5.5
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #336 +/- ##
==========================================
- Coverage 88.17% 88.17% -0.01%
==========================================
Files 227 227
Lines 36028 36200 +172
Branches 2323 2324 +1
==========================================
+ Hits 31769 31919 +150
- Misses 4255 4277 +22
Partials 4 4
Flags with carried forward coverage won't be shown. Click here to find out more.
🚀 New features to boost your workflow:
|
AI-assisted: Claude Opus 5.5
Temporary: no marilib release ships marilib.sim yet. Replace this with a version pin once the mari simulator PR is merged and released. AI-assisted: Claude Opus 5.5
AI-assisted: Claude Opus 5.5
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Two changes that let the controller drive robots over a mari network the same way on the bench and in the simulator, with the same metrics on both.
Mari metrics from the controller.
--mari-metrics-output DIRmakes the edge adapter write the samerun_*folder of PDR, latency and join CSVs thatmari-edgewrites.--mari-probe-interval Ssends metrics probes to every robot (0, the default, sends none). Before this, getting link metrics during a controller run meant runningmari-edgeseparately, which cannot share the gateway's serial port. Both options apply to serial gateways and to the DotBot simulator. The cloud adapter is unchanged apart from sharing the event handler, which is now factored out of the two marilib adapters.Simulated mari robots run on marilib's network simulator. The simulator's own
MariNetworkSimulatorwas a fixed 102-slot timing model with a per-frame PDR draw. Robots in mari mode now become nodes of amarilib.sim.Network, and aMarilibEdgereads the simulated gateway's UART exactly as it reads a real one. So joins, the schedule, the downlink queue and its limits, and the metrics probes all behave as the firmware does. Commands to mari robots go through mari, while other robots keep the direct path. Probes are answered by the simulated net core and never reach the robot app, as on hardware.World file changes (breaking, under the beta policy):
[network]dropsslot_duration_msandmqtt_latency_ms. The slotframe now comes from the mari schedule, and the network adds no latency of its own.[network]gainsschedule(a mari schedule name; when left out, the smallest one that fits the mari robots) andseed.uplink_pdr/downlink_pdr, overriding the network-wide values.Depends on DotBots/mari#179 (
marilib.sim), which no marilib release ships yet. Until it does,pyproject.tomltakesmarilib-pkgfrom that PR's branch at a fixed commit, so CI can run. That pin is temporary: it must be replaced by a version pin on the marilib release before this merges, which is why this PR stays a draft.Validation
--mari-metrics-output, and wrote per-robot PDR and latency throughout the runs.dotbot/adapter.pydotbot/dotbot_simulator.pydotbot/tests/test_dotbot_simulator.pydotbot/tests/test_scenarios.pydotbot/controller_app.pydoc/conf.py,pyproject.tomland 7 other small files:controller.py,simulator_init_state.toml(both copies),tests/scenario_harness.py,tests/test_adapter.py,tests/test_controller_app.py,utils/perf/bench_controller.py