Fixed api commands stop and dock

EinEinfach · May 22, 2024 · 90549a2 · 90549a2
1 parent 1433754
commit 90549a2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/CaSSAndRA/app.py b/CaSSAndRA/app.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-#Version:0.113.0 Removed updating... message in browser
+#Version:0.113.1 Fixed api commands stop and dock
 # package imports
 import os
 import sys

diff --git a/CaSSAndRA/src/backend/comm/api.py b/CaSSAndRA/src/backend/comm/api.py
@@ -293,21 +293,20 @@ def perform_maps_cmd(self, buffer: dict) -> None:
                 logger.debug(f'{e}')
 
     def perform_robot_cmd(self, buffer) -> None:
-        if 'value' in buffer:
-            allowed_values = ['mow', 'stop', 'dock']
-            try:
+        allowed_values = ['mow', 'stop', 'dock']
+        try:
+            if self.command == 'stop':
+                cmdlist.cmd_stop = True
+            elif self.command == 'dock':
+                cmdlist.cmd_dock = True
+            elif self.command == 'mow':
                 self.value = buffer['value'][0]
-                if self.command == 'mow':
-                    self.perform_mow_cmd()
-                elif self.command == 'stop':
-                    cmdlist.cmd_stop = True
-                elif self.command == 'dock':
-                    cmdlist.cmd_dock = True
-                else:
-                    logger.info(f'No valid command in api message found. Allowed values: {allowed_values}. Aborting')
-            except Exception as e:
-                logger.info(f'No valid value in api message found. Allowed values: {allowed_values}. Aborting')
-                logger.debug(f'{e}')
+                self.perform_mow_cmd()
+            else:
+                logger.info(f'No valid command in api message found. Allowed values: {allowed_values}. Aborting')
+        except Exception as e:
+            logger.info(f'No valid value in api message found. Allowed values: {allowed_values}. Aborting')
+            logger.debug(f'{e}')
 
     def perform_mow_cmd(self) -> None:
         allowed_values = ['resume', 'task', 'all', 'selection']

diff --git a/CaSSAndRA/src/backend/data/appdata.py b/CaSSAndRA/src/backend/data/appdata.py
@@ -1,4 +1,4 @@
 import logging
 logger = logging.getLogger(__name__)
 
-version = '0.113.0'
+version = '0.113.1'