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

Owfs update #204

Merged
merged 20 commits into from
Jun 15, 2013
Merged

Owfs update #204

merged 20 commits into from
Jun 15, 2013

Conversation

jduda
Copy link
Collaborator

@jduda jduda commented May 25, 2013

I hope I did this correctly.
There should be only 2 files.
I need a few people to test the update Owfs_Item before merging to the master branch.

The new Owfs_Item uses a Socket_Item to connect to the owserver instead of a direct socket connection. This has the advantage of avoiding any stalls in the MH main loop.

Another major change is the fact the "state" information is now properly stored in the base Generic_Item. This wasn't the case before.

Another major change is the state for PIO, LATCH, and SENSE has changed from 0/1 to ON/OFF.

If using a raw Owfs_Item, doing a ->get( ) will not return the state, but instead request a fetch of the state. The updated state will be available by ->state( ).

@krkeegan
Copy link
Collaborator

krkeegan commented Jun 1, 2013

Jim, sorry one of the merges upstream from you caused a change in some file attributes, I think that is preventing the auto merge of this request.

Can you pull upstream/master, merge it into this branch, and then push your branch back to origin? That will fix the issue, and you won't need to make another pull request.

Thanks,

Kevin

@jduda
Copy link
Collaborator Author

jduda commented Jun 2, 2013

Done. I hope I did this properly.

On 05/31/2013 10:32 PM, Kevin Robert Keegan wrote:

Jim, sorry one of the merges upstream from you caused a change in some file attributes, I think that is preventing the auto merge of this request.

Can you pull upstream/master, merge it into this branch, and then push your branch back to origin? That will fix the issue, and you won't need to make another pull request.

Thanks,

Kevin


Reply to this email directly or view it on GitHub #204 (comment).

krkeegan added a commit that referenced this pull request Jun 15, 2013
@krkeegan krkeegan merged commit 06cc25f into hollie:master Jun 15, 2013
@hollie hollie mentioned this pull request Jun 15, 2013
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