avernois/clocks
1
0
Fork 0
Code Issues 8 Pull requests 4 Projects Releases 2 Packages Wiki Activity Actions

WIP: Draft: linear: proper alignment with ws2812b 60leds/m strip #34

Draft
avernois wants to merge 3 commits from linear_60 into main
pull from: linear_60
merge into: avernois:main
Conversation 7 Commits 3 Files changed 13 +3436 -958
avernois commented 2020-07-17 06:10:02 +00:00 (Migrated from gitlab.com)
Copy link

also

  • add some helpers to align pieces together
  • add a box to hold pcb

this closes #1 and #2

also * add some helpers to align pieces together * add a box to hold pcb this closes #1 and #2
avernois commented 2020-07-17 06:11:12 +00:00 (Migrated from gitlab.com)
Copy link

this alignment has not been tested yet.
It would probably be better to wait for a cut before merging...

this alignment has not been tested yet. It would probably be better to wait for a cut before merging...
avernois commented 2020-07-17 08:11:14 +00:00 (Migrated from gitlab.com)
Copy link

changed the description

changed the description
avernois commented 2020-07-24 17:22:06 +00:00 (Migrated from gitlab.com)
Copy link

added 9 commits

  • 8478af1d...c1d291e2 - 8 commits from branch main
  • cb5aedc4 - linear: proper alignment with ws2812b 60leds/m strip

Compare with previous version

added 9 commits <ul><li>8478af1d...c1d291e2 - 8 commits from branch <code>main</code></li><li>cb5aedc4 - linear: proper alignment with ws2812b 60leds/m strip</li></ul> [Compare with previous version](/avernois/clocks/-/merge_requests/13/diffs?diff_id=102781586&start_sha=8478af1d07a563f382128e56b4409a766b794fa3)
avernois commented 2020-07-25 13:38:59 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 1e40752e - linear: proper alignment with ws2812b 60leds/m strip

Compare with previous version

added 1 commit <ul><li>1e40752e - linear: proper alignment with ws2812b 60leds/m strip</li></ul> [Compare with previous version](/avernois/clocks/-/merge_requests/13/diffs?diff_id=102855499&start_sha=cb5aedc4db0d6726bc630ad429a61ad9032e7356)
avernois commented 2020-07-25 19:30:14 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • b6e3d1d9 - WIP: linear.60: fix wrong cut

Compare with previous version

added 1 commit <ul><li>b6e3d1d9 - WIP: linear.60: fix wrong cut</li></ul> [Compare with previous version](/avernois/clocks/-/merge_requests/13/diffs?diff_id=102866781&start_sha=1e40752e4313fd7ca92e191daef7399e78395864)
avernois commented 2020-07-25 19:30:14 +00:00 (Migrated from gitlab.com)
Copy link

marked as a Work In Progress from b6e3d1d932

marked as a **Work In Progress** from b6e3d1d932d78e302edb23b7f7b1084c627e4f8d
avernois commented 2020-07-27 11:50:31 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 8823ca4f - linear_60: add keys for the lock

Compare with previous version

added 1 commit <ul><li>8823ca4f - linear_60: add keys for the lock</li></ul> [Compare with previous version](/avernois/clocks/-/merge_requests/13/diffs?diff_id=103017057&start_sha=b6e3d1d932d78e302edb23b7f7b1084c627e4f8d)
This pull request is marked as a work in progress.
This branch is out-of-date with the base branch
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin linear_60:linear_60
git switch linear_60

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff linear_60
git switch linear_60
git rebase main
git switch main
git merge --ff-only linear_60
git switch linear_60
git rebase main
git switch main
git merge --no-ff linear_60
git switch main
git merge --squash linear_60
git switch main
git merge --ff-only linear_60
git switch main
git merge linear_60
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
common

   
config

   
defect

   
idea

   
linear

   
square
No labels
common
config
defect
idea
linear
square
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
avernois/clocks!34
No description provided.