Skip to content
Snippets Groups Projects

issue 22+37, pretty stable, compiles on my machine

Merged fleur requested to merge fleur/firmware:fleur/leds into master

will do: move power on delay, let no cycles be wasted. make leds.py nicer. add another way to save power, hierarchy must only be active during data transmittion, after that even led 14 can be switched off when the top leds are still active i think. will adjust initial rgb channel gammas as soon as i get my hands on final hardware

enjoy =D

Edited by fleur

Merge request reports

Merge request pipeline #1851 passed

Merge request pipeline passed for 709be86d

Approval is optional

Merged by rahixrahix 5 years ago (Aug 12, 2019 2:39pm UTC)

Merge details

  • Changes merged into master with 709be86d (commits were squashed).
  • Did not delete the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • rahix
  • rahix
  • rahix
  • rahix
  • rahix
  • rahix
  • rahix
  • rahix
  • rahix
  • There is one more thing but it is something for which you are absolutely not to blame: Because you touched some files in hw-tests which weren't previously formatted, your changes get drowned in the formatting changes. To fix this once and for all, I pushed some commits to master which format all of those file.

    Now, I have to ask you to rebase again but because of my commits this would produce horrible merge-conflicts. To prevent these, you can rebase like this:

    $ git fetch origin
    $ git rebase -X theirs origin/master

    This will unconditionally take your version for all changes (which is ok here because you also applied the formatting script).

  • fleur added 8 commits

    added 8 commits

    • f8eb2cde...1bb79811 - 4 commits from branch card10:master
    • 219eb2b1 - issue 22+37, pretty stable, compiles on my machine
    • bb623f4f - removed legacy functions from hardware test + minor bugfix
    • 6f76c14c - formatting fixed
    • f3497016 - added docs & cleaned up a bit. couldn't test pycardium docs yet, epicardium looks good.

    Compare with previous version

  • fleur added 1 commit

    added 1 commit

    Compare with previous version

  • fleur added 1 commit

    added 1 commit

    • f2a0bf4f - minor fix: changed datatype of pride flags

    Compare with previous version

  • fleur changed the description

    changed the description

  • rahix added 1 commit

    added 1 commit

    • 636e6489 - docs: Update leds docs so they are rendered correctly

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading