Index: leahi_dialin/common/td_defs.py =================================================================== diff -u -r862daa5b6357ddaba02aa7d1fb9d0952e4a16e6f -r67f759670b9e987f698b58bf7c969e0fa8c78fec --- leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 862daa5b6357ddaba02aa7d1fb9d0952e4a16e6f) +++ leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 67f759670b9e987f698b58bf7c969e0fa8c78fec) @@ -1058,19 +1058,21 @@ MEASURED_BLOOD_FLOW_RATE = 1 # Measured Blood Flow Rate for Blood Flow Motor MEASURED_BLOOD_PUMP_ROTOR_SPEED = 2 # Measured Bloop Pump Rotor Speed for Blood Flow Motor MEASURED_BLOOD_PUMP_SPEED = 3 # Measured Blood Pump Speed for Blood Flow Motor - MEASURED_BLOOD_PUMP_TORQUE = 4 # Measured Blood Pump torque - SET_RPM = 5 # Set Revolutions per minute for Blood Flow Motor - ROTOR_COUNT = 6 # Rotor Count for Blood Flow Motor - PRES_BLOOD_FLOW_RATE = 7 # Pressure Blood Flow Rate for Blood Flow Motor - ROTOR_HALL_STATE = 8 # Rotor Hall State for Blood Flow Motor - NUM_OF_BLOOD_FLOW_MOTOR_ATTRIBUTES = 9 # Number of Blood Flow Motor Attributes + MEASURED_RAW_PUMP_SPEED = 4 # Measured RAw Blood Pump Speed for Blood Flow Motor + MEASURED_BLOOD_PUMP_TORQUE = 5 # Measured Blood Pump torque + SET_RPM = 6 # Set Revolutions per minute for Blood Flow Motor + ROTOR_COUNT = 7 # Rotor Count for Blood Flow Motor + PRES_BLOOD_FLOW_RATE = 8 # Pressure Blood Flow Rate for Blood Flow Motor + ROTOR_HALL_STATE = 9 # Rotor Hall State for Blood Flow Motor + NUM_OF_BLOOD_FLOW_MOTOR_ATTRIBUTES = 10 # Number of Blood Flow Motor Attributes TDBloodFlowMotorAttributes._str_list = { # Official Name : Accepted strings 'SET_BLOOD_FLOW_RATE': ['set flow rate'], 'MEASURED_BLOOD_FLOW_RATE': ['measured flow rate'], 'MEASURED_BLOOD_PUMP_ROTOR_SPEED': ['measured rpm', 'measured rotor speed'], 'MEASURED_BLOOD_PUMP_SPEED': ['measured speed'], + 'MEASURED_RAW_PUMP_SPEEDraw': ['raw measured speed'], 'MEASURED_BLOOD_PUMP_TORQUE': ['measured torque'], 'SET_RPM': ['set rotor speed'], 'ROTOR_COUNT': [], Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -reca9e15bc984af2b7f59eb38f3836ca354ee1251 -r67f759670b9e987f698b58bf7c969e0fa8c78fec --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision eca9e15bc984af2b7f59eb38f3836ca354ee1251) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 67f759670b9e987f698b58bf7c969e0fa8c78fec) @@ -83,15 +83,15 @@ @param message: published DD pressure data message @return: none """ - sensor_list =[] - sensor_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D9_PRES.name, DataTypes.F32)) - sensor_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D66_PRES.name, DataTypes.F32)) - sensor_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D51_PRES.name, DataTypes.F32)) - sensor_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D18_PRES.name, DataTypes.F32)) - sensor_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D41_PRES.name, DataTypes.F32)) - sensor_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D87_PRES.name, DataTypes.F32)) + msg_list =[] + msg_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D9_PRES.name, DataTypes.F32)) + msg_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D66_PRES.name, DataTypes.F32)) + msg_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D51_PRES.name, DataTypes.F32)) + msg_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D18_PRES.name, DataTypes.F32)) + msg_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D41_PRES.name, DataTypes.F32)) + msg_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D87_PRES.name, DataTypes.F32)) - self.process_into_vars(decoder_list = sensor_list, message = message) + self.process_into_vars(decoder_list = msg_list, message = message) self.dd_pressures_timestamp = timestamp Index: leahi_dialin/fp/modules/flow_sensors.py =================================================================== diff -u -rba415df9f8e76d6b0f21e8f69ba99346e42f7b09 -r67f759670b9e987f698b58bf7c969e0fa8c78fec --- leahi_dialin/fp/modules/flow_sensors.py (.../flow_sensors.py) (revision ba415df9f8e76d6b0f21e8f69ba99346e42f7b09) +++ leahi_dialin/fp/modules/flow_sensors.py (.../flow_sensors.py) (revision 67f759670b9e987f698b58bf7c969e0fa8c78fec) @@ -81,11 +81,11 @@ @param message: published flow sensor data message @returns none """ - sensor_list =[] - sensor_list.append((self.fp_flows, fp_enum_repository.FPFlowSensorNames.P7_FLOW.name, DataTypes.F32)) - sensor_list.append((self.fp_flows, fp_enum_repository.FPFlowSensorNames.P16_FLOW.name, DataTypes.F32)) + msg_list =[] + msg_list.append((self.fp_flows, fp_enum_repository.FPFlowSensorNames.P7_FLOW.name, DataTypes.F32)) + msg_list.append((self.fp_flows, fp_enum_repository.FPFlowSensorNames.P16_FLOW.name, DataTypes.F32)) - self.process_into_vars(decoder_list = sensor_list, message = message) + self.process_into_vars(decoder_list = msg_list, message = message) self.fp_flow_timestamp = timestamp Index: leahi_dialin/td/modules/battery.py =================================================================== diff -u -r43f69b19f03145572d88f5f3c0cc739503c6d647 -r67f759670b9e987f698b58bf7c969e0fa8c78fec --- leahi_dialin/td/modules/battery.py (.../battery.py) (revision 43f69b19f03145572d88f5f3c0cc739503c6d647) +++ leahi_dialin/td/modules/battery.py (.../battery.py) (revision 67f759670b9e987f698b58bf7c969e0fa8c78fec) @@ -91,20 +91,20 @@ @param message: published data message @return: None """ - sensor_list =[] - sensor_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.REMAINING_CAPACITY.name, DataTypes.U32)) - sensor_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.BATTERY_STATUS.name, DataTypes.U32)) - sensor_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.BATTERY_CHARGE_STATUS.name, DataTypes.U32)) - sensor_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.BATTERY_I2C_STATUS.name, DataTypes.U32)) - sensor_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.FAULT_STATUS.name, DataTypes.U32)) - sensor_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.THERMISTOR_PCT.name, DataTypes.U32)) - sensor_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.BATTERY_VOLTAGE.name, DataTypes.U32)) - sensor_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.SYSTEM_VOLTAGE.name, DataTypes.U32)) - sensor_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.BATTERY_CURRENT.name, DataTypes.U32)) - sensor_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.RELATIVE_STATE_OF_CHARGE.name, DataTypes.U32)) - sensor_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.FULL_CHARGE_CAPACITY.name, DataTypes.U32)) + msg_list =[] + msg_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.REMAINING_CAPACITY.name, DataTypes.U32)) + msg_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.BATTERY_STATUS.name, DataTypes.U32)) + msg_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.BATTERY_CHARGE_STATUS.name, DataTypes.U32)) + msg_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.BATTERY_I2C_STATUS.name, DataTypes.U32)) + msg_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.FAULT_STATUS.name, DataTypes.U32)) + msg_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.THERMISTOR_PCT.name, DataTypes.U32)) + msg_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.BATTERY_VOLTAGE.name, DataTypes.U32)) + msg_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.SYSTEM_VOLTAGE.name, DataTypes.U32)) + msg_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.BATTERY_CURRENT.name, DataTypes.U32)) + msg_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.RELATIVE_STATE_OF_CHARGE.name, DataTypes.U32)) + msg_list.append((self.battery_data, td_enum_repository.TDBatteryRegisterNames.FULL_CHARGE_CAPACITY.name, DataTypes.U32)) - self.process_into_dict(decoder_list = sensor_list, message = message) + self.process_into_dict(decoder_list = msg_list, message = message) self.battery_broadcast_timestamp = timestamp Index: leahi_dialin/td/modules/blood_flow.py =================================================================== diff -u -rba415df9f8e76d6b0f21e8f69ba99346e42f7b09 -r67f759670b9e987f698b58bf7c969e0fa8c78fec --- leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision ba415df9f8e76d6b0f21e8f69ba99346e42f7b09) +++ leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 67f759670b9e987f698b58bf7c969e0fa8c78fec) @@ -54,6 +54,7 @@ td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_FLOW_RATE.name: 0.0, td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_ROTOR_SPEED.name: 0.0, td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_SPEED.name: 0.0, + td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_RAW_PUMP_SPEED.name: 0.0, td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_TORQUE.name: 0.0, td_enum_repository.TDBloodFlowMotorAttributes.SET_RPM.name: 0.0, td_enum_repository.TDBloodFlowMotorAttributes.ROTOR_COUNT.name: 0, @@ -92,6 +93,7 @@ msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_FLOW_RATE.name, DataTypes.F32)) msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_ROTOR_SPEED.name, DataTypes.F32)) msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_SPEED.name, DataTypes.F32)) + msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_RAW_PUMP_SPEED.name, DataTypes.F32)) msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_TORQUE.name, DataTypes.F32)) msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.SET_RPM.name, DataTypes.F32)) msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.ROTOR_COUNT.name, DataTypes.U32))