Merge pull request 'fix: patch code scheduling by hhhdg' (#99) from patch_valve_hhhdg into dev

Reviewed-on: #99

CHANGED

@@ -0,0 +1 @@
+    spellcheck + corrections

FHEM/73_GardenaSmartBridge.pm

@@ -414,7 +414,6 @@ sub Set {
 
     if ( lc $cmd eq 'getdevicesstate' ) {
         getDevices($hash);
-
     }
     elsif ( lc $cmd eq 'gettoken' ) {
         return "please set Attribut gardenaAccountEmail first"
@@ -438,6 +437,15 @@ sub Set {
 
         DeletePassword($hash);
     }
+    elsif ( lc $cmd eq 'debughelper' ) {
+        return "usage: $cmd" if ( scalar( @{$aArg} ) != 2 );
+        my $new_helper       = $aArg->[0];
+        my $new_helper_value = $aArg->[1];
+        Log3( $name, 5,
+"[DEBUG] - GardenaSmartBridge ($name) - override helper $new_helper with $new_helper_value"
+        );
+        $hash->{helper}{$new_helper} = $new_helper_value;
+    }
     else {
 
         my $list = "getDevicesState:noArg getToken:noArg"
@@ -520,7 +528,6 @@ sub ErrorHandling {
                 1 );
 
             if ( $err =~ /timed out/ ) {
-
                 Log3 $dname, 5,
 "GardenaSmartBridge ($dname) - RequestERROR: connect to gardena cloud is timed out. check network";
             }
@@ -606,7 +613,7 @@ sub ErrorHandling {
     }
 
     if (
-        $data =~ /Error/
+        $data =~ /Error/ && $data !~ /lastLonaErrorCode/
         || (   defined($decode_json)
             && ref($decode_json) eq 'HASH'
             && defined( $decode_json->{errors} ) )
@@ -621,8 +628,13 @@ sub ErrorHandling {
         if ( $param->{code} == 400 ) {
             if ($decode_json) {
                 if ( ref( $decode_json->{errors} ) eq "ARRAY"
-                    && defined( $decode_json->{errors} ) )
+                    && exists( $decode_json->{errors} ) )
+                    # replace defined with exists
+                    # && defined( $decode_json->{errors} ) )
                 {
+                    # $decode_json->{errors} -> ARRAY
+                    # $decode_json->{errors}[0] -> HASH
+                    if (exists ($decode_json->{errors}[0]{error}) ) {
                       readingsBulkUpdate(
                         $dhash,
                         "state",
@@ -641,6 +653,7 @@ sub ErrorHandling {
                           "GardenaSmartBridge ($dname) - RequestERROR: "
                         . $decode_json->{errors}[0]{error} . " "
                         . $decode_json->{errors}[0]{attribute};
+                  } # fi exists error
                 }
             }
             else {
@@ -731,7 +744,7 @@ sub ErrorHandling {
         my $i = 0;
         for my $dev_settings ( @{ $devJson->{settings} } ) {
             $output .= "[" . $i++ . "]id: $dev_settings->{id} \n";
-            $output .= "name: $dev_settings->{name} ";
+            $output .= "name: $dev_settings->{name} \n";
             if (   ref( $dev_settings->{value} ) eq 'ARRAY'
                 || ref( $dev_settings->{value} ) eq 'HASH' )
             {
@@ -747,16 +760,7 @@ sub ErrorHandling {
 
         for my $dev_settings ( @{ $devJson->{abilities} } ) {
             $output .= "[" . $i++ . "]id: $dev_settings->{id} \n";
-            $output .= "name: $dev_settings->{name} ";
-
-            if (   ref( $dev_settings->{value} ) eq 'ARRAY'
-                || ref( $dev_settings->{value} ) eq 'HASH' )
-            {
-                $output .= 'N/A \n';
-            }
-            else {
-                $output .= "value: $dev_settings->{value} \n";
-            }
+            $output .= "name: $dev_settings->{name} \n";
         }
 
         $hash->{helper}{debug_device_output} = $output;
@@ -1055,6 +1059,14 @@ sub WriteReadings {
                       if ( ref($v) eq 'ARRAY' );
 
                     #$v = encode_utf8($v);
+                    $v = ' ' if (!defined $v);
+                    Log3 $name, 4, "Gardena DEBUG DEBUG DEBUG stage 1 ".$decode_json->{abilities}[0]{properties}[$properties]{name} if ( $decode_json->{abilities}[0]{properties}[$properties]
+                        {name} !~ /ethernet_status|wifi_status/ );
+                    Log3 $name, 4, "Gardena DEBUG DEBUG DEBUG stage 2".$t if ( $decode_json->{abilities}[0]{properties}[$properties]
+                        {name} !~ /ethernet_status|wifi_status/ );
+                    Log3 $name, 4, "Gardena DEBUG DEBUG DEBUG stage 3".$v if ( $decode_json->{abilities}[0]{properties}[$properties]
+                        {name} !~ /ethernet_status|wifi_status/ );
+
                     readingsBulkUpdateIfChanged(
                         $hash,
                         $decode_json->{abilities}[0]{properties}[$properties]
@@ -1073,35 +1085,15 @@ sub WriteReadings {
                         && ref($v) eq 'HASH'
                       )
                       {
-                        if ( $decode_json->{abilities}[0]{properties}
-                            [$properties]{name} eq 'ethernet_status' )
-                        {
+                        if ($v->{is_connected} ) {
                           readingsBulkUpdateIfChanged( $hash,
-                                'ethernet_status-mac', $v->{mac} );
-                            readingsBulkUpdateIfChanged( $hash,
-                                'ethernet_status-ip', $v->{ip} )
+                            $decode_json->{abilities}[0]{properties}[$properties]{name}.'-ip', $v->{ip} )
                             if ( ref( $v->{ip} ) ne 'HASH' );
                           readingsBulkUpdateIfChanged( $hash,
-                                'ethernet_status-isconnected',
-                                $v->{isConnected} );
-                        }
-                        elsif ( $decode_json->{abilities}[0]{properties}
-                            [$properties]{name} eq 'wifi_status' )
-                        {
-                            readingsBulkUpdateIfChanged( $hash,
-                                'wifi_status-ssid', $v->{ssid} )
-                              if ( ref( $v->{ssid} ) ne 'HASH' );
-                            readingsBulkUpdateIfChanged( $hash,
-                                'wifi_status-mac', $v->{mac} );
-                            readingsBulkUpdateIfChanged( $hash,
-                                'wifi_status-ip', $v->{ip} )
-                              if ( ref( $v->{ip} ) ne 'HASH' );
-                            readingsBulkUpdateIfChanged( $hash,
-                                'wifi_status-isconnected', $v->{isConnected} );
-                            readingsBulkUpdateIfChanged( $hash,
-                                'wifi_status-signal', $v->{signal} );
-                        }
+                            $decode_json->{abilities}[0]{properties}[$properties]{name}.'-isconnected', $v->{is_connected} )
+                            if ( $v->{is_connected} );
                         }
+                      } # fi ethernet and wifi
                 }
                 $properties--;
 
@@ -1331,17 +1323,16 @@ sub createHttpValueStrings {
         }    # park until next schedules or override
         elsif (defined($abilities)
             && defined($payload)
-            && $abilities eq 'mower_timer' )
+            && $abilities eq 'mower' )
         {
             my $valve_id;
-            $method = 'PUT';
             
             $uri .=
                 '/devices/'
               . $deviceId
               . '/abilities/'
               . $abilities
-              . '/properties/mower_timer';
+              . '/commands/manual_start';
 
         }
         elsif (defined($abilities)
@@ -1577,7 +1568,7 @@ sub DeletePassword {
   ],
   "release_status": "stable",
   "license": "GPL_2",
-  "version": "v2.4.7",
+  "version": "v2.6.2",
   "author": [
     "Marko Oldenburg <fhemdevelopment@cooltux.net>"
   ],

controls_GardenaSmartDevice.txt

@@ -1,2 +1,2 @@
-UPD 2022-02-01_18:41:32 49520 FHEM/73_GardenaSmartBridge.pm
-UPD 2022-02-09_13:50:50 57267 FHEM/74_GardenaSmartDevice.pm
+UPD 2024-04-15_09:21:58 49572 FHEM/73_GardenaSmartBridge.pm
+UPD 2024-04-15_09:32:30 127663 FHEM/74_GardenaSmartDevice.pm

hooks/commit-msg

@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+commit_msg=$(cat "${1:?Missing commit message file}")
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}
+
+if ! echo "$commit_msg" | grep -Eq "^(build|chore|ci|docs|feat|feat!|fix|perf|refactor|revert|style|test)(\(.+\))?: .*$" ; then 
+
+  echo "Invalid commit message" 
+
+    exit 1 
+
+fi 
+
+echo "Commit message is valid!"

hooks/post-commit

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -eu
+
+# destination of the final changelog file
+OUTPUT_FILE=CHANGELOG.md
+
+# generate the changelog
+git --no-pager log --no-merges --format="### %s%d%n>%aD%n%n>Author: %aN (%aE)%n%n>Commiter: %cN (%cE)%n%n%b%n%N%n" > $OUTPUT_FILE
+
+# prevent recursion!
+# since a 'commit --amend' will trigger the post-commit script again
+# we have to check if the changelog file has changed or not
+res=$(git status --porcelain | grep -c ".\$OUTPUT_FILE$")
+if [ "$res" -gt 0 ]; then
+  git add $OUTPUT_FILE
+  git commit --amend
+  echo "Populated Changelog in $OUTPUT_FILE"
+fi