diff --git a/code/bruce/test_x10_light.pl b/code/bruce/test_x10_light.pl index 6d10bc55b..4d56cdc95 100644 --- a/code/bruce/test_x10_light.pl +++ b/code/bruce/test_x10_light.pl @@ -2,18 +2,13 @@ #@ Test x10 light commands -$v_test_light_timed = - new Voice_Cmd("Turn the Outside lights off in [1,5,10,30,60] minutes"); +$v_test_light_timed = new Voice_Cmd("Turn the Outside lights off in [1,5,10,30,60] minutes"); $v_test_light_timed->set_info('A test of the set_with_timer X10_Item method'); set_with_timer $camera_light ON, $state * 60 if $state = said $v_test_light_timed; -$v_test_light1 = new Voice_Cmd( - "Set test camera light 1 to [on,brighten,dim,-50,+20,+50,+70,50,10%,12%,30%,50%,60%,70%,&P1,&P2,&P3,&P13,&P10,&P30,&P40,&P50,&P60,&P80,fred]" -); -$v_test_light2 = new Voice_Cmd( - "Set test camera light 2 to [on,brighten,dim,-50,+20,+50,+70,50,10%,12%,30%,50%,60%,70%,&P1,&P2,&P3,&P13,&P10,&P30,&P40,&P50,&P60,&P80,fred]" -); +$v_test_light1 = new Voice_Cmd("Set test camera light 1 to [on,brighten,dim,-50,+20,+50,+70,50,10%,12%,30%,50%,60%,70%,&P1,&P2,&P3,&P13,&P10,&P30,&P40,&P50,&P60,&P80,fred]"); +$v_test_light2 = new Voice_Cmd("Set test camera light 2 to [on,brighten,dim,-50,+20,+50,+70,50,10%,12%,30%,50%,60%,70%,&P1,&P2,&P3,&P13,&P10,&P30,&P40,&P50,&P60,&P80,fred]"); #v_test_light2 = new Voice_Cmd("Set bathroom light to [on,off,brighten,dim,-50,+20,+50,+70,50,10%,12%,30%,60%,70%,&P1,&P2,&P3,&P13,&P10,&P30,&P40,&P50,&P60,&P80,fred]"); $v_test_light1->set_info( @@ -33,9 +28,7 @@ set $bathroom_light $state; } -$v_test_lights = new Voice_Cmd( - "{please, } {turn the, } test lights [on,off,&P13,&P10,&P15,&P20,10%,20%,70%,&P60]" -); +$v_test_lights = new Voice_Cmd("{please, } {turn the, } test lights [on,off,&P13,&P10,&P15,&P20,10%,20%,70%,&P60]"); #$v_test_lights-> set_info('Test sending some extended X10 states to a fancy LM14 X10 module'); #$test_lights = new X10_Item('C9'); diff --git a/code/bruce/weatherpoint.pl b/code/bruce/weatherpoint.pl index dd69b9227..271c35884 100644 --- a/code/bruce/weatherpoint.pl +++ b/code/bruce/weatherpoint.pl @@ -13,8 +13,7 @@ my $f_weatherpoint_page = "$config_parms{data_dir}/web/weatherpoint.txt"; my $f_weatherpoint_html = "$config_parms{data_dir}/web/weatherpoint.html"; -$p_weatherpoint_page = new Process_Item( - "get_url \"$config_parms{weatherpointURL}\" \"$f_weatherpoint_html\""); +$p_weatherpoint_page = new Process_Item("get_url \"$config_parms{weatherpointURL}\" \"$f_weatherpoint_html\""); $v_get_weatherpoint = new Voice_Cmd('Get weather point'); #if ($Startup or $Reload) { # Used for testing diff --git a/code/common/UIRT2_learning.pl b/code/common/UIRT2_learning.pl index ce43839b9..224f6ee69 100644 --- a/code/common/UIRT2_learning.pl +++ b/code/common/UIRT2_learning.pl @@ -37,8 +37,7 @@ $ofa_html = &ofa_html; } -$uirt2_test = new Voice_Cmd( - "uirt2 debug [version,raw,uir,struct,gpio,replay,learn,dump codes]"); +$uirt2_test = new Voice_Cmd("uirt2 debug [version,raw,uir,struct,gpio,replay,learn,dump codes]"); if ( my $state = said $uirt2_test) { UIRT2::get_version() if $state eq 'version'; diff --git a/code/common/USB_UIRT_learning.pl b/code/common/USB_UIRT_learning.pl index c407c15ae..2d2c2ca1a 100644 --- a/code/common/USB_UIRT_learning.pl +++ b/code/common/USB_UIRT_learning.pl @@ -37,8 +37,7 @@ $ofa_html = &ofa_html; } -$usb_uirt_test = new Voice_Cmd( - "usb_uirt debug [version,raw,oldraw,uir,get config,learn,dump codes]"); +$usb_uirt_test = new Voice_Cmd("usb_uirt debug [version,raw,oldraw,uir,get config,learn,dump codes]"); if ( my $state = said $usb_uirt_test) { USB_UIRT::get_version() if $state eq 'version'; diff --git a/code/common/audrey_control.pl b/code/common/audrey_control.pl index 1e71db7b1..8e4e98d18 100644 --- a/code/common/audrey_control.pl +++ b/code/common/audrey_control.pl @@ -129,17 +129,10 @@ $v_audrey_mail_light = new Voice_Cmd("Audrey mail light [on,off,blinking]"); $v_audrey_both_lights = new Voice_Cmd("Audrey lights both [on,off,blinking]"); $v_audrey_beeps = new Voice_Cmd("Audrey beeps [enabled,disabled,stopped]"); -$v_audrey_sound_play = new Voice_Cmd( - "Play Audrey sound number [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18]" -); -$v_audrey_volume = new Voice_Cmd( - "Set Audrey volume to [1,10,20,25,30,40,50,60,70,75,80,90,100]"); -$v_audrey_remote = new Voice_Cmd( - "Push Audrey Button [browser,address_book,date_book,audrey_options,power_button,turn_knob_left,push_knob,turn_knob_right,mail,tab,enter]" -); -$v_audrey_sound_play_by_name = new Voice_Cmd( - "Play Audrey sound [cancel,check,copy,cut,delete,help,major_high,menu_close,menu_open,minor_high,minor_low,paste,print,scroll_down,scroll_up,snapshot,warning,go_to_sleep,wake_up]" -); +$v_audrey_sound_play = new Voice_Cmd("Play Audrey sound number [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18]"); +$v_audrey_volume = new Voice_Cmd("Set Audrey volume to [1,10,20,25,30,40,50,60,70,75,80,90,100]"); +$v_audrey_remote = new Voice_Cmd("Push Audrey Button [browser,address_book,date_book,audrey_options,power_button,turn_knob_left,push_knob,turn_knob_right,mail,tab,enter]"); +$v_audrey_sound_play_by_name = new Voice_Cmd("Play Audrey sound [cancel,check,copy,cut,delete,help,major_high,menu_close,menu_open,minor_high,minor_low,paste,print,scroll_down,scroll_up,snapshot,warning,go_to_sleep,wake_up]"); if ( said $v_audrey_select) { my $state = $v_audrey_select->{state}; diff --git a/code/common/barcode_scan.pl b/code/common/barcode_scan.pl index bf6444a0d..669ffa77b 100644 --- a/code/common/barcode_scan.pl +++ b/code/common/barcode_scan.pl @@ -32,9 +32,7 @@ ); $barcode_mode->set_authority('anyone'); -$v_barcode_mode = new Voice_Cmd( - 'Change barcode scan to [entry,add inventory,delete inventory,query inventory,clear inventory] mode' -); +$v_barcode_mode = new Voice_Cmd('Change barcode scan to [entry,add inventory,delete inventory,query inventory,clear inventory] mode'); $v_barcode_mode->set_info( 'Controls what you want to do with barcode scans. Web will create urls, inventory updates a database' ); diff --git a/code/common/benchmarks.pl b/code/common/benchmarks.pl index 92e6ff09c..b2b4c4734 100644 --- a/code/common/benchmarks.pl +++ b/code/common/benchmarks.pl @@ -40,8 +40,7 @@ my $speed_benchmark_count = 0; -$v_speed_benchmark = - new Voice_Cmd '[Start a by name,Start a by speed,Stop the] speed benchmark'; +$v_speed_benchmark = new Voice_Cmd '[Start a by name,Start a by speed,Stop the] speed benchmark'; $v_speed_benchmark->set_info( 'This will suspend normal mh while it benchmarks each code member individually. It can take few minutes.' ); diff --git a/code/common/callerid.pl b/code/common/callerid.pl index 60eba3060..7fb91908a 100644 --- a/code/common/callerid.pl +++ b/code/common/callerid.pl @@ -33,22 +33,14 @@ =cut # Use this for each of your cid hardware interfaces -$cid_interface1 = new Telephony_Interface( - $config_parms{callerid_name}, - $config_parms{callerid_port}, - $config_parms{callerid_type} -); +$cid_interface1 = new Telephony_Interface($config_parms{callerid_name},$config_parms{callerid_port},$config_parms{callerid_type}); $cid_item = new CID_Lookup($cid_interface1); my $cid_interface2; if ( $Startup and defined( $config_parms{callerid2_name} ) ) { print_log("Creating and adding 2nd Caller ID interface"); - $cid_interface2 = new Telephony_Interface( - $config_parms{callerid2_name}, - $config_parms{callerid2_port}, - $config_parms{callerid2_type} - ); + $cid_interface2 = new Telephony_Interface($config_parms{callerid2_name},$config_parms{callerid2_port},$config_parms{callerid2_type}); { $cid_item->add($cid_interface2); } # the brace brackets keep mh from pulling this line out of the loop @@ -62,8 +54,7 @@ # These objects will enable cid logging and announcing $cid_log = new CID_Log($cid_item); # Enables logging -$cid_server = - new CID_Server($cid_item); # Enables YAC, Acid, and xAP/xPL callerid clients +$cid_server = new CID_Server($cid_item); # Enables YAC, Acid, and xAP/xPL callerid clients # Add one of these for each YAC client: http://www.sunflowerhead.com/software/yac #$cid_client1 = new CID_Server_YAC('localhost'); @@ -74,8 +65,7 @@ #$cid_announce = new CID_Announce($cid_item, 'Call from $first $last'); # Setup commands we can use to run tests without the modem -$cid_interface_test = new Voice_Cmd( - 'Test callerid [0,1,2,3,4,5,6,7,8,9,offhook,UKknown,UK unknown]'); +$cid_interface_test = new Voice_Cmd('Test callerid [0,1,2,3,4,5,6,7,8,9,offhook,UKknown,UK unknown]'); if ( defined( $state = state_now $cid_interface_test) ) { set_test $cid_interface1 'RING' if $state == 0; set_test $cid_interface1 diff --git a/code/common/clock_map2.pl b/code/common/clock_map2.pl index 9cd3b21fb..b4dab5de4 100644 --- a/code/common/clock_map2.pl +++ b/code/common/clock_map2.pl @@ -12,8 +12,7 @@ my $MAPDIR = "$Pgm_Root/web/newclock/maps"; my $f_get_map = "$config_parms{data_dir}/earth_jpg.data"; my $min_size = 20000; #minimum size to test if a jpg has been downloaded -$p_get_map = new Process_Item( - "get_url -quiet \"$URL\" $config_parms{data_dir}/earth_jpg.data"); +$p_get_map = new Process_Item("get_url -quiet \"$URL\" $config_parms{data_dir}/earth_jpg.data"); # Update earth.jpg for each Hour, once a week diff --git a/code/common/eBay.pl b/code/common/eBay.pl index 1da273479..0f48466f1 100644 --- a/code/common/eBay.pl +++ b/code/common/eBay.pl @@ -42,53 +42,40 @@ $v_check_ebay = new Voice_Cmd('Check eBay'); $v_check_ebay->set_info('Checks current eBay status'); -$f_ebay_login1_headers = - new File_Item "$config_parms{data_dir}/web/ebay_login1.headers"; -$p_ebay_login1 = new Process_Item( - qq[get_url -header "$f_ebay_login1_headers->{file}" "https://signin.ebay.com/ws2/eBayISAPI.dll?SignIn" "/dev/null" ] -); +$f_ebay_login1_headers = new File_Item "$config_parms{data_dir}/web/ebay_login1.headers"; +$p_ebay_login1 = new Process_Item(qq[get_url -header "$f_ebay_login1_headers->{file}" "https://signin.ebay.com/ws2/eBayISAPI.dll?SignIn" "/dev/null" ]); -$f_ebay_login2_html = - new File_Item "$config_parms{data_dir}/web/ebay_login2.html"; -$f_ebay_login2_headers = - new File_Item "$config_parms{data_dir}/web/ebay_login2.headers"; +$f_ebay_login2_html = new File_Item "$config_parms{data_dir}/web/ebay_login2.html"; +$f_ebay_login2_headers = new File_Item "$config_parms{data_dir}/web/ebay_login2.headers"; my $url_ebay_login2 = 'https://signin.ebay.com/ws/eBayISAPI.dll?UsingSSL=1'; $p_ebay_login2 = new Process_Item; -$f_ebay_watching = - new File_Item "$config_parms{data_dir}/web/ebay_watching.html"; -my $url_ebay_watching = - 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBayWatching&ssPageName=STRK:ME:LNLK'; +$f_ebay_watching = new File_Item "$config_parms{data_dir}/web/ebay_watching.html"; +my $url_ebay_watching = 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBayWatching&ssPageName=STRK:ME:LNLK'; $p_ebay_watching = new Process_Item; $f_ebay_bidding = new File_Item "$config_parms{data_dir}/web/ebay_bidding.html"; -my $url_ebay_bidding = - 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBayBidding&ssPageName=STRK:ME:LNLK'; +my $url_ebay_bidding = 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBayBidding&ssPageName=STRK:ME:LNLK'; $p_ebay_bidding = new Process_Item; $f_ebay_won = new File_Item "$config_parms{data_dir}/web/ebay_won.html"; -my $url_ebay_won = - 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBayWon&ssPageName=STRK:ME:LNLK'; +my $url_ebay_won = 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBayWon&ssPageName=STRK:ME:LNLK'; $p_ebay_won = new Process_Item; $f_ebay_selling = new File_Item "$config_parms{data_dir}/web/ebay_selling.html"; -my $url_ebay_selling = - 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBaySelling&ssPageName=STRK:ME:LNLK'; +my $url_ebay_selling = 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBaySelling&ssPageName=STRK:ME:LNLK'; $p_ebay_selling = new Process_Item; $f_ebay_sold = new File_Item "$config_parms{data_dir}/web/ebay_sold.html"; -my $url_ebay_sold = - 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBaySold&ssPageName=STRK:ME:LNLK'; +my $url_ebay_sold = 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBaySold&ssPageName=STRK:ME:LNLK'; $p_ebay_sold = new Process_Item; $f_ebay_unsold = new File_Item "$config_parms{data_dir}/web/ebay_unsold.html"; -my $url_ebay_unsold = - 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBayUnsold&ssPageName=STRK:ME:LNLK'; +my $url_ebay_unsold = 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBayUnsold&ssPageName=STRK:ME:LNLK'; $p_ebay_unsold = new Process_Item; $f_ebay_lost = new File_Item "$config_parms{data_dir}/web/ebay_lost.html"; -my $url_ebay_lost = - 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBayLost&ssPageName=STRK:ME:LNLK'; +my $url_ebay_lost = 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBayLost&ssPageName=STRK:ME:LNLK'; $p_ebay_lost = new Process_Item; my $ebay_cookies; diff --git a/code/common/eliza_server.pl b/code/common/eliza_server.pl index 87afda67b..546223a87 100644 --- a/code/common/eliza_server.pl +++ b/code/common/eliza_server.pl @@ -32,8 +32,7 @@ my ($eliza); undef $eliza if $eliza and state_changed $eliza_rule; -$f_eliza_deep_thoughts = - new File_Item("$config_parms{data_dir}/remarks/deep_thoughts.txt"); +$f_eliza_deep_thoughts = new File_Item("$config_parms{data_dir}/remarks/deep_thoughts.txt"); if ( defined( $state = state_now $eliza_data) ) { my $msg = $state; diff --git a/code/common/internet_earthquakes_cal.pl b/code/common/internet_earthquakes_cal.pl index cffd6b75a..dc5a0aace 100644 --- a/code/common/internet_earthquakes_cal.pl +++ b/code/common/internet_earthquakes_cal.pl @@ -69,19 +69,14 @@ $Earthquake_Count = $config_parms{Earthquake_Count}; } -$f_earthquakes_cal_html = - new File_Item("$config_parms{data_dir}/web/earthquakes_cal.html"); -$f_earthquakes_cal_gif = - new File_Item("$config_parms{data_dir}/web/earthquakes_cal.gif"); +$f_earthquakes_cal_html = new File_Item("$config_parms{data_dir}/web/earthquakes_cal.html"); +$f_earthquakes_cal_gif = new File_Item("$config_parms{data_dir}/web/earthquakes_cal.gif"); my $image; $p_earthquakes_image_cal = new Process_Item; -$p_earthquakes_cal = new Process_Item( - "get_url http://quake.wr.usgs.gov/recenteqs/Quakes/quakes0.htm " - . $f_earthquakes_cal_html->name ); +$p_earthquakes_cal = new Process_Item("get_url http://quake.wr.usgs.gov/recenteqs/Quakes/quakes0.htm " . $f_earthquakes_cal_html->name ); -$v_earthquakes_cal = - new Voice_Cmd('[Get,Show,Read,Clear] recent California earthquakes'); +$v_earthquakes_cal = new Voice_Cmd('[Get,Show,Read,Clear] recent California earthquakes'); $v_earthquakes_cal->set_info( 'Display recent California earthquake information'); $v_earthquakes_cal->set_authority('anyone'); diff --git a/code/common/internet_top10.pl b/code/common/internet_top10.pl index b4f9f2fdc..95db912b5 100644 --- a/code/common/internet_top10.pl +++ b/code/common/internet_top10.pl @@ -10,8 +10,7 @@ #noloop=stop -$p_top10_list = new Process_Item( - "get_url http://www.cbs.com/latenight/lateshow/top_ten/ $f_top10_html"); +$p_top10_list = new Process_Item("get_url http://www.cbs.com/latenight/lateshow/top_ten/ $f_top10_html"); # *** Split these up for security (allow anyone to read) diff --git a/code/common/mh_control.pl b/code/common/mh_control.pl index 6591d4762..4daf32c58 100644 --- a/code/common/mh_control.pl +++ b/code/common/mh_control.pl @@ -555,8 +555,7 @@ sub serial_match_log { } # Repeat last spoken -$v_repeat_last_spoken = - new Voice_Cmd '{Repeat your last message, What did you say}', ''; +$v_repeat_last_spoken = new Voice_Cmd '{Repeat your last message, What did you say}', ''; $v_repeat_last_spoken->tie_event('&handle_repeat_last_spoken_state()'); # noloop sub handle_repeat_last_spoken_state() { diff --git a/code/common/monitor_router_lingo.pl b/code/common/monitor_router_lingo.pl index 2de8aac1c..88d73bf21 100644 --- a/code/common/monitor_router_lingo.pl +++ b/code/common/monitor_router_lingo.pl @@ -45,10 +45,8 @@ # noloop=stop $v_check_lingo_router = new Voice_Cmd('Check Lingo router'); -$p_check_lingo_router = new Process_Item( - "get_url -quiet \"$lingo_status_url\" \"$f_lingo_status_html\""); -$p_reboot_lingo_router = new Process_Item( - "get_url -quiet \"$lingo_reboot_url\" \"$f_lingo_reboot_html\""); +$p_check_lingo_router = new Process_Item("get_url -quiet \"$lingo_status_url\" \"$f_lingo_status_html\""); +$p_reboot_lingo_router = new Process_Item("get_url -quiet \"$lingo_reboot_url\" \"$f_lingo_reboot_html\""); # Run on the 3rd minute of every 5 minute block (or when requested by # the voice command) diff --git a/code/common/mp3Rip_code.pl b/code/common/mp3Rip_code.pl index 9e6c3cfdf..19f2fe782 100644 --- a/code/common/mp3Rip_code.pl +++ b/code/common/mp3Rip_code.pl @@ -272,9 +272,7 @@ if ($Reload) { $cd_drive_in_use = 0; - $get_cdinfo_process = new Process_Item( - "$config_parms{mp3Rip_cdinfo} > $config_parms{mp3Rip_work_dir}/cd-info.curr" - ); + $get_cdinfo_process = new Process_Item("$config_parms{mp3Rip_cdinfo} > $config_parms{mp3Rip_work_dir}/cd-info.curr"); $cddbp = new CDDB; print_log "mp3Rip: cddbids still being processed: $Save{'mp3Rip_pending'}" if $main::Debug{mp3Rip}; diff --git a/code/common/mp3_alsaplayer.pl b/code/common/mp3_alsaplayer.pl index 7b04488db..7e25a101c 100644 --- a/code/common/mp3_alsaplayer.pl +++ b/code/common/mp3_alsaplayer.pl @@ -32,9 +32,7 @@ sub set_alsaplayer_in_use_notify { $in_use_notify = $_[0]; } -$v_mp3_control_cmd = new Voice_Cmd( - "Set the house mp3 player to [Play,Stop,Pause,Restart,Next Song,Previous Song,Volume Down,Volume Up,Shuffle On,Shuffle Off,Repeat On,Repeat Off]" -); +$v_mp3_control_cmd = new Voice_Cmd("Set the house mp3 player to [Play,Stop,Pause,Restart,Next Song,Previous Song,Volume Down,Volume Up,Shuffle On,Shuffle Off,Repeat On,Repeat Off]"); my $state; mp3_control($state) if $state = said $v_mp3_control_cmd; diff --git a/code/common/mp3_mpd.pl b/code/common/mp3_mpd.pl index cc151d3fb..727c0cf67 100644 --- a/code/common/mp3_mpd.pl +++ b/code/common/mp3_mpd.pl @@ -62,12 +62,8 @@ print_log "MPD Database Updated"; } -$v_mp3_control_cmd = new Voice_Cmd( - "Set the house mp3 player to [Play,Stop,Pause,Restart,Next Song,Previous Song,Volume Down,Volume Up,Shuffle On,Shuffle Off,Repeat On,Repeat Off,track]" -); -$v_mp3_vol_control = new Voice_Cmd( - "Set the house mp3 volume to [5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100]" -); +$v_mp3_control_cmd = new Voice_Cmd("Set the house mp3 player to [Play,Stop,Pause,Restart,Next Song,Previous Song,Volume Down,Volume Up,Shuffle On,Shuffle Off,Repeat On,Repeat Off,track]"); +$v_mp3_vol_control = new Voice_Cmd("Set the house mp3 volume to [5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100]"); $v_mpd_control = new Voice_Cmd("[Regenerate,Restart] MPD"); my $state; diff --git a/code/common/news_ap_breaking.pl b/code/common/news_ap_breaking.pl index 297c7c244..f78fe491d 100644 --- a/code/common/news_ap_breaking.pl +++ b/code/common/news_ap_breaking.pl @@ -10,9 +10,7 @@ my $f_ap_news = "$config_parms{data_dir}/web/ap_breaking_news.txt"; my $f_ap_news_html = "$config_parms{data_dir}/web/ap_breaking_news_pruned.html"; my $f_ap_news_rss = "$config_parms{data_dir}/web/ap_breaking_news.rss"; -$p_ap_news = new Process_Item( - qq!get_url "http://hosted.ap.org/lineups/TOPHEADS.rss?SITE=NHPOR&SECTION=HOME" $f_ap_news_rss! -); +$p_ap_news = new Process_Item(qq!get_url "http://hosted.ap.org/lineups/TOPHEADS.rss?SITE=NHPOR&SECTION=HOME" $f_ap_news_rss!); $v_ap_news = new Voice_Cmd('What is in the News'); $v_ap_news->set_info('Responds with headline stories from the AP'); $v_get_ap_news = new Voice_Cmd('[Get,Check,Mail,SMS] AP breaking news'); diff --git a/code/common/news_onthisday.pl b/code/common/news_onthisday.pl index c64a1e7a7..8ee62160b 100644 --- a/code/common/news_onthisday.pl +++ b/code/common/news_onthisday.pl @@ -7,9 +7,7 @@ my $f_onthisday_html = "$config_parms{data_dir}/web/onthisday.html"; my $f_onthisday_html2 = "$config_parms{data_dir}/web/onthisday_pruned.html"; -$p_onthisday = new Process_Item( - "get_url http://www.nytimes.com/learning/general/onthisday/index.html $f_onthisday_html" -); +$p_onthisday = new Process_Item("get_url http://www.nytimes.com/learning/general/onthisday/index.html $f_onthisday_html"); $v_onthisday = new Voice_Cmd('[Get,Show,Check] on this day'); $v_onthisday->set_info('Get or display the daily calendar facts'); $v_onthisday->set_authority('anyone'); diff --git a/code/common/news_physics_web.pl b/code/common/news_physics_web.pl index 7d587c069..87d7a3441 100644 --- a/code/common/news_physics_web.pl +++ b/code/common/news_physics_web.pl @@ -7,8 +7,7 @@ my $f_physics_web = "$config_parms{data_dir}/web/physics_web.txt"; my $f_physics_web_html = "$config_parms{data_dir}/web/physics_web.html"; -$p_physics_web = new Process_Item( - "get_url http://physicsweb.org/archive/news $f_physics_web_html"); +$p_physics_web = new Process_Item("get_url http://physicsweb.org/archive/news $f_physics_web_html"); $v_physics_web = new Voice_Cmd('[Get,Read] physics web'); $v_physics_web->set_authority('anyone'); diff --git a/code/common/news_yahoo.pl b/code/common/news_yahoo.pl index 9972aef71..ac920bb6c 100644 --- a/code/common/news_yahoo.pl +++ b/code/common/news_yahoo.pl @@ -19,13 +19,10 @@ $news_files{"Health"} = "$config_parms{data_dir}/web/Health_news.txt"; $news_files{"Sports"} = "$config_parms{data_dir}/web/Sports_news.txt"; -$p_all_news = - new Process_Item("get_url http://dailynews.yahoo.com/fc $f_all_news_html"); +$p_all_news = new Process_Item("get_url http://dailynews.yahoo.com/fc $f_all_news_html"); $v_all_news = new Voice_Cmd('Get current news'); $v_all_news->set_authority('anyone'); -$v_news = new Voice_Cmd( - 'Tell me the [Top,U S,World,Entertainment,Business,Technology,Science,Health,Sports] news' -); +$v_news = new Voice_Cmd('Tell me the [Top,U S,World,Entertainment,Business,Technology,Science,Health,Sports] news'); $v_news->set_authority('anyone'); # Create trigger diff --git a/code/common/pocketsphinx_control.pl b/code/common/pocketsphinx_control.pl index f5b8b5b97..97221b6d6 100644 --- a/code/common/pocketsphinx_control.pl +++ b/code/common/pocketsphinx_control.pl @@ -80,17 +80,9 @@ # define some classes we need $v_pocketsphinx_reset = new Voice_Cmd("reset pocket sphinx language files"); -$v_pocketsphinx_awake = new Voice_Cmd( - $config_parms{pocketsphinx_awake_phrase}, - $config_parms{pocketsphinx_awake_response} -); -$v_pocketsphinx_asleep = new Voice_Cmd( - $config_parms{pocketsphinx_asleep_phrase}, - $config_parms{pocketsphinx_timeout_response} -); -$pocketsphinx_listener = - new PocketSphinx_Listener( "$config_parms{pocketsphinx_dev}", - $config_parms{pocketsphinx_rate} ); +$v_pocketsphinx_awake = new Voice_Cmd($config_parms{pocketsphinx_awake_phrase},$config_parms{pocketsphinx_awake_response}); +$v_pocketsphinx_asleep = new Voice_Cmd($config_parms{pocketsphinx_asleep_phrase},$config_parms{pocketsphinx_timeout_response}); +$pocketsphinx_listener = new PocketSphinx_Listener( "$config_parms{pocketsphinx_dev}",$config_parms{pocketsphinx_rate} ); $t_awake_timer = new Timer; # Set mode on startup and reload diff --git a/code/common/proxy_client_server.pl b/code/common/proxy_client_server.pl index e9b77dfaf..e42fca364 100644 --- a/code/common/proxy_client_server.pl +++ b/code/common/proxy_client_server.pl @@ -95,14 +95,12 @@ bedroom => 'bedroom' ); -$test_voice_proxy = new Voice_Cmd - 'Test proxy speak to [all,livingroom,jim,sharon,kitchen,bedroom]'; +$test_voice_proxy = new Voice_Cmd 'Test proxy speak to [all,livingroom,jim,sharon,kitchen,bedroom]'; $test_voice_proxy->tie_event( 'speak "rooms=$state we are the borg,, you will be assimilated,, resistance is few tile"' ); -$test_play_proxy = new Voice_Cmd - 'Test proxy play to [all,livingroom,jim,sharon,kitchen,bedroom]'; +$test_play_proxy = new Voice_Cmd 'Test proxy play to [all,livingroom,jim,sharon,kitchen,bedroom]'; $test_play_proxy->tie_event( 'play (rooms=> "$state", time => 60, volume => 80, file => "chimes/west30.wav")' ); @@ -170,8 +168,7 @@ sub proxy_speak_play { # Proxy Server Section -$proxy_server = - new Socket_Item( undef, undef, 'server_proxy', undef, undef, undef, "\035" ); +$proxy_server = new Socket_Item( undef, undef, 'server_proxy', undef, undef, undef, "\035" ); # Allow for proxy regstration to the main mh (optional) # If you want this, add these mh.ini parms: mh_proxyreg_port, mh_server, and proxy_name diff --git a/code/common/speak_insult.pl b/code/common/speak_insult.pl index 4a8b0933c..d72c833a9 100644 --- a/code/common/speak_insult.pl +++ b/code/common/speak_insult.pl @@ -8,12 +8,7 @@ #@ You can see a video of this code allowing my 2 robots to insult each other #@ at misterhouse.net/public/robot/. -$f_insult = new File_Item( - &file_default( - $config_parms{speak_insult_file}, - "$config_parms{data_dir}/remarks/insults1.txt" - ) -); +$f_insult = new File_Item(&file_default($config_parms{speak_insult_file},"$config_parms{data_dir}/remarks/insults1.txt")); $v_insult1 = new Voice_Cmd('Speak an insult'); $v_insult1->set_authority('anyone'); diff --git a/code/common/timers.pl b/code/common/timers.pl index be50984f3..c886c2775 100644 --- a/code/common/timers.pl +++ b/code/common/timers.pl @@ -59,9 +59,7 @@ sub expired_timer { } # Allow for limited voice command timers -$v_minute_timer = new Voice_Cmd( - 'Set a timer for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,25,30,45,60,90,120] minutes' -); +$v_minute_timer = new Voice_Cmd('Set a timer for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,25,30,45,60,90,120] minutes'); $v_minute_timer->set_info( 'Set a minute timer. Time remaining will be periodically announced'); if ( said $v_minute_timer) { diff --git a/code/common/trivia.pl b/code/common/trivia.pl index 7079c59fb..d46116bea 100644 --- a/code/common/trivia.pl +++ b/code/common/trivia.pl @@ -8,9 +8,7 @@ my $f_trivia_question = "$config_parms{data_dir}/trivia_question.txt"; my $f_trivia_answer = "$config_parms{data_dir}/trivia_answer.txt"; -$v_trivia_next = new Voice_Cmd( - 'What is the [Current,next Science,next Entertainment,next Mixed,next Sports,next Random] trivia question' -); +$v_trivia_next = new Voice_Cmd('What is the [Current,next Science,next Entertainment,next Mixed,next Sports,next Random] trivia question'); $v_trivia_answer = new Voice_Cmd('What is the trivia answer'); $v_trivia_next->set_authority('anyone'); diff --git a/code/common/tv_info.pl b/code/common/tv_info.pl index 7ca4d9d46..666670023 100644 --- a/code/common/tv_info.pl +++ b/code/common/tv_info.pl @@ -5,17 +5,11 @@ $f_tv_file = new File_Item("$config_parms{data_dir}/tv_info1.txt"); -$p_tv_info = new Process_Item( - qq[get_tv_info -times all -keys "$config_parms{favorite_tv_shows}" -keyfile $config_parms{favorite_tv_shows_file} -title_only -early_am 0+6 -outfile2 $config_parms{data_dir}/web/tv_info3.txt] -); +$p_tv_info = new Process_Item(qq[get_tv_info -times all -keys "$config_parms{favorite_tv_shows}" -keyfile $config_parms{favorite_tv_shows_file} -title_only -early_am 0+6 -outfile2 $config_parms{data_dir}/web/tv_info3.txt]); $v_tv_results = new Voice_Cmd( 'What are the tv search results', 0 ); -$v_tv_movies1 = new Voice_Cmd( - "What TV movies are on channel [$config_parms{favorite_tv_channels}] tonight", - 0 -); -$v_tv_movies2 = - new Voice_Cmd( 'What TV movies are on at [6pm,7pm,8pm,9pm] tonight', 0 ); +$v_tv_movies1 = new Voice_Cmd("What TV movies are on channel [$config_parms{favorite_tv_channels}] tonight", 0 ); +$v_tv_movies2 = new Voice_Cmd( 'What TV movies are on at [6pm,7pm,8pm,9pm] tonight', 0 ); $v_tv_movies1->set_info( 'Looks for TV shows that are 2-3 hours in length from 6 to 10 pm, on channels:', 0 @@ -25,9 +19,7 @@ 0 ); -$v_tv_shows1 = new Voice_Cmd( - "What TV shows are on channel [$config_parms{favorite_tv_channels}] tonight" -); +$v_tv_shows1 = new Voice_Cmd("What TV shows are on channel [$config_parms{favorite_tv_channels}] tonight"); $v_tv_shows2 = new Voice_Cmd('What TV shows of interest are on today'); $v_tv_shows1->set_info( "Lists all shows on from 6 to 10 pm tonight on channels:$config_parms{favorite_tv_channels}" diff --git a/code/common/viavoice_control.pl b/code/common/viavoice_control.pl index 7914cfdf7..c732c11c2 100644 --- a/code/common/viavoice_control.pl +++ b/code/common/viavoice_control.pl @@ -10,17 +10,9 @@ $v_viavoice_hello->set_info('A dummy little test command'); # Create the viavoice control phrases -$v_viavoice_awake = new Voice_Cmd( - $config_parms{viavoice_awake_phrase}, - $config_parms{viavoice_awake_response}, - 0, 'mh_activate' -); -$v_viavoice_asleep = new Voice_Cmd( - $config_parms{viavoice_asleep_phrase}, - $config_parms{viavoice_asleep_response} -); -$v_viavoice_off = new Voice_Cmd( $config_parms{viavoice_off_phrase}, - 'you want the microphone off', 1 ); +$v_viavoice_awake = new Voice_Cmd($config_parms{viavoice_awake_phrase},$config_parms{viavoice_awake_response},0, 'mh_activate'); +$v_viavoice_asleep = new Voice_Cmd($config_parms{viavoice_asleep_phrase},$config_parms{viavoice_asleep_response}); +$v_viavoice_off = new Voice_Cmd( $config_parms{viavoice_off_phrase},'you want the microphone off', 1 ); # Monitor the Tk button my ( $tk_vr_mode, $tk_vr_mode_prev ); diff --git a/code/common/weather_pollen.pl b/code/common/weather_pollen.pl index 0729cbcf3..e1097ff61 100644 --- a/code/common/weather_pollen.pl +++ b/code/common/weather_pollen.pl @@ -58,9 +58,7 @@ $v_read_pollen_forecast->set_info( "Reads out the previously fetched pollen forecast."); -$p_pollen_forecast = new Process_Item( - "get_url http://www.wunderground.com/DisplayPollen.asp?Zipcode=$config_parms{zip_code} $pollen_file" -); +$p_pollen_forecast = new Process_Item("get_url http://www.wunderground.com/DisplayPollen.asp?Zipcode=$config_parms{zip_code} $pollen_file"); &parse_pollen_forecast if ( ($Reload) && ( -e $pollen_file ) ); diff --git a/code/common/weather_weatherbug.pl b/code/common/weather_weatherbug.pl index ab5d1ef6e..96e5927ae 100755 --- a/code/common/weather_weatherbug.pl +++ b/code/common/weather_weatherbug.pl @@ -118,9 +118,8 @@ $weatherbug_url, 13, 0 ) if ( $Debug{weatherbug} ); - # Define the new process item that fetchs the RSS feed for the location - $p_weather_weatherbug_forecast = new Process_Item( - qq{get_url -quiet "$weatherbug_url" "$weatherbug_file"}); +# Define the new process item that fetchs the RSS feed for the location +$p_weather_weatherbug_forecast = new Process_Item(qq{get_url -quiet "$weatherbug_url" "$weatherbug_file"}); # Need to add a process to search for the citycode $weatherbug_url = @@ -132,9 +131,8 @@ $weatherbug_url, 13, 0 ) if ( $Debug{weatherbug} ); - # Define the new process item that fetchs the RSS feed for the location - $p_weather_weatherbug_citycode = new Process_Item( - qq{get_url -quiet "$weatherbug_url" "$weatherbug_file"}); +# Define the new process item that fetchs the RSS feed for the location +$p_weather_weatherbug_citycode = new Process_Item(qq{get_url -quiet "$weatherbug_url" "$weatherbug_file"}); # Need to add a process to get the live observations # use the lattitude and longitude form if they are available @@ -171,13 +169,12 @@ $weatherbug_url, 13, 0 ) if ( $Debug{weatherbug} ); - # Define the new process item that fetchs the RSS feed for the location - $p_weather_weatherbug_liveweather = new Process_Item( - qq{get_url -quiet "$weatherbug_url" "$weatherbug_obs_file"}); +# Define the new process item that fetchs the RSS feed for the location +$p_weather_weatherbug_liveweather = new Process_Item(qq{get_url -quiet "$weatherbug_url" "$weatherbug_obs_file"}); - # Define the voice commands that are used to get and process the RSS feed - my $weatherbug_states = 'getforecast,LiveWeather,getcitycode,debug'; - $v_weatherbug = new Voice_Cmd("Weatherbug [$weatherbug_states]"); +# Define the voice commands that are used to get and process the RSS feed +my $weatherbug_states = 'getforecast,LiveWeather,getcitycode,debug'; +$v_weatherbug = new Voice_Cmd("Weatherbug [$weatherbug_states]"); # Define the lists of returned conditions by image code # Conditions from wxbug api definition diff --git a/code/examples/Insteon_thermostat.pl b/code/examples/Insteon_thermostat.pl index add1c959c..5d03035e8 100755 --- a/code/examples/Insteon_thermostat.pl +++ b/code/examples/Insteon_thermostat.pl @@ -1,8 +1,6 @@ # Category=HVAC -$v_test_thermostat = new Voice_Cmd( - "Send Thermostat cmd [poll_mode,mode_off,mode_heat,mode_cool,mode_auto,mode_pgm_heat,mode_pgm_cool,mode_pgm_auto,fan_on,fan_auto,poll_temp,poll_setpoint]" -); +$v_test_thermostat = new Voice_Cmd("Send Thermostat cmd [poll_mode,mode_off,mode_heat,mode_cool,mode_auto,mode_pgm_heat,mode_pgm_cool,mode_pgm_auto,fan_on,fan_auto,poll_temp,poll_setpoint]"); # Create the Object in user code: #use Insteon_Thermostat; diff --git a/code/examples/ncpuxa_example.pl b/code/examples/ncpuxa_example.pl index 7c02288f9..410431828 100644 --- a/code/examples/ncpuxa_example.pl +++ b/code/examples/ncpuxa_example.pl @@ -29,8 +29,7 @@ $TV = new IR_Item 'TV', '', 'ncpuxa', \%tvmap; -$v_tv_control = new Voice_Cmd( - "tv [power,on,off,mute,vol+,vol-,ch+,ch-,video1,video2,video3,last,13]"); +$v_tv_control = new Voice_Cmd("tv [power,on,off,mute,vol+,vol-,ch+,ch-,video1,video2,video3,last,13]"); if ( $state = said $v_tv_control) { print_log "Setting TV to $state"; diff --git a/code/examples/ocelot_infrared.pl b/code/examples/ocelot_infrared.pl index d69a6ae69..35aa199dd 100644 --- a/code/examples/ocelot_infrared.pl +++ b/code/examples/ocelot_infrared.pl @@ -126,8 +126,7 @@ $AMP = new IR_Item 'AMP', '', 'ncpuxa', \%ampmap; -$v_amp_control = - new Voice_Cmd("amp [on,off,mute,vol+,vol-,dvd,cd,tv,vcr,tape]"); +$v_amp_control = new Voice_Cmd("amp [on,off,mute,vol+,vol-,dvd,cd,tv,vcr,tape]"); if ( $state = said $v_amp_control) { print_log "Setting AMP to $state"; @@ -168,9 +167,7 @@ $DVD = new IR_Item 'DVD', '', 'ncpuxa', \%dvdmap; -$v_dvd_control = new Voice_Cmd( - "dvd [power,play,pause,stop,chap+,chap-,menu,up,down,left,right,select,rew,ff]" -); +$v_dvd_control = new Voice_Cmd("dvd [power,play,pause,stop,chap+,chap-,menu,up,down,left,right,select,rew,ff]"); if ( $state = said $v_dvd_control) { print_log "Setting DVD to $state"; @@ -208,9 +205,7 @@ $VCR = new IR_Item 'VCR', '', 'ncpuxa', \%vcrmap; -$v_vcr_control = new Voice_Cmd( - "vcr [power,cable,v4,video2,video3,mute,vol+,vol-,ch+,ch-,record,play,pause,stop,ff,rew]" -); +$v_vcr_control = new Voice_Cmd("vcr [power,cable,v4,video2,video3,mute,vol+,vol-,ch+,ch-,record,play,pause,stop,ff,rew]"); if ( $state = said $v_vcr_control) { print_log "Setting VCR to $state"; @@ -257,9 +252,7 @@ $CD = new IR_Item 'CD', '', 'ncpuxa', \%cdmap; -$v_cd_control = new Voice_Cmd( - "cd control [on,off,play,stop,next track,previous track,next disc,previous disc,pause]" -); +$v_cd_control = new Voice_Cmd("cd control [on,off,play,stop,next track,previous track,next disc,previous disc,pause]"); if ( $state = said $v_cd_control) { $state = "disc+" if $state eq 'next disc'; diff --git a/code/examples/socket_test2.pl b/code/examples/socket_test2.pl index 7280bf32c..45955f735 100644 --- a/code/examples/socket_test2.pl +++ b/code/examples/socket_test2.pl @@ -11,8 +11,7 @@ my $client1_address = '192.168.0.2:8084'; $client1 = new Socket_Item( undef, undef, $client1_address ); -$v_test_client1 = new Voice_Cmd( - "Run socket test: [display,speak,run,log,file,use mhsend command]"); +$v_test_client1 = new Voice_Cmd("Run socket test: [display,speak,run,log,file,use mhsend command]"); if ( $state = said $v_test_client1) { print_log "Running client test $state"; diff --git a/code/examples/test_web_styles.pl b/code/examples/test_web_styles.pl index 7debdbbd5..b1e07c9ea 100644 --- a/code/examples/test_web_styles.pl +++ b/code/examples/test_web_styles.pl @@ -1,24 +1,20 @@ # Category=Test -$v_test_dropdown = new Voice_Cmd( - 'Set dropdown thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,78,79,80]' -); +$v_test_dropdown = new Voice_Cmd('Set dropdown thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,78,79,80]'); $v_test_dropdown->set_info('Test of the dropdown widget'); $v_test_dropdown->set_web_style('dropdown'); if ( $state = said $v_test_dropdown) { speak( text => "Dropdown widget changed to $state degrees." ); } -$v_test_radio = new Voice_Cmd( - 'Set radio thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,78,79,80]'); +$v_test_radio = new Voice_Cmd('Set radio thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,78,79,80]'); $v_test_radio->set_info('Test of the radio widget'); $v_test_radio->set_web_style('radio'); if ( $state = said $v_test_radio) { speak( text => "Radio widget changed to $state degrees." ); } -$v_test_url = new Voice_Cmd( - 'Set url thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,78,79,80]'); +$v_test_url = new Voice_Cmd('Set url thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,78,79,80]'); $v_test_url->set_info('Test of the url widget'); $v_test_url->set_web_style('url'); if ( $state = said $v_test_url) { diff --git a/code/examples/x10_preset_dim.pl b/code/examples/x10_preset_dim.pl index 17fce9c4b..329d47132 100644 --- a/code/examples/x10_preset_dim.pl +++ b/code/examples/x10_preset_dim.pl @@ -6,18 +6,13 @@ # - Note: extended codes only work with the CM11 interface and a compatable receiver # like the LM14A/PLM21 2 way X10 pro lamp modules. -$test_light1 = - new X10_Item('O7'); # X10_Item supports relative brightness level states +-## +$test_light1 = new X10_Item('O7'); # X10_Item supports relative brightness level states +-## $test_light2 = new X10_Item( 'O7', 'CM11', 'LM14' ) ; # X10_Lamp supports direct brightness level states ##% # All X10 items support direct preset dim commands &P## (1->64) -$v_test_light1 = new Voice_Cmd( - "Set test light to [on,off,bright,dim,-10,-20,-30,-50,-70,+10,+20,+30,+50,+70,&P3,&P10,&P30,&P40,&P50,&P60]" -); -$v_test_light2 = new Voice_Cmd( - "Set test light to [on,off,bright,dim,2%,4%,5%,10%,20%,30%,40%,50%,60%,70%,80%,90%,&P3,&P10,&P30,&P40,&P50,&P60]" -); +$v_test_light1 = new Voice_Cmd("Set test light to [on,off,bright,dim,-10,-20,-30,-50,-70,+10,+20,+30,+50,+70,&P3,&P10,&P30,&P40,&P50,&P60]"); +$v_test_light2 = new Voice_Cmd("Set test light to [on,off,bright,dim,2%,4%,5%,10%,20%,30%,40%,50%,60%,70%,80%,90%,&P3,&P10,&P30,&P40,&P50,&P60]"); set $test_light1 $state if $state = said $v_test_light1; set $test_light2 $state if $state = said $v_test_light2; diff --git a/code/proxy/proxy_server.pl b/code/proxy/proxy_server.pl index d0022a3e6..fbe873c91 100644 --- a/code/proxy/proxy_server.pl +++ b/code/proxy/proxy_server.pl @@ -22,8 +22,7 @@ =cut -$proxy_server = - new Socket_Item( undef, undef, 'server_proxy', undef, undef, undef, "\035" ); +$proxy_server = new Socket_Item( undef, undef, 'server_proxy', undef, undef, undef, "\035" ); #print '.'; # A heartbeat diff --git a/code/support/hai-omnistat/omnistat.pl b/code/support/hai-omnistat/omnistat.pl index c5cbcd006..c221058b2 100644 --- a/code/support/hai-omnistat/omnistat.pl +++ b/code/support/hai-omnistat/omnistat.pl @@ -68,22 +68,14 @@ my $statidx = " "; $statidx = " $omniname[$omnistat]" if ( $#omnilist > 0 ); - $v_omnistat_fan[$omnistat] = - new Voice_Cmd("Set$statidx Thermostat fan [on,auto,cycle]"); + $v_omnistat_fan[$omnistat] = new Voice_Cmd("Set$statidx Thermostat fan [on,auto,cycle]"); $v_omnistat_resume[$omnistat] = new Voice_Cmd("Resume $statidx Thermostat"); - $v_omnistat_hold[$omnistat] = - new Voice_Cmd("Set$statidx Thermostat hold [on,off,vacation]"); - $v_omnistat_mode[$omnistat] = - new Voice_Cmd("Set$statidx Thermostat mode [off,heat,cool,auto]"); - $v_omnistat_cool_sp[$omnistat] = - new Voice_Cmd("Set$statidx Thermostat cool setpoint to [$temprange]"); - $v_omnistat_heat_sp[$omnistat] = - new Voice_Cmd("Set$statidx Thermostat heat setpoint to [$temprange]"); - $v_omnistat_setting[$omnistat] = - new Voice_Cmd("What is the$statidx thermostat set to"); - $v_omnistat_background[$omnistat] = new Voice_Cmd( - "Set$statidx Thermostat background to [Blue,Green,Purple,Red,Orange,Yellow]" - ); + $v_omnistat_hold[$omnistat] = new Voice_Cmd("Set$statidx Thermostat hold [on,off,vacation]"); + $v_omnistat_mode[$omnistat] = new Voice_Cmd("Set$statidx Thermostat mode [off,heat,cool,auto]"); + $v_omnistat_cool_sp[$omnistat] = new Voice_Cmd("Set$statidx Thermostat cool setpoint to [$temprange]"); + $v_omnistat_heat_sp[$omnistat] = new Voice_Cmd("Set$statidx Thermostat heat setpoint to [$temprange]"); + $v_omnistat_setting[$omnistat] = new Voice_Cmd("What is the$statidx thermostat set to"); + $v_omnistat_background[$omnistat] = new Voice_Cmd("Set$statidx Thermostat background to [Blue,Green,Purple,Red,Orange,Yellow]"); # With these, you can either send # 'Set Thermostat cool setpoint to 68'