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

Branch merge phase2 #14

Merged
merged 160 commits into from
Nov 24, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
160 commits
Select commit Hold shift + click to select a range
4e8e805
Copied remotely
Mar 8, 2010
22b7344
Mar 8, 2010
19f6f30
synced changes from main tree to insteon branch
Jul 26, 2010
7cba1d9
Attempt to avoid loops in request_status method for items with members.
Jul 26, 2010
caeda28
Fix typo in debug statement.
Jul 26, 2010
6bd16e9
Remove old references to Insteon_Device.
Jul 26, 2010
02ad3a1
Found more Insteon_Device references that required changing.
Jul 26, 2010
be5026b
Fix bug referencing active_interface when it should have been _active…
Jul 26, 2010
03a3bdb
Extend delay from 2 to 3 seconds for all_link messages.
Jul 26, 2010
264ea2d
Fixed double typo in send_timeout
Jul 26, 2010
f2f337d
insteon config file converter.
Jul 26, 2010
9185142
- new show_all_errors variable so that you get to see the full error …
Aug 4, 2010
4b920ce
Fix various bugs.
Aug 13, 2010
977d5c2
Provide proper diagnostic feedback to missing SCENE_MEMBER entries
Jan 5, 2011
5a42f77
Various bug fixes.
Jan 5, 2011
9b07394
Refactor code specific to KeyPadLinc out of BaseController. Add set_…
Jan 5, 2011
69b2d4e
Change broken references to convert_ramp
Jan 5, 2011
7ad4080
Send xAP messages via a queue to throttle send rates.
Jan 6, 2011
ac72395
Merge changes from trunk to insteon-branch.
Jan 9, 2011
2ffbcde
Fix typo and proper inclusion of BaseInterface object in conditional …
Jan 17, 2011
ac1333a
updated code for Omnistat2 support.
Jan 18, 2011
275ada3
Fixed small typos in Gregg's previous commit
Jan 18, 2011
144afc2
Remove a couple of lines of dead code. Note that according to Gregg,
Jan 18, 2011
04d4d1d
Port r1805:r1806 from trunk.
Jan 18, 2011
2444ea1
Sync. with trunk (r1803 to 1814):
Jan 20, 2011
239fc66
Added "equals" method to be used to compare objects based on device_i…
Jan 21, 2011
bfe8026
Revise object comparison to use new "equals" method when determining …
Jan 21, 2011
a3341ad
Merge r1818 (EIO board voice commands) from trunk
Jan 24, 2011
e8d49bc
Properly fix state validation by comparing against object's hash. Re…
Jan 24, 2011
01e1ed3
Fix broken references to adlb (should be aldb).
Jan 24, 2011
c105fa6
Make cosmetic changes to menus, etc. Fix broken adlb references (sho…
Jan 24, 2011
32d4379
Fix parenthesis typos.
Jan 24, 2011
f6bd3e4
r1822 by Gregg attempted to clarify, through the name of voice commands,
Jan 26, 2011
8424e93
Add missing help text for telnet commands
Jan 27, 2011
caafe9f
Re-write Insteon::ALDB_i1::log_alllink_table() so links are logged
Jan 28, 2011
0fc8b40
Make sure the "insteon" branch has *all* changes made in trunk since the
Feb 4, 2011
7a6ff85
Feb 7, 2011
dff2bea
Add support for sending 'toggle' as a viable set param.
Feb 7, 2011
387248e
Thanks to Gregg for committing a change so SET?device=toggle can be used
Feb 7, 2011
bef0260
Add better message for NACKs received from PLM on all link send.
Feb 12, 2011
004c0e8
Notify the sending object if it fails due to timeout.
Mar 7, 2011
7b4d647
Implement more robust form of is_acknowledged so that object doesn't …
Mar 7, 2011
7e6c700
Do not unconditionally delete our "scan insteon link tables" trigger
Mar 9, 2011
527d73c
Synchronize the "insteon" branch with the latest changes in trunk,
Mar 9, 2011
c59cf7f
I think I messed up %Debug processing with my last svn commit, so I h…
Mar 12, 2011
ceeb0c5
Guard against objects that are not defined or do not have an is_ackno…
Mar 14, 2011
00f4a36
Update how the polling loops work with DS18S20 and DS2450. Add suppo…
Mar 30, 2011
2b1993c
Do not hardcode path to .wav file in the web server cache directory
Apr 17, 2011
88cd837
Incorporate failure callback.
May 20, 2011
dd35c98
Incorporate success callback.
May 20, 2011
19458a3
Incorporate failure callback.
May 20, 2011
f5ff506
Incorporate failure callback facility as well as other bug fixes.
May 20, 2011
b5a701d
Incorporate improved error tracking and handling when scanning link t…
May 20, 2011
79d8a60
Fix the get_sensed( ) method in Owfs_DS2408. This method was not ret…
Jun 9, 2011
cc7ab68
Adjust "to_string" method to report interface_data instead of "comman…
Jun 10, 2011
7f624ef
Major problems with linking--too numerous to elaborate.
Jun 10, 2011
06cf141
Multiple changes to address linking problems.
Jun 10, 2011
ed8a6a1
Multiple changes to address linking problems.
Jun 10, 2011
f216076
Switch inheritance ordering for SwitchLinc and KeypadLinc classes to …
Jun 10, 2011
a06a1ee
Add "AUDIT" mode for the orphan links command.
Jun 10, 2011
64ab720
Add support for the DS2413 device.
Jun 11, 2011
65a80eb
The DS2413 does not have an input latch, so remove the get_latch meth…
Jun 12, 2011
2468368
Synchronize the "insteon" branch with the latest changes in trunk,
Jun 13, 2011
33a88f7
Replace ':' with '-' in voice command "AUDIT: delete orphan links"
Jun 13, 2011
bc20513
Explicitly specify set methods for SwitchLinc and SwitchLincRelay sin…
Jun 14, 2011
eb00566
Change inheritance order to ensure proper link restoration on reload.
Jun 14, 2011
a9b6947
Improve logging--especially audit mode.
Jun 14, 2011
4e4b04d
Force state tracking for ApplianceLinc to be same as for *Relay classes.
Jun 14, 2011
5ae0282
Modify set_linked_devices to adjust state to only be on or off if a n…
Jun 15, 2011
dfdf605
Adjust inheritance order for KeypadLincRelay as well.
Jun 15, 2011
5028c4d
Revise delete_orphan_links to use health data from scan_links. Also,…
Jun 23, 2011
d0c84ef
Support ALDB health function.
Jun 23, 2011
47627ce
Added iolinc conversion support and more comments.
Jun 24, 2011
9c404d4
Commit Mark's request for an override for retry attempts.
Jun 28, 2011
5e3c6c2
Various logging fixes and rewording to be more obvious. Prevent auto…
Jun 28, 2011
3b2dac5
Replace obsolete insteon items with new ones.
Jun 28, 2011
4511196
Fix typo that crashes lib.
Jun 28, 2011
e8a7d9b
Various minor changes to menu options.
Jun 29, 2011
ed35857
Improve logging message to include additional remedial actions.
Jun 29, 2011
668c24e
Ensure that repeats do not occur for any "start all linking" message.
Jun 29, 2011
615338b
Adjust handling of NACKs received for managing PLM links.
Jun 29, 2011
fcd79dc
Minor cosmetic mods and commenting.
Jun 30, 2011
cd63d0e
Revised fragment processing to guard against fragment duplicates.
Jun 30, 2011
f41c382
Remove init of a message's queue_time; handled elsewhere now.
Jul 1, 2011
ff20b75
Implement seconds_delayed method to track time between initialization…
Jul 1, 2011
60abcd7
Implement default hop count method to be used to adjust the starting …
Jul 1, 2011
9d0c193
Display message's queue time as well as default hop count.
Jul 1, 2011
181fb67
Fix typo introduced in r1922 that prevented the "plm scan all device
Jul 2, 2011
0b862db
New code to talk to CM15A and CM19A via mochad.
Jul 2, 2011
c9b5d0e
Compare received message id with active message to prevent accidental…
Jul 2, 2011
72e3306
Added code to open CMxx fifo if it didn't work at startup.
Jul 23, 2011
9c5098e
Fix incorrect reference to KeyPadlinc index.
Sep 6, 2011
14c0649
Revise processing of serial data after parsing is complete and prior …
Sep 6, 2011
e67c4b1
Always clear the serial buffer after getting data.
Sep 6, 2011
d508838
Synchronize the "insteon" branch with the latest changes in trunk,
Sep 6, 2011
a3b8715
Avoid adding repeat fragments. Allow special case of manage links vi…
Sep 6, 2011
c0ef7e4
Fix references to ALDB and various formatting consistency changes.
Sep 7, 2011
52dce0e
Fix references to ALDB. Differentiate one-sided links from being orp…
Sep 7, 2011
6e2d6e9
Prevent clearing active message unless the received insteon message i…
Sep 7, 2011
0c94da1
Ensure fragment buffering is cleared. Clear resend timer on clearing…
Sep 7, 2011
c5fd544
Implement debug verbosity levels where ini setting can be debug=inste…
Sep 7, 2011
73e58b9
Fix typo on scan all link tables.
Nov 14, 2011
1800a6b
Small update on converting old PLM entries.
Nov 27, 2011
a282cdf
This has major improvements on serial port data handing to avoid the
Nov 27, 2011
a032bd9
Add a cache of group1 values and output to allow reusing of values that
Nov 27, 2011
884cee9
Fixed comment.
Nov 27, 2011
8d536e1
Synchronize the "insteon" branch with the latest changes in trunk,
Dec 20, 2011
7fbd562
IV reorganized how the audreyspeak works with Voice_Text.pm. This wa…
Feb 2, 2012
ea6b08a
Add minor comments.
Feb 3, 2012
f4f400b
Replace hash flag representing ongoing transmission ("xmit_in_progres…
Feb 3, 2012
9826a37
Replace use of hash flag (xmit_in_progress) with member function. En…
Feb 3, 2012
406563c
Discard frequent reports only if the state is the same.
Feb 7, 2012
bc0f8ab
Improve log statement utility during audit mode delete orphan links.
Feb 13, 2012
a8c41c1
Minor indenting cleanup.
Feb 13, 2012
03d4f51
Improve diagnostic logging statements.
Feb 14, 2012
aed572e
Report setby object name rather than allow object ref to be logged.
Feb 16, 2012
7a540c9
Alter delete orphans logic so that missing links does not also force …
Feb 16, 2012
c5aa672
Improve sync_links logic to support audit mode. Don't allow link upd…
Feb 16, 2012
d891837
Add support for sync links audit mode.
Feb 16, 2012
daa83de
Add support to filter out deaf devices during queueing of sync all li…
Feb 16, 2012
1e2d532
Support failure callback handling.
Feb 16, 2012
3c369b3
Incorporate callback to memory functions so that failures will allow …
Feb 16, 2012
73ae09e
Added sync all links (non-audit).
Feb 16, 2012
e2183a5
Properly queue up each individual candidate device's delete_orphan_li…
Mar 1, 2012
3b60d4a
Minor cleanup.
Mar 1, 2012
a95401c
Fix typo.
Mar 1, 2012
a29a1ba
Guard against duplicate messages when parsing.
Mar 1, 2012
67f7e13
Don't warn about skipping unhealthy device if it is "deaf" anyway.
Mar 1, 2012
bf1a1b7
Exit properly for deaf devices.
Mar 2, 2012
d2bd34e
Keep duplicate addresses array from being clobbered during delete_orp…
Mar 5, 2012
ba1fc5e
Don't clobber the callback after processing the pending one. Ensure …
Mar 6, 2012
6009581
Fix keeping duplicate_link_addresses state on delete operations. Fix …
Mar 8, 2012
79daceb
Ensure that xmit timer is checked as part of transmit_in_progress ret…
Mar 8, 2012
8cb1582
Actively match against deviceid and other factors before processing m…
Mar 9, 2012
ebf4838
Minor code cleanup.
Mar 9, 2012
68b251b
Detect ack messages that have a bogus deviceid.
Mar 9, 2012
8aa6be8
Parse group record for cleanup message.
Mar 9, 2012
5a0d6bf
Properly handly more corner case ACK/NACK messages.
Mar 9, 2012
510110b
Add explicit handlers for cleanup direct messages.
Mar 9, 2012
efb84f3
Prevent processing pending transmit queue until after clearing occurs.
Mar 11, 2012
5e7d188
Update pocketsphinx to support the latest 0.7 release and utilize the…
Mar 12, 2012
72f5da6
Catch the possibility of a corrupted message in the cleanup message h…
Mar 12, 2012
21b9d4a
Ensure that check on active_message->command_type only occurs if it i…
Mar 12, 2012
3b02fb1
Repair various bugs which can caused lights to remain stuck on at times.
Mar 17, 2012
2d223d8
Modified to support rfxcom lan in xpl mode, patch from
Oct 18, 2012
ed9c929
Update android_server to allow speak and play events to go to multipl…
Oct 28, 2012
746df35
Update Generic_Item and Voice_Cmd to provide android_xml subroutines …
Oct 28, 2012
4aa6efa
Prevent Caller ID announcments when receiving MSG_OFF and MSG_WAITING…
Oct 28, 2012
7e24c76
Add a watch-dog timer to Presence_Monitor to avoid lights remaining o…
Oct 28, 2012
cc7053d
Provide human readable NACK messages. Implement Insteon get_engine_v…
brainwarr Nov 3, 2012
04bcb73
Merge pull request #1 from brainwarr/iEngine_n_nacks
hollie Nov 3, 2012
51c7617
Need to carry over cmd2 data for nacks.
brainwarr Nov 4, 2012
a9483f1
Merge pull request #2 from brainwarr/iEngine_n_nacks
hollie Nov 4, 2012
ba265d5
Add support for callerid pop up message and notification.
Nov 6, 2012
ea7a429
Merge pull request #7 from jduda/android_callerid
hollie Nov 6, 2012
8dba152
Merge branch 'master' into branch_merge_phase1
hollie Nov 7, 2012
09c6f4f
Merged phase_one into master
hollie Nov 20, 2012
870989a
Updated xPL_Items.pl to the version of the master branch.
hollie Nov 21, 2012
b9e299c
Made HAI menu more clear, and added symlink to make web interface work.
marcmerlin Nov 24, 2012
d971bb5
Made HAI RCxx menu more obvious.
marcmerlin Nov 24, 2012
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion bin/mh.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1211,7 +1211,6 @@ viavoice_voice = male
@ sleep mode
@ - pocketsphinx_timeout_response: This is what is said (or played) when the awake
@ timer expires.
@ - pocketsphinx_cmudict Pocketsphinx full english dictionary file location.
@ - pocketsphinx_hmm Pocketsphinx Human Markov Model directory location.
@ - pocketsphinx_rate Audio Sample rate
@ - pocketsphinx_continuous Program location for pocketsphinx_continuous
Expand Down
270 changes: 0 additions & 270 deletions code/common/insteon_item_commands.pl

This file was deleted.

4 changes: 2 additions & 2 deletions code/support/hai-omnistat/hai_web/menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<tbody>
<tr>
<td align="left" valign="top" width="100%">
<a href="/hai/omnistat_sched_web.pl"><img src="/bin/button.pl?Program%20HVAC" border="0"></a><br>
<a href="/hai/omnistat_setup_web.pl"><img src="/bin/button.pl?Setup%20HVAC" border="0"></a><br>
<a href="/hai/omnistat_sched_web.pl"><img src="/bin/button.pl?Reprog%20Stat" border="0"></a><br>
<a href="/hai/omnistat_setup_web.pl"><img src="/bin/button.pl?Adjust%20Stat" border="0"></a><br>
</td>
</tr>
</tbody>
Expand Down
27 changes: 21 additions & 6 deletions code/support/hai-omnistat/omnistat.pl
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
# Originally by Kent Noonan, Joel Davidson & Dan Arnold
# Close to full rewrite/overhaul by Marc MERLIN 2009/07/22


use vars qw(@omnilist @omnistat @omniname @omnioffset $stat_cool_temp $stat_heat_temp $stat_mode $stat_fan $stat_hold
#
use vars qw(%omnicache @omnilist @omnistat @omniname @omnioffset $stat_cool_temp $stat_heat_temp $stat_mode $stat_fan $stat_hold
$stat_indoor_temp $cmd $stat_model @v_omnistat_fan @v_omnistat_resume @v_omnistat_hold @v_omnistat_mode
@v_omnistat_cool_sp @v_omnistat_heat_sp @v_omnistat_setting @stat_reset_timer $house_stat $mbr_stat $test_stat
@v_omnistat_background);
Expand Down Expand Up @@ -104,6 +104,17 @@
# we make the extended group1 call that also retreives the stat's output status
my ($cool_sp, $heat_sp, $mode, $fan, $hold, $temp, $output) = $omnistat[$omnistat]->read_group1("true");
my $stat_type = $omnistat[$omnistat]->get_stat_type;
# Remember the queried values in our own cache so that we don't query this from other places unless
# necessary (this is important in a multiple thermostat sharing the same cable situation
# where querying two stats in code later will cause collisions on the cable).
$omnicache{$omniname[$omnistat]}->{'cool_sp'} = $cool_sp;
$omnicache{$omniname[$omnistat]}->{'heat_sp'} = $heat_sp;
$omnicache{$omniname[$omnistat]}->{'mode'} = $mode;
$omnicache{$omniname[$omnistat]}->{'fan'} = $fan;
$omnicache{$omniname[$omnistat]}->{'hold'} = $hold;
$omnicache{$omniname[$omnistat]}->{'temp'} = $temp;
$omnicache{$omniname[$omnistat]}->{'output'} = $output;
$omnicache{$omniname[$omnistat]}->{'stat_type'} = $stat_type;

# This mashes $hold and $mode together from registers cached in the group1 call and outputs a combined string
$mode = $omnistat[$omnistat]->get_mode;
Expand Down Expand Up @@ -215,10 +226,14 @@
}
}

if ($state = $omnistat[$omnistat]->state_now) {
# this may or many not be useful to you, you can comment it out if you're not planning on using state changes for coding
Omnistat::omnistat_log("".$omniname[$omnistat]." Omnistat State set to: $state", 3);
}
# WARNING: Reading state_now here empties the 'state_now' flag. If you need it elsewhere, that won't work.
# For debugging, Omnistat.pl will also output state changes like so:
# 25/11/2011 23:30:37 Omnistat[2]->read_reg: set state->now to temp_change

# If you plan on using state_now elsewhere in your code, you should leave this commented this out:
# if ($state = $omnistat[$omnistat]->state_now) {
# Omnistat::omnistat_log("".$omniname[$omnistat]." Omnistat State set to: $state", 3);
# }
}

#vim:sts=4:sw=4
1 change: 1 addition & 0 deletions lib/Generic_Item.pm
Original file line number Diff line number Diff line change
Expand Up @@ -1195,6 +1195,7 @@ with the lexical variables $state and $object getting set.
The code is a string that will be eval'd and the variables are available to
it, but not to any subroutines called by it unless you pass them.
You can also set the state variable explicitly since you usually know the item.
The code is a string that will be eval'd.

(optional) Setting state limits this tied code to run only when the given
state is set.
Expand Down
Loading