Skip to content

Merge V2.1 into main and tag as V2.1.0 #80

Merged
IanSuper7 merged 50 commits intomainfrom
Version2.1
Aug 14, 2025
Merged

Merge V2.1 into main and tag as V2.1.0 #80
IanSuper7 merged 50 commits intomainfrom
Version2.1

Conversation

@micromouseonline
Copy link
Member

Effectively makes the V2.1 boards the current 'main' branch.

There are a lot of changes and so expect conflicts. These may be difficult to resolve with KiCAD. I suggest we allow the incoming to override anything already there.

We will need to tag a release upon completion.

The great thing about Pull Requests is they can be revised and even rejected if things do not work out.

Resolves #77

paulbuzzby and others added 30 commits April 9, 2025 14:56
Board reworked based on known issues from prototype builds.
Updated for v2.0 board set addressing all issues raised on the prototype board.
Updated for v2.0 board set addressing all issues raised on the prototype board.
Wall sensor updated for Issues raised on prototype builds. Better pin markings added to Line sensor, mezz and chassis boards
…t field with RSOnline part numbers for most passive components
Copy link
Member Author

@micromouseonline micromouseonline left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow - no conflicts. I am inmpressed.

Note that one of the options is to squash and merge.

@paulbuzzby
Copy link
Collaborator

I'll save hitting the merge button until tomorrow but that is good about no conflicts. I am yet to add the RAPID fields but this is still a good test

@micromouseonline
Copy link
Member Author

Try an experiment. Since you have rwite access to the repo, you should be able to pull the V2.1 branch, make your change and push it back up. Since that branch is part of a PR, you changes should be incorporated.

Thus, only when there is agreement on the state of the PR branch, we can do the merge. Subsequent changes will then be done with the mini-bracnches as discussed.
This repo is currently private so the rules requiring multiple reviewers cannot be applied. I think that constraint goes away once it is public.

@paulbuzzby
Copy link
Collaborator

I just pushed a small change to the chassis board as there are 2 RSONLINE options. I wouldn't have thought it would get included in this PR but lets see

@micromouseonline
Copy link
Member Author

Perfect. That is how it will work. Anyone with write access to the repo can edit/update the PR until it gets merged in.

I am assuming Ian sees these messages.

A risk, until we go public, is that one of the other contributors bypasses the rules. After going public, we can apply restrictions.

At some point, anyone who is not likely, or required, to be able to maintain the repo directly, should be withdrawn to a read-only role.

@IanSuper7
Copy link
Collaborator

IanSuper7 commented Aug 14, 2025 via email

@IanSuper7 IanSuper7 merged commit cc7b17c into main Aug 14, 2025
@IanSuper7 IanSuper7 deleted the Version2.1 branch August 14, 2025 20:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Merge version2branch into main and delete?

3 participants