Skip to content

Comments

Update OBSPro code to new hardware revision#384

Merged
amandel merged 4 commits intoopenbikesensor:mainfrom
Prismary:main
Feb 22, 2026
Merged

Update OBSPro code to new hardware revision#384
amandel merged 4 commits intoopenbikesensor:mainfrom
Prismary:main

Conversation

@Prismary
Copy link
Contributor

Hi, my name is Clemens, I work for Fabian at MKFS electronics. 👋

This PR is to update all OBSPro related code to work with the latest hardware revision used in the newly distributed prototypes. The major changes revolve around the removal of soft power-on/off features and reverting back to the classic display.

@amandel
Copy link
Member

amandel commented Feb 21, 2026

Hi Clemens,

thanks for your contribution.

I'd like to create a brach to support of the prototype revision of the OBSPro based on the code before this commit. For easier merging later on, can you please separate the white space and formatting related changes from the pr?

BTW: Usually a PR should not start form the main branch but a feature or bugfix branch.

Happy to see the new generation of the OBSPro!

Kind regards,
Andreas.

@Prismary
Copy link
Contributor Author

Hi Andreas,

all formatting and other irrelevant changes have been reverted. Sorry about merging from the main branch, I agree it's not elegant, I haven't done very many pull requests in my time...

Best regards
Clemens

@gluap
Copy link
Contributor

gluap commented Feb 22, 2026

I merged Andreas' changes from openbikesensor/OpenBikeSensorFirmwar:main into Prismary/OpenBikeSensorFirmware:main to make the CI builds run.

@gluap
Copy link
Contributor

gluap commented Feb 22, 2026

@amandel As far as I can see the remaining sonarcloud issue has happened in the past and is probably unrelated to the PR content. e.g. #364 had a similar issue that sonarcloud wouldn't run.

edit: Well this is interesting. I temporarily cloned the branch into the OpenBikeSensor repo under a new name, there the checks ran through, and now also here the build (which was formerly red) seems to have turned green.

@amandel
Copy link
Member

amandel commented Feb 22, 2026

@gluap - Thanks for looking into this. Now it looks like we do again have more changes than we should have in this PR.

Issue is that the SONAR_TOKEN is not visible if the changes come from a fork outside of the openbikesensor org.

Should I rebase & merge this PR?

@gluap
Copy link
Contributor

gluap commented Feb 22, 2026

@amandel Apologies for my poor commit history hygiene. I'm fine with rebase&merge.

Out of curiosity: why not just squash and merge? That should result in a single commit, too.

@amandel
Copy link
Member

amandel commented Feb 22, 2026

No worries. Usually I don't see this critical. But in this case this is the one commit that contains the difference between the new and old OBSpro generations.

Now I see 4 commits, 2 that are already at main and 2 that should be squashed into one.

Likely Squash and merge is fine....

@amandel amandel merged commit 7a07702 into openbikesensor:main Feb 22, 2026
7 of 8 checks passed
@amandel
Copy link
Member

amandel commented Feb 22, 2026

@Prismary thanks for the PR
@gluap squash and merge worked fine

@Prismary
Copy link
Contributor Author

@amandel thanks for the pull.
Also, for future reference, I think it was the right call not to open a new branch for the OBSPro related changes, since as far as I'm aware, we've all agreed upon not legacy supporting the 10 or so remaining old prototypes of the Pro.

@gluap
Copy link
Contributor

gluap commented Feb 22, 2026

I added a tag last_obspro_rev2.1 in case we want to get back to the last commit before the new obs pro version. We can then make a branch starting from there should that become necessary to support the ~10 devices.

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.

3 participants