Index: shared/scripts/configuration/config.py =================================================================== diff -u -r9c7d70310b95c674deb5b9207e953ce8526b31ce -reac82ce576632cb0d401c3bff8c4e1cea4d724f2 --- shared/scripts/configuration/config.py (.../config.py) (revision 9c7d70310b95c674deb5b9207e953ce8526b31ce) +++ shared/scripts/configuration/config.py (.../config.py) (revision eac82ce576632cb0d401c3bff8c4e1cea4d724f2) @@ -5,12 +5,8 @@ # # THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN # WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. -# -# @file config.py -# -# @author (last) LTTS -# @date (last) 18-Jan-2022 -# +# @author (last) LTTS +# @date (last) 14-June-2022 ############################################################################ import os @@ -32,7 +28,7 @@ ENABLED = True DISABLED = False CURRENT_COLOR = '#000000' -COMPLETE_COLOR= '#4290ec' +COMPLETE_COLOR = '#4290ec' ENABLED_COLOR = '#fcfcfc' INCOMPLETE_COLOR = '#607a91' OUT_OF_RANGE_COLOR = "#c53b33" @@ -46,11 +42,7 @@ HEART_RATE_LOWER_LIMIT = 40 HEART_RATE_UPPER_LIMIT = 180 - -KEYBOARD_SWITCH = ["ABC", "&123"] - -#create custom treatment -PATIENT_ID = "demopatientid" +#create custom treatment HEPARIN_TYPE = "UFH 1,000 IU/mL" ACID_CONCENTRATE = ["Fres. Naturalyte", "08-1251-1", "08-2251-0", "08-3251-9"] BICARBONATE_CONCENTRATE = "Fres. Centrisol" @@ -60,11 +52,7 @@ "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"} - -CURRENT_COLOR = '#000000' -COMPLETE_COLOR= '#4290ec' -ENABLED_COLOR = '#fcfcfc' -INCOMPLETE_COLOR = '#607a91' + TREATMENT_UNHIGHLIGHTED_COLOR = "#000000" TREATMENT_HIGHLIGHTED_COLOR = "#135088" OPERATIONAL_PARAMETERS = {"Heparin Type": HEPARIN_TYPE, "Acid Concentrate": "Fres. Naturalyte", @@ -85,23 +73,11 @@ VENOUS_VALUE_570 = 570 POSITIVE_BUFFER = 10 NEGATIVE_BUFFER = -10 -PATIENT_ID = "demopatientid" -HEPARIN_TYPE = "UFH 1,000 IU/mL" -ACID_CONCENTRATE = ["Fres. Naturalyte", "08-1251-1", "08-2251-0", "08-3251-9"] -BICARBONATE_CONCENTRATE = "Fres. Centrisol" -DIALYZER_TYPE = ["BB Diacap Pro 13H", "BB Diacap Pro 16H", "BB Diacap Pro 19H", "F Optiflux F160NRe", "F Optiflux F180NRe"] -TREATMENT_UNHIGHLIGHTED_COLOR = "#000000" -TREATMENT_HIGHLIGHTED_COLOR = "#135088" - -OPERATIONAL_PARAMETERS = {"Heparin Type": HEPARIN_TYPE, "Acid Concentrate": "Fres. Naturalyte", - "Bicarbonate Concentrate": BICARBONATE_CONCENTRATE, "Dialyzer Type": "BB Diacap Pro 16H"} #Alarm List NUM_OF_ALARM_PRIORITIES = 4 # Total number of alarm priorities NUM_OF_REQUEST_REJECT_REASONS = 43 NUM_OF_MSG_ID = 289 -ACCEPTED = True -REJECTED = False ALARM_ID_NO_ALARM = 0 ALARM_ID_OUT_OF_RANGE = 290 @@ -142,7 +118,7 @@ ALARM_BUTTONS_RINSEBACK_RESUME_END = ALARM_BUTTONS_RESUME_RINSEBACK_END ALARM_BUTTONS_END_RESUME_RINSEBACK = ALARM_BUTTONS_RESUME_RINSEBACK_END -#standby mode +#standby mode & ultrafiltration SALINE_BOLUS_CUMULATIVE = 300 UF_MINIMUM_VALUE = 0 UF_MAXIMUM_VALUE = 600 @@ -182,13 +158,7 @@ DIALYSATE_FLOW_BUFFER = 50 DIALYSATE_FLOW_SLIDER_WIDTH_BUFFER = 60 -#main treatment screen -SYSTOLIC_LOWER_LIMIT = 60 -SYSTOLIC_UPPER_LIMIT = 250 -DIASTOLIC_LOWER_LIMIT = 40 -DIASTOLIC_UPPER_LIMIT = 200 -HEART_RATE_LOWER_LIMIT = 40 -HEART_RATE_UPPER_LIMIT = 180 +#blood priming BLOOD_PRIMING_RANGE = 300 BLOOD_PRIMING_TARGET_MAXIMUM = 300 @@ -259,10 +229,6 @@ "rinseback_flow_rate" : [50, 25, 187], } -#Ultrafilteration -SALINE_BOLUS_CUMULATIVE = 300 -UF_MINIMUM_VALUE = 0 -UF_MAXIMUM_VALUE = 600 #ultrafilteration volume based on flow parameters. Python list contains Rotational speed, Motor speed, # MC speed, MC current and PWM. @@ -284,13 +250,6 @@ 5 : {"uf_maximum" : 480, "uf_minimum" : 380}, } -BLOOD_PRIMING_TEXT = "Blood Priming" -SALINE_UNIT = "mL" -BLOOD_PRIMING_DEFAULT_VALUE = "0 mL" - -#tst_treatment_saline_data -NUM_OF_REQUEST_REJECT_REASONS = 43 - #dictionary contains saline cumulative and saline delivered value #key : saline cumulative value. #value: saline delivered value @@ -356,40 +315,7 @@ "OPTION_12" : {"uf_maximum" : 1250, "uf_minimum" : 0}, } -#create custom treatment -HIGHER_VALUE_OF_BLOOD_FLOW_RATE = 500 -LOWER_VALUE_OF_BLOOD_FLOW_RATE = 100 -STEP_VALUE_OF_BLOOD_FLOW_RATE = 25 -BUFFER_LOW_AND_HIGH_LIMITS = 30 -ARTERIAL_VALUE_0 = 0 -ARTERIAL_VALUE_NEGATIVE_300 = -300 -ARTERIAL_VALUE_NEGATIVE_20 = -20 -ARTERIAL_VALUE_NEGATIVE_270 = -270 -VENOUS_VALUE_600 = 600 -VENOUS_VALUE_20 = 20 -VENOUS_VALUE_50 = 50 -VENOUS_VALUE_570 = 570 -POSITIVE_BUFFER = 10 -NEGATIVE_BUFFER = -10 - -#create custom treatment -HIGHER_VALUE_OF_BLOOD_FLOW_RATE = 500 -LOWER_VALUE_OF_BLOOD_FLOW_RATE = 100 -STEP_VALUE_OF_BLOOD_FLOW_RATE = 25 -BUFFER_LOW_AND_HIGH_LIMITS = 30 -ARTERIAL_VALUE_0 = 0 -ARTERIAL_VALUE_NEGATIVE_300 = -300 -ARTERIAL_VALUE_NEGATIVE_20 = -20 -ARTERIAL_VALUE_NEGATIVE_270 = -270 -VENOUS_VALUE_600 = 600 -VENOUS_VALUE_20 = 20 -VENOUS_VALUE_50 = 50 -VENOUS_VALUE_570 = 570 -POSITIVE_BUFFER = 10 -NEGATIVE_BUFFER = -10 - - #pre-treatment_priming NOT_VISIBLE = False VISIBLE = True @@ -407,13 +333,6 @@ MINIMUM_COUNTDOWN_TIME = 0 CONSUMABLE_SELF_TEST_BICARB_PUMP_CHECK_STATE = 3 -#services -ENABLED = True -DISABLED = False - -OUT_OF_RANGE_COLOR = "#c53b33" -IN_RANGE_COLOR = "#fcfcfc" -SERVICE_CONF_LOCATION = os.environ['HOME']+"/Projects/application/resources/settings/Service.conf" VALID = True INVALID = False @@ -463,11 +382,6 @@ "Average Venous Pressure": [20.0, 101.45], } -#main-treatment heparin -NUM_OF_REQUEST_REJECT_REASONS = 43 - #ui_logs RESET_BINARY = "0" SET_BINARY = "1" #Message binaries appending with for easy identification - - Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r9c7d70310b95c674deb5b9207e953ce8526b31ce -reac82ce576632cb0d401c3bff8c4e1cea4d724f2 --- shared/scripts/configuration/strings.py (.../strings.py) (revision 9c7d70310b95c674deb5b9207e953ce8526b31ce) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision eac82ce576632cb0d401c3bff8c4e1cea4d724f2) @@ -6,29 +6,26 @@ # # THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN # WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - # @file strings.py # # @author (last) LTTS -# @date (last) 18-Jan-2022 +# @date (last) 14-June-2022 ############################################################################ - +#pretreatment_screen_bullets PRE_TREATMENT_SCREENS = ["Create" , "Sample" , "Consumables" , "Disposables" , "Prime" , "Ultrafiltration" , "BP/HR" , "Connection" , "Start"] POST_TREATMENT_SCREENS = ["Disconnection", "Review", "Disposables", "Disinfection"] BLOOD_PRIMING_TEXT = "Blood Priming" SALINE_UNIT = "mL" BLOOD_PRIMING_DEFAULT_VALUE = "0 mL" + +#UF treatment ULTRAFILTRATION_PAUSED_TEXT = "Ultrafiltration Paused" RESUME_TEXT = "RESUME ULTRAFILTRATION" EDIT_TEXT = "EDIT ULTRAFILTRATION VOLUME" TITLE_TEXT = "ULTRAFILTRATION VOLUME (L)" -BLOOD_PRIMING_TEXT = "Blood Priming" -SALINE_UNIT = "mL" -BLOOD_PRIMING_DEFAULT_VALUE = "0 mL" - #main treatment pressure PRESSURE_TITLE = "PRESSURES" ARTERIAL_TITLE = "Arterial" @@ -49,10 +46,11 @@ HEPARIN_PAUSE_DELIVERY_TEXT = "PAUSE DELIVERY" HEPARIN_MAXIMUM_VOLUME_DELIVERED_TEXT = "Maximum Cumulative Heparin Volume Delivered" HEPARIN_SYRINGE_EMPTY_TEXT = "Syringe Empty" +HEPARIN_DISPENSING_RATE = "Heparin Dispensing Rate" +HEPARIN_BOLUS_VOLUME = "Heparin Bolus Volume" +HEPARIN_STOP_TIME = "Heparin Stop Time" +HEPARIN_TYPE_TITLE = "Heparin Type" -#tst_treatment_saline_data -SALINE_UNIT = "mL" - # dictionary of rejection reason from application source code. # message location -> denali-> Headers-> common-> MsgDefs.h REJECTION_REASON = { @@ -407,38 +405,13 @@ 3 : 'ALARM_PRIORITY_HIGH', } -#main-treatment heparin -HEPARIN_TEXT = "HEPARIN" -HEPARIN_UNIT = "mL" -HEPARIN_DELIVERY_TEXT = "HEPARIN DELIVERY" -HEPARIN_DELIVERY_OFF_TEXT = "OFF" -HEPARIN_STOP_TEXT = "Delivery Stopped" -HEPARIN_RESUME_DELIVERY_TEXT = "RESUME DELIVERY" -HEPARIN_BOLUS_ACTIVE_TEXT = "Bolus Active" -HEPARIN_BOLUS_DISPENSING_TEXT = "Dispensing Active" -HEPARIN_PAUSE_DELIVERY_TEXT = "PAUSE DELIVERY" -HEPARIN_MAXIMUM_VOLUME_DELIVERED_TEXT = "Maximum Cumulative Heparin Volume Delivered" -HEPARIN_SYRINGE_EMPTY_TEXT = "Syringe Empty" -HEPARIN_DISPENSING_RATE = "Heparin Dispensing Rate" -HEPARIN_BOLUS_VOLUME = "Heparin Bolus Volume" -HEPARIN_STOP_TIME = "Heparin Stop Time" -HEPARIN_TYPE_TITLE = "Heparin Type" - #Setting EXPORT_TEXT ="Export" DEVICE_SETTINGS_TEXT = "Device Settings" DEVICE_SETTINGS_SCREEN_PARAMETER = ["Information", "Volume And Brightness", "Wi-Fi", "Bluetooth Cuff", "Dialysate Generator Settings", "Services"] -SettingsHome_Treatment_Text = "Treatment" -SettingsHome_Manager_Text = "Manager" -SettingsHome_Settings_Text = "Settings" - #UF treatment LIQUID_UNIT = "mL" -ULTRAFILTRATION_PAUSED_TEXT = "Ultrafiltration Paused" -RESUME_TEXT = "RESUME ULTRAFILTRATION" -EDIT_TEXT = "EDIT ULTRAFILTRATION VOLUME" -TITLE_TEXT = "ULTRAFILTRATION VOLUME (L)" #create custom treatment TREATMENT_TITLE = "Create a Custom Treatment" @@ -458,21 +431,7 @@ BLOOD_PRESSURE_UNIT = "mmHg" HEART_RATE_UNIT = "BPM" -#create custom treatment -TREATMENT_TITLE = "Create a Custom Treatment" -CONFIRM_TREATMENT_TITLE = "Confirm Treatment" -PRESCRIPTION_TITLE = "PRESCRIPTION" -OPERATING_PARAMETERS_TITLE = "OPERATING PARAMETERS" -PATIENT_ID_TEXT = "Patient ID" PATIENT_ID = "demopatientid" -BLOOD_FLOW_RATE = "Blood Flow Rate" -DIALYSATE_FLOW_RATE = "Dialysate Flow Rate" -DURATION = "Duration" -HEPARIN_DISPENSING_RATE = "Heparin Dispensing Rate" -HEPARIN_BOLUS_VOLUME = "Heparin Bolus Volume" -HEPARIN_STOP_TIME = "Heparin Stop Time" -SALINE_BOLUS_VOLUME = "Saline Bolus Volume" -HEPARIN_TYPE_TITLE = "Heparin Type" SALINE_BOLUS_TITLE = "Saline Bolus" ACID_CONCENTRATE_TITLE = "Acid Concentrate" BICARBONATE_CONCENTRATE_TITLE = "Bicarbonate Concentrate" @@ -481,14 +440,12 @@ BLOOD_PRESSURE_MEASUREMENT_INTERVAL = "Blood Pressure Measurement Interval" RINSEBACK_FLOW_RATE = "Rinseback Flow Rate" OFF_TEXT = "OFF" +BACK_TEXT = "BACK" CONTINUE_TEXT = "CONTINUE" CREATE_TREATMENT_PARAMETERS = ["Blood Flow Rate", "Dialysate Flow Rate", "Duration","Heparin Dispensing Rate", "Heparin Bolus Volume","Heparin Stop Time", "Saline Bolus", "Dialysate Temperature", "Blood Pressure Measurement Interval", "Rinseback Flow Rate"] -OFF_TEXT = "OFF" -BACK_TEXT = "BACK" -CONTINUE_TEXT = "CONTINUE" PRESCRIPTION_DETAILS = { "Blood Flow Rate": "mL/min", "Dialysate Flow Rate": "mL/min", @@ -515,34 +472,21 @@ PRIMING_TITLE = "Priming" SYSTEM_SELF_TEST_TITLE = "System Self Test" FILTER_FLUSH_TITLE = "Filter Flush" -SALINE_UNIT = "mL" -BLOOD_PRIMING_DEFAULT_VALUE = "0 mL" -BLOOD_PRIMING_TEXT = "Blood Priming" #Pre-Treatment Disposables NEXT_BUTTON_TEXT = "NEXT" BACK_BUTTON_TEXT = "BACK" CONFIRM_BUTTON_TEXT = "CONFIRM" -#Filter Flush -BEGIN_PRIME_TITLE = "Begin Prime" -PRIMING_TITLE = "Priming" -FILTER_FLUSH_TITLE = "Filter Flush" -SYSTEM_SELF_TEST_TITLE = "System Self Test" - - #Pre_treatment_water_sample SAMPLE_TEXT = "Sample" CREATE_TEXT = "Create" WATER_SAMPLE_BUTTON_TEXT = "WATER SAMPLE" -NEXT_BUTTON_TEXT = "NEXT" -WATER_SAMPLE_BUTTON_TEXT = "WATER SAMPLE" -BACK_BUTTON_TEXT = "BACK" PASS_TEXT = "PASS" FAIL_TEXT = "FAIL" OK_TEXT = "OK" -#Vitals +#Vitals & pretreatment_patient_connection SYSTOLIC_TEXT = "systolic" DIASTOLIC_TEXT = "diastolic" @@ -552,44 +496,11 @@ SELF_TEST_COMPLETION_MSG = "Self Test Complete!" PRIMING_COMPLETE_MSG = "Priming Complete!" -#main treatment pressure -PRESSURE_TITLE = "PRESSURES" -ARTERIAL_TITLE = "Arterial" -VENOUS_TITLE = "Venous" -VENOUS_UOM = "mmHg" -ARTERIAL_UOM = "mmHg" -LOW_TEXT = "LOW" -HIGH_TEXT = "HIGH" - #main_treatment_flows FLOW_UNIT = "mL/min" BLOOD_FLOW_TEXT = "blood" DIALYSATE_FLOW_TEXT = "dialysate" - -#main treatment screen -VITALS_TITLE = "VITALS" -IN_RANGE_COLOR = "#fcfcfc" - -PRESCRIPTION_DETAILS = { - "Blood Flow Rate": "mL/min", "Dialysate Flow Rate": "mL/min", - "Duration": "min", "Heparin Dispensing Rate": "mL/hr", - "Heparin Bolus Volume": "mL", "Heparin Stop Time": "min", - "Saline Bolus Volume": "mL", - "Dialysate Temperature": "°C", "Arterial Pressure Limit Low": "mmHg", - "Arterial Pressure Limit High": "mmHg","Blood Pressure Measure Interval":"min", - "Rinseback Rate" : "mL/min", "Venous Pressure Limit High": "mmHg", - "Venous Pressure Limit Low": "mmHg" -} - -# pretreatment_patient_connection -DIASTOLIC_TEXT = "diastolic" -SYSTOLIC_TEXT = "systolic" -HEART_RATE_TITLE = "Heart Rate" -BLOOD_PRESSURE_TITLE = "Blood Pressure" -BLOOD_PRESSURE_UNIT = "mmHg" -HEART_RATE_UNIT = "BPM" - #tst_treatment_monitoring FLOWS_TEXT = "FLOWS" BLOOD_UNIT = "mL/min" @@ -606,12 +517,10 @@ SALINE_BOLUS = "SALINE BOLUS" VOLUME_DELIVERED = "Volume Delivered" CUMULATIVE_DELIVERED = "Cumulative Delivered" -VOLUME_DELIVERED = "Volume Delivered" #post-treatment PATIENT_DISCONNECTION_TEXT = "Patient Disconnection" REVIEW_TEXT = "Review" -EXPORT_TEXT = "Export" PATIENT_DISCONNECTION_CONFIRM_BUTTON_TEXT = "CONFIRM" DISPOSABLE_TEXT = "Disposables" NEXT_TEXT = "NEXT" @@ -676,7 +585,7 @@ #services SHUTDOWN_TEXT = "SHUTDOWN" -# pretreatment_patient_connection +# pretreatment_patient_connection & ui logs ACK_REQ_STATUS = 'Ack Req' ACK_BAK_STATUS = 'Ack Bak' PATIENT_CONNECTION_TEXT = "Patient Connection" @@ -690,22 +599,3 @@ 2 : "Remove arterial and venous shunt.", 3 : "Connect arterial and venous cartridge lines to your patient access lines." } - -ACCEPTED = True -REJECTED = False - -#pretreatment_screen_bullets -PRE_TREATMENT_SCREENS = ["Create" , "Sample" , "Consumables" , "Disposables" , "Prime" , "Ultrafiltration" , "BP/HR" , "Connection" , "Start"] - -#ui_logs -ACK_REQ_STATUS = 'Ack Req' -ACK_BAK_STATUS = 'Ack Bak' -BLOOD_PRIMING_TEXT = "Blood Priming" -SALINE_UNIT = "mL" -BLOOD_PRIMING_DEFAULT_VALUE = "0 mL" - -#standby mode -BLOOD_PRIMING_TEXT = "Blood Priming" -SALINE_UNIT = "mL" - -