Bug fix in http encrypted connection.

- Cassandra encrypts ASCII 126 now with right value
EinEinfach · Aug 18, 2023 · afdb552 · afdb552
1 parent 474e012
commit afdb552
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/CaSSAndRA/app.py b/CaSSAndRA/app.py
@@ -1,4 +1,4 @@
-#Version:0.50.0 -> Rover angle comming now from Sunray FW. Added some debug messages
+#Version:0.50.1 -> Bug fix in http encryption connection. Cassandra encrypt ASCII 126 with invalid value
 
 # create logger
 import logging

diff --git a/CaSSAndRA/src/backend/comm/httpcomm.py b/CaSSAndRA/src/backend/comm/httpcomm.py
@@ -54,7 +54,7 @@ def cmd_to_rover(connect_data: dict(), connection: list()) -> int():
             logger.debug('Encryption: true')
             data_ascii = [ord(c) for c in data]
             data_encrypt = [x + 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.debug('Data to be send: '+data)

diff --git a/CaSSAndRA/src/backend/data/appdata.py b/CaSSAndRA/src/backend/data/appdata.py
@@ -3,6 +3,8 @@
 
 from datetime import datetime
 
+version = '0.50.1'
+
 commcfg = {
             "USE": "HTTP",
             "MQTT": [

diff --git a/CaSSAndRA/src/components/modalinfo.py b/CaSSAndRA/src/components/modalinfo.py
@@ -3,10 +3,14 @@
 
 from . import ids
 from src.backend.data.roverdata import robot
+from src.backend.data import appdata
 
 info = dbc.Modal([
                 dbc.ModalHeader(dbc.ModalTitle('Info')),
                 dbc.ModalBody(id=ids.MODALINFOBODY),
+                dbc.ModalFooter([
+                    html.Div(['CaSSAndRA Version: '+appdata.version], style={'font-size': '10px'})
+                ])
             ],
             id=ids.MODALINFO, 
             is_open=False,