From 8743c546ed50b1c70e3922c9a85165157cf805e7 Mon Sep 17 00:00:00 2001
From: Marko Mecina <marko.mecina@univie.ac.at>
Date: Tue, 6 Sep 2022 13:55:42 +0200
Subject: [PATCH] define project in egse.cfg instead of ccs_main_config.cfg
---
Ccs/ccs_main_config.cfg | 4 ++--
egse.cfg | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Ccs/ccs_main_config.cfg b/Ccs/ccs_main_config.cfg
index 115e344..7104882 100644
--- a/Ccs/ccs_main_config.cfg
+++ b/Ccs/ccs_main_config.cfg
@@ -13,7 +13,7 @@ font_size = 10
scrollback_lines = 1000
[ccs-database]
-project = SMILE
+project = ${project:name}
idb_schema = ${database:mib-schema}
commit_interval = 0.05
@@ -69,7 +69,7 @@ test = ["format", "uint3"]
[ccs-user_decoders]
[ccs-monitor_parameter_sets]
-states = [["('KST05357', 52059, 3, 25, 321, 2, 18, 16)", "('KST05354', 52059, 3, 25, 321, 2, 18, 16)", "('KST05360', 52059, 3, 25, 321, 2, 18, 16)", "('KST05334', 52059, 3, 25, 321, 2, 18, 16)", "('KST05335', 52059, 3, 25, 321, 2, 18, 16)", "('KST05337', 52059, 3, 25, 321, 2, 18, 16)", "('KST05340', 52059, 3, 25, 321, 2, 18, 16)", "('KST05365', 52059, 3, 25, 321, 2, 18, 16)"], [], []]
+states = [["('KST05334', 52059, 3, 25, 321, 2, 18, 16)", "('KST05335', 52059, 3, 25, 321, 2, 18, 16)", "('KST05337', 52059, 3, 25, 321, 2, 18, 16)", "('KST05340', 52059, 3, 25, 321, 2, 18, 16)", "('KST05354', 52059, 3, 25, 321, 2, 18, 16)", "('KST05357', 52059, 3, 25, 321, 2, 18, 16)", "('KST05360', 52059, 3, 25, 321, 2, 18, 16)", "('KST05365', 52059, 3, 25, 321, 2, 18, 16)", "('KST05379', 52059, 3, 25, 321, 2, 18, 16)"], [], []]
dpumode = [["KST05155"], [], []]
temps = [["('KST05001', 52061, 3, 25, 321, 1, 18, 16)", "('KST05002', 52061, 3, 25, 321, 1, 18, 16)", "('KST05003', 52061, 3, 25, 321, 1, 18, 16)"], [], []]
test1 = [["('KST05001', 52061, 3, 25, 321, 1, 18, 16)", "('KST05002', 52061, 3, 25, 321, 1, 18, 16)", "('KST05003', 52061, 3, 25, 321, 1, 18, 16)", "('KST05142', 52061, 3, 25, 321, 1, 18, 16)", "('KST05143', 52061, 3, 25, 321, 1, 18, 16)", "('KST05144', 52061, 3, 25, 321, 1, 18, 16)", "('KST05145', 52061, 3, 25, 321, 1, 18, 16)", "('KST05146', 52061, 3, 25, 321, 1, 18, 16)", "('KST05147', 52061, 3, 25, 321, 1, 18, 16)", "('KST05148', 52061, 3, 25, 321, 1, 18, 16)", "('KST05149', 52061, 3, 25, 321, 1, 18, 16)", "('KST05150', 52061, 3, 25, 321, 1, 18, 16)", "('KST05152', 52061, 3, 25, 321, 1, 18, 16)"], ["('KST05053', 52062, 3, 25, 321, 2, 18, 16)", "('KST05055', 52062, 3, 25, 321, 2, 18, 16)", "('KST05074', 52062, 3, 25, 321, 2, 18, 16)", "('KST05296', 52062, 3, 25, 321, 2, 18, 16)", "('KST05297', 52062, 3, 25, 321, 2, 18, 16)", "('KST05307', 52062, 3, 25, 321, 2, 18, 16)", "('KST05328', 52062, 3, 25, 321, 2, 18, 16)", "('KST05331', 52062, 3, 25, 321, 2, 18, 16)", "('KST05334', 52062, 3, 25, 321, 2, 18, 16)", "('KST05345', 52062, 3, 25, 321, 2, 18, 16)", "('KST05348', 52062, 3, 25, 321, 2, 18, 16)", "('KST05351', 52062, 3, 25, 321, 2, 18, 16)", "('KST05356', 52062, 3, 25, 321, 2, 18, 16)"], ["('KST05377', 52031, 1, 3, 321, 0, -1, 0)", "('KST05378', 52031, 1, 3, 321, 0, -1, 0)"]]
diff --git a/egse.cfg b/egse.cfg
index 20a3356..7818b3d 100644
--- a/egse.cfg
+++ b/egse.cfg
@@ -7,6 +7,9 @@ crplm = ${obsw}/CrPlm/build/pc
ia = ${obsw}/CrIa/build/pc
start-simulator-log = ${logging:log-dir}/simulators/sim.log
+[project]
+name = SMILE
+
[database]
user = egse
password = xrayvision
--
GitLab