Index: HemodialysisDevice.py =================================================================== diff -u -r3f171e5d0207b44d3008de8d213e7e513eb11729 -rfd391b8c2b17088fa1bb18985abb584a156aa73c --- HemodialysisDevice.py (.../HemodialysisDevice.py) (revision 3f171e5d0207b44d3008de8d213e7e513eb11729) +++ HemodialysisDevice.py (.../HemodialysisDevice.py) (revision fd391b8c2b17088fa1bb18985abb584a156aa73c) @@ -531,6 +531,8 @@ END_POS_MEAS_MC_SPEED = START_POS_MEAS_MC_SPEED + 4 START_POS_MEAS_MC_CURR = END_POS_MEAS_MC_SPEED END_POS_MEAS_MC_CURR = START_POS_MEAS_MC_CURR + 4 + START_POS_PWM_DC = END_POS_MEAS_MC_CURR + END_POS_PWM_DC = START_POS_PWM_DC + 4 def __init__(self, outer_instance, can_interface=None): """ @@ -554,6 +556,7 @@ self.MeasuredBloodPumpSpeed = 0.0 self.MeasuredBloodPumpMCSpeed = 0.0 self.MeasuredBloodPumpMCurrent = 0.0 + self.PWMDutyCyclePct = 0.0 def handlerBloodFlowSyncFunction(self, message): """ @@ -577,6 +580,9 @@ message['message'][self.START_POS_MEAS_MC_SPEED:self.END_POS_MEAS_MC_SPEED])) self.MeasuredBloodPumpMCCurrent = struct.unpack('f', bytearray( message['message'][self.START_POS_MEAS_MC_CURR:self.END_POS_MEAS_MC_CURR])) + self.PWMDutyCyclePct = struct.unpack('f', bytearray( + message['message'][self.START_POS_PWM_DC:self.END_POS_PWM_DC])) + )) def CmdBloodFlowSetPointOverride(self, reset, flow): """ Index: document/Doxyfile =================================================================== diff -u -raf4e78cc8f334d92a29ce7aa2b89c15a2cca8064 -rfd391b8c2b17088fa1bb18985abb584a156aa73c --- document/Doxyfile (.../Doxyfile) (revision af4e78cc8f334d92a29ce7aa2b89c15a2cca8064) +++ document/Doxyfile (.../Doxyfile) (revision fd391b8c2b17088fa1bb18985abb584a156aa73c) @@ -2496,7 +2496,7 @@ # Customizations for doxypy FILTER_SOURCE_FILES = YES -INPUT_FILTER = "python /usr/local/bin/doxypy.py" +INPUT_FILTER = "doxypy" OPTIMIZE_OUTPUT_JAVA = YES EXTRACT_ALL = YES FILE_PATTERNS = *.py