FHEM/mod-GardenaSmart
1
0
Fork 0
Code Issues 2 Pull Requests Releases 3 Wiki Activity

dev #54

Merged
marko merged 19 commits from dev into main 2022-04-12 11:37:37 +00:00
Conversation 0 Commits 19 Files Changed 2 +12 -11
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9f19ed8817 - Show all commits

21
FHEM/74_GardenaSmartDevice.pm
View File

@ -280,7 +280,11 @@ sub Set {
my $service_id; my $service_id;
my $mainboard_version = my $mainboard_version =
ReadingsVal( $name, 'mower_type-mainboard_version', 0.0 ); ReadingsVal( $name, 'mower_type-mainboard_version', 0.0 );
my $timezone_offset = ( Time::Piece->new )->tzoffset;
my ($Sekunden, $Minuten, $Stunden, $Monatstag, $Monat,
$Jahr, $Wochentag, $Jahrestag, $Sommerzeit) = localtime(time);
my $timezone_offset = $Sommerzeit ? 0 : ( Time::Piece->new )->tzoffset;
#set default abilitie ... overwrite in cmd to change #set default abilitie ... overwrite in cmd to change
$abilities = 'mower' $abilities = 'mower'
@ -881,12 +885,12 @@ sub setState {
? ?
( ReadingsVal($name, 'scheduling-schedules_paused_until', '' ) eq '' ) ( ReadingsVal($name, 'scheduling-schedules_paused_until', '' ) eq '' )
# leer ( zeitplan aktiv ... ) # leer ( zeitplan aktiv ... )
? sprintf( (RigReadingsValue($hash, 'watering. %s minutes remaining.').' '.RigReadingsValue($hash, 'next timer: %s')), ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 ), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '')) ) ? sprintf( (RigReadingsValue($hash, 'will be irrigated %s minutes remaining.').' '.RigReadingsValue($hash, 'next watering: %s')), ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 ), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '')) )
# zeitplan pausiert # zeitplan pausiert
: :
( ReadingsVal($name, 'scheduling-schedules_paused_until', '') eq '2038-01-18T00:00:00.000Z') ( ReadingsVal($name, 'scheduling-schedules_paused_until', '') eq '2038-01-18T00:00:00.000Z')
# pause bis dauerhaft # pause bis dauerhaft
? sprintf( (RigReadingsValue($hash, 'watering. %s minutes remaining.').' '.RigReadingsValue($hash , 'permanently paused')), ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 )) ? sprintf( (RigReadingsValue($hash, 'will be irrigated %s minutes remaining.').' '.RigReadingsValue($hash , 'schedule permanently paused')), ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 ))
# naechter termin # naechter termin
: sprintf( RigReadingsValue($hash , 'paused until %s'), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-schedules_paused_until', '')) ) : sprintf( RigReadingsValue($hash , 'paused until %s'), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-schedules_paused_until', '')) )
@ -895,7 +899,7 @@ sub setState {
: :
( ReadingsVal($name, 'scheduling-schedules_paused_until', '' ) eq '' ) ( ReadingsVal($name, 'scheduling-schedules_paused_until', '' ) eq '' )
# zeitplan aktiv # zeitplan aktiv
? sprintf( RigReadingsValue($hash, 'next timer: %s'), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '') ) ) ? sprintf( RigReadingsValue($hash, 'next watering: %s'), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '') ) )
# zeitplan pausiert # zeitplan pausiert
: RigReadingsValue($hash, 'closed') : RigReadingsValue($hash, 'closed')
@ -1072,13 +1076,10 @@ sub ReadingLangGerman {
'inactive' => 'nicht aktiv', 'inactive' => 'nicht aktiv',
'hibernate' => 'Winterschlaf', 'hibernate' => 'Winterschlaf',
'awake' => 'Aufgewacht', 'awake' => 'Aufgewacht',
'schedule permanently paused' => 'Zeitplan dauerhaft pausiert',
'permanently paused' => 'Dauerhaft pausiert',
'paused until %s' => 'pausiert bis %s', 'paused until %s' => 'pausiert bis %s',
'watering. %s minutes remaining.'=> 'Wird bewässert. %d Minuten verbleibend.', 'will be irrigated %s minutes remaining.'=> 'Wird bewässert. %d Minuten verbleibend.',
'next timer: %s' => 'Nächste Bewässerung: %s', 'next watering: %s' => 'Nächste Bewässerung: %s',
); );
if ( if (

2
controls_GardenaSmartDevice.txt
View File

@ -1,2 +1,2 @@
UPD 2022-03-29_13:42:09 49520 FHEM/73_GardenaSmartBridge.pm UPD 2022-03-29_13:42:09 49520 FHEM/73_GardenaSmartBridge.pm
UPD 2022-04-07_14:49:06 62210 FHEM/74_GardenaSmartDevice.pm UPD 2022-04-07_19:49:15 62409 FHEM/74_GardenaSmartDevice.pm