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

Razberry - Zwave Lock child object added #566

Merged
merged 10 commits into from
Feb 22, 2016
Merged

Conversation

hplato
Copy link
Collaborator

@hplato hplato commented Nov 23, 2015

Tested with a kwikset lock. Basic lock control and battery tracking. Advanced features such as pushing and deleting codes still a WIP.

hplato added 9 commits May 31, 2015 11:41
… connection to devices randomly

(or at least the single fan device I have)
…ateTime so the pinging

could be intelligent. Hopfully a poll cycle ping will keep devices always alive
Made it simpler to add devices for child objects. Will add -0-38 to device ID if not present
Refinements to make communication tracker more accurate
Simplified devices, child devices just need the device ID. -0-38 will be appended if not present
Refinements to make communication tracker more accurate
@marcmerlin
Copy link
Collaborator

This branch has conflicts that must be resolved
Use the command line to resolve conflicts before continuing.

Could you solve these first so that we can look at a clean diff before merge?

@hplato
Copy link
Collaborator Author

hplato commented Jan 13, 2016

I'll have the same issue as with venstar. I'm not a git expert so i'm unsure how to continue to contribute?

Sent from my mobile device.

On Jan 13, 2016, at 7:55 AM, Marc MERLIN [email protected] wrote:

This branch has conflicts that must be resolved
Use the command line to resolve conflicts before continuing.

Could you solve these first so that we can look at a clean diff before merge?


Reply to this email directly or view it on GitHub.

@marcmerlin
Copy link
Collaborator

Same comment here. Check out master, re-apply your patches, delete this pull request, and submit a new one.

@hplato
Copy link
Collaborator Author

hplato commented Feb 22, 2016

OK, I’m in progress of updating my running with master and trying to figure out how to adapt a bunch of conflict files (those that I’ve modified, but with PerlTidy, the original file has changed so now I’ve got to figure out how to find the actual changes I’ve made, re-apply them against the ‘perltidy’d’ file, and then update.

Some short-term pain, but once we’re over this we’ll have a much cleaner codebase...

On Feb 21, 2016, at 6:11 PM, Marc MERLIN [email protected] wrote:

Same comment here. Check out master, re-apply your patches, delete this pull request, and submit a new one.


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

@hplato
Copy link
Collaborator Author

hplato commented Feb 22, 2016

Can you look at the latest pull request. I did the following steps

  • git checkout master
  • git pull
  • git checkout razberry
  • cp lib/raZberry.pm /tmp
  • git merge master
  • cp lib/raZberry.pm /tmp
  • perltidy -pro=../perltidyrc #I downloaded this file from stable bin/.pertidyrc
  • git add lib/raZberry
  • git commit
  • git push hplato

From what I see on the pull request, there is only one changed file, and it looks like only the lock changes. Can someone confirm?

On Feb 21, 2016, at 6:11 PM, Marc MERLIN [email protected] wrote:

Same comment here. Check out master, re-apply your patches, delete this pull request, and submit a new one.


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

@marcmerlin
Copy link
Collaborator

I didn't review the actual code, so I'm relying on you to have tested it, but otherwise it looks good. I'll merge.

marcmerlin added a commit that referenced this pull request Feb 22, 2016
Razberry - Zwave Lock child object added
@marcmerlin marcmerlin merged commit efb1a98 into hollie:master Feb 22, 2016
hollie referenced this pull request in hplato/misterhouse Feb 25, 2016
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