From a422002bd433892323e146f0dec67e6f140be4e9 Mon Sep 17 00:00:00 2001
From: Claudio Scafuri <claudio.scafuri@elettra.eu>
Date: Wed, 7 Apr 2021 15:06:33 +0200
Subject: [PATCH] some progress - to be tested
---
docs/new-bit-info.txt | 13 +++++++++++++
etc/test.sh | 2 +-
mscr.pro | 2 +-
src/mscr.ui | 12 ++++++------
4 files changed, 21 insertions(+), 8 deletions(-)
create mode 100644 docs/new-bit-info.txt
diff --git a/docs/new-bit-info.txt b/docs/new-bit-info.txt
new file mode 100644
index 0000000..d08f1fe
--- /dev/null
+++ b/docs/new-bit-info.txt
@@ -0,0 +1,13 @@
+ #define MSCR_STAT_SIZE 12
+ #define MSCR_STAT_TYPE 0 // bool 0: pneumatic (false), stepper (vertical slit present) (true)
+ #define MSCR_STAT_POLAR1_PRESENT 1 // polarimeter 2 present (true)
+ #define MSCR_STAT_POLAR1_MODE 2 // polarimeter 1 continuos (false), discrete (true)
+ #define MSCR_STAT_POLAR2_PRESENT 3 // polarimeter 2 present (true)
+ #define MSCR_STAT_POLAR2_MODE 4 // polarimeter 2 continuos (false), discrete (true)
+ #define MSCR_STAT_HORSLIT_PRESENT 5 // horizontal slit present (true)
+ #define MSCR_STAT_VER_MOVE_ACK 6 // allowed to move vertical slit (true)
+ #define MSCR_STAT_HOR_MOVE_ACK 7 // allowed to move horizontal slit (true)
+ #define MSCR_STAT_LIGHT_ON 8 // light ON (true)
+ #define MSCR_STAT_SAFETY_SWITCH 9 // safety switch touched (true)
+ #define MSCR_STAT_PNEUM_MOVING 10 // vertical piston (pneumatic actuator) is moving (true)
+ #define MSCR_STAT_PNEUM_REACH_ERR 11 // vertical piston (pneumatic actuator) reach error (true)
diff --git a/etc/test.sh b/etc/test.sh
index 4330867..e3338c2 100755
--- a/etc/test.sh
+++ b/etc/test.sh
@@ -1 +1 @@
-bin/mscr srv-tango-srf-01:20000/dbd/diagnostics/mscr_dbd.01
+bin/mscr-gui srv-tango-srf-01:20000/dbd/diagnostics/mscr_dbd.01
diff --git a/mscr.pro b/mscr.pro
index edbbf3c..90ee061 100644
--- a/mscr.pro
+++ b/mscr.pro
@@ -9,4 +9,4 @@ HEADERS += src/mscr.h
FORMS = src/mscr.ui
-TARGET = bin/mscr
+TARGET = bin/mscr-gui
diff --git a/src/mscr.ui b/src/mscr.ui
index cccdf47..873204b 100644
--- a/src/mscr.ui
+++ b/src/mscr.ui
@@ -297,7 +297,7 @@
<rect>
<x>10</x>
<y>60</y>
- <width>139</width>
+ <width>161</width>
<height>17</height>
</rect>
</property>
@@ -385,7 +385,7 @@
<rect>
<x>16</x>
<y>58</y>
- <width>139</width>
+ <width>181</width>
<height>17</height>
</rect>
</property>
@@ -765,7 +765,7 @@
<string>AUXILIARY OUTPUT ON</string>
</property>
<property name="targets">
- <string>$1->Giulio;;;;;</string>
+ <string>$1->AuxiliaryOutOn;;;;;;</string>
</property>
</widget>
</item>
@@ -786,7 +786,7 @@
<string>AUXILIARY OUTPUT OFF</string>
</property>
<property name="targets">
- <string>$1->Giulio;;;;;</string>
+ <string>$1->AuxiliaryOutOff;;;;;;</string>
</property>
</widget>
</item>
@@ -1047,13 +1047,13 @@
<number>1</number>
</property>
<property name="trueColors">
- <string>4290494403;4290494403;4290494403;4290494403;4290494403;4290494403;4284344910;4284344910;4290494403;4290494403;4278228181;4293342999</string>
+ <string>4290494403;4290494403;4290494403;4290494403;4290494403;4290494403;4284344910;4284344910;4294556167;4290494403;4278228181;4293342999</string>
</property>
<property name="falseColors">
<string>4290494403;4290494403;4290494403;4290494403;4290494403;4290494403;4294556167;4294556167;4290494403;4290494403;4290494403;4284344910</string>
</property>
<property name="trueStrings">
- <string>pneumatic;present;discrete;present;discrete;present;allowed to move;allowed to move;on;touched;moving;not reached position</string>
+ <string>pneumatic;present;discrete;present;discrete;present;allowed to move;allowed to move;on;touched;moving;reach error</string>
</property>
<property name="falseStrings">
<string>stepper;not preset;continuos;not present;continuos;not present;not allowed to move;not allowed to move;off;not touched;not moving;reached position</string>
--
GitLab