Index: DD_Calibration/interface.ui
===================================================================
diff -u -rab304a3190684a7bbf1a68a29eafa34a8c503e3f -r95474c125e6f45fc7659e76d27390ac006ed6c76
--- DD_Calibration/interface.ui (.../interface.ui) (revision ab304a3190684a7bbf1a68a29eafa34a8c503e3f)
+++ DD_Calibration/interface.ui (.../interface.ui) (revision 95474c125e6f45fc7659e76d27390ac006ed6c76)
@@ -6,8 +6,8 @@
0
0
- 668
- 396
+ 1183
+ 773
@@ -34,9 +34,9 @@
- &6 DD Info/&B Calibration
+ &6 DD Info/&C Calibration
-
+
-
@@ -60,7 +60,7 @@
-
- 0
+ 3
@@ -69,23 +69,285 @@
-
+
-
+
+
+ CalibrationTime
+
+
+
+ -
+
+
+ Index
+
+
+
+ -
+
+
+ Accepted
+
+
+
-
Req [0x11A]
+ -
+
+
+ Req [0x118]
+
+
+
+ -
+
+
+ CalibrationTime Rejection
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Gain Rejection
+
+
+
+ -
+
+
+ OffSet Rejection
+
+
+
-
OffSet
- -
-
+
-
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(255, 81, 96);
+
+
+
+ 283 : [0x11B] Set Pressures
+
+
+ Qt::AlignCenter
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Accepted
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Send
+
+
+
+ -
+
+
+ Gain
+
+
+
+ -
+
+
+ Index
+
+
+
+ -
+
+
+ Send
+
+
+
+ -
+
+
+ Reason
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
-
@@ -106,36 +368,953 @@
- -
-
+
-
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+ Index
+
+
+
+ -
+
+
+ CalibrationTime
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Reason
+
+
+
+ -
+
+
Gain
+ -
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ OffSet
+
+
+
+
+
+
+
+
+
+ Temperature
+
+
+ -
+
+
-
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Accepted
+
+
+
+ -
+
+
+ Index
+
+
+
+ -
+
+
+ Reason
+
+
+
+ -
+
+
+ Gain
+
+
+
+ -
+
+
+ CalibrationTime Rejection
+
+
+
+ -
+
+
+ Req [0x11C]
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Req [0x11E]
+
+
+
+ -
+
+
+ OffSet
+
+
+
+ -
+
+
+ OffSet
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(173, 127, 168)
+
+
+
+ 285 : [0x11D] Get Temperatures
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Index
+
+
+
+ -
+
+
+ OffSet Rejection
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Reason
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(173, 127, 168)
+
+
+
+ 287 : [0x11F] Set Temperatures
+
+
+ Qt::AlignCenter
+
+
+
-
-
+
Send
+ -
+
+
+ Gain
+
+
+
-
-
+
CalibrationTime
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Index
+
+
+
+ -
+
+
+ Send
+
+
+
+ -
+
+
+ Accepted
+
+
+
+ -
+
+
+ Gain Rejection
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ CalibrationTime
+
+
+
+
+
+
+
+
+
+ Concentrate Pump
+
+
+ -
+
+
-
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ OffSet
+
+
+
+ -
+
+
+ Index
+
+
+
+ -
+
+
+ CalibrationTime
+
+
+
+ -
+
+
+ Reason
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ CalibrationTime Rejection
+
+
+
+ -
+
+
+ Gain
+
+
+
+ -
+
+
+ Gain Rejection
+
+
+
+ -
+
+
+ Req [0x122]
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Req [0x120]
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ -
+
+
+ Accepted
+
+
+
+ -
+
+
+ Gain
+
+
+
+ -
+
+
+ Reason
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(136, 138, 133)
+
+
+
+ 29 : [0x123] Set Concentrate Pump
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Index
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Accepted
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ OffSet Rejection
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(136, 138, 133)
+
+
+
+ 289 : [0x121] Get Concentrate Pump
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
-
-
+
Index
+ -
+
+
+ OffSet
+
+
+
+ -
+
+
+ CalibrationTime
+
+
+
+ -
+
+
+ Send
+
+
+
+ -
+
+
+ Send
+
+
+
-
-
+
Qt::AlignCenter
@@ -144,38 +1323,1033 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+
+
+
+ D12
+
+
+ -
+
+
-
+
+
+ CalibrationTime Rejection
+
+
+
+ -
+
+
+ Accepted
+
+
+
+ -
+
+
+ Reason
+
+
+
+ -
+
+
+ Target Pump Speed Rejection Reason
+
+
+
+ -
+
+
+ CalibrationTime
+
+
+
+ -
+
+
+ Req [0x126]
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(52, 101, 164)
+
+
+
+ 295 : [0x127] Set D12 Dialysate Pump
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Target Pump Speed
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Reason
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(52, 101, 164)
+
+
+
+ 293 : [0x125] Get D12 Dialysate Pump
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Send
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ CalibrationTime
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Accepted
+
+
+
+ -
+
+
+ Send
+
+
+
-
-
+
+ -
+
+
+ Req [0x124]
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Target Pump Speed
+
+
+
+
+
+
+
+
+
+ D48
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Gain
+
+
+
+ -
+
+
+ Accepted
+
+
+
+ -
+
+
+ CalibrationTime
+
+
+
+ -
+
+
+ Reason
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(193, 125, 17)
+
+
+
+ 297 : [0x129] Get D48 Dialysate Pump
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ OffSet
+
+
+
+ -
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Req [0x12A]
+
+
+
+ -
+
+
+ Req [0x128]
+
+
+
+ -
+
+
+ Accepted
+
+
+
+ -
+
+
+ OffSet Rejection
+
+
+
+ -
+
+
+ Gain Rejection
+
+
+
+ -
+
+
+ Send
+
+
+
-
-
+
10
color: rgb(238, 238, 236);
-background-color: rgb(255, 81, 96);
+background-color: rgb(193, 125, 17)
- 283 : [0x11B] Set Pressures
+ 299 : [0x12B] Set D48 Dialysate Pump
Qt::AlignCenter
+ -
+
+
+ CalibrationTime Rejection
+
+
+
+ -
+
+
+ CalibrationTime
+
+
+
+ -
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Gain
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ OffSet
+
+
+
+ -
+
+
+ Reason
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
-
-
+
Send
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+
+
+
+ Acid Conc
+
+
+ -
+
+
-
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ -
+
+
+ Req [0x12C]
+
+
+
+ -
+
+
+ Send
+
+
+
+ -
+
+
+ Index
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ CalibrationTime
+
+
+
+ -
+
+
+ Conc Mix Ratio Rejection
+
+
+
+ -
+
+
+ Full Bottome Volume ML
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(78, 154, 6)
+
+
+
+ 303 : [0x12F] Set Acid Concentrates
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(78, 154, 6)
+
+
+
+ 301 : [0x12D] Get Acid Concentrates
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ -
+
+
+ Full Bottome Volume ML
+
+
+
+ -
+
+
+ Index
+
+
+
+ -
+
+
+ Reason
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ -
+
+
+ Accepted
+
+
+
+ -
+
+
+ Conductiviy US Per CM
+
+
+
+ -
+
+
+ Conc Mix Ratio
+
+
+
-
-
+
Qt::AlignCenter
@@ -184,22 +2358,676 @@
+ -
+
+
+ Bottle Temperature
+
+
+
+ -
+
+
+ Full Bottome Volume ML Rejection
+
+
+
+ -
+
+
+ Index
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Conc Mix Ratio
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Send
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Req [0x12E]
+
+
+
+ -
+
+
+ Bottle Temperature
+
+
+
+ -
+
+
+ Accepted
+
+
+
+ -
+
+
+ Conductiviy US Per CM
+
+
+
+ -
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
-
-
+
Reason
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ CalibrationTime Rejection
+
+
+
+ -
+
+
+ Conductiviy US Per CM Rejection
+
+
+
+ -
+
+
+ Bottle Temperature Rejection
+
+
+
+
+
+
+
+
+
+ Bicarb Conc
+
+
+ -
+
+
-
+
+
+ Reason
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Conc Mix Ratio
+
+
+
+ -
+
+
+ Index
+
+
+
+ -
+
+
+ Index
+
+
+
+ -
+
+
+ Bottle Temperature
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ CalibrationTime
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Conductiviy US Per CM Rejection
+
+
+
+ -
+
+
+ Req [0x132]
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(193, 125, 17)
+
+
+
+ 307 : [0x133] Set Bicarb Concentrates
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Full Bottome Volume ML Rejection
+
+
+
+ -
+
+
+ Conductiviy US Per CM
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ CalibrationTime Rejection
+
+
+
+ -
+
+
+ Send
+
+
+
+ -
+
+
+ Index
+
+
+
+ -
+
+
+ Send
+
+
+
+ -
+
+
+ Conc Mix Ratio
+
+
+
+ -
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Full Bottome Volume ML
+
+
+
+ -
+
+
+ Accepted
+
+
+
+ -
+
+
+ Conductiviy US Per CM
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
-
-
+
- Req [0x118]
+ Req [0x130]
+ -
+
+
+ Reason
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(193, 125, 17)
+
+
+
+ 305 : [0x131] Get Bicarb Concentrates
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Bottle Temperature
+
+
+
+ -
+
+
+ Accepted
+
+
+
+ -
+
+
+ Bottle Temperature Rejection
+
+
+
+ -
+
+
+ Full Bottome Volume ML
+
+
+
+ -
+
+
+ -
+
+
+ Conc Mix Ratio Rejection
+
+
+
+ -
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
-
-
+
0
@@ -229,8 +3057,169 @@
+
+
+
+
+
+
+ Accel Sensor
+
+
+ -
+
+
-
+
+
+ Req [0x136]
+
+
+
+ -
+
+
+ Z Offset
+
+
+
+ -
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(164, 0, 0)
+
+
+
+ 309 : [0x135] Get Accel Sensor
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Y Offset
+
+
+
+ -
+
+
+ Send
+
+
+
+ -
+
+
+ CalibrationTime
+
+
+
+ -
+
+
+ X Offset
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(164, 0, 0)
+
+
+
+ 311 : [0x137] Set Accel Sensor
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Send
+
+
+
+ -
+
+
+ Reason
+
+
+
+ -
+
+
+ Req [0x134]
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
-
-
+
Qt::AlignCenter
@@ -240,7 +3229,7 @@
-
-
+
Qt::AlignCenter
@@ -250,7 +3239,7 @@
-
-
+
Qt::AlignCenter
@@ -260,7 +3249,7 @@
-
-
+
Qt::AlignCenter
@@ -270,42 +3259,42 @@
-
-
+
- Index
+ X Offset
-
-
+
- Gain
+ Y Offset
-
-
+
- OffSet
+ Z Offset
-
-
+
CalibrationTime
-
-
+
Accepted
-
-
+
Qt::AlignCenter
@@ -315,7 +3304,7 @@
-
-
+
Qt::AlignCenter
@@ -325,42 +3314,42 @@
-
-
+
Reason
-
-
+
- Gain Rejection
+ Y Offset Rejection
-
-
+
- Index
+ X Offset Rejection
-
-
+
CalibrationTime Rejection
-
-
+
- OffSet Rejection
+ Z Offset Rejection
-
-
+
0
@@ -391,7 +3380,7 @@
-
-
+
0
@@ -422,7 +3411,7 @@
-
-
+
0
@@ -453,7 +3442,7 @@
-
-
+
0
@@ -484,36 +3473,1305 @@
-
-
+
Accepted
+ -
+
+
-
+
- Temperature
+ Blook Leak Sensor
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(0, 0, 0)
+
+
+
+ 313 : [0x139] Get Blood Leak Sensor
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Send
+
+
+
+ -
+
+
+ Set Point
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ CalibrationTime
+
+
+
+ -
+
+
+ Reason
+
+
+
+ -
+
+
+ CalibrationTime Rejection
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(0, 0, 0)
+
+
+
+ 315 : [0x13B] Set Blood Leak Sensor
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ CalibrationTime
+
+
+
+ -
+
+
+ Reason
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Req [0x13A]
+
+
+
+ -
+
+
+ Req [0x138]
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Send
+
+
+
+ -
+
+
+ Set Point Rejection
+
+
+
+ -
+
+
+ Accepted
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Set Point
+
+
+
+ -
+
+
+ Accepted
+
+
+
+
+
+
-
+
- Concentrate Pump
+ Conductivity Sensor
+
+ -
+
+
-
+
+
+ CalibrationTime
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ Accepted
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ -
+
+
+ Reserved 1
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Alpha High
+
+
+
+ -
+
+
+ Reason
+
+
+
+ -
+
+
+ -
+
+
+ Zeta High
+
+
+
+ -
+
+
+ Alpha High
+
+
+
+ -
+
+
+ Delta
+
+
+
+ -
+
+
+ Index
+
+
+
+ -
+
+
+ Req [0x13E]
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ ETA Low
+
+
+
+ -
+
+
+ Alpha Low
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ -
+
+
+ Reserved 2
+
+
+
+ -
+
+
+ CalibrationTime
+
+
+
+ -
+
+
+ -
+
+
+ Delta
+
+
+
+ -
+
+
+ Reason
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Send
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Zeta Low
+
+
+
+ -
+
+
+ K Low
+
+
+
+ -
+
+
+ Zeta Low
+
+
+
+ -
+
+
+ ETA Low
+
+
+
+ -
+
+
+ K Low
+
+
+
+ -
+
+
+ Reserved 1
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(196, 160, 0)
+
+
+
+ 317 : [0x13D] Get Conductivity Sensor
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Req [0x13C]
+
+
+
+ -
+
+
+ Send
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ -
+
+
+ Beta
+
+
+
+ -
+
+
+ Index
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ K High
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(196, 160, 0)
+
+
+
+ 319 : [0x13F] Set Conductivity Sensor
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Alpha Low
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Zeta High
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Reserved 2
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
+
+
+ -
+
+
+ Accepted
+
+
+
+ -
+
+
+ ETA High
+
+
+
+ -
+
+
+ Beta
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ ETA High
+
+
+
+ -
+
+
+ K High
+
+
+
+ -
+
+
+
+
+
-
-
- D48
-
-
-
-
- D12
-
-
Index: DD_Calibration/loader.py
===================================================================
diff -u -rab304a3190684a7bbf1a68a29eafa34a8c503e3f -r95474c125e6f45fc7659e76d27390ac006ed6c76
--- DD_Calibration/loader.py (.../loader.py) (revision ab304a3190684a7bbf1a68a29eafa34a8c503e3f)
+++ DD_Calibration/loader.py (.../loader.py) (revision 95474c125e6f45fc7659e76d27390ac006ed6c76)
@@ -40,13 +40,103 @@
MsgIds.MSG_ID_UI_DD_NVM_GET_PRESSURE_SENSOR_CAL_RECORD_REQUEST.value,
self.handle_get_calibration_pressures)
- if self.can_interface is not None:
self.can_interface.register_receiving_publication_function(
CAN.CanChannels.ui_sync_broadcast_ch_id,
MsgIds.MSG_ID_UI_DD_NVM_SET_PRESSURE_SENSOR_CAL_RECORD_REQUEST.value,
self.handle_set_calibration_pressures)
+
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_GET_TEMPERATURE_SENSOR_CAL_RECORD_REQUEST.value,
+ self.handle_get_temperature_pressures)
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_SET_TEMPERATURE_SENSOR_CAL_RECORD_REQUEST.value,
+ self.handle_set_temperature_pressures)
+
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_GET_CONC_PUMP_CAL_RECORD_REQUEST.value,
+ self.handle_get_conc_pump_pressures)
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_SET_CONC_PUMP_CAL_RECORD_REQUEST.value,
+ self.handle_set_conc_pump_pressures)
+
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_GET_D12_PUMP_CAL_RECORD_REQUEST.value,
+ self.handle_get_d12_pump_pressures)
+
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_SET_D12_PUMP_CAL_RECORD_REQUEST.value,
+ self.handle_set_d12_pump_pressures)
+
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_GET_D48_PUMP_CAL_RECORD_REQUEST.value,
+ self.handle_get_d48_pump_pressures)
+
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_SET_D48_PUMP_CAL_RECORD_REQUEST.value,
+ self.handle_set_d48_pump_pressures)
+
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_GET_ACID_CONC_CAL_RECORD_REQUEST.value,
+ self.handle_get_acid_conc_pressures)
+
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_SET_ACID_CONC_CAL_RECORD_REQUEST.value,
+ self.handle_set_acid_conc_pressures)
+
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_GET_BICARB_CONC_CAL_RECORD_REQUEST.value,
+ self.handle_get_bicarb_conc_pressures)
+
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_SET_BICARB_CONC_CAL_RECORD_REQUEST.value,
+ self.handle_set_bicarb_conc_pressures)
+
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_GET_ACCEL_SENSOR_CAL_RECORD_REQUEST.value,
+ self.handle_get_accel_sensor_pressures)
+
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_SET_ACCEL_SENSOR_CAL_RECORD_REQUEST.value,
+ self.handle_set_accel_sensor_pressures)
+
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_GET_BLOOD_LEAK_SENSOR_CAL_RECORD_REQUEST.value,
+ self.handle_get_blood_leak_pressures)
+
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_SET_BLOOD_LEAK_SENSOR_CAL_RECORD_REQUEST.value,
+ self.handle_set_blood_leak_pressures)
+
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_GET_CONDUCTIVITY_SENSOR_CAL_RECORD_REQUEST.value,
+ self.handle_get_conductivity_sensor_pressures)
+
+ self.can_interface.register_receiving_publication_function(
+ CAN.CanChannels.ui_sync_broadcast_ch_id,
+ MsgIds.MSG_ID_UI_DD_NVM_SET_CONDUCTIVITY_SENSOR_CAL_RECORD_REQUEST.value,
+ self.handle_set_conductivity_sensor_pressures)
+
+
+
def _init_loader(self):
"""
finds and creates widgets
@@ -66,9 +156,23 @@
"After RO filter",
]
+ self.temperatureList = [
+ "Heat exchanger Inlet",
+ "Heat exchanger Outlet",
+ "Hydraulics Primary Heater",
+ "Trimmer Heater",
+ "Conductivity",
+ "Barometric",
+ ]
+
+ self.concPumpList = [
+ "Acid",
+ "Bicarbonate",
+ "Ultrafiltration",
+ ]
+
# Pressures
self.tbGetPressureSend = self.find_widget(QtWidgets.QToolButton , 'tbGetPressureSend' )
-
self.lbGetPressuresReq = self.find_widget(QtWidgets.QLabel , 'lbGetPressuresReq' )
self.cbGetPressureAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbGetPressureAccepted' )
self.sbGetPressureRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbGetPressureRejectionReason' )
@@ -78,7 +182,7 @@
self.sbGetPressureCalibrationTime = self.find_widget(QtWidgets.QSpinBox , 'sbGetPressureCalibrationTime' )
self.tbSetPressureSend = self.find_widget(QtWidgets.QToolButton , 'tbSetPressureSend' )
- self.lbSetPressuresIndex = self.find_widget(QtWidgets.QLabel , 'lbSetPressuresIndex' )
+ self.lbSetPressureIndex = self.find_widget(QtWidgets.QLabel , 'lbSetPressureIndex' )
self.lbSetPressureGain = self.find_widget(QtWidgets.QLabel , 'lbSetPressureGain' )
self.lbSetPressureOffset = self.find_widget(QtWidgets.QLabel , 'lbSetPressureOffset' )
self.lbSetPressureCalibrationTime = self.find_widget(QtWidgets.QLabel , 'lbSetPressureCalibrationTime' )
@@ -89,14 +193,81 @@
self.sbSetPressureOffset = self.find_widget(QtWidgets.QSpinBox , 'sbSetPressureOffset' )
self.sbSetPressureCalibrationTime = self.find_widget(QtWidgets.QSpinBox , 'sbSetPressureCalibrationTime' )
+ # Temperatures
+ self.tbGetTemperatureSend = self.find_widget(QtWidgets.QToolButton , 'tbGetTemperatureSend' )
+ self.lbGetTemperatureReq = self.find_widget(QtWidgets.QLabel , 'lbGetTemperatureReq' )
+ self.cbGetTemperatureAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbGetTemperatureAccepted' )
+ self.sbGetTemperatureRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbGetTemperatureRejectionReason' )
+ self.sbGetTemperatureIndex = self.find_widget(QtWidgets.QSpinBox , 'sbGetTemperatureIndex' )
+ self.sbGetTemperatureGain = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbGetTemperatureGain' )
+ self.sbGetTemperatureOffset = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbGetTemperatureOffset' )
+ self.sbGetTemperatureCalibrationTime = self.find_widget(QtWidgets.QSpinBox , 'sbGetTemperatureCalibrationTime' )
+ self.tbSetTemperatureSend = self.find_widget(QtWidgets.QToolButton , 'tbSetTemperatureSend' )
+ self.lbSetTemperatureIndex = self.find_widget(QtWidgets.QLabel , 'lbSetTemperatureIndex' )
+ self.lbSetTemperatureGain = self.find_widget(QtWidgets.QLabel , 'lbSetTemperatureGain' )
+ self.lbSetTemperatureOffset = self.find_widget(QtWidgets.QLabel , 'lbSetTemperatureOffset' )
+ self.lbSetTemperatureCalibrationTime = self.find_widget(QtWidgets.QLabel , 'lbSetTemperatureCalibrationTime' )
+ self.cbSetTemperatureAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbSetTemperatureAccepted' )
+ self.sbSetTemperatureRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbSetTemperatureRejectionReason' )
+ self.sbSetTemperatureIndex = self.find_widget(QtWidgets.QSpinBox , 'sbSetTemperatureIndex' )
+ self.sbSetTemperatureGain = self.find_widget(QtWidgets.QSpinBox , 'sbSetTemperatureGain' )
+ self.sbSetTemperatureOffset = self.find_widget(QtWidgets.QSpinBox , 'sbSetTemperatureOffset' )
+ self.sbSetTemperatureCalibrationTime = self.find_widget(QtWidgets.QSpinBox , 'sbSetTemperatureCalibrationTime' )
+
+ # Concentrates Pump
+ self.tbGetConcPumpSend = self.find_widget(QtWidgets.QToolButton , 'tbGetConcPumpSend' )
+ self.lbGetConcPumpReq = self.find_widget(QtWidgets.QLabel , 'lbGetConcPumpReq' )
+ self.cbGetConcPumpAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbGetConcPumpAccepted' )
+ self.sbGetConcPumpRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbGetConcPumpRejectionReason' )
+ self.sbGetConcPumpIndex = self.find_widget(QtWidgets.QSpinBox , 'sbGetConcPumpIndex' )
+ self.sbGetConcPumpGain = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbGetConcPumpGain' )
+ self.sbGetConcPumpOffset = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbGetConcPumpOffset' )
+ self.sbGetConcPumpCalibrationTime = self.find_widget(QtWidgets.QSpinBox , 'sbGetConcPumpCalibrationTime' )
+
+ self.tbSetConcPumpSend = self.find_widget(QtWidgets.QToolButton , 'tbSetConcPumpSend' )
+ self.lbSetConcPumpIndex = self.find_widget(QtWidgets.QLabel , 'lbSetConcPumpIndex' )
+ self.lbSetConcPumpGain = self.find_widget(QtWidgets.QLabel , 'lbSetConcPumpGain' )
+ self.lbSetConcPumpOffset = self.find_widget(QtWidgets.QLabel , 'lbSetConcPumpOffset' )
+ self.lbSetConcPumpCalibrationTime = self.find_widget(QtWidgets.QLabel , 'lbSetConcPumpCalibrationTime' )
+ self.cbSetConcPumpAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbSetConcPumpAccepted' )
+ self.sbSetConcPumpRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbSetConcPumpRejectionReason' )
+ self.sbSetConcPumpIndex = self.find_widget(QtWidgets.QSpinBox , 'sbSetConcPumpIndex' )
+ self.sbSetConcPumpGain = self.find_widget(QtWidgets.QSpinBox , 'sbSetConcPumpGain' )
+ self.sbSetConcPumpOffset = self.find_widget(QtWidgets.QSpinBox , 'sbSetConcPumpOffset' )
+ self.sbSetConcPumpCalibrationTime = self.find_widget(QtWidgets.QSpinBox , 'sbSetConcPumpCalibrationTime' )
+
+ # D12 Pump
+ self.tbGetD12PumpSend = self.find_widget(QtWidgets.QToolButton , 'tbGetD12PumpSend' )
+ self.lbGetD12PumpReq = self.find_widget(QtWidgets.QLabel , 'lbGetD12PumpReq' )
+ self.cbGetD12PumpAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbGetD12PumpAccepted' )
+ self.sbGetD12PumpRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbGetD12PumpRejectionReason' )
+ self.sbGetD12PumpTargetPumpSpeed = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbGetD12PumpTargetPumpSpeed' )
+ self.sbGetD12PumpCalibrationTime = self.find_widget(QtWidgets.QSpinBox , 'sbGetD12PumpCalibrationTime' )
+
+ self.tbSetD12PumpSend = self.find_widget(QtWidgets.QToolButton , 'tbSetD12PumpSend' )
+ self.lbSetD12PumpTargetPumpSpeed = self.find_widget(QtWidgets.QLabel , 'lbSetD12PumpTargetPumpSpeed' )
+ self.lbSetD12PumpCalibrationTime = self.find_widget(QtWidgets.QLabel , 'lbSetD12PumpCalibrationTime' )
+ self.cbSetD12PumpAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbSetD12PumpAccepted' )
+ self.sbSetD12PumpRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbSetD12PumpRejectionReason' )
+ self.sbSetD12PumpTargetPumpSpeed = self.find_widget(QtWidgets.QSpinBox , 'sbSetD12PumpTargetPumpSpeed' )
+ self.sbSetD12PumpCalibrationTime = self.find_widget(QtWidgets.QSpinBox , 'sbSetD12PumpCalibrationTime' )
+
+
+
def _init_connections(self):
"""
initializes the widget's connections
:return: none
"""
self.tbGetPressureSend .clicked.connect ( self.do_get_pressures_response )
self.tbSetPressureSend .clicked.connect ( self.do_set_pressures_response )
+ self.tbGetTemperatureSend .clicked.connect ( self.do_get_temperature_response )
+ self.tbSetTemperatureSend .clicked.connect ( self.do_set_temperature_response )
+ self.tbGetConcPumpSend .clicked.connect ( self.do_get_conc_pump_response )
+ self.tbSetConcPumpSend .clicked.connect ( self.do_set_conc_pump_response )
+ self.tbGetD12PumpSend .clicked.connect ( self.do_get_d12_pump_response )
+ self.tbSetD12PumpSend .clicked.connect ( self.do_set_d12_pump_response )
def getIntValue (self, message):
@@ -117,6 +288,12 @@
"""
self.init_get_pressures()
self.init_set_pressures()
+ self.init_get_temperature()
+ self.init_set_temperature()
+ self.init_get_ConcPump()
+ self.init_set_ConcPump()
+ self.init_get_d12_pump()
+ self.init_set_d12_pump()
def init_get_pressures(self):
@@ -130,7 +307,7 @@
def init_set_pressures(self):
- self.lbSetPressuresIndex .setText ("-")
+ self.lbSetPressureIndex .setText ("-")
self.lbSetPressureGain .setText ("-")
self.lbSetPressureOffset .setText ("-")
self.lbSetPressureCalibrationTime .setText ("-")
@@ -141,6 +318,67 @@
self.sbSetPressureCalibrationTime .setValue (0)
+ def init_get_temperature(self):
+ self.lbGetTemperatureReq .setText ("-")
+ self.sbGetTemperatureRejectionReason .setValue (0)
+ self.sbGetTemperatureIndex .setValue (0)
+ self.sbGetTemperatureGain .setValue (0)
+ self.sbGetTemperatureOffset .setValue (0)
+ self.sbGetTemperatureCalibrationTime .setValue (0)
+ self.cbGetTemperatureAccepted .setChecked ( True )
+
+
+ def init_set_temperature(self):
+ self.lbSetTemperatureIndex .setText ("-")
+ self.lbSetTemperatureGain .setText ("-")
+ self.lbSetTemperatureOffset .setText ("-")
+ self.lbSetTemperatureCalibrationTime .setText ("-")
+ self.cbSetTemperatureAccepted .setChecked ( True )
+ self.sbSetTemperatureIndex .setValue (0)
+ self.sbSetTemperatureGain .setValue (0)
+ self.sbSetTemperatureOffset .setValue (0)
+ self.sbSetTemperatureCalibrationTime .setValue (0)
+
+
+ def init_get_ConcPump(self):
+ self.lbGetConcPumpReq .setText ("-")
+ self.sbGetConcPumpRejectionReason .setValue (0)
+ self.sbGetConcPumpIndex .setValue (0)
+ self.sbGetConcPumpGain .setValue (0)
+ self.sbGetConcPumpOffset .setValue (0)
+ self.sbGetConcPumpCalibrationTime .setValue (0)
+ self.cbGetConcPumpAccepted .setChecked ( True )
+
+
+ def init_set_ConcPump(self):
+ self.lbSetConcPumpIndex .setText ("-")
+ self.lbSetConcPumpGain .setText ("-")
+ self.lbSetConcPumpOffset .setText ("-")
+ self.lbSetConcPumpCalibrationTime .setText ("-")
+ self.cbSetConcPumpAccepted .setChecked ( True )
+ self.sbSetConcPumpIndex .setValue (0)
+ self.sbSetConcPumpGain .setValue (0)
+ self.sbSetConcPumpOffset .setValue (0)
+ self.sbSetConcPumpCalibrationTime .setValue (0)
+
+
+ def init_get_d12_pump(self):
+ self.lbGetD12PumpReq .setText ("-")
+ self.sbGetD12PumpRejectionReason .setValue (0)
+ self.sbGetD12PumpTargetPumpSpeed .setValue (0)
+ self.sbGetD12PumpCalibrationTime .setValue (0)
+ self.cbGetD12PumpAccepted .setChecked ( True )
+
+
+ def init_set_d12_pump(self):
+ self.lbSetD12PumpTargetPumpSpeed .setText ("-")
+ self.lbSetD12PumpCalibrationTime .setText ("-")
+ self.cbSetD12PumpAccepted .setChecked ( True )
+ self.sbSetD12PumpTargetPumpSpeed .setValue (0)
+ self.sbSetD12PumpCalibrationTime .setValue (0)
+
+
+
@Slot()
def handle_get_calibration_pressures(self, message, timestamp = 0.0):
"""
@@ -150,7 +388,6 @@
message = message['message']
self.index = MsgFieldPositions.START_POS_FIELD_1
value = self.getIntValue(message)
- print(value)
cmdString = self.pressureList[value] if value >= 0 and value < len(self.pressureList) else ""
self.lbGetPressuresReq.setText(f"{cmdString} ({value})")
@@ -164,18 +401,159 @@
message = message['message']
self.index = MsgFieldPositions.START_POS_FIELD_1
value = self.getIntValue(message)
- gain = f"{self.getFloatValue(message):.1f}"
- offset = f"{self.getFloatValue(message):.1f}"
+ gain = f"{self.getFloatValue(message):.3f}"
+ offset = f"{self.getFloatValue(message):.3f}"
caltime = str(self.getIntValue(message))
cmdString = self.pressureList[value] if value >= 0 and value < len(self.pressureList) else ""
- self.lbSetPressuresIndex .setText(f"{cmdString} ({value})")
+ self.lbSetPressureIndex .setText(f"{cmdString} ({value})")
self.lbSetPressureGain .setText(gain)
self.lbSetPressureOffset .setText(offset)
self.lbSetPressureCalibrationTime .setText(caltime)
@Slot()
+ def handle_get_temperature_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+ value = self.getIntValue(message)
+ cmdString = self.temperatureList[value] if value >= 0 and value < len(self.temperatureList) else ""
+ self.lbGetTemperatureReq.setText(f"{cmdString} ({value})")
+
+
+ @Slot()
+ def handle_set_temperature_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+ value = self.getIntValue(message)
+ gain = f"{self.getFloatValue(message):.3f}"
+ offset = f"{self.getFloatValue(message):.3f}"
+ caltime = str(self.getIntValue(message))
+
+ cmdString = self.temperatureList[value] if value >= 0 and value < len(self.temperatureList) else ""
+ self.lbSetTemperatureIndex .setText(f"{cmdString} ({value})")
+ self.lbSetTemperatureGain .setText(gain)
+ self.lbSetTemperatureOffset .setText(offset)
+ self.lbSetTemperatureCalibrationTime .setText(caltime)
+
+
+ @Slot()
+ def handle_get_conc_pump_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+ value = self.getIntValue(message)
+ cmdString = self.concPumpList[value] if value >= 0 and value < len(self.concPumpList) else ""
+ self.lbGetConcPumpReq.setText(f"{cmdString} ({value})")
+
+
+ @Slot()
+ def handle_set_conc_pump_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+ value = self.getIntValue(message)
+ gain = f"{self.getFloatValue(message):.3f}"
+ offset = f"{self.getFloatValue(message):.3f}"
+ caltime = str(self.getIntValue(message))
+
+ cmdString = self.concPumpList[value] if value >= 0 and value < len(self.concPumpList) else ""
+ self.lbSetConcPumpIndex .setText(f"{cmdString} ({value})")
+ self.lbSetConcPumpGain .setText(gain)
+ self.lbSetConcPumpOffset .setText(offset)
+ self.lbSetConcPumpCalibrationTime .setText(caltime)
+
+
+ @Slot()
+ def handle_get_d12_pump_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+ self.lbGetD12PumpReq.setText("Received")
+
+
+ @Slot()
+ def handle_set_d12_pump_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ print("JERERERE")
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+ target = f"{self.getFloatValue(message):.3f}"
+ caltime = str(self.getIntValue(message))
+
+ self.lbSetD12PumpTargetPumpSpeed .setText(target)
+ self.lbSetD12PumpCalibrationTime .setText(caltime)
+
+
+ @Slot()
+ def handle_get_d48_pump_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+
+
+ @Slot()
+ def handle_set_d48_pump_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+
+
+ @Slot()
+ def handle_get_acid_conc_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+
+
+ @Slot()
+ def handle_set_acid_conc_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+
+
+ @Slot()
+ def handle_get_bicarb_conc_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+
+
+ @Slot()
+ def handle_set_bicarb_conc_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+
+
+ @Slot()
+ def handle_get_accel_sensor_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+
+
+ @Slot()
+ def handle_set_accel_sensor_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+
+
+ @Slot()
+ def handle_get_blood_leak_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+
+
+ @Slot()
+ def handle_set_blood_leak_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+
+
+ @Slot()
+ def handle_get_conductivity_sensor_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+
+
+ @Slot()
+ def handle_set_conductivity_sensor_pressures(self, message, timestamp = 0.0):
+ message = message['message']
+ self.index = MsgFieldPositions.START_POS_FIELD_1
+
+
+ @Slot()
def do_get_pressures_response(self):
self.lbGetPressuresReq .setText ("-")
self.dd_interface.dd_get_calibration_pressure_sensor_record(self.cbGetPressureAccepted .isChecked() ,
@@ -188,7 +566,7 @@
@Slot()
def do_set_pressures_response(self):
- self.lbSetPressuresIndex .setText ("-")
+ self.lbSetPressureIndex .setText ("-")
self.lbSetPressureGain .setText ("-")
self.lbSetPressureOffset .setText ("-")
self.lbSetPressureCalibrationTime .setText ("-")
@@ -199,3 +577,118 @@
self.sbSetPressureOffset .value() ,
self.sbSetPressureCalibrationTime .value() )
+
+ @Slot()
+ def do_get_temperature_response(self):
+ self.lbGetTemperatureReq .setText ("-")
+ self.dd_interface.dd_get_calibration_temperature_sensor_record( self.cbGetTemperatureAccepted .isChecked() ,
+ self.sbGetTemperatureRejectionReason .value() ,
+ self.sbGetTemperatureIndex .value() ,
+ self.sbGetTemperatureGain .value() ,
+ self.sbGetTemperatureOffset .value() ,
+ self.sbGetTemperatureCalibrationTime .value() )
+
+ @Slot()
+ def do_set_temperature_response(self):
+ self.lbSetTemperatureIndex .setText ("-")
+ self.lbSetTemperatureGain .setText ("-")
+ self.lbSetTemperatureOffset .setText ("-")
+ self.lbSetTemperatureCalibrationTime .setText ("-")
+ self.dd_interface.dd_set_calibration_temperature_sensor_record(self.cbSetTemperatureAccepted .isChecked() ,
+ self.sbSetTemperatureRejectionReason .value() ,
+ self.sbSetTemperatureIndex .value() ,
+ self.sbSetTemperatureGain .value() ,
+ self.sbSetTemperatureOffset .value() ,
+ self.sbSetTemperatureCalibrationTime .value() )
+
+
+ @Slot()
+ def do_get_conc_pump_response(self):
+ self.lbGetConcPumpReq .setText ("-")
+ self.dd_interface.dd_get_calibration_ConcPump_sensor_record( self.cbGetConcPumpAccepted .isChecked() ,
+ self.sbGetConcPumpRejectionReason .value() ,
+ self.sbGetConcPumpIndex .value() ,
+ self.sbGetConcPumpGain .value() ,
+ self.sbGetConcPumpOffset .value() ,
+ self.sbGetConcPumpCalibrationTime .value() )
+
+
+ @Slot()
+ def do_set_conc_pump_response(self):
+ self.lbSetConcPumpIndex .setText ("-")
+ self.lbSetConcPumpGain .setText ("-")
+ self.lbSetConcPumpOffset .setText ("-")
+ self.lbSetConcPumpCalibrationTime .setText ("-")
+ self.dd_interface.dd_set_calibration_ConcPump_sensor_record(self.cbSetConcPumpAccepted .isChecked() ,
+ self.sbSetConcPumpRejectionReason .value() ,
+ self.sbSetConcPumpIndex .value() ,
+ self.sbSetConcPumpGain .value() ,
+ self.sbSetConcPumpOffset .value() ,
+ self.sbSetConcPumpCalibrationTime .value() )
+
+
+ @Slot()
+ def do_get_d12_pump_response(self):
+ self.lbGetD12PumpReq .setText ("-")
+ self.dd_interface.dd_get_calibration_D12Pump_sensor_record( self.cbGetD12PumpAccepted .isChecked() ,
+ self.sbGetD12PumpRejectionReason .value() ,
+ self.sbGetD12PumpTargetPumpSpeed .value() ,
+ self.sbGetD12PumpCalibrationTime .value() )
+
+
+ @Slot()
+ def do_set_d12_pump_response(self):
+ self.lbSetD12PumpTargetPumpSpeed .setText ("-")
+ self.lbSetD12PumpCalibrationTime .setText ("-")
+ self.dd_interface.dd_set_calibration_D12Pump_sensor_record( self.cbSetD12PumpAccepted .isChecked() ,
+ self.sbSetD12PumpRejectionReason .value() ,
+ self.sbSetD12PumpTargetPumpSpeed .value() ,
+ self.sbSetD12PumpCalibrationTime .value() )
+
+
+ # @Slot()
+ # def do_get_d48_pump_response(self):
+
+
+ # @Slot()
+ # def do_set_d48_pump_response(self):
+
+
+ # @Slot()
+ # def do_get_acid_conc_response(self):
+
+
+ # @Slot()
+ # def do_set_acid_conc_response(self):
+
+
+ # @Slot()
+ # def do_get_bicarb_conc_response(self):
+
+
+ # @Slot()
+ # def do_set_bicarb_conc_response(self):
+
+
+ # @Slot()
+ # def do_get_accelerometer_sensor_response(self):
+
+
+ # @Slot()
+ # def do_set_accelerometer_sensor_response(self):
+
+
+ # @Slot()
+ # def do_get_blood_leak_sensor_response(self):
+
+
+ # @Slot()
+ # def do_set_blood_leak_sensor_response(self):
+
+
+ # @Slot()
+ # def do_get_conductivity_sensor_response(self):
+
+
+ # @Slot()
+ # def do_set_conductivity_sensor_response(self):
\ No newline at end of file