Branch merge phase1 #12

hollie · 2012-11-07T21:14:30Z

This is the first phase of merrgin insteon and master. In this phase I bring all changes of master that are not in insteon to the insteon branch.

When this is done, bringing insteon to master should be easy (famous last words TM :-)

I encountered 2 files that did not merge automatically, and I tried to make the best of it. I did not test out the branch to see if it still runs, as I have completely no clue how to test insteon.

The offending files:

web/bin/items.pl had edits on the same line that could not be merged automatically. I think that got merged fine manually.
lib/xPL_Items,pl had the problem that at a point in time the line endings were changed and hence the file could not be merged automatically. I solved this by taking the master version and setting the line ending to unix again. Hope this turns out fine. By the way: git has a way to convert line endings automatically, if you don't use the regular line endings, please configure this in your git settings!

…_interface.

= -> ==

…each time it happens (by default mh only shows you the error in details the first time, for _any_ module and then that's it). - show how many times an error was triggered - add a module_allowed_errors variable to allow each module to set how many times they can error out before they get kicked out of the main loop (default was and still is 10, but not it's actually clear what's going on). For instance, I have: omnistat_allowed_errors = 999999999999 hvac_allowed_errors = 999999999999

…ith_timer to BaseController.

…within has_link method. Thanks to Eloy P. for bug fix.

a good part of Insteon.pm is going to be re-written, so it may not be a good use of anyone's time to look to deeply into the current Insteon.pm code.

* Improve stripping of end of line comments in .mht files. * Missing rename of triggers_save to _triggers_save in web page code. * Remove stray vim swap file. * lib/Omnistat.pm updates by Marc.

…d and, if applicable, group.

…if a cached object already exists. Necessary when mh reloads.

…ove duplicate scan_link_table method.

…essage to an object. Avoid the possibility of accidental processing for an unsent message.

… CMU Language Toolkit for buiding the language files. This new version is much better with the binary language file support.

…andler of on_standard_insteon_received.

…s an InsteonMessage.

famille <famille@famille-simon.com>

…e android devices. Previously, only the last android device register would get these events. Update the android_server module to support the new android_xml subroutine which provides more advanced xml feature for android application support.

…which provide additional xml capabilities for android application support.

… indicators for TELCO.

…n too long. This prevents a rouge problems with occupancy which I havn't been able to resolve in any better wway.

…rsion command.

Provide human readable NACK messages. Implement Insteon get_engine_vers...

Need to carry over cmd2 data for nacks.

This change adds the android_callerid method. Call this message with a callerid Name and Number. This will result in a callerid popup message and notification to be sent to the android. The android application can be configured to act on the message or ignore.

Add support for callerid pop up message and notification.

Conflicts: lib/xPL_Items.pm web/bin/items.pl

jduda · 2012-11-08T00:52:53Z

On 11/07/2012 04:14 PM, Lieven Hollevoet wrote:

This is the first phase of merrgin insteon and master. In this phase I
bring all changes of master that are not in insteon to the insteon
branch.

When this is done, bringing insteon to master should be easy (famous
last words TM :-)

I encountered 2 files that did not merge automatically, and I tried to
make the best of it. I did not test out the branch to see if it still
runs, as I have completely no clue how to test insteon.

The offending files:

web/bin/items.pl had edits on the same line that could not be
merged automatically. I think that got merged fine manually.

lib/xPL_Items,pl had the problem that at a point in time the line
endings were changed and hence the file could not be merged
automatically. I solved this by taking the master version and
setting the line ending to unix again. Hope this turns out fine.
By the way: git has a way to convert line endings automatically,
if you don't use the regular line endings, please configure this
in your git settings!
    You can merge this Pull Request by running:
git pull https://github.com/hollie/misterhouse branch_merge_phase1

Or view, comment on, or merge it at:

Did I do this correctly? I used a fresh git pull to avoid messing up my
working sandbox.

 92    19:41    git clone https://github.com/hollie/misterhouse.git

mh-git-upstream
93 19:42 cd mh-git-upstream/
96 19:43 git checkout -b insteon origin/insteon
98 19:43 git pull https://github.com/hollie/misterhouse
branch_merge_phase1v

I then started mh-git-upstream directory live. It all seems to be
working fine. Obviously, I can only test the things I use, and of
course Insteon itself.

I also did a directory diff using meld and I don't see any drastic
differences.

Regards,

Jim

hollie · 2012-11-08T08:04:30Z

Hi Jim,

On Thu, Nov 8, 2012 at 1:52 AM, Jim Duda notifications@github.com wrote:

Did I do this correctly? I used a fresh git pull to avoid messing up my
working sandbox.

92 19:41 git clone https://github.com/hollie/misterhouse.git
mh-git-upstream
93 19:42 cd mh-git-upstream/
96 19:43 git checkout -b insteon origin/insteon
98 19:43 git pull https://github.com/hollie/misterhouse
branch_merge_phase1v

The last git-pull operation should have resulted in some output showing you
what files are being updated.

Also 'git status' should show you 'your branch is xx commits ahead of
origin/insteon'.

Finally: if your current working copy has a README.md file in the root,
then you're most probably looking at the correct version. I added this file
to the master branch when I imported the project and not to insteon. The
branch_merge_phase1 branch should add it to your insteon branch.

Kind regards,
Lieven.

jduda · 2012-11-08T12:29:57Z

On 11/08/2012 03:04 AM, Lieven Hollevoet wrote:

The last git-pull operation should have resulted in some output showing you
what files are being updated.

Also 'git status' should show you 'your branch is xx commits ahead of
origin/insteon'.

Finally: if your current working copy has a README.md file in the root,
then you're most probably looking at the correct version. I added this file
to the master branch when I imported the project and not to insteon. The
branch_merge_phase1 branch should add it to your insteon branch.

Lieven,

Thank you. Yes indeed, this all checks out as you described.

Regards,

Jim

Http1.1 updates #1

Master Merge

gliming and others added 30 commits March 8, 2010 11:15

Copied remotely

4e8e805

22b7344

synced changes from main tree to insteon branch

19f6f30

Attempt to avoid loops in request_status method for items with members.

7cba1d9

Fix typo in debug statement.

caeda28

Remove old references to Insteon_Device.

6bd16e9

Found more Insteon_Device references that required changing.

02ad3a1

Fix bug referencing active_interface when it should have been _active…

be5026b

…_interface.

Extend delay from 2 to 3 seconds for all_link messages.

03a3bdb

Fixed double typo in send_timeout

264ea2d

= -> ==

insteon config file converter.

f2f337d

Fix various bugs.

4b920ce

Provide proper diagnostic feedback to missing SCENE_MEMBER entries

977d5c2

Various bug fixes.

5a42f77

Refactor code specific to KeyPadLinc out of BaseController. Add set_w…

9b07394

…ith_timer to BaseController.

Change broken references to convert_ramp

69b2d4e

Send xAP messages via a queue to throttle send rates.

7ad4080

Merge changes from trunk to insteon-branch.

ac72395

Fix typo and proper inclusion of BaseInterface object in conditional …

2ffbcde

…within has_link method. Thanks to Eloy P. for bug fix.

updated code for Omnistat2 support.

ac1333a

Fixed small typos in Gregg's previous commit

275ada3

Remove a couple of lines of dead code. Note that according to Gregg,

144afc2

a good part of Insteon.pm is going to be re-written, so it may not be a good use of anyone's time to look to deeply into the current Insteon.pm code.

Port r1805:r1806 from trunk.

04d4d1d

Sync. with trunk (r1803 to 1814):

2444ea1

* Improve stripping of end of line comments in .mht files. * Missing rename of triggers_save to _triggers_save in web page code. * Remove stray vim swap file. * lib/Omnistat.pm updates by Marc.

Added "equals" method to be used to compare objects based on device_i…

239fc66

…d and, if applicable, group.

Revise object comparison to use new "equals" method when determining …

bfe8026

…if a cached object already exists. Necessary when mh reloads.

Merge r1818 (EIO board voice commands) from trunk

a3341ad

Properly fix state validation by comparing against object's hash. Rem…

e8d49bc

…ove duplicate scan_link_table method.

Fix broken references to adlb (should be aldb).

01e1ed3

gliming and others added 23 commits March 9, 2012 16:32

Actively match against deviceid and other factors before processing m…

8cb1582

…essage to an object. Avoid the possibility of accidental processing for an unsent message.

Minor code cleanup.

ebf4838

Detect ack messages that have a bogus deviceid.

68b251b

Parse group record for cleanup message.

8aa6be8

Properly handly more corner case ACK/NACK messages.

5a0d6bf

Add explicit handlers for cleanup direct messages.

510110b

Prevent processing pending transmit queue until after clearing occurs.

efb84f3

Update pocketsphinx to support the latest 0.7 release and utilize the…

5e7d188

… CMU Language Toolkit for buiding the language files. This new version is much better with the binary language file support.

Catch the possibility of a corrupted message in the cleanup message h…

72f5da6

…andler of on_standard_insteon_received.

Ensure that check on active_message->command_type only occurs if it i…

21b9d4a

…s an InsteonMessage.

Repair various bugs which can caused lights to remain stuck on at times.

3b02fb1

Modified to support rfxcom lan in xpl mode, patch from

2d223d8

famille <famille@famille-simon.com>

Update Generic_Item and Voice_Cmd to provide android_xml subroutines …

746df35

…which provide additional xml capabilities for android application support.

Prevent Caller ID announcments when receiving MSG_OFF and MSG_WAITING…

4aa6efa

… indicators for TELCO.

Add a watch-dog timer to Presence_Monitor to avoid lights remaining o…

7e24c76

…n too long. This prevents a rouge problems with occupancy which I havn't been able to resolve in any better wway.

Provide human readable NACK messages. Implement Insteon get_engine_ve…

cc7053d

…rsion command.

Merge pull request #1 from brainwarr/iEngine_n_nacks

04bcb73

Provide human readable NACK messages. Implement Insteon get_engine_vers...

Need to carry over cmd2 data for nacks.

51c7617

Merge pull request #2 from brainwarr/iEngine_n_nacks

a9483f1

Need to carry over cmd2 data for nacks.

Merge pull request #7 from jduda/android_callerid

ea7a429

Add support for callerid pop up message and notification.

Merge branch 'master' into branch_merge_phase1

8dba152

Conflicts: lib/xPL_Items.pm web/bin/items.pl

marcmerlin merged commit 8dba152 into master Nov 24, 2012

hplato added a commit that referenced this pull request Aug 30, 2017

Merge pull request #12 from waynieack/HTTP_Updates

826bad4

Http1.1 updates #1

hplato pushed a commit that referenced this pull request Dec 7, 2019

Merge pull request #12 from hollie/master

53a16cb

Master Merge

hplato mentioned this pull request Dec 29, 2020

Mqtt lwt wildcards #805

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Branch merge phase1 #12

Branch merge phase1 #12

hollie commented Nov 7, 2012

jduda commented Nov 8, 2012

hollie commented Nov 8, 2012

jduda commented Nov 8, 2012

Branch merge phase1 #12

Branch merge phase1 #12

Conversation

hollie commented Nov 7, 2012

jduda commented Nov 8, 2012

hollie commented Nov 8, 2012

jduda commented Nov 8, 2012