From 730a9d199bccb475f93142ff4c56d3d96266d45c Mon Sep 17 00:00:00 2001 From: deespe Date: Tue, 7 Mar 2023 00:57:39 +0000 Subject: [PATCH] 22_HOMEMODE: fixed homebridgeMapping new line issue git-svn-id: https://svn.fhem.de/fhem/trunk@27308 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/22_HOMEMODE.pm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/fhem/FHEM/22_HOMEMODE.pm b/fhem/FHEM/22_HOMEMODE.pm index 67ba74e22..bf8ce857e 100644 --- a/fhem/FHEM/22_HOMEMODE.pm +++ b/fhem/FHEM/22_HOMEMODE.pm @@ -15,7 +15,7 @@ use Time::HiRes qw(gettimeofday); use HttpUtils; use vars qw{%attr %defs %modules $FW_CSRF}; -my $HOMEMODE_version = '1.5.7'; +my $HOMEMODE_version = '1.5.8'; my $HOMEMODE_Daytimes = '05:00|morning 10:00|day 14:00|afternoon 18:00|evening 23:00|night'; my $HOMEMODE_Seasons = '03.01|spring 06.01|summer 09.01|autumn 12.01|winter'; my $HOMEMODE_UserModes = 'gotosleep,awoken,asleep'; @@ -3220,17 +3220,17 @@ sub HOMEMODE_HomebridgeMapping($) my ($hash) = @_; my $name = $hash->{NAME}; my $mapping = 'SecuritySystemCurrentState=alarmState,values=armhome:0;armaway:1;armnight:2;disarm:3;alarm:4'; - $mapping .= '\nSecuritySystemTargetState=modeAlarm,values=armhome:0;armaway:1;armnight:2;disarm:3,cmds=0:modeAlarm+armhome;1:modeAlarm+armaway;2:modeAlarm+armnight;3:modeAlarm+disarm,delay=1'; - $mapping .= '\nSecuritySystemAlarmType=alarmTriggered_ct,values=0:0;/.*/:1'; - $mapping .= '\nOccupancyDetected=presence,values=present:1;absent:0'; - $mapping .= '\nMute=dnd,valueOn=on,cmdOn=dnd+on,cmdOff=dnd+off'; - $mapping .= '\nOn=anyoneElseAtHome,valueOn=on,cmdOn=anyoneElseAtHome+on,cmdOff=anyoneElseAtHome+off'; - $mapping .= '\nContactSensorState=contactsOutsideOpen_ct,values=0:0;/.*/:1' if (HOMEMODE_ID($name,undef,'contactsOutsideOpen_ct')); - $mapping .= '\nStatusTampered=sensorsTampered_ct,values=0:0;/.*/:1' if (HOMEMODE_ID($name,undef,'sensorsTampered_ct')); - $mapping .= '\nMotionDetected=motionsInside_ct,values=0:0;/.*/:1' if (HOMEMODE_ID($name,undef,'motionsInside_ct')); - $mapping .= '\nStatusLowBattery=batteryLow_ct,values=0:0;/.*/:1' if (HOMEMODE_ID($name,undef,'batteryLow_ct')); - $mapping .= '\nSmokeDetected=alarmSmoke_ct,values=0:0;/.*/:1' if (HOMEMODE_ID($name,undef,'alarmSmoke_ct')); - $mapping .= '\nAirPressure=pressure' if (HOMEMODE_ID($name,undef,'pressure')); + $mapping .= "\nSecuritySystemTargetState=modeAlarm,values=armhome:0;armaway:1;armnight:2;disarm:3,cmds=0:modeAlarm+armhome;1:modeAlarm+armaway;2:modeAlarm+armnight;3:modeAlarm+disarm,delay=1"; + $mapping .= "\nSecuritySystemAlarmType=alarmTriggered_ct,values=0:0;/.*/:1"; + $mapping .= "\nOccupancyDetected=presence,values=present:1;absent:0"; + $mapping .= "\nMute=dnd,valueOn=on,cmdOn=dnd+on,cmdOff=dnd+off"; + $mapping .= "\nOn=anyoneElseAtHome,valueOn=on,cmdOn=anyoneElseAtHome+on,cmdOff=anyoneElseAtHome+off"; + $mapping .= "\nContactSensorState=contactsOutsideOpen_ct,values=0:0;/.*/:1" if (HOMEMODE_ID($name,undef,'contactsOutsideOpen_ct')); + $mapping .= "\nStatusTampered=sensorsTampered_ct,values=0:0;/.*/:1" if (HOMEMODE_ID($name,undef,'sensorsTampered_ct')); + $mapping .= "\nMotionDetected=motionsInside_ct,values=0:0;/.*/:1" if (HOMEMODE_ID($name,undef,'motionsInside_ct')); + $mapping .= "\nStatusLowBattery=batteryLow_ct,values=0:0;/.*/:1" if (HOMEMODE_ID($name,undef,'batteryLow_ct')); + $mapping .= "\nSmokeDetected=alarmSmoke_ct,values=0:0;/.*/:1" if (HOMEMODE_ID($name,undef,'alarmSmoke_ct')); + $mapping .= "\nAirPressure=pressure" if (HOMEMODE_ID($name,undef,'pressure')); addToDevAttrList($name,'genericDeviceType') if (!grep /^genericDeviceType/,split(' ',AttrVal('global','userattr',''))); addToDevAttrList($name,'homebridgeMapping:textField-long') if (!grep /^homebridgeMapping/,split(' ',AttrVal('global','userattr',''))); CommandAttr(undef,"$name genericDeviceType security");