From b4438675129d847e26e5116eb970ed80d95fd573 Mon Sep 17 00:00:00 2001
From: meggert <eggertm@irs.uni-stuttgart.de>
Date: Tue, 28 Feb 2023 11:02:59 +0100
Subject: [PATCH] final fixes

---
 eive_tmtc/tmtc/acs/acs_ctrl.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eive_tmtc/tmtc/acs/acs_ctrl.py b/eive_tmtc/tmtc/acs/acs_ctrl.py
index 73b46e0..9df6fcf 100644
--- a/eive_tmtc/tmtc/acs/acs_ctrl.py
+++ b/eive_tmtc/tmtc/acs/acs_ctrl.py
@@ -34,7 +34,7 @@ from tmtccmd.tc.pus_20_fsfw_param import (
 from tmtccmd.pus.s20_fsfw_param_defs import (
     create_scalar_u8_parameter,
     create_scalar_u16_parameter,
-    create_scalar_u32_parameter,
+    create_scalar_i32_parameter,
     create_scalar_float_parameter,
     create_scalar_double_parameter,
     create_vector_float_parameter,
@@ -462,7 +462,7 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
 
 
 def set_acs_ctrl_param_scalar(q: DefaultPusQueueHelper):
-    pt = int(input("Specify parameter type to set {0: \"uint8\", 1: \"uint16\", 2: \"uint32\", 3: \"float\", "
+    pt = int(input("Specify parameter type to set {0: \"uint8\", 1: \"uint16\", 2: \"int32\", 3: \"float\", "
                    "4: \"double\"}: "))
     sid = int(input("Specify parameter struct ID to set: "))
     pid = int(input("Specify parameter ID to set: "))
@@ -495,7 +495,7 @@ def set_acs_ctrl_param_scalar(q: DefaultPusQueueHelper):
             param = int(input("Specify parameter value to set: "))
             q.add_pus_tc(
                 create_load_param_cmd(
-                    create_scalar_u32_parameter(
+                    create_scalar_i32_parameter(
                         object_id=ACS_CONTROLLER,
                         domain_id=sid,
                         unique_id=pid,
@@ -552,7 +552,7 @@ def set_acs_ctrl_param_vector(q: DefaultPusQueueHelper):
                     )
                 )
             else:
-                print("Aborting")
+                q.add_log_cmd("Aborted by user input")
                 return
         case 1:
             elms = int(input("Specify number of elements in vector to set: "))
@@ -572,7 +572,7 @@ def set_acs_ctrl_param_vector(q: DefaultPusQueueHelper):
                     )
                 )
             else:
-                print("Aborting")
+                q.add_log_cmd("Aborted by user input")
                 return
 
 
@@ -603,7 +603,7 @@ def set_acs_ctrl_param_matrix(q: DefaultPusQueueHelper):
                     )
                 )
             else:
-                print("Aborting")
+                q.add_log_cmd("Aborted by user input")
                 return
         case 1:
             rows = int(input("Specify number of rows in matrix to set: "))
@@ -628,7 +628,7 @@ def set_acs_ctrl_param_matrix(q: DefaultPusQueueHelper):
                     )
                 )
             else:
-                print("Aborting")
+                q.add_log_cmd("Aborted by user input")
                 return