Skip to content
Snippets Groups Projects

MLVDS Bus Feature

Merged Cagil Guemues requested to merge a7_m2s into main
All threads resolved!

This branch brings the major feature of controlling all 16 motors of the ZMX Crate. The main effort of this sprint was focusing on MLVDS-Bus implementation between the Manager and Subordinate ZMX connection modules.

Changelog:

  • Implement Manager-to-Subordinate(M2S) and Subordinate-to-Manager(S2M) paths. Basic functionality is proven to work on hardware however more long-term tests are needed.
  • Extend the Aurora frame structure to cover the Memory Mapped Interface (No logic to handle the MM, only there to pass the bytes across the Aurora link
  • Application configuration no longer configures DAQ
  • K7 <-> A7 Aurora link is no longer continuously active. It relies on strobes on both sides together with back-pressure
  • Entire ZMX Connection module logic now runs on a single clock domain (Aurora User clock) also for Subordinates
  • Timing Module now configures its register lengths using Application Configuration through C_TRG_CNT parameter
  • Improve overall documentation of the project

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • added 1 commit

    • e251a4ca - fix: change repo for manifest file to gitlab.desy.de

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • added 1 commit

    • 825de683 - fix: buffer overflow in AXI4-Stream Clock Converter

    Compare with previous version

  • Michael Randall added 3 commits

    added 3 commits

    • 266d0998 - fix: correct latching of manager motor control signals
    • c69c5958 - fix: wrong output port assignment on the M2S Rx side
    • 96627f99 - Merge branch 'motor_ctrl_latch' into 'a7_m2s'

    Compare with previous version

  • Michael Randall added 2 commits

    added 2 commits

    • cc1d590a - refactor: S2M interface
    • 488a1572 - Merge branch 's2m_refactor' into 'a7_m2s'

    Compare with previous version

  • Cagil Guemues added 2 commits

    added 2 commits

    • b806a4f0 - fix: incorrect step data received on manager ZMX connection module
    • d619b649 - Merge branch 'k2a_issues' into 'a7_m2s'

    Compare with previous version

  • Michael Randall added 9 commits

    added 9 commits

    • 18878844 - chore: MLVDS S2M clock detection now relies on main 125MHz aurora clock,...
    • 43d52912 - wip: revised clock detector
    • 0b7fbedd - fix: add asynchronous reset to sensitivity list
    • 9024dce6 - wip: add synchronizer for external motor status signals
    • 55cc385c - fix: missing timing exceptions
    • e426402f - wip: remove debugging signal
    • 6f5cf64e - fix: buffer overflow on A7-to-K7 direction of Aurora
    • 5022c0c3 - wip: write documentation for the motion control software
    • 52285807 - Merge branch 'cleanup' into 'a7_m2s'

    Compare with previous version

  • added 1 commit

    • c56528fb - wip: changes during merge request

    Compare with previous version

  • Cagil Guemues resolved all threads

    resolved all threads

  • Michael Randall approved this merge request

    approved this merge request

  • mentioned in commit beb1d7c2

  • Please register or sign in to reply
    Loading