Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temperature usermod: update OneWire to 2.3.8 #4131

Merged

Conversation

iammattcoleman
Copy link

@iammattcoleman iammattcoleman commented Sep 7, 2024

OneWire 2.3.8 includes stickbreaker's and garyd9's ESP32 fixes, making blazoncek's fork no longer necessary.

This updates the dependency and removes the comment suggesting blazoncek's fork.

I noticed some minor issues that were unrelated to the OneWire version change, so I put them in separate commits prior to the final commit that's the focus of this pull request:

  • One of the files had CRLF endings, which my IDE warned me about when I tried to commit my changes to it.
    I ran git ls-files --eol | awk '$1 == "i/crlf"' and found three other files in the codebase with CRLF endings.
    So, I figured I should go ahead and make the whole codebase uniformly use LF endings.
  • The Temperature usermod's changelog sections weren't rendering properly, so I added blank lines to fix it.

It will probably be the fastest/easiest to review if you view the diffs for each commit separately.

@blazoncek
Copy link
Collaborator

I do appreciate the effort but changing CRLF formatting is for the maintainers or original authors to perform.
I am the author of boblight and maintainer of dallas temperature usermods.
As for OneWire and Dallas usermod, the platformio.ini was already updated to use library version 2.3.8 so the only acceptable change is modification of readme.md

@iammattcoleman
Copy link
Author

Thank you for the feedback @blazoncek.

In all cases, the CRLF-terminated files were alone in a directory of otherwise LF-terminated files. So, they all look to be unintentional but I certainly don't want to offend anyone. I'll drop the line-ending commit.

Would you like me to retain the commit that fixes the Temperature usermod's changelog Markdown rendering?

Also, shouldn't the Temperature usermod's platformio_override.ini be updated in addition to the readme? If I leave it as it currently is, people using the Temperature usermod might accidentally use the older version or might unnecessarily use your fork.

@blazoncek
Copy link
Collaborator

MD changes are fine with me.
PlatformIO overrides are also ok but in reality I don't think people use them as most have been copied to global sample file.

CRLF madness is a consequence of working on Win & mac systems without using a GH (changes made that not yet belong to a commit).

@iammattcoleman
Copy link
Author

@blazoncek I've removed the line-termination change.

This change ensures that the dates are displayed on their own lines.
Without the blank lines, many Markdown renderers will append the dates
to the previous bullet point.
OneWire 2.3.8 includes stickbreaker's and garyd9's ESP32 fixes:
blazoncek's fork is no longer needed
@iammattcoleman
Copy link
Author

@blazoncek I rebased my feature branch on top of the current state of the 0_15 branch.

@blazoncek blazoncek merged commit 81382a4 into Aircoookie:0_15 Sep 11, 2024
20 checks passed
@iammattcoleman iammattcoleman deleted the update-temperature-dependency branch September 15, 2024 15:03
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.

2 participants