diff --git a/fhem/test/fhem.cfg b/fhem/test/fhem.cfg index 2be72697d..36f0911d8 100644 --- a/fhem/test/fhem.cfg +++ b/fhem/test/fhem.cfg @@ -1,8 +1,9 @@ -logfile - -port 7072 global -verbose 3 -savefile test/fhem.save -modpath . +attr global logfile - +attr global port 7072 global +attr global verbose 3 +attr global statefile test/fhem.save +attr global modpath . + define FHZ FHZ none define floor-lamp FS20 1234 00 @@ -23,4 +24,4 @@ define fllog FileLog /tmp/fhem/test/fl-%Y-%U.log fl:.*(temp|actuator).* define wzlog FileLog /tmp/fhem/test/wz-%Y-%U.log wz:.*(temp|actuator).* define outlog FileLog /tmp/fhem/test/out-%Y-%U.log out1:.*(H:).* -notifyon btn4 /usr/local/bin/shared/setroll "%" +define n_btn4 notify btn4 /usr/local/bin/shared/setroll "%" diff --git a/fhem/test/fhem.save b/fhem/test/fhem.save index da5802054..cbbcaf519 100644 --- a/fhem/test/fhem.save +++ b/fhem/test/fhem.save @@ -1,70 +1,71 @@ -#Thu Feb 8 15:09:20 2007 +#Sat Apr 14 10:31:43 2007 setstate FHZ fhtbuf: 1c -setstate FHZ 2006-02-12 14:03:39 fhtbuf 23 -setstate FHZ 2006-03-26 08:47:36 init2 deadbeefdeadbe -setstate FHZ 2006-03-26 08:47:36 serial deadbeef +setstate FHZ 2006-02-12 14:03:39 fhtbuf 23 +setstate FHZ 2006-03-26 08:47:36 init2 deadbeefdeadbe +setstate FHZ 2006-03-26 08:47:36 serial deadbeef setstate btn4 on -setstate btn4 2006-04-12 15:19:33 on +setstate btn4 2006-04-12 15:19:33 state on setstate cellar ??? setstate fl measured-temp: 21.6 (Celsius) -setstate fl 2006-03-29 23:02:30 actuator 00% -setstate fl 2006-03-26 08:50:43 mon-from1 06:00 -setstate fl 2006-03-26 08:50:43 mon-to1 23:00 -setstate fl 2006-03-26 08:50:45 tue-from1 06:00 -setstate fl 2006-03-26 08:50:45 tue-to1 23:00 -setstate fl 2006-03-26 08:50:46 wed-from1 06:00 -setstate fl 2006-03-26 08:50:46 wed-to1 23:00 -setstate fl 2006-03-26 08:50:47 thu-from1 06:00 -setstate fl 2006-03-26 08:50:48 thu-to1 23:00 -setstate fl 2006-03-26 08:50:49 fri-from1 06:00 -setstate fl 2006-03-26 08:50:49 fri-to1 23:50 -setstate fl 2006-03-26 08:50:50 sat-from1 08:00 -setstate fl 2006-03-26 08:50:51 sat-to1 23:50 -setstate fl 2006-03-26 08:50:53 sun-from1 08:00 -setstate fl 2006-03-26 08:50:53 sun-to1 23:00 -setstate fl 2006-03-26 08:50:57 mode auto -setstate fl 2006-03-29 23:01:06 desired-temp 18.0 (Celsius) -setstate fl 2006-03-29 23:04:28 state Bat: ok, Window: closed -setstate fl 2006-03-26 08:48:48 init 255 -setstate fl 2006-03-26 08:50:54 day-temp 21.5 (Celsius) -setstate fl 2006-03-26 08:50:54 night-temp 18.0 (Celsius) -setstate fl 2006-03-26 08:50:55 unknown_85 4 -setstate fl 2006-03-26 08:50:55 windowopen-temp 12.0 (Celsius) -setstate fl 2006-03-29 23:04:27 measured-temp 21.6 (Celsius) +setstate fl 2006-03-29 23:02:30 actuator 00% +setstate fl 2006-03-26 08:50:54 day-temp 21.5 (Celsius) +setstate fl 2006-03-29 23:01:06 desired-temp 18.0 (Celsius) +setstate fl 2006-03-26 08:50:49 fri-from1 06:00 +setstate fl 2006-03-26 08:50:49 fri-to1 23:50 +setstate fl 2006-03-26 08:48:48 init 255 +setstate fl 2006-03-29 23:04:27 measured-temp 21.6 (Celsius) +setstate fl 2006-03-26 08:50:57 mode auto +setstate fl 2006-03-26 08:50:43 mon-from1 06:00 +setstate fl 2006-03-26 08:50:43 mon-to1 23:00 +setstate fl 2006-03-26 08:50:54 night-temp 18.0 (Celsius) +setstate fl 2006-03-26 08:50:50 sat-from1 08:00 +setstate fl 2006-03-26 08:50:51 sat-to1 23:50 +setstate fl 2006-03-29 23:04:28 state Bat: ok, Window: closed +setstate fl 2006-03-26 08:50:53 sun-from1 08:00 +setstate fl 2006-03-26 08:50:53 sun-to1 23:00 +setstate fl 2006-03-26 08:50:47 thu-from1 06:00 +setstate fl 2006-03-26 08:50:48 thu-to1 23:00 +setstate fl 2006-03-26 08:50:45 tue-from1 06:00 +setstate fl 2006-03-26 08:50:45 tue-to1 23:00 +setstate fl 2006-03-26 08:50:55 unknown_85 4 +setstate fl 2006-03-26 08:50:46 wed-from1 06:00 +setstate fl 2006-03-26 08:50:46 wed-to1 23:00 +setstate fl 2006-03-26 08:50:55 windowopen-temp 12.0 (Celsius) setstate floor-lamp on -setstate floor-lamp 2006-03-29 12:05:34 on +setstate floor-lamp 2006-03-29 12:05:34 state on +setstate global setstate marqee on -setstate marqee 2006-04-01 12:46:02 on +setstate marqee 2006-04-01 12:46:02 state on +setstate n_btn4 active setstate tf1 T: 20.3 H: 31.3 Bat: ok -setstate tf1 2006-04-11 09:48:48 battery Bat: ok -setstate tf1 2006-04-11 09:48:48 type HMS100TF -setstate tf1 2006-04-11 09:48:48 humidity 31.3 (%) -setstate tf1 2006-04-11 09:48:48 temperature 20.3 (Celsius) +setstate tf1 2006-04-11 09:48:48 battery Bat: ok +setstate tf1 2006-04-11 09:48:48 humidity 31.3 (%) +setstate tf1 2006-04-11 09:48:48 temperature 20.3 (Celsius) +setstate tf1 2006-04-11 09:48:48 type HMS100TF setstate window-lamp on -setstate window-lamp 2006-03-29 12:05:34 on +setstate window-lamp 2006-03-29 12:05:34 state on setstate wz measured-temp: 22.4 (Celsius) -setstate wz 2006-03-29 23:04:17 actuator 00% -setstate wz 2006-03-26 08:50:33 mon-from1 06:00 -setstate wz 2006-03-26 08:50:33 mon-to1 23:00 -setstate wz 2006-03-26 08:50:34 tue-from1 06:00 -setstate wz 2006-03-26 08:50:35 tue-to1 23:00 -setstate wz 2006-03-26 08:50:36 wed-from1 06:00 -setstate wz 2006-03-26 08:50:36 wed-to1 23:00 -setstate wz 2006-03-26 08:50:37 thu-from1 06:00 -setstate wz 2006-03-26 08:50:37 thu-to1 23:00 -setstate wz 2006-03-26 08:50:39 fri-from1 06:00 -setstate wz 2006-03-26 08:50:39 fri-to1 23:50 -setstate wz 2006-03-26 08:50:40 sat-from1 06:00 -setstate wz 2006-03-26 08:50:40 sat-to1 23:50 -setstate wz 2006-03-26 08:52:29 sun-from1 06:00 -setstate wz 2006-03-26 08:52:29 sun-to1 23:00 -setstate wz 2006-03-26 08:52:33 mode auto -setstate wz 2006-03-29 23:02:48 desired-temp 18.0 (Celsius) -setstate wz 2006-03-29 22:54:38 state Bat: ok, Window: closed -setstate wz 2006-03-26 08:48:38 init 255 -setstate wz 2006-03-26 08:52:30 day-temp 22.0 (Celsius) -setstate wz 2006-03-26 08:52:31 night-temp 18.0 (Celsius) -setstate wz 2006-03-26 08:52:31 unknown_85 4 -setstate wz 2006-03-26 08:52:31 windowopen-temp 12.0 (Celsius) -setstate wz 2006-03-29 22:54:38 measured-temp 22.4 (Celsius) -at *04:00:00 set wz refreshvalues +setstate wz 2006-03-29 23:04:17 actuator 00% +setstate wz 2006-03-26 08:52:30 day-temp 22.0 (Celsius) +setstate wz 2006-03-29 23:02:48 desired-temp 18.0 (Celsius) +setstate wz 2006-03-26 08:50:39 fri-from1 06:00 +setstate wz 2006-03-26 08:50:39 fri-to1 23:50 +setstate wz 2006-03-26 08:48:38 init 255 +setstate wz 2006-03-29 22:54:38 measured-temp 22.4 (Celsius) +setstate wz 2006-03-26 08:52:33 mode auto +setstate wz 2006-03-26 08:50:33 mon-from1 06:00 +setstate wz 2006-03-26 08:50:33 mon-to1 23:00 +setstate wz 2006-03-26 08:52:31 night-temp 18.0 (Celsius) +setstate wz 2006-03-26 08:50:40 sat-from1 06:00 +setstate wz 2006-03-26 08:50:40 sat-to1 23:50 +setstate wz 2006-03-29 22:54:38 state Bat: ok, Window: closed +setstate wz 2006-03-26 08:52:29 sun-from1 06:00 +setstate wz 2006-03-26 08:52:29 sun-to1 23:00 +setstate wz 2006-03-26 08:50:37 thu-from1 06:00 +setstate wz 2006-03-26 08:50:37 thu-to1 23:00 +setstate wz 2006-03-26 08:50:34 tue-from1 06:00 +setstate wz 2006-03-26 08:50:35 tue-to1 23:00 +setstate wz 2006-03-26 08:52:31 unknown_85 4 +setstate wz 2006-03-26 08:50:36 wed-from1 06:00 +setstate wz 2006-03-26 08:50:36 wed-to1 23:00 +setstate wz 2006-03-26 08:52:31 windowopen-temp 12.0 (Celsius) diff --git a/fhem/test/fhem_small.cfg b/fhem/test/fhem_small.cfg index fdbeedf4e..b1954574b 100644 --- a/fhem/test/fhem_small.cfg +++ b/fhem/test/fhem_small.cfg @@ -1,10 +1,10 @@ -logfile - -port 7072 -verbose 3 -savefile test/fhem_small.save -modpath . +attr global logfile - +attr global port 7072 +attr global verbose 3 +attr global statefile test/fhem_small.save +attr global modpath . +attr global pidfilename test/fhz.pid define FHZ FHZ none -pidfile test/fhz.pid define floor-lamp FS20 1234 00 define window-lamps FS20 1234 01 @@ -18,4 +18,4 @@ define tf1 HMS 1237 # The path must be abolute, else it won't work in the fhemweb.pl display define wzlog FileLog /tmp/fhem-2.1/test/wz-%Y-%U.log wz:.*(temp|actuator).* -notifyon btn4 /usr/local/bin/shared/setroll "%" +define n_btn4 notify btn4 /usr/local/bin/shared/setroll "%" diff --git a/fhem/test/fhem_small.save b/fhem/test/fhem_small.save index fe03346ed..c67dad2c7 100644 --- a/fhem/test/fhem_small.save +++ b/fhem/test/fhem_small.save @@ -1,37 +1,39 @@ -#Fri Jan 26 10:49:05 2007 -setstate FHZ fhtbuf: 1c +#Sat Apr 14 10:33:04 2007 +setstate FHZ Initialized setstate btn4 off -setstate btn4 2006-04-15 11:46:39 off +setstate btn4 2006-04-15 11:46:39 state off setstate cellar-lamp on -setstate cellar-lamp 2006-03-29 12:05:34 on +setstate cellar-lamp 2006-03-29 12:05:34 state on setstate floor-lamp on -setstate floor-lamp 2007-01-26 10:40:17 on +setstate floor-lamp 2007-01-26 10:40:17 state on +setstate global +setstate n_btn4 active setstate tf1 HMS100TF: T: 20.3°C, H: 31.3%, Bat: ok -setstate tf1 2006-04-11 09:48:48 HMS100TF T: 20.3°C, H: 31.3%, Bat: ok +setstate tf1 2006-04-11 09:48:48 HMS100TF T: 20.3°C, H: 31.3%, Bat: ok setstate window-lamps on -setstate window-lamps 2006-03-29 12:05:34 on +setstate window-lamps 2006-03-29 12:05:34 state on setstate wz measured-temp: 22.4 (Celsius) -setstate wz 2006-03-29 23:04:17 actuator 00% -setstate wz 2006-03-26 08:50:33 mon-from1 06:00 -setstate wz 2006-03-26 08:50:33 mon-to1 23:00 -setstate wz 2006-03-26 08:50:34 tue-from1 06:00 -setstate wz 2006-03-26 08:50:35 tue-to1 23:00 -setstate wz 2006-03-26 08:50:36 wed-from1 06:00 -setstate wz 2006-03-26 08:50:36 wed-to1 23:00 -setstate wz 2006-03-26 08:50:37 thu-from1 06:00 -setstate wz 2006-03-26 08:50:37 thu-to1 23:00 -setstate wz 2006-03-26 08:50:39 fri-from1 06:00 -setstate wz 2006-03-26 08:50:39 fri-to1 23:50 -setstate wz 2006-03-26 08:50:40 sat-from1 06:00 -setstate wz 2006-03-26 08:50:40 sat-to1 23:50 -setstate wz 2006-03-26 08:52:29 sun-from1 06:00 -setstate wz 2006-03-26 08:52:29 sun-to1 23:00 -setstate wz 2006-03-26 08:52:33 mode auto -setstate wz 2006-03-29 23:02:48 desired-temp 18.0 (Celsius) -setstate wz 2006-03-29 22:54:38 state Bat: ok, Window: closed -setstate wz 2006-03-26 08:48:38 init 255 -setstate wz 2006-03-26 08:52:30 day-temp 22.0 (Celsius) -setstate wz 2006-03-26 08:52:31 night-temp 18.0 (Celsius) -setstate wz 2006-03-26 08:52:31 unknown_85 4 -setstate wz 2006-03-26 08:52:31 windowopen-temp 12.0 (Celsius) -setstate wz 2006-03-29 22:54:38 measured-temp 22.4 (Celsius) +setstate wz 2006-03-29 23:04:17 actuator 00% +setstate wz 2006-03-26 08:52:30 day-temp 22.0 (Celsius) +setstate wz 2006-03-29 23:02:48 desired-temp 18.0 (Celsius) +setstate wz 2006-03-26 08:50:39 fri-from1 06:00 +setstate wz 2006-03-26 08:50:39 fri-to1 23:50 +setstate wz 2006-03-26 08:48:38 init 255 +setstate wz 2006-03-29 22:54:38 measured-temp 22.4 (Celsius) +setstate wz 2006-03-26 08:52:33 mode auto +setstate wz 2006-03-26 08:50:33 mon-from1 06:00 +setstate wz 2006-03-26 08:50:33 mon-to1 23:00 +setstate wz 2006-03-26 08:52:31 night-temp 18.0 (Celsius) +setstate wz 2006-03-26 08:50:40 sat-from1 06:00 +setstate wz 2006-03-26 08:50:40 sat-to1 23:50 +setstate wz 2006-03-29 22:54:38 state Bat: ok, Window: closed +setstate wz 2006-03-26 08:52:29 sun-from1 06:00 +setstate wz 2006-03-26 08:52:29 sun-to1 23:00 +setstate wz 2006-03-26 08:50:37 thu-from1 06:00 +setstate wz 2006-03-26 08:50:37 thu-to1 23:00 +setstate wz 2006-03-26 08:50:34 tue-from1 06:00 +setstate wz 2006-03-26 08:50:35 tue-to1 23:00 +setstate wz 2006-03-26 08:52:31 unknown_85 4 +setstate wz 2006-03-26 08:50:36 wed-from1 06:00 +setstate wz 2006-03-26 08:50:36 wed-to1 23:00 +setstate wz 2006-03-26 08:52:31 windowopen-temp 12.0 (Celsius)