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 27
    • Issues 27
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 3
    • Merge Requests 3
  • 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
  • !4

Open
Opened Oct 09, 2022 by Peter Jansweijer@peterj
  • Report abuse
Report abuse

Peter clb wrpc v5

wrpc-sw.git


There are 2 wrpc-sw.git branches that are based on each other: peter_clb_wrpc-v5 (SHA-1: 68f17463) peter_wrpc-v5 (SHA-1: 4467bedb)

Some explanation: e) Many of our applications use Crystek VCXOs that need other Ki,Kp PLL parameters, hence the defines HELPER_CRYSTEK_CVPD922 and MAIN_CRYSTEK_CVPD922 (SHA-1: 794ef617)

f) SPEC7 needs to initialize it's clocking circuitry whenever its role (master, slave, gm) changes. I added a "board_pre_pll_lock(mode)" call in PPSI to do this initialization. (ppsi.git; peter_wrpc-v5; SHA-1: b2cb7be)

g) peter_clb_wrpc-v5 adds the board files for CLBv2,v3 and v4.

To summarize: to merge all a list of repo's, branches and SHA codes below


wrpc-sw.git: peter_clb_wrpc-v5 (SHA-1: 68f17463) <= this merge request

It depends on (see rmerge regquest for ppsi) ppsi.git: peter_wrpc-v5 (SHA-1: b2cb7be)

Check out, review, and merge locally

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

git fetch origin
git checkout -b peter_clb_wrpc-v5 origin/peter_clb_wrpc-v5

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 peter_clb_wrpc-v5

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 1288
  • Pipelines 1
  • Changes 419+
Tristan Gingold
Assignee
Tristan Gingold @tgingold
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: project/wrpc-sw!4