Index: shared/scripts/configuration/config.py =================================================================== diff -u -r2413e6298b362ada05bed6e59568300c2034e18d -r569753d3ae672f7d00d8c06dcca22d2ef8f0aa0d --- shared/scripts/configuration/config.py (.../config.py) (revision 2413e6298b362ada05bed6e59568300c2034e18d) +++ shared/scripts/configuration/config.py (.../config.py) (revision 569753d3ae672f7d00d8c06dcca22d2ef8f0aa0d) @@ -9,14 +9,13 @@ # @file config.py # # @author (last) LTTS -# @date (last) 18-Jan-2022 +# @date (last) 08-July-2022 # ############################################################################ import os from configuration.strings import * - AUT_NAME = "denaliSquish" @@ -254,7 +253,12 @@ "rinseback_flow_rate" : [50, 25, 187], } +COLOR_CODES = {"Aqua": "#81ffff", "Blue": "#017dea", "Blue 2": "#1090d5", "Green": "#29fd2d", "Grey": "#d3d3d3", + "Lavender": "#db98f5", "Light Blue": "#acd7f1", "Light Teal": "#29f1da","Lime": "#b7fc36", + "Magenta":"#fd28fd", "Orange": "#f2721c", "Peach":"#f1979a", "Red": "#c53b33", "Rose":"#fc178d", + "Slate blue":"#7f7ffa", "Violet": "#6435c9", "White": "#ffffff", "Yellow": "#fcfc4d"} + #ultrafilteration volume based on flow parameters. Python list contains Rotational speed, Motor speed, # MC speed, MC current and PWM. TREATMENT_ULTRAFILTRATION_FLOW_PARAMETERS = { @@ -432,3 +436,8 @@ PARAMETER_INDEX = 5 +#cloud_sync_hd_opmodes +OPMODE_INDEX = 5 +SUBMODE = 6 +HD_OPMODES_MSG_PARAMETER_LEN = 7 +HD_OPMODES_CREDENTIAL_PARAMETER_LEN = 6 Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r2413e6298b362ada05bed6e59568300c2034e18d -r569753d3ae672f7d00d8c06dcca22d2ef8f0aa0d --- shared/scripts/configuration/strings.py (.../strings.py) (revision 2413e6298b362ada05bed6e59568300c2034e18d) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 569753d3ae672f7d00d8c06dcca22d2ef8f0aa0d) @@ -18,6 +18,7 @@ BLOOD_PRIMING_VALUE_0 = "0" BLOOD_PRIMING_DEFAULT_VALUE = BLOOD_PRIMING_VALUE_0 + " " + BLOOD_PRIMING_UNIT + #pretreatment_screen_bullets PRE_TREATMENT_SCREENS = ["Create" , "Sample" , "Consumables" , "Disposables" , "Prime" , "Ultrafiltration" , "BP/HR" , "Connection" , "Start"] POST_TREATMENT_SCREENS = ["Disconnection", "Review", "Disposables", "Disinfection"] @@ -838,4 +839,3 @@ CONFIRM_TEXT = "CONFIRM" SHUTDOWN_TEXT = "SHUTDOWN" - Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r2413e6298b362ada05bed6e59568300c2034e18d -r569753d3ae672f7d00d8c06dcca22d2ef8f0aa0d --- shared/scripts/configuration/utility.py (.../utility.py) (revision 2413e6298b362ada05bed6e59568300c2034e18d) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 569753d3ae672f7d00d8c06dcca22d2ef8f0aa0d) @@ -6,12 +6,12 @@ # WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. # # @file utils.py + # @author (last) LTTS # @date (last) 15-Jan-2022 # ############################################################################ - import builtins import csv import names @@ -323,8 +323,8 @@ def set_arterial_ranges_min_val(art_low): """ - Method to set the Arterial range maximum value to user expected value - @param art_low - (int) user expected value + Method to set the Arterial range maximum value to user expected value + @param art_low - (int) user expected value """ test.startSection("Set Arterial range minimum value to {}".format(art_low)) arterial_min = squish.waitForObjectExists(names.o_PreTreatmentCreate_rangeRect_RangeRect_Artery) @@ -369,8 +369,8 @@ def set_arterial_ranges_max_val(art_high): """ - Method to set the Arterial range maximum value to user expected value - @param art_high - (int) user expected value + Method to set the Arterial range maximum value to user expected value + @param art_high - (int) user expected value """ test.startSection("Set Arterial range maximum value to {}".format(art_high)) arterial_max = squish.waitForObjectExists(names.o_PreTreatmentCreate_rangeRect_RangeRect_Artery) @@ -415,8 +415,8 @@ def set_venous_ranges_max_val(ven_high): """ - Method to set the Venous range maximum value to user expected value - @param ven_high - (int) user expected value + Method to set the Venous range maximum value to user expected value + @param ven_high - (int) user expected value """ test.startSection("Set Venous range maximum value to {}".format(ven_high)) ven_max = squish.waitForObjectExists(names.o_PreTreatmentCreate_rangeRect_RangeRect_Venous) @@ -462,8 +462,8 @@ #Methods for create custom treatment def set_venous_ranges_min_val(ven_low): """ - Method to set the Venous range maximum value to user expected value - @param ven_low - (int) user expected value + Method to set the Venous range maximum value to user expected value + @param ven_low - (int) user expected value """ test.startSection("set Venous range minimum value to {}".format(ven_low)) ven_min = squish.waitForObjectExists(names.o_PreTreatmentCreate_rangeRect_RangeRect_Venous) @@ -1066,13 +1066,12 @@ except: test.fail("Log file is not created or log file is not created based on standard log naming format.") - def get_epoch_value_consistancy(current_epoch_value, expected_epoch_value): """ This function is verify consistancy of epoch value. @input current_epoch_value (float) - current epoch time - @input expected_epoch_value (str) - epoch time from cloud-sync log. - @return (bool) - True - if expected value is in range. else, return False + @input expected_epoch_value (str) - epoch time from the cloud-sync log. + @return (bool) - True/False """ expected_epoch_value = int(expected_epoch_value) maximum_epoch_value = int(current_epoch_value + 25) @@ -1081,4 +1080,3 @@ if expected_epoch_value > minimum_epoch_value and expected_epoch_value < maximum_epoch_value : return True return False - Index: shared/scripts/names.py =================================================================== diff -u -r2413e6298b362ada05bed6e59568300c2034e18d -r569753d3ae672f7d00d8c06dcca22d2ef8f0aa0d --- shared/scripts/names.py (.../names.py) (revision 2413e6298b362ada05bed6e59568300c2034e18d) +++ shared/scripts/names.py (.../names.py) (revision 569753d3ae672f7d00d8c06dcca22d2ef8f0aa0d) @@ -953,5 +953,5 @@ o_PostTreatmentStack_treatmentReviewConfirm_PostTreatmentReview = {"container": o_PostTreatmentStack_PostTreatmentStack, "objectName": "_treatmentReviewConfirm", "type": "PostTreatmentReview", "visible": True} o_treatmentReviewConfirm_Code_Tx_code_Label = {"container": o_PostTreatmentStack_treatmentReviewConfirm_PostTreatmentReview, "text": "Code: Tx_code", "type": "Label", "unnamed": 1, "visible": True} - - +#cloud_sync_hd_opmodes +device_settings_screen = {"container": o_Gui_MainView, "text": "Treatment", "type": "Text", "unnamed": 1, "visible": True}