gitarre

diff --git a/Griesstatt/fhem.cfg b/Griesstatt/fhem.cfg
index ea9332c..938dd34 100644 (file)
--- a/Griesstatt/fhem.cfg
+++ b/Griesstatt/fhem.cfg
@@ -1,80 +1,57 @@
-attr global userattr cmdIcon devStateIcon devStateIcon:textField-long devStateStyle icon sortby webCmd webCmdLabel:textField-long widgetOverride
+attr global userattr cmdIcon devStateIcon:textField-long devStateStyle fp_Haus icon sortby webCmd webCmdLabel:textField-long widgetOverride
 attr global autoload_undefined_devices 1
-attr global autosave 0
 attr global logfile ./log/fhem-%Y-%m.log
 attr global modpath .
-attr global motd Messages collected while initializing FHEM:\
-configfile: telnetPort already defined, delete it first\
-\
-Autosave deactivated
 attr global statefile ./log/fhem.save
 attr global verbose 3
 
 define WEB FHEMWEB 8083 global
-setuuid WEB 5d07a041-f33f-d703-bb00-f5a252e8b7a1a442
+setuuid WEB 666a04e7-f33f-4e10-de28-693ca796d799d8ed
 attr WEB editConfig 1
-define allowed_WEB allowed
-setuuid allowed_WEB 5d07a041-f33f-d703-11a1-1b4c3372df08fe0f
-attr allowed_WEB basicAuth cmFpbmVyOkZpbmtlbndlZzU=
-attr allowed_WEB validFor WEB
 
 # Fake FileLog entry, to access the fhem log from FHEMWEB 
-define Logfile FileLog ./log/fhem-%Y-%m.log fakelog
-setuuid Logfile 5d07a041-f33f-d703-9c49-a9ebbdff8eb16730
+define Logfile FileLog ./log/fhem-%Y-%m.log Logfile
+setuuid Logfile 666a04e7-f33f-4e10-6ab3-94823e74f33f912e
 
 define autocreate autocreate
-setuuid autocreate 5d07a041-f33f-d703-e88f-8ceeb477d5e04772
+setuuid autocreate 666a04e7-f33f-4e10-4f89-a059722ddd8cca3f
 attr autocreate filelog ./log/%NAME-%Y.log
 
 define eventTypes eventTypes ./log/eventTypes.txt
-setuuid eventTypes 5d07a041-f33f-d703-e43c-930c656ddea2cd5a
+setuuid eventTypes 666a04e7-f33f-4e10-fd23-f7821c69255f44b5
 
 # Disable this to avoid looking for new USB devices on startup
-define initialUsbCheck notify global:INITIALIZED usb create
-setuuid initialUsbCheck 5d07a041-f33f-d703-f259-0751a20adc04fee2
-define KNX TUL tul:/dev/ttyACM0@57600 1.1.255
-setuuid KNX 5d07a18b-f33f-d703-97fe-8c0cc64740b9ed0b
-define KNX_0000003 KNX 0/0/3:dpt9.001
-setuuid KNX_0000003 5d07a2ce-f33f-d703-92d0-f28f6329df06b1bd
-attr KNX_0000003 IODev KNX
-attr KNX_0000003 alias WohnzimmerTemp
-attr KNX_0000003 room KNX,Temperaturen
-define FileLog_KNX_0000003 FileLog ./log/KNX_0000003-%m.%Y.log KNX_0000003
-setuuid FileLog_KNX_0000003 5d07a3fa-f33f-d703-dea3-fe2cadc45a732339
-attr FileLog_KNX_0000003 logtype text
-attr FileLog_KNX_0000003 room KNX
+#define initialUsbCheck notify global:INITIALIZED usb create
+#setuuid initialUsbCheck 666a04e7-f33f-4e10-c59c-4ce1cf81a6556aa2
+
+# Web-PW
+define allowed_WEB allowed
+setuuid allowed_WEB 667be596-f33f-4e10-0dd6-57f6d00c48dd26ad
+attr allowed_WEB basicAuth SHA256:39FBC4B8:w18RiLACYUKck2+SsoMqeZmiykhYteHJNeDn948hPTg
+attr allowed_WEB validFor WEB
+
+# KNX
+define myKNXGW KNXIO T 127.0.0.1:6720 0.0.51
+setuuid myKNXGW 667bee54-f33f-4e10-c68c-f990b74d0aa9edad
 define KNX_0000001 KNX 0/0/1:dpt6
-setuuid KNX_0000001 5d07a446-f33f-d703-512c-cdd3a079a055c862
-attr KNX_0000001 IODev KNX
+setuuid KNX_0000001 667bf1c2-f33f-4e10-4a68-5aa6b0fe46ac3188
+attr KNX_0000001 alias Heizregler_WZ
 attr KNX_0000001 room KNX
 define KNX_0000002 KNX 0/0/2:dpt9
-setuuid KNX_0000002 5d07a44c-f33f-d703-ce64-672cadeabf414018
-attr KNX_0000002 IODev KNX
+setuuid KNX_0000002 667bf1ef-f33f-4e10-cdc4-b66f8b515573dd93
 attr KNX_0000002 room KNX
-define FileLog_KNX_0000001 FileLog ./log/KNX_0000001-%Y.log KNX_0000001
-setuuid FileLog_KNX_0000001 5d07a44c-f33f-d703-6fee-cbbab18f34c5eb89
-attr FileLog_KNX_0000001 logtype text
-attr FileLog_KNX_0000001 room KNX
 define KNX_LED2 KNX 0/1/2:dpt1.001
-setuuid KNX_LED2 5d07b290-f33f-d703-f038-0ddf855521469d08
-attr KNX_LED2 IODev KNX
+setuuid KNX_LED2 667bf209-f33f-4e10-e7ee-7034096e298f128f
 attr KNX_LED2 room KNX
 define KNX_LED3 KNX 0/1/3:dpt1.001
-setuuid KNX_LED3 5d07b298-f33f-d703-5783-d5d6fb7d3b39a5ff
-attr KNX_LED3 IODev KNX
+setuuid KNX_LED3 667bf21e-f33f-4e10-f087-5a6307a16dd8296e
 attr KNX_LED3 room KNX
 define KNX_LED4 KNX 0/1/4:dpt1.001
-setuuid KNX_LED4 5d07b2a2-f33f-d703-7018-de5d38adf8813077
-attr KNX_LED4 IODev KNX
+setuuid KNX_LED4 667bf232-f33f-4e10-f2fb-fe17343cbed619b1
 attr KNX_LED4 room KNX
 define KNX_LED1 KNX 0/1/1:dpt1.001
-setuuid KNX_LED1 5d07b2c5-f33f-d703-9842-8a48f65177f4c666
-attr KNX_LED1 IODev KNX
+setuuid KNX_LED1 667bf246-f33f-4e10-e905-80ae0a07b5cdc77c
 attr KNX_LED1 room KNX
-define FileLog_KNX_0000002 FileLog ./log/KNX_0000002-%Y.log KNX_0000002
-setuuid FileLog_KNX_0000002 5d07b42b-f33f-d703-fcc1-a4ef9876715dea5f
-attr FileLog_KNX_0000002 logtype text
-attr FileLog_KNX_0000002 room KNX
 define KNX_0000002_notify_1 notify KNX_0000001:getG1:..* \
 \
 { \
@@ -96,68 +73,58 @@ fhem("set KNX_LED4 g1 on") if ($heizstatus == 4);;\
 Log 1, "LED set";;\
 }\
 
-setuuid KNX_0000002_notify_1 5d07f609-f33f-d703-d7ab-35661dde8ebe4b02
-define KNX_0003188 KNX 0/3/188:MODEL_NOT_DEFINED
-setuuid KNX_0003188 5d08b7d7-f33f-d703-97e6-db5c03954880ba87
-attr KNX_0003188 IODev KNX
-attr KNX_0003188 disable 1
-attr KNX_0003188 room KNX
-define FileLog_KNX_0003188 FileLog ./log/KNX_0003188-%Y.log KNX_0003188
-setuuid FileLog_KNX_0003188 5d08b7d7-f33f-d703-edc8-4501566baeec6d7c
-attr FileLog_KNX_0003188 logtype text
-attr FileLog_KNX_0003188 room KNX
-define telnetPort telnet 7072 global
-setuuid telnetPort 5df68b4a-f33f-d703-4f7b-cb3742bcd8220943
-define KNX_0101001 KNX 1/1/1:MODEL_NOT_DEFINED
-setuuid KNX_0101001 5df750fa-f33f-d703-57ed-626773e098172585
-attr KNX_0101001 IODev KNX
-attr KNX_0101001 disable 1
-attr KNX_0101001 room KNX
-define KNX_0101251 KNX 1/1/251:MODEL_NOT_DEFINED
-setuuid KNX_0101251 5df750fb-f33f-d703-275b-08f7293994ac2a5b
-attr KNX_0101251 IODev KNX
-attr KNX_0101251 disable 1
-attr KNX_0101251 room KNX
-define FileLog_KNX_0101251 FileLog ./log/KNX_0101251-%Y.log KNX_0101251
-setuuid FileLog_KNX_0101251 5df7510a-f33f-d703-300a-b5d2b3feac1ff427
-attr FileLog_KNX_0101251 logtype text
-attr FileLog_KNX_0101251 room KNX
-define FileLog_KNX_0101001 FileLog ./log/KNX_0101001-%Y.log KNX_0101001
-setuuid FileLog_KNX_0101001 5df7510a-f33f-d703-339d-f373f346f95fa05f
-attr FileLog_KNX_0101001 logtype text
-attr FileLog_KNX_0101001 room KNX
-define KNX_0002000 KNX 0/2/0:MODEL_NOT_DEFINED
-setuuid KNX_0002000 5e0914c6-f33f-d703-414e-1b22ae4fea94f8f0
-attr KNX_0002000 IODev KNX
-attr KNX_0002000 disable 1
-attr KNX_0002000 room KNX
-define FileLog_KNX_0002000 FileLog ./log/KNX_0002000-%Y.log KNX_0002000
-setuuid FileLog_KNX_0002000 5e0914c6-f33f-d703-1198-69f7ab329b56fd83
-attr FileLog_KNX_0002000 logtype text
-attr FileLog_KNX_0002000 room KNX
-
-# include from xfhem package
-include wagnertech.cfg
-define watchdog at +*00:10:00 "/usr/share/sysal/bin/triggerWatchdog_REST http://wagnertech.de/sysal/rest rwd-picolo picolo"
-setuuid watchdog 5e729c61-f33f-d703-0550-ba440a71a6afda79
+setuuid KNX_0000002_notify_1 667bf292-f33f-4e10-2b3b-3f9841723e42b3f4
 define RPiMaster RPI_1Wire BUSMASTER
-setuuid RPiMaster 654a38fa-f33f-d703-f38c-a3dc2297e7b995d6
+setuuid RPiMaster 667bf5d0-f33f-4e10-4d77-64c4890249bcdab5
 define Zimmer1Temp RPI_1Wire 28-00000a54cd2a
-setuuid Zimmer1Temp 654a7665-f33f-d703-cfe8-494db38bfeecea44
-attr Zimmer1Temp room RPI_1Wire,Temperaturen
+setuuid Zimmer1Temp 667bf5e1-f33f-4e10-fcc8-2d4cb9fd693370d8
 define KNX_0002003 KNX 0/2/3:dpt9.001
-setuuid KNX_0002003 656641be-f33f-d703-7a08-ca62fcd333a7516a
-attr KNX_0002003 IODev KNX
+setuuid KNX_0002003 667bf97e-f33f-4e10-2e4a-457cddde355b1312
 attr KNX_0002003 alias MZimmerTemp
 attr KNX_0002003 room KNX
-define KNX_0002004 KNX 0/2/4:dpt6
-setuuid KNX_0002004 6566561b-f33f-d703-ce4e-c9c35d16d0d2f43b
-attr KNX_0002004 IODev KNX
-attr KNX_0002004 room KNX
+define Heizregler_GZ KNX 0/2/4:dpt6
+setuuid Heizregler_GZ 667bf9aa-f33f-4e10-0eaf-dac3d2b790b8c764
+attr Heizregler_GZ room KNX
+define Z1TempSetter at +*00:03:00 set KNX_0002003 g1 {(ReadingsNum("Zimmer1Temp","temperature",0))}
+setuuid Z1TempSetter 667bf9d1-f33f-4e10-1a50-1b27edc908be5185
+attr Z1TempSetter room KNX
+define KNX_0000003 KNX 0/0/3:dpt9.001
+setuuid KNX_0000003 667c0d0b-f33f-4e10-8c84-955b7b2cc0eb81b4
+attr KNX_0000003 alias WohnzimmerTemp
+define rg_Griesstatt readingsGroup <%on@blue>,<Status>,<Extra>,<>\
+KNX_0000001:state,state@BoostWZ,state@KNX_0000003\
+Heizregler_GZ:state,state@BoostUZ,temperature@Zimmer1Temp\
+
+setuuid rg_Griesstatt 668ce488-f33f-4e10-44f7-78bacb2d8842eb5a
+attr rg_Griesstatt commands {\
+ "state.AN"=>"set %DEVICE AUS",\
+ "state.AUS"=>"set %DEVICE AN",\
+ "state.4"=>"set %DEVICE 2",\
+ "state.2"=>"set %DEVICE 4"\
+}
+attr rg_Griesstatt fp_Haus 50,200,1
+attr rg_Griesstatt room Haus
+attr rg_Griesstatt valueFormat {"temperature"=> "%.2f"}
+attr rg_Griesstatt valueIcon {\
+ 'state.AUS' => 'off@black',\
+ 'state.AN' => 'on@red',\
+ 'state.4' => 'off@black',\
+ 'state.2' => 'on@red'\
+}
+attr rg_Griesstatt valueSuffix {"temperature"=>" °C"}
 define KNX_0002002 KNX 0/2/2:MODEL_NOT_DEFINED
-setuuid KNX_0002002 656658a8-f33f-d703-fcb2-0547e4c2c7d72cc4
+setuuid KNX_0002002 668ce4f9-f33f-4e10-785f-01812b86d138ebc4
 attr KNX_0002002 disable 1
 attr KNX_0002002 room KNX
-define Z1TempSetter at +*00:03:00 set KNX_0002003 g1 {(ReadingsNum("Zimmer1Temp","temperature",0))}
-setuuid Z1TempSetter 656e11f7-f33f-d703-98d3-b892c1812275b7f7
-attr Z1TempSetter room KNX
+define Haus FLOORPLAN
+setuuid Haus 668ce89d-f33f-4e10-5507-b2f4269398afd4c7
+attr Haus fp_arrange 0
+attr Haus fp_default 1
+attr Haus fp_noMenu 1
+attr Haus stylesheet defaultfloorplanstyle.css
+define BoostWZ dummy
+setuuid BoostWZ 668ceca6-f33f-4e10-843e-f639b1cd2f62923f
+attr BoostWZ devStateIcon AUS:off@black:AN AN:on@red:AUS
+define BoostUZ dummy
+setuuid BoostUZ 668cee5e-f33f-4e10-26fa-884cc1c6ae9c8a0c
+attr BoostUZ devStateIcon AUS:off@black:AN AN:on@red:AUS