From 75f9979cebff6c07662cc2e0f3333d6704f3f74d Mon Sep 17 00:00:00 2001
From: Ellert <>
Date: Thu, 26 Jan 2023 18:07:57 +0000
Subject: [PATCH] AutomowerConnect(Device): add Internal MODEL

git-svn-id: https://svn.fhem.de/fhem/trunk@27125 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED                           | 4 ++--
 fhem/FHEM/74_AutomowerConnect.pm       | 5 ++---
 fhem/FHEM/75_AutomowerConnectDevice.pm | 9 ++++-----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 63c8ac9cd..eb6e56afb 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,7 +1,7 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
- - feature: 74_AutomowerConnect: add attr disabledForIntervals
- - feature: 75_AutomowerConnectDevice: add attr disabledForIntervals
+ - feature: 74_AutomowerConnect: add disabledForIntervals, Internal MODEL
+ - feature: 75_AutomowerConnectDevice: add disabledForIntervals, Internal MODEL
  - bugfix:  98_WeekdayTimer: !$we handling
  - new:     74_AutomowerConnect: Control Automower + Host
  - new:     75_AutomowerConnectDevice: Control Automower Client
diff --git a/fhem/FHEM/74_AutomowerConnect.pm b/fhem/FHEM/74_AutomowerConnect.pm
index 16f4d759d..ff452d0b3 100644
--- a/fhem/FHEM/74_AutomowerConnect.pm
+++ b/fhem/FHEM/74_AutomowerConnect.pm
@@ -470,7 +470,8 @@ sub getMowerResponse {
         readingsBulkUpdateIfChanged($hash, $pref."_name", $hash->{helper}{mower}{attributes}{$pref}{name} );
         my $model = $hash->{helper}{mower}{attributes}{$pref}{model};
         $model =~ s/AUTOMOWER./AUTOMOWER®/;
-        readingsBulkUpdateIfChanged($hash, $pref."_model", $model );
+        $hash->{MODEL} = $model if ( $model && $hash->{MODEL} ne $model );
+        # readingsBulkUpdateIfChanged($hash, $pref."_model", $model );
         readingsBulkUpdateIfChanged($hash, $pref."_serialNumber", $hash->{helper}{mower}{attributes}{$pref}{serialNumber} );
         $pref = 'planner';
         readingsBulkUpdateIfChanged($hash, "planner_restrictedReason", $hash->{helper}{mower}{attributes}{$pref}{restrictedReason} );
@@ -1505,7 +1506,6 @@ sub readMap {
     <li>status_statusTimestampDiff - time difference in seconds between the last and second last change of the API content</li>
     <li>status_statusTimestampOld - local time of second last change of the API content</li>
     <li>system_name - name of the mower</li>
-    <li>system_model - model of the mower</li>
     <li>system_serialNumber - serial number of the mower</li>
 
   </ul>
@@ -1760,7 +1760,6 @@ sub readMap {
     <li>status_statusTimestampDiff - Zeitdifferenz zwichen den beiden letzten Änderungen im Inhalt der Daten aus der API</li>
     <li>status_statusTimestampOld - Lokalzeit der vorletzten Änderung der Daten in der API</li>
     <li>system_name - Name des Automowers</li>
-    <li>system_model - Model des Automowers</li>
     <li>system_serialNumber - Seriennummer des Automowers</li>
   </ul>
 </ul>
diff --git a/fhem/FHEM/75_AutomowerConnectDevice.pm b/fhem/FHEM/75_AutomowerConnectDevice.pm
index 6a7975cee..27fb7fa47 100644
--- a/fhem/FHEM/75_AutomowerConnectDevice.pm
+++ b/fhem/FHEM/75_AutomowerConnectDevice.pm
@@ -1,4 +1,6 @@
 ###############################################################################
+#
+#  $Id$
 # 
 #  This script is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,8 +18,6 @@
 #  GNU General Public License for more details.
 #
 #
-#  $Id$
-#
 #
 ################################################################################
 
@@ -301,7 +301,8 @@ sub Notify {
       readingsBulkUpdateIfChanged($hash, $pref."_name", $hash->{helper}{mower}{attributes}{$pref}{name} );
       my $model = $hash->{helper}{mower}{attributes}{$pref}{model};
       $model =~ s/AUTOMOWER./AUTOMOWER®/;
-      readingsBulkUpdateIfChanged($hash, $pref."_model", $model );
+      $hash->{MODEL} = $model if ( $model && $hash->{MODEL} ne $model );
+      # readingsBulkUpdateIfChanged($hash, $pref."_model", $model );
       readingsBulkUpdateIfChanged($hash, $pref."_serialNumber", $hash->{helper}{mower}{attributes}{$pref}{serialNumber} );
       $pref = 'planner';
       readingsBulkUpdateIfChanged($hash, "planner_restrictedReason", $hash->{helper}{mower}{attributes}{$pref}{restrictedReason} );
@@ -1249,7 +1250,6 @@ sub readMap {
     <li>status_statusTimestampDiff - time difference in seconds between the last and second last change of the API content</li>
     <li>status_statusTimestampOld - local time of second last change of the API content</li>
     <li>system_name - name of the mower</li>
-    <li>system_model - model of the mower</li>
     <li>system_serialNumber - serial number of the mower</li>
 
   </ul>
@@ -1479,7 +1479,6 @@ sub readMap {
     <li>status_statusTimestampDiff - Zeitdifferenz zwichen den beiden letzten Änderungen im Inhalt der Daten aus der API</li>
     <li>status_statusTimestampOld - Lokalzeit der vorletzten Änderung der Daten in der API</li>
     <li>system_name - Name des Automowers</li>
-    <li>system_model - Model des Automowers</li>
     <li>system_serialNumber - Seriennummer des Automowers</li>
   </ul>
 </ul>