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
  • !3

Open
Opened Dec 01, 2020 by Juan David González Cobas@dcobas
  • Report abuse
Report abuse

David usb bootloader fixes

This is an attempt at making the usb-bootloader.py script compatible both with Python3 and 2.7, eliminating all ambiguities about str/bytes along the way.

Alongside, some robustness options are added to the load target in the Makefile to avoid using bogus default serial lines or Python interpreters (which can now be overriden)

Check out, review, and merge locally

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

git fetch origin
git checkout -b david-usb-bootloader-fixes origin/david-usb-bootloader-fixes

Step 2. Review the changes locally

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

git fetch origin
git checkout origin/tom-nov20
git merge --no-ff david-usb-bootloader-fixes

Step 4. Push the result of the merge to GitLab

git push origin tom-nov20

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 3
  • Pipelines 1
  • Changes 2
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: project/wrpc-sw!3