search

genielabs / HomeGenie

HomeGenie, the programmable automation intelligence
https://homegenie.it
GNU General Public License v3.0
401 stars 157 forks source link

ComboMeter/Sensor device. Multiinstance parsing fixes for energy reports. #122

Closed hybridview closed 9 years ago

hybridview commented 9 years ago

It took me more time dealing with GITHUB than coding these changes (merging upstream forks, etc). All these changes have been thoroughly tested locally and work great.

Fixed multi-instance report message parsing that caused some report to result in incorrect "Binary" and "Generic" param types. Added new "Combo" device handler to support devices (like HEM) that support both Sensor and Meter. Changed Meter command class to be parsed as "BasicReport" since it is not really a multi-instance (See comments in code for more details). Added Aeon Labs HEM product handler as confirmation for the new combo device handling.

hybridview commented 9 years ago

Hold on... Something isn't right. GIT is killing me. I'm going to destroy my branches and manually merge my changes into a new one. What a pain...

hybridview commented 9 years ago

I just created a new branch from your latest commit Gene. I see the same issue as I saw minutes ago, where a new file "ParameterEvent.cs" is not referenced in the ZWavLib project file. Did the commit work from your end? Since my original pull seems to be good, I'm re-opening.

genemars commented 9 years ago

there was a blackout and couldn't fix the error in my last commit. now it should be fixed.

hybridview commented 9 years ago

I really hope this pull is all set now. GIT is making me pull my hair out. When I tried to merge your changes into my dev branch (which usually works perfect), it could not add that new ParamEvent file. A search online has other users reporting this issue. I added it myself, but it's now saying I am adding this new file as part of my commit. I don't think this should affect the pull.. :/

genemars commented 9 years ago

I think something is wrong with the pull requests. it result in 29 files changed =/ Can you make some cleanup so that only changes are effectively passed into this? How many files did you change?

hybridview commented 9 years ago

I had to do 3 upstream merges from your changes, so much of those 27 files are your changes merged and re-committed. I'm going to delete all my branches and manually add my changes to your latest commit to keep the history clean. Do you plan on making any big commits / rafactorings for MIG and ZWaveLib today? If so, I will wait until tomorrow.

genemars commented 9 years ago

Yes I think it's better waiting until tomorrow as I have another commit pending. No big changes, but it's better keep synchronized when working on same files.

hybridview commented 9 years ago

Sounds perfect! Got caught up in family stuff today anyways.