-
Notifications
You must be signed in to change notification settings - Fork 20
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
Bug fixes - alarm setting #16
Conversation
Various bugfixes and lots of formatting changes to enhance readability.
Added a "polarity" parameter to setAlarm for the user to be able to set the polarity as desired.
Hello wvmarle,
Thanks for putting all that work into finding and fixing library errors! I think part of the issue with all the differences between the main branch and the merge is that I modified the main branch after the fork that you used to make the corrections. Thus if I pull your changes into the main branch I’d lose the changes that I made. Since this is a standard type of issue with source control systems I’m sure that git has some sort of mechanism to handle this. But I’m no git guru so it may take a bit to get that done but your fixed will be integrated even if I have to type them in myself.
Thanks,
…-Arnd.
From: wvmarle <notifications@github.com>
Sent: 05 July 2018 06:14
To: SV-Zanshin/MCP7940 <MCP7940@noreply.github.com>
Cc: Subscribed <subscribed@noreply.github.com>
Subject: [SV-Zanshin/MCP7940] Bug fixes - alarm setting (#16)
Found issues with setting the alarms (see also http://forum.arduino.cc/index.php?topic=556111), fixed it.
Git does believe some of your later additions are deleted by me, I don't really understand git so you'll have to be careful when merging.
Lots of enhancements on layout for readability as well.
_____
You can view, comment on, or merge this pull request online at:
#16
Commit Summary
* Various fixes
* Initial commit
* Merge branch 'master' of github.com:wvmarle/MCP7940
* Added setting of the ALMPOL bit and explanation of what it does.
* .
* Deletions
* Learning to work with git
File Changes
* R .gitattibutes <https://github.com/SV-Zanshin/MCP7940/pull/16/files#diff-0> (1)
* M .gitignore <https://github.com/SV-Zanshin/MCP7940/pull/16/files#diff-1> (1)
* M README.md <https://github.com/SV-Zanshin/MCP7940/pull/16/files#diff-2> (1)
* M src/MCP7940.cpp <https://github.com/SV-Zanshin/MCP7940/pull/16/files#diff-3> (470)
* M src/MCP7940.h <https://github.com/SV-Zanshin/MCP7940/pull/16/files#diff-4> (15)
Patch Links:
* https://github.com/SV-Zanshin/MCP7940/pull/16.patch
* https://github.com/SV-Zanshin/MCP7940/pull/16.diff
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub <#16> , or mute the thread <https://github.com/notifications/unsubscribe-auth/AWfRxIESS1Mk1SwgT7MZ8kpaq4vmLmBoks5uDaCXgaJpZM4VDQmu> . <https://github.com/notifications/beacon/AWfRxC7iehe2GVWbdfkQuGkVoRkIDFJAks5uDaCXgaJpZM4VDQmu.gif>
|
It looks like the best way forward is to merge your modifications and enhancements and then I will add my changes which seem to predate your fork but weren't included. One is adding multiple I2C speed capability to the library and the other is a bug fix related to the base day-of-week. |
Thanks. I'm going to update my branch asap. Another possible enhancement (but it's a bit of tedious work) would be to improve the bit handling by using the bit names as defined in the datasheet, and Arduino's built-in bitSet(), bitClear(), bitWrite() and bitRead() functions. Again for general readability and maintainability. So far I like this RTC. Much cheaper than the DS2321, pretty decent power characteristics, large voltage range and it has NVRAM. You may have noticed I did add an extra parameter to the setAlarm function. Not sure if that's the best solution (it breaks any existing sketches!). Maybe better to handle the ALMPOL in a separate function? |
wvmarle - I see that you are making further enhancements and changes to your forked copy. Please remember to do a "pull" from the master so that the changes that I've incorporated to the master branch are loaded into your copy, then you can put in a pull request so your changes can be integrated back into the master. If you don't do that, then the copies would become out of sync. |
Yes... done that already, got the I2C things. |
Found issues with setting the alarms (see also http://forum.arduino.cc/index.php?topic=556111), fixed it.
Git does believe some of your later additions are deleted by me, I don't really understand git so you'll have to be careful when merging.
Lots of enhancements on layout for readability as well.