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

Time to merge Paleoterra redox into develop? #262

Merged
merged 94 commits into from
Aug 19, 2020
Merged

Conversation

aufdenkampe
Copy link
Member

It would be great to get this merged so that we don't need to manage it as a separate branch.

bschulz1701 and others added 30 commits April 25, 2018 17:15
Added support for Paleo Terra Redox sensors, reading out only a voltage in uV. Code compiles and runs but has not been tested with Paleo Terra hardware in the loop

Also need to add failure conditions in order to return -9999 for the correct conditions of operation, some hardware testing will be required
NOTE: To verify the presance of absance of the sensor, it the code checks the result of the conversion, the i2c status bit, and the value of the config register. If the conversion result is 0, the i2c status 0, and the config is invalid, this corresponds to a detached sensor and the result will return -9999. This solution has the following known errata, if the sensor reads a value of 0 while operating in 12 bit mode (so config = 0x00) then it will return an erronious -9999, this is extremely unlikely (and we are currently operating in 18 bit mode) but should be documented.
Also longer waiting time for interenet connect for first clock sync
Can either hold up and wait for a button press at a certain time, or set up an interrupt for it.
I had missed for AnthonyTest2.ino previously.
I'll probably delete this file before merging to Master.
Demos of how to create the variable pointers inside or outside of the variable array
Setup does not need to be overridden
Pulling master in to PaleoTerraRedox to use current modular formats
@aufdenkampe
Copy link
Member Author

@SRGDamia1 describes some important points describing the change to Testato's SoftwareWire (I2C) instead of TodBot's, and some general points regarding SoftwareWire in #264 (comment).

I point out the latest tests by @fisherba of this in #264 (comment), which were only using hardware I2C for redox sensors and also not using the code at the head of this branch.

I think that it might be wise to test this further before merging into develop.

@aufdenkampe aufdenkampe requested a review from fisherba August 6, 2019 23:47
@SRGDamia1
Copy link
Contributor

@aufdenkampe I am working on this merge right now! Please do not make any changes on this branch until I have pushed my work. (It's a messy merge so it will take me some time to clean it.)

@aufdenkampe
Copy link
Member Author

@SRGDamia1, sounds good. I'll leave this Paleoterra redox branch all to you!

This was *supposed* to be just a merge, but in fixing the conflicts I got carried away and added all the documentation and a bunch of other things that should have been separate commits.  I'm not untangling it all now.
@SRGDamia1 SRGDamia1 merged commit 2e23a32 into develop Aug 19, 2020
@SRGDamia1 SRGDamia1 deleted the PaleoTerraRedox branch August 19, 2020 04:37
@SRGDamia1
Copy link
Contributor

Done

@aufdenkampe
Copy link
Member Author

@SRGDamia1, thanks!

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.

4 participants