Index: leahi_dialin.egg-info/PKG-INFO =================================================================== diff -u --- leahi_dialin.egg-info/PKG-INFO (revision 0) +++ leahi_dialin.egg-info/PKG-INFO (revision 7a827f82f5866f5780a0a679920b1e7b75280efd) @@ -0,0 +1,13 @@ +Metadata-Version: 1.2 +Name: leahi-dialin +Version: 1.0.0+develop.9bec057 +Summary: The Diality Dialin API +Home-page: UNKNOWN +Author: Micheal Garthwaite +Author-email: mgarthwaite@diality.com +License: UNKNOWN +Description: UNKNOWN +Platform: UNKNOWN +Classifier: Programming Language :: Python :: 3.6 +Classifier: Operating System :: POSIX :: Linux +Requires-Python: ~=3.6 Index: leahi_dialin.egg-info/SOURCES.txt =================================================================== diff -u --- leahi_dialin.egg-info/SOURCES.txt (revision 0) +++ leahi_dialin.egg-info/SOURCES.txt (revision 7a827f82f5866f5780a0a679920b1e7b75280efd) @@ -0,0 +1,74 @@ +README.md +setup.py +leahi_dialin/__init__.py +leahi_dialin/version.py +leahi_dialin.egg-info/PKG-INFO +leahi_dialin.egg-info/SOURCES.txt +leahi_dialin.egg-info/dependency_links.txt +leahi_dialin.egg-info/requires.txt +leahi_dialin.egg-info/top_level.txt +leahi_dialin/common/__init__.py +leahi_dialin/common/alarm_defs.py +leahi_dialin/common/alarm_priorities.py +leahi_dialin/common/dd_defs.py +leahi_dialin/common/msg_defs.py +leahi_dialin/common/msg_ids.py +leahi_dialin/common/td_defs.py +leahi_dialin/common/test_config_defs.py +leahi_dialin/common/ui_defs.py +leahi_dialin/dd/__init__.py +leahi_dialin/dd/dialysate_delivery.py +leahi_dialin/dd/modules/__init__.py +leahi_dialin/dd/modules/balancing_chamber.py +leahi_dialin/dd/modules/concentrate_pump.py +leahi_dialin/dd/modules/conductivity_sensors.py +leahi_dialin/dd/modules/constants.py +leahi_dialin/dd/modules/dialysate_pump.py +leahi_dialin/dd/modules/gen_dialysate.py +leahi_dialin/dd/modules/heaters.py +leahi_dialin/dd/modules/levels.py +leahi_dialin/dd/modules/pressure_sensors.py +leahi_dialin/dd/modules/temperature_sensors.py +leahi_dialin/dd/modules/valves.py +leahi_dialin/dd/proxies/__init__.py +leahi_dialin/dd/proxies/ro_proxy.py +leahi_dialin/dd/proxies/td_proxy.py +leahi_dialin/protocols/CAN.py +leahi_dialin/protocols/__init__.py +leahi_dialin/ro/__init__.py +leahi_dialin/ro/reverse_osmosis.py +leahi_dialin/ro/modules/__init__.py +leahi_dialin/ro/modules/boost_pump.py +leahi_dialin/ro/modules/conductivity_sensors.py +leahi_dialin/ro/modules/constants.py +leahi_dialin/ro/modules/flow_sensors.py +leahi_dialin/ro/modules/levels.py +leahi_dialin/ro/modules/pressure_sensors.py +leahi_dialin/ro/modules/valves.py +leahi_dialin/td/__init__.py +leahi_dialin/td/treatment_delivery.py +leahi_dialin/td/modules/__init__.py +leahi_dialin/td/modules/air_pump.py +leahi_dialin/td/modules/air_trap.py +leahi_dialin/td/modules/alarms.py +leahi_dialin/td/modules/blood_flow.py +leahi_dialin/td/modules/bubble_detector.py +leahi_dialin/td/modules/buttons.py +leahi_dialin/td/modules/constants.py +leahi_dialin/td/modules/pressure_sensors.py +leahi_dialin/td/modules/switches.py +leahi_dialin/td/modules/valves.py +leahi_dialin/td/modules/voltages.py +leahi_dialin/td/proxies/__init__.py +leahi_dialin/td/proxies/dd_proxy.py +leahi_dialin/td/proxies/ro_proxy.py +leahi_dialin/ui/__init__.py +leahi_dialin/utils/__init__.py +leahi_dialin/utils/base.py +leahi_dialin/utils/checks.py +leahi_dialin/utils/conversions.py +leahi_dialin/utils/data_logger.py +leahi_dialin/utils/excel_ops.py +leahi_dialin/utils/helpers.py +leahi_dialin/utils/nv_ops_utils.py +leahi_dialin/utils/singleton.py \ No newline at end of file Index: leahi_dialin.egg-info/dependency_links.txt =================================================================== diff -u --- leahi_dialin.egg-info/dependency_links.txt (revision 0) +++ leahi_dialin.egg-info/dependency_links.txt (revision 7a827f82f5866f5780a0a679920b1e7b75280efd) @@ -0,0 +1 @@ + Index: leahi_dialin.egg-info/requires.txt =================================================================== diff -u --- leahi_dialin.egg-info/requires.txt (revision 0) +++ leahi_dialin.egg-info/requires.txt (revision 7a827f82f5866f5780a0a679920b1e7b75280efd) @@ -0,0 +1,13 @@ +aenum +cycler +importlib-metadata +kiwisolver +matplotlib +numpy +openpyxl +pandas +pyparsing +python-can +python-dateutil +six +wrapt Index: leahi_dialin.egg-info/top_level.txt =================================================================== diff -u --- leahi_dialin.egg-info/top_level.txt (revision 0) +++ leahi_dialin.egg-info/top_level.txt (revision 7a827f82f5866f5780a0a679920b1e7b75280efd) @@ -0,0 +1 @@ +leahi_dialin Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -r9a915d188a0e77cc68e9d5a91de66bacbd1da96f -r7a827f82f5866f5780a0a679920b1e7b75280efd --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 9a915d188a0e77cc68e9d5a91de66bacbd1da96f) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 7a827f82f5866f5780a0a679920b1e7b75280efd) @@ -255,36 +255,36 @@ # Extract each valve state from U16 valves states using bit-masking self.valve_state_VHO["state"] = self._binary_to_valve_state(vst[0] & 1) self.valve_state_VTD["state"] = self._binary_to_valve_state(vst[0] & 2) - self.valve_state_VHB["state"] = self._binary_to_valve_state(vst[0] & 8) - self.valve_state_VRP["state"] = self._binary_to_valve_state(vst[0] & 16) - self.valve_state_VDR["state"] = self._binary_to_valve_state(vst[0] & 32) - self.valve_state_VDB2["state"] = self._binary_to_valve_state(vst[0] & 64) - self.valve_state_VP1["state"] = self._binary_to_valve_state(vst[0] & 128) - self.valve_state_VPT["state"] = self._binary_to_valve_state(vst[0] & 256) - self.valve_state_VDB1["state"] = self._binary_to_valve_state(vst[0] & 512) - self.valve_state_VDI["state"] = self._binary_to_valve_state(vst[0] & 1024) - self.valve_state_VDO["state"] = self._binary_to_valve_state(vst[0] & 2048) - self.valve_state_VP2["state"] = self._binary_to_valve_state(vst[0] & 4096) - self.valve_state_VHI["state"] = self._binary_to_valve_state(vst[0] & 8192) - self.valve_state_VWI["state"] = self._binary_to_valve_state(vst[0] & 16384) - self.valve_state_rsvrd1["state"] = self._binary_to_valve_state(vst[0] & 32768) - self.valve_state_rsvrd2["state"] = self._binary_to_valve_state(vst[0] & 65536) + self.valve_state_VHB["state"] = self._binary_to_valve_state(vst[0] & 4) + self.valve_state_VRP["state"] = self._binary_to_valve_state(vst[0] & 8) + self.valve_state_VDR["state"] = self._binary_to_valve_state(vst[0] & 16) + self.valve_state_VDB2["state"] = self._binary_to_valve_state(vst[0] & 32) + self.valve_state_VP1["state"] = self._binary_to_valve_state(vst[0] & 64) + self.valve_state_VPT["state"] = self._binary_to_valve_state(vst[0] & 128) + self.valve_state_VDB1["state"] = self._binary_to_valve_state(vst[0] & 256) + self.valve_state_VDI["state"] = self._binary_to_valve_state(vst[0] & 512) + self.valve_state_VDO["state"] = self._binary_to_valve_state(vst[0] & 1024) + self.valve_state_VP2["state"] = self._binary_to_valve_state(vst[0] & 2048) + self.valve_state_VHI["state"] = self._binary_to_valve_state(vst[0] & 4096) + self.valve_state_VWI["state"] = self._binary_to_valve_state(vst[0] & 8192) + self.valve_state_rsvrd1["state"] = self._binary_to_valve_state(vst[0] & 16384) + self.valve_state_rsvrd2["state"] = self._binary_to_valve_state(vst[0] & 32768) bcv = struct.unpack('B', bytearray(message['message'][self.START_POS_BCV_VALVES_STATES:self.END_POS_BCV_VALVES_STATES])) self.valve_state_BCV1["state"] = self._binary_to_valve_state(bcv[0] & 1) self.valve_state_BCV2["state"] = self._binary_to_valve_state(bcv[0] & 2) - self.valve_state_BCV3["state"] = self._binary_to_valve_state(bcv[0] & 8) - self.valve_state_BCV7["state"] = self._binary_to_valve_state(bcv[0] & 16) - self.valve_state_BCV5["state"] = self._binary_to_valve_state(bcv[0] & 32) - self.valve_state_BCV6["state"] = self._binary_to_valve_state(bcv[0] & 64) - self.valve_state_BCV4["state"] = self._binary_to_valve_state(bcv[0] & 128) - self.valve_state_BCV8["state"] = self._binary_to_valve_state(bcv[0] & 256) + self.valve_state_BCV3["state"] = self._binary_to_valve_state(bcv[0] & 4) + self.valve_state_BCV7["state"] = self._binary_to_valve_state(bcv[0] & 8) + self.valve_state_BCV5["state"] = self._binary_to_valve_state(bcv[0] & 16) + self.valve_state_BCV6["state"] = self._binary_to_valve_state(bcv[0] & 32) + self.valve_state_BCV4["state"] = self._binary_to_valve_state(bcv[0] & 64) + self.valve_state_BCV8["state"] = self._binary_to_valve_state(bcv[0] & 128) ufi = struct.unpack('B', bytearray(message['message'][self.START_POS_UFI_VALVES_STATES:self.END_POS_UFI_VALVES_STATES])) self.valve_state_UFI1["state"] = self._binary_to_valve_state(ufi[0] & 1) self.valve_state_UFI2["state"] = self._binary_to_valve_state(ufi[0] & 2) - self.valve_state_UFI3["state"] = self._binary_to_valve_state(ufi[0] & 8) - self.valve_state_UFI4["state"] = self._binary_to_valve_state(ufi[0] & 16) + self.valve_state_UFI3["state"] = self._binary_to_valve_state(ufi[0] & 4) + self.valve_state_UFI4["state"] = self._binary_to_valve_state(ufi[0] & 8) start = self.END_POS_UFI_VALVES_STATES end = start + 1 @@ -408,9 +408,8 @@ """ Constructs and sends the valve open close command - @param valve: unsigned int - dialysate pump ID - @param command: int - value to command the dialysate pump - @param speed: integer - rpm to set the speed to + @param valve: int - valve ID + @param state: int - valve state to command the valve to @return: 1 if successful, zero otherwise """