Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Sign in
S
Software for White Rabbit PTP Core
  • Project
    • Project
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 28
    • Issues 28
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 4
    • Merge Requests 4
  • CI / CD
    • CI / CD
    • Pipelines
    • Schedules
  • Wiki
    • Wiki
  • image/svg+xml
    Discourse
    • Discourse
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • Projects
  • Software for White Rabbit PTP Core
  • Merge Requests
  • !2

Open
Opened May 15, 2020 by li hongming@hongming
  • Report abuse
Report abuse

add support for WRS-LJ.

There are three types of wrs: normal wrs(mark as wrs), wrs with LJD (mark as WRS-LJD), wrs with embedded lowjitter circuits(mark as WRSLJ). lj_loopback_i/o is used to distinguish wrs from WRS-LJD and WRSLJ. lj_osc_freq_i is used to distinguish WRSLJ from WRS-LJD. lj_osc_freq_i=111 means WRSLJ. lj_osc_freq_i=others means WRS-LJD.

lj_osc_freq_i[2 downto 0] need to be pulled up

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b hm_proposed_master origin/hm_proposed_master

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/proposed_master
git merge --no-ff hm_proposed_master

Step 4. Push the result of the merge to GitLab

git push origin proposed_master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 0
  • Commits 2
  • Pipelines 2
  • Changes 3
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
1
Labels
feature
Assign labels
  • View project labels
Reference: project/wrpc-sw!2