From 640bcb03b0332fa9c50911f2f4a53ab5ca1c4886 Mon Sep 17 00:00:00 2001
From: Beta-User <>
Date: Wed, 13 Oct 2021 04:26:30 +0000
Subject: [PATCH] 59_Twilight: remove NOTIFYDEF when DEF changes, #123375

git-svn-id: https://svn.fhem.de/fhem/trunk@25067 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/59_Twilight.pm                  | 5 +++--
 fhem/FHEM/lib/AttrTemplate/zwave.template | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fhem/FHEM/59_Twilight.pm b/fhem/FHEM/59_Twilight.pm
index 27ec3218a..8562f7c10 100644
--- a/fhem/FHEM/59_Twilight.pm
+++ b/fhem/FHEM/59_Twilight.pm
@@ -116,12 +116,13 @@ sub Twilight_Define {
     my $href = shift;
     return if !defined $aref && !defined $href;
 
-    return $@ unless ( FHEM::Meta::SetInternals($hash) );
+    return $@ if !FHEM::Meta::SetInternals($hash);
 
     return 'syntax: define <name> Twilight [<latitude> <longitude>] [indoorHorizon=... ] [weatherDevice=<device:reading>]'
       if int(@$aref) < 2 || int(@$aref) > 6;
 
     my $DEFmayChange = int(@$aref) == 6 ? 1 : 0;
+    notifyRegexpChanged( $hash, q{} );
 
     my $weather = q{none};
     $weather = pop @$aref if int(@$aref) == 6 || int(@$aref) == 4 && !looks_like_number($$aref[3]);
@@ -177,7 +178,7 @@ sub Twilight_Undef {
 
     deleteAllRegIntTimer($hash);
 
-    notifyRegexpChanged( $hash, "" );
+    notifyRegexpChanged( $hash, q{} );
     for my $key ( keys %{ $hash->{helper}{extWeather} } ) {
         delete $hash->{helper}{extWeather}{$key};
     }
diff --git a/fhem/FHEM/lib/AttrTemplate/zwave.template b/fhem/FHEM/lib/AttrTemplate/zwave.template
index a468344c0..180f3f803 100644
--- a/fhem/FHEM/lib/AttrTemplate/zwave.template
+++ b/fhem/FHEM/lib/AttrTemplate/zwave.template
@@ -66,7 +66,6 @@ attr DEVICE eventMap { usr=>{'dim.100'=>'dim 99' } }
 attr DEVICE webCmd dim
 attr DEVICE widgetOverride dim:colorpicker,BRI,0,1,99
 set DEVICE attrTemplate speechcontrol_type_light
-attr DEVICE model zigbee2mqtt_light_dimmer
 setreading DEVICE attrTemplateVersion zwave_dimmer_20211011