Fix issu in encrypted http mode

EinEinfach · May 12, 2024 · ae60394 · ae60394
1 parent de6bd12
commit ae60394
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/CaSSAndRA/app.py b/CaSSAndRA/app.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-#Version:0.110.0 Added new dock reason (temperature out of range)
+#Version:0.110.1 Fix issue in encrypted http mode
 # package imports
 import os
 import sys

diff --git a/CaSSAndRA/src/backend/comm/connections.py b/CaSSAndRA/src/backend/comm/connections.py
@@ -151,6 +151,7 @@ def connect(self):
         logger.info('Connecting...')
         try:
             data = self.reqandchecksum('AT+V')
+            logger.debug(f'Data to be send: {data}')
             logger.info('TX: '+data)
             res = requests.post(url=self.http_ip, headers=self.header, data=data+'\n', timeout=6)
             logger.debug('Status code: '+str(res.status_code))
@@ -193,10 +194,11 @@ def connect(self):
     def get_state(self) -> None:
         logger.info('Performing get state http-request')
         data = self.reqandchecksum('AT+S')
+        logger.debug(f'Data to be send: {data}')
         if self.http_encryption == 1:
             data_ascii = [ord(c) for c in data]
             data_encrypt = [x + self.http_encryptkey for x in data_ascii]
-            data_encrypt = [x - 126 + 31 if x>=126 else x for x in data_encrypt]
+            data_encrypt = [x - 126 + 31 if x>126 else x for x in data_encrypt]
             data = ''.join(map(chr, data_encrypt))
         try:
             logger.info('TX: '+data) 
@@ -220,10 +222,11 @@ def get_state(self) -> None:
     def get_stats(self) -> None:
         logger.info('Performing get stats http-request')
         data = self.reqandchecksum('AT+T')
+        logger.debug(f'Data to be send: {data}')
         if self.http_encryption == 1:
             data_ascii = [ord(c) for c in data]
             data_encrypt = [x + self.http_encryptkey for x in data_ascii]
-            data_encrypt = [x - 126 + 31 if x>=126 else x for x in data_encrypt]
+            data_encrypt = [x - 126 + 31 if x>126 else x for x in data_encrypt]
             data = ''.join(map(chr, data_encrypt))
         try:
             logger.info('TX: '+data)
@@ -247,10 +250,11 @@ def get_stats(self) -> None:
     def get_obstacles(self) -> int:
         logger.info('Performing get obstacles http-request')
         data = self.reqandchecksum('AT+S2')
+        logger.debug(f'Data to be send: {data}')
         if self.http_encryption == 1:
             data_ascii = [ord(c) for c in data]
             data_encrypt = [x + self.http_encryptkey for x in data_ascii]
-            data_encrypt = [x - 126 + 31 if x>=126 else x for x in data_encrypt]
+            data_encrypt = [x - 126 + 31 if x>126 else x for x in data_encrypt]
             data = ''.join(map(chr, data_encrypt))
         try:
             logger.info('Backend: TX '+data) 
@@ -279,6 +283,7 @@ def cmd_to_rover(self) -> None:
             rep_cnt = 0
             logger.debug(''+msg_pckg['msg'][i]+' will be send to the rover')
             data = self.reqandchecksum(msg_pckg['msg'][i])
+            logger.debug(f'Data to be send: {data}')
             if self.http_encryption == 1:
                 data_ascii = [ord(c) for c in data]
                 data_encrypt = [x + self.http_encryptkey for x in data_ascii]

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.110.0'
+version = '0.110.1'