Code

Branch merge phase1#12

Code

Merged

marcmerlin merged 156 commits intomasterhollie/misterhouse:masterfrom branch_merge_phase1hollie/misterhouse:branch_merge_phase1Copy head branch name to clipboardNov 24, 2012

+8,865-5,700

Commits

Commits on Mar 8, 2010

• Copied remotely

  

  gliming

  committed
  4e8e805

• 

  gliming

  committed
  22b7344

Commits on Jul 26, 2010

• synced changes from main tree to insteon branch

  

  marcmerlin

  committed
  19f6f30

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

  

  gliming

  committed
  7cba1d9

• Fix typo in debug statement.

  

  gliming

  committed
  caeda28

• Remove old references to Insteon_Device.

  

  gliming

  committed
  6bd16e9

• Found more Insteon_Device references that required changing.

  

  gliming

  committed
  02ad3a1

• Fix bug referencing active_interface when it should have been _active_interface.

  

  gliming

  committed
  be5026b

• Extend delay from 2 to 3 seconds for all_link messages.

  

  gliming

  committed
  03a3bdb

• Fixed double typo in send_timeout

  Show description for 264ea2d
  

  marcmerlin

  committed
  264ea2d

• insteon config file converter.

  

  marcmerlin

  committed
  f2f337d

Commits on Aug 4, 2010

• - new show_all_errors variable so that you get to see the full error each

  Show description for 9185142
  

  marcmerlin

  committed
  9185142

Commits on Aug 13, 2010

• Fix various bugs.

  

  gliming

  committed
  4b920ce

Commits on Jan 5, 2011

• Provide proper diagnostic feedback to missing SCENE_MEMBER entries

  

  gliming

  committed
  977d5c2

• Various bug fixes.

  

  gliming

  committed
  5a42f77

• Refactor code specific to KeyPadLinc out of BaseController. Add set_with_timer to BaseController.

  

  gliming

  committed
  9b07394

• Change broken references to convert_ramp

  

  gliming

  committed
  69b2d4e

Commits on Jan 6, 2011

• Send xAP messages via a queue to throttle send rates.

  

  gliming

  committed
  7ad4080

Commits on Jan 9, 2011

• Merge changes from trunk to insteon-branch.

  

  jduda

  committed
  ac72395

Commits on Jan 17, 2011

• Fix typo and proper inclusion of BaseInterface object in conditional within has_link method. Thanks to Eloy P. for bug fix.

  

  gliming

  committed
  2ffbcde

Commits on Jan 18, 2011

• updated code for Omnistat2 support.

  

  marcmerlin

  committed
  ac1333a

• Fixed small typos in Gregg's previous commit

  

  peloy

  committed
  275ada3

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

  Show description for 144afc2
  

  peloy

  committed
  144afc2

• Port r1805:r1806 from trunk.

  

  peloy

  committed
  04d4d1d

Commits on Jan 20, 2011

• Sync. with trunk (r1803 to 1814):

  Show description for 2444ea1
  

  peloy

  committed
  2444ea1

Commits on Jan 21, 2011

• Added "equals" method to be used to compare objects based on device_id and, if applicable, group.

  

  gliming

  committed
  239fc66

• Revise object comparison to use new "equals" method when determining if a cached object already exists. Necessary when mh reloads.

  

  gliming

  committed
  bfe8026

Commits on Jan 24, 2011

• Merge r1818 (EIO board voice commands) from trunk

  

  peloy

  committed
  a3341ad

• Properly fix state validation by comparing against object's hash. Remove duplicate scan_link_table method.

  

  gliming

  committed
  e8d49bc

• Fix broken references to adlb (should be aldb).

  

  gliming

  committed
  01e1ed3

• Make cosmetic changes to menus, etc. Fix broken adlb references (should be aldb).

  

  gliming

  committed
  c105fa6

• Fix parenthesis typos.

  

  gliming

  committed
  32d4379

Commits on Jan 26, 2011

• r1822 by Gregg attempted to clarify, through the name of voice commands,

  Show description for f6bd3e4
  

  peloy

  committed
  f6bd3e4

Commits on Jan 27, 2011

• Add missing help text for telnet commands

  

  peloy

  committed
  8424e93

Commits on Jan 28, 2011

• Re-write Insteon::ALDB_i1::log_alllink_table() so links are logged

  Show description for caafe9f
  

  peloy

  committed
  caafe9f

Commits on Feb 4, 2011

• Make sure the "insteon" branch has *all* changes made in trunk since the

  Show description for 0fc8b40
  

  peloy

  committed
  0fc8b40

Commits on Feb 7, 2011

• 

  gliming

  committed
  7a6ff85

• Add support for sending 'toggle' as a viable set param.

  

  gliming

  committed
  dff2bea

• Thanks to Gregg for committing a change so SET?device=toggle can be used

  Show description for 387248e
  

  peloy

  committed
  387248e

Commits on Feb 12, 2011

• Add better message for NACKs received from PLM on all link send.

  

  gliming

  committed
  bef0260

Commits on Mar 7, 2011

• Notify the sending object if it fails due to timeout.

  

  gliming

  committed
  004c0e8

• Implement more robust form of is_acknowledged so that object doesn't continue waiting for ACK on timeout.

  

  gliming

  committed
  7b4d647

Commits on Mar 9, 2011

• Do not unconditionally delete our "scan insteon link tables" trigger

  Show description for 7e6c700
  

  peloy

  committed
  7e6c700

• Synchronize the "insteon" branch with the latest changes in trunk,

  Show description for 527d73c
  

  peloy

  committed
  527d73c

Commits on Mar 12, 2011

• I think I messed up %Debug processing with my last svn commit, so I have backed out my changes to bin/mh. I think my mod to code/common/mh_control.pl actually fixed Jim's problem (and didn't have a…

  Show description for c59cf7f
  

  dnorwood2

  committed
  c59cf7f

Commits on Mar 14, 2011

• Guard against objects that are not defined or do not have an is_acknowledged method.

  

  gliming

  committed
  ceeb0c5

Commits on Mar 30, 2011

• Update how the polling loops work with DS18S20 and DS2450. Add support for DS2405 and DS2408 devices.

  

  jduda

  committed
  00f4a36

Commits on Apr 17, 2011

• Do not hardcode path to .wav file in the web server cache directory

  Show description for 2b1993c
  

  peloy

  committed
  2b1993c

Commits on May 20, 2011

• Incorporate failure callback.

  

  gliming

  committed
  88cd837

• Incorporate success callback.

  

  gliming

  committed
  dd35c98

• Incorporate failure callback.

  

  gliming

  committed
  19458a3

• Incorporate failure callback facility as well as other bug fixes.

  

  gliming

  committed
  f5ff506

• Incorporate improved error tracking and handling when scanning link tables.

  

  gliming

  committed
  b5a701d

Commits on Jun 9, 2011

• Fix the get_sensed( ) method in Owfs_DS2408. This method was not returning 0 when the input was low.

  

  jduda

  committed
  79d8a60

Commits on Jun 10, 2011

• Adjust "to_string" method to report interface_data instead of "command" to provide better diagnostic for PLM-specific commands.

  

  gliming

  committed
  cc7ab68

• Major problems with linking--too numerous to elaborate.

  

  gliming

  committed
  7f624ef

• Multiple changes to address linking problems.

  

  gliming

  committed
  06cf141

• Multiple changes to address linking problems.

  

  gliming

  committed
  ed8a6a1

• Switch inheritance ordering for SwitchLinc and KeypadLinc classes to that restore_data (after reload) works properly.

  

  gliming

  committed
  f216076

• Add "AUDIT" mode for the orphan links command.

  

  gliming

  committed
  a06a1ee

Commits on Jun 11, 2011

• Add support for the DS2413 device.

  

  jduda

  committed
  64ab720

Commits on Jun 12, 2011

• The DS2413 does not have an input latch, so remove the get_latch method from DS2413.

  

  jduda

  committed
  65a80eb

Commits on Jun 13, 2011

• Synchronize the "insteon" branch with the latest changes in trunk,

  Show description for 2468368
  

  peloy

  committed
  2468368

• Replace ':' with '-' in voice command "AUDIT: delete orphan links"

  Show description for 33a88f7
  

  peloy

  committed
  33a88f7

Commits on Jun 14, 2011

• Explicitly specify set methods for SwitchLinc and SwitchLincRelay since automatic inheritance doesn't apply.

  

  gliming

  committed
  bc20513

• Change inheritance order to ensure proper link restoration on reload.

  

  gliming

  committed
  eb00566

• Improve logging--especially audit mode.

  

  gliming

  committed
  a9b6947

• Force state tracking for ApplianceLinc to be same as for *Relay classes.

  

  gliming

  committed
  4e4b04d

Commits on Jun 15, 2011

• Modify set_linked_devices to adjust state to only be on or off if a non-dimmable light.

  

  gliming

  committed
  5ae0282

• Adjust inheritance order for KeypadLincRelay as well.

  

  gliming

  committed
  dfdf605

Commits on Jun 23, 2011

• Revise delete_orphan_links to use health data from scan_links. Also, avoid pre-emptive orphan delete of "deaf" devices.

  

  gliming

  committed
  5028c4d

• Support ALDB health function.

  

  gliming

  committed
  d0c84ef

Commits on Jun 24, 2011

• Added iolinc conversion support and more comments.

  

  marcmerlin

  committed
  47627ce

Commits on Jun 28, 2011

• Commit Mark's request for an override for retry attempts.

  

  gliming

  committed
  9c404d4

• Various logging fixes and rewording to be more obvious. Prevent automatic removal of links in delete ophan links where no reciprocal link exists; warn instead.

  

  gliming

  committed
  5e3c6c2

• Replace obsolete insteon items with new ones.

  

  gliming

  committed
  3b2dac5

• Fix typo that crashes lib.

  

  gliming

  committed
  4511196

Commits on Jun 29, 2011

• Various minor changes to menu options.

  

  gliming

  committed
  e8a7d9b

• Improve logging message to include additional remedial actions.

  

  gliming

  committed
  ed35857

• Ensure that repeats do not occur for any "start all linking" message.

  

  gliming

  committed
  668c24e

• Adjust handling of NACKs received for managing PLM links.

  

  gliming

  committed
  615338b

Commits on Jun 30, 2011

• Minor cosmetic mods and commenting.

  

  gliming

  committed
  fcd79dc

• Revised fragment processing to guard against fragment duplicates.

  

  gliming

  committed
  cd63d0e

Commits on Jul 1, 2011

• Remove init of a message's queue_time; handled elsewhere now.

  

  gliming

  committed
  f41c382

• Implement seconds_delayed method to track time between initialization and usage when sending.

  

  gliming

  committed
  ff20b75

• Implement default hop count method to be used to adjust the starting hop count for sent messages.

  

  gliming

  committed
  60abcd7

• Display message's queue time as well as default hop count.

  

  gliming

  committed
  9d0c193

Commits on Jul 2, 2011

• Fix typo introduced in r1922 that prevented the "plm scan all device

  Show description for 181fb67
  

  peloy

  committed
  181fb67

• New code to talk to CM15A and CM19A via mochad.

  

  marcmerlin

  committed
  0b862db

• Compare received message id with active message to prevent accidental clearing.

  

  gliming

  committed
  c9b5d0e

Commits on Jul 23, 2011

• Added code to open CMxx fifo if it didn't work at startup.

  

  marcmerlin

  committed
  72e3306

Commits on Sep 6, 2011

• Fix incorrect reference to KeyPadlinc index.

  

  gliming

  committed
  9c5098e

• Revise processing of serial data after parsing is complete and prior to subsequent/pending command processing.

  

  gliming

  committed
  14c0649

• Always clear the serial buffer after getting data.

  

  gliming

  committed
  e67c4b1

• Synchronize the "insteon" branch with the latest changes in trunk,

  Show description for d508838
  

  peloy

  committed
  d508838

• Avoid adding repeat fragments. Allow special case of manage links via manage_link_first_rec and manage_link_next_rec to return 15 rather than the entire sent message.

  

  gliming

  committed
  a3b8715

Commits on Sep 7, 2011

• Fix references to ALDB and various formatting consistency changes.

  

  gliming

  committed
  c0ef7e4

• Fix references to ALDB. Differentiate one-sided links from being orphaned or incorrect.

  

  gliming

  committed
  52dce0e

• Prevent clearing active message unless the received insteon message is an acknowledge of a direct message.

  

  gliming

  committed
  6e2d6e9

• Ensure fragment buffering is cleared. Clear resend timer on clearing active message.

  

  gliming

  committed
  0c94da1

• Implement debug verbosity levels where ini setting can be debug=insteon:x (where x=1,2 or 3). 3 is most verbose.

  

  gliming

  committed
  c5fd544

Commits on Nov 14, 2011

• Fix typo on scan all link tables.

  

  gliming

  committed
  73e58b9

Commits on Nov 27, 2011

• Small update on converting old PLM entries.

  

  marcmerlin

  committed
  1800a6b

• This has major improvements on serial port data handing to avoid the

  Show description for a282cdf
  

  marcmerlin

  committed
  a282cdf

• Add a cache of group1 values and output to allow reusing of values that

  Show description for a032bd9
  

  marcmerlin

  committed
  a032bd9

• Fixed comment.

  

  marcmerlin

  committed
  884cee9

Commits on Dec 20, 2011

• Synchronize the "insteon" branch with the latest changes in trunk,

  Show description for 8d536e1
  

  peloy

  committed
  8d536e1

Commits on Feb 2, 2012

• IV reorganized how the audreyspeak works with Voice_Text.pm. This was necessary to allow other services, like android_server, to use the same output of the voice synthesizer, to avoid calling the s…

  Show description for 7fbd562
  

  jduda

  committed
  7fbd562

Commits on Feb 3, 2012

• Add minor comments.

  

  gliming

  committed
  ea6b08a

• Replace hash flag representing ongoing transmission ("xmit_in_progress") with member function.

  

  gliming

  committed
  f4f400b

• Replace use of hash flag (xmit_in_progress) with member function. Ensure that received x10 message doesn't clear active message unless the active message is an x10 message.

  

  gliming

  committed
  9826a37

Commits on Feb 7, 2012

• Discard frequent reports only if the state is the same.

  

  gliming

  committed
  406563c

Commits on Feb 13, 2012

• Improve log statement utility during audit mode delete orphan links.

  

  gliming

  committed
  bc0f8ab

• Minor indenting cleanup.

  

  gliming

  committed
  a8c41c1

Commits on Feb 14, 2012

• Improve diagnostic logging statements.

  

  gliming

  committed
  03d4f51

Commits on Feb 16, 2012

• Report setby object name rather than allow object ref to be logged.

  

  gliming

  committed
  aed572e

• Alter delete orphans logic so that missing links does not also force other checks.

  

  gliming

  committed
  7a540c9

• Improve sync_links logic to support audit mode. Don't allow link updates if the data is functionally equivalent.

  

  gliming

  committed
  c5aa672

• Add support for sync links audit mode.

  

  gliming

  committed
  d891837

• Add support to filter out deaf devices during queueing of sync all links.

  

  gliming

  committed
  daa83de

• Support failure callback handling.

  

  gliming

  committed
  1e2d532

• Incorporate callback to memory functions so that failures will allow continuation.

  

  gliming

  committed
  3c369b3

• Added sync all links (non-audit).

  

  gliming

  committed
  73ae09e

Commits on Mar 1, 2012

• Properly queue up each individual candidate device's delete_orphan_link method rather than run them all concurrently.

  

  gliming

  committed
  e2183a5

• Minor cleanup.

  

  gliming

  committed
  3b60d4a

• Fix typo.

  

  gliming

  committed
  a95401c

• Guard against duplicate messages when parsing.

  

  gliming

  committed
  a29a1ba

• Don't warn about skipping unhealthy device if it is "deaf" anyway.

  

  gliming

  committed
  67f7e13

Commits on Mar 2, 2012

• Exit properly for deaf devices.

  

  gliming

  committed
  bf1a1b7

Commits on Mar 5, 2012

• Keep duplicate addresses array from being clobbered during delete_orphan_links. Pass the "data3" record always when creating a delete request (needed for KPL lookups). Various logging improvements.

  

  gliming

  committed
  d2bd34e

Commits on Mar 6, 2012

• Don't clobber the callback after processing the pending one. Ensure that it is cleared in advance.

  

  gliming

  committed
  ba1fc5e

Commits on Mar 8, 2012

• Fix keeping duplicate_link_addresses state on delete operations. Fix available next empty address on "add" operations. Add extra debug statements for scan logging.

  

  gliming

  committed
  6009581

• Ensure that xmit timer is checked as part of transmit_in_progress return value to guarantee that the queue does not get processed until the timer expires.

  

  gliming

  committed
  79daceb

Commits on Mar 9, 2012

• Actively match against deviceid and other factors before processing message to an object. Avoid the possibility of accidental processing for an unsent message.

  

  gliming

  committed
  8cb1582

• Minor code cleanup.

  

  gliming

  committed
  ebf4838

• Detect ack messages that have a bogus deviceid.

  

  gliming

  committed
  68b251b

• Parse group record for cleanup message.

  

  gliming

  committed
  8aa6be8

• Properly handly more corner case ACK/NACK messages.

  

  gliming

  committed
  5a0d6bf

• Add explicit handlers for cleanup direct messages.

  

  gliming

  committed
  510110b

Commits on Mar 11, 2012

• Prevent processing pending transmit queue until after clearing occurs.

  

  gliming

  committed
  efb84f3

Commits on Mar 12, 2012

• Update pocketsphinx to support the latest 0.7 release and utilize the CMU Language Toolkit for buiding the language files. This new version is much better with the binary language file support.

  

  jduda

  committed
  5e7d188

• Catch the possibility of a corrupted message in the cleanup message handler of on_standard_insteon_received.

  

  gliming

  committed
  72f5da6

• Ensure that check on active_message->command_type only occurs if it is an InsteonMessage.

  

  gliming

  committed
  21b9d4a

Commits on Mar 17, 2012

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

  

  jduda

  committed
  3b02fb1

Commits on Oct 18, 2012

• Modified to support rfxcom lan in xpl mode, patch from

  Show description for 2d223d8
  

  marcmerlin

  committed
  2d223d8

Commits on Oct 28, 2012

• Update android_server to allow speak and play events to go to multiple android devices. Previously, only the last android device register would get these events. Update the android_server module to…

  Show description for ed9c929
  

  jduda

  committed
  ed9c929

• Update Generic_Item and Voice_Cmd to provide android_xml subroutines which provide additional xml capabilities for android application support.

  

  jduda

  committed
  746df35

• Prevent Caller ID announcments when receiving MSG_OFF and MSG_WAITING indicators for TELCO.

  

  jduda

  committed
  4aa6efa

• Add a watch-dog timer to Presence_Monitor to avoid lights remaining on too long. This prevents a rouge problems with occupancy which I havn't been able to resolve in any better wway.

  

  jduda

  committed
  7e24c76

Commits on Nov 3, 2012

• Provide human readable NACK messages. Implement Insteon get_engine_version command.

  brainwarr

  committed
  cc7053d

• Merge pull request #1 from brainwarr/iEngine_n_nacks

  Show description for 04bcb73
  hollie

  committed
  04bcb73

Commits on Nov 4, 2012

• Need to carry over cmd2 data for nacks.

  brainwarr

  committed
  51c7617

• Merge pull request #2 from brainwarr/iEngine_n_nacks

  Show description for a9483f1
  hollie

  committed
  a9483f1

Commits on Nov 6, 2012

• Add support for callerid pop up message and notification.

  Show description for ba265d5
  

  Jim Duda

  committed
  ba265d5

• Merge pull request #7 from jduda/android_callerid

  Show description for ea7a429
  hollie

  committed
  ea7a429

Commits on Nov 7, 2012

• Merge branch 'master' into branch_merge_phase1

  Show description for 8dba152
  hollie

  committed
  8dba152