From 15f10ff3f84f4cf9df9057e0b7b137223f524fb6 Mon Sep 17 00:00:00 2001
From: Lucio Zambon <lucio.zambon@elettra.eu>
Date: Thu, 19 Oct 2023 15:02:59 +0200
Subject: [PATCH] change bits
---
src/super.cpp | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/super.cpp b/src/super.cpp
index f252a26..91fe489 100755
--- a/src/super.cpp
+++ b/src/super.cpp
@@ -738,7 +738,7 @@ super::super(QWidget *parent) : QWidget(parent)
connectDevice("kg05/mod/hv_kg05.01", &hvServer);
}
else if (!modNum.compare("XS")) {
- connectDevice("kg05/mod/hv_kxs.01", &hvServer);
+ connectDevice("kxs/mod/hv_kxs.01", &hvServer);
}
else if (!modNum.compare("ST")) {
connectDevice("kst/mod/hv", &hvServer);
@@ -764,7 +764,7 @@ super::super(QWidget *parent) : QWidget(parent)
connectDevice("kg05/mod/ross_kg05.01", &rossServer);
}
else if (!modNum.compare("XS")) {
- connectDevice("kg05/mod/ross_kxs.01", &rossServer);
+ connectDevice("kxs/mod/ross_kxs.01", &rossServer);
}
else if (!modNum.compare("ST")) {
connectDevice("kg05/mod/ross_kg05.03", &rossServer);
@@ -1099,8 +1099,10 @@ super::super(QWidget *parent) : QWidget(parent)
cmd_rfamp_off->setTargets("kxs/mod/rfamp_kxs.01->Off");
ui.rfamp_stat->setSource("kxs/mod/rfamp_kxs.01/IsOn");
ui.rfamp_reset->setTargets("kxs/mod/rfamp_kxs.01->ResetReversePower");
- ui.rfReverseAB->setNumColumns(1);
- ui.rfReverseAB->setDisplayMask("12");
+ // ui.rfReverseAB->setNumColumns(1);
+ ui.rfReverseAB->setNumColumns(2);
+ // ui.rfReverseAB->setDisplayMask("12");
+ ui.rfReverseAB->setDisplayMask("12,11");
ui.rfReverseAB->setSource("kxs/interlock/mod_kxs.01/StatThyTriggerEnable");
ui.rfReverseAB->setTrueColors(ui.rfReverseAB_2->trueColors());
// kxs/power_supply/psklyfoc_kxs.01
@@ -1538,6 +1540,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.SF6Open->hide();
ui.SF6Close->hide();
ui.SF6Stat->hide();
+ ui.Ross_Interlock_Enable->setDisplayMask(QList<unsigned>() << 0);
}
else if (!modNum.compare("05")) {
// main tab
@@ -2313,6 +2316,18 @@ super::super(QWidget *parent) : QWidget(parent)
ui.piri_a_fault->show();
ui.piri_b_fault->show();
}
+ if (!modNum.compare("XS")) {
+ ui.rfReverseAB->setTrueStrings("A;Arc");
+ ui.rfReverseAB->setFalseStrings("A;Arc");
+ ui.rfReverseAB_2->setTrueStrings("A;Arc");
+ ui.rfReverseAB_2->setFalseStrings("A;Arc");
+ }
+ else {
+ ui.rfReverseAB->setTrueStrings("A;B");
+ ui.rfReverseAB->setFalseStrings("A;B");
+ ui.rfReverseAB_2->setTrueStrings("A;B");
+ ui.rfReverseAB_2->setFalseStrings("A;B");
+ }
if (!modNum.compare("XS")) {
ui.klyfil_state_k4->show();
ui.klyfil_state_k4->setSource("kxs/power_supply/psklyfil_kxs.01/State");
--
GitLab