Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r78ca8321ca7429b492dcbaa373262094ceadd901 -r465679409a5fe6f6007ddffca1fd3e89ead9d9c4 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 78ca8321ca7429b492dcbaa373262094ceadd901) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 465679409a5fe6f6007ddffca1fd3e89ead9d9c4) @@ -502,13 +502,14 @@ D28_AVG_TEMP = 14 # D28 Filtered value D30_AVG_TEMP = 15 # D30 Filtered value D78_AVG_TEMP = 16 # D78 Filtered value - D9_TEMP = 17 # D9 Pressure sensor temperature value - D66_TEMP = 18 # D66 Pressure sensor temperature value - D51_TEMP = 19 # D51 Pressure sensor temperature value - D18_TEMP = 20 # D18 Pressure sensor temperature value - D41_TEMP = 21 # D41 Pressure sensor temperature value - D87_TEMP = 22 # D87 Pressure sensor temperature value - NUM_OF_TEMP_SENSORS = 23 # Number of Temperature Sensors + D1_AVG_TEMP = 17 # D1 Filtered value + D9_TEMP = 18 # D9 Pressure sensor temperature value + D66_TEMP = 19 # D66 Pressure sensor temperature value + D51_TEMP = 20 # D51 Pressure sensor temperature value + D18_TEMP = 21 # D18 Pressure sensor temperature value + D41_TEMP = 22 # D41 Pressure sensor temperature value + D87_TEMP = 23 # D87 Pressure sensor temperature value + NUM_OF_TEMP_SENSORS = 24 # Number of Temperature Sensors # Aliases FIRST_PRESSURE_SENSOR = D9_TEMP Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r69db0a9ed734905964a1e79bf80ff3723b7cf509 -r465679409a5fe6f6007ddffca1fd3e89ead9d9c4 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 69db0a9ed734905964a1e79bf80ff3723b7cf509) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 465679409a5fe6f6007ddffca1fd3e89ead9d9c4) @@ -192,7 +192,7 @@ MSG_ID_TD_ADJUST_TREATMENT_LOGS_RESPONSE = 0xAA MSG_ID_TD_WATER_SAMPLE_RESULT_RESPONSE = 0xAB MSG_ID_TD_WATER_SAMPLE_DATA = 0xAC - MSG_ID_TD_TREATMENT_LOG_AVERAGE_DATA = 0xAD + MSG_ID_TD_DRY_SELF_TEST_PROGRESS_DATA = 0xAD MSG_ID_TD_TUBE_SET_AUTHENTICATION_REQUEST = 0xAE MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xAF MSG_ID_TD_SYRINGE_PUMP_DATA = 0xB1 Index: leahi_dialin/dd/modules/dialysate_pump.py =================================================================== diff -u -r9dd43942f571c0f63e69e191b5b33b566a07c641 -r465679409a5fe6f6007ddffca1fd3e89ead9d9c4 --- leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision 9dd43942f571c0f63e69e191b5b33b566a07c641) +++ leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision 465679409a5fe6f6007ddffca1fd3e89ead9d9c4) @@ -91,26 +91,26 @@ @return: None """ sensor_list =[] - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.TARGET_RPM.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.TARGET_RPM.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.MEASURED_SPEED.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.MEASURED_SPEED.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.CURRENT_SPEED.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.CURRENT_SPEED.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.STATE.name, DataTypes.U32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.STATE.name, DataTypes.U32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.TARGET_PRESSURE.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.TARGET_PRESSURE.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.MEASURED_PRESSURE.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.MEASURED_PRESSURE.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.MEASURED_CURRENT.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.MEASURED_CURRENT.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.CONTROL.name, DataTypes.U32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.CONTROL.name, DataTypes.U32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.DIRECTION_ERROR_COUNT.name, DataTypes.U32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.DIRECTION_ERROR_COUNT.name, DataTypes.U32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.MEASURED_DIRECTION.name, DataTypes.U32)) - sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.MEASURED_DIRECTION.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_RPM.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_RPM.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_SPEED.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_SPEED.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.CURRENT_SPEED.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.CURRENT_SPEED.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.STATE.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.STATE.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_PRESSURE.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_PRESSURE.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_PRESSURE.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_PRESSURE.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_CURRENT.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_CURRENT.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.CONTROL.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.CONTROL.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.DIRECTION_ERROR_COUNT.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.DIRECTION_ERROR_COUNT.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_DIRECTION.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_DIRECTION.name, DataTypes.U32)) self.process_into_dict(dict_to_update = self.dd_dialysate_pumps, decoder_list = sensor_list, Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r465679409a5fe6f6007ddffca1fd3e89ead9d9c4 --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 465679409a5fe6f6007ddffca1fd3e89ead9d9c4) @@ -64,6 +64,7 @@ dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D78_AVG_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D1_AVG_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D9_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D66_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D51_TEMP.name: 0.0, @@ -99,6 +100,7 @@ sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D78_AVG_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D1_AVG_TEMP.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D9_TEMP.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D66_TEMP.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D51_TEMP.name, DataTypes.F32)) Index: leahi_dialin/fp/modules/ro_pump.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r465679409a5fe6f6007ddffca1fd3e89ead9d9c4 --- leahi_dialin/fp/modules/ro_pump.py (.../ro_pump.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/fp/modules/ro_pump.py (.../ro_pump.py) (revision 465679409a5fe6f6007ddffca1fd3e89ead9d9c4) @@ -84,7 +84,6 @@ sensor_list.append((fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE_PCT.name, DataTypes.F32)) sensor_list.append((fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.DUTY_CYCLE_PCT.name, DataTypes.F32)) sensor_list.append((fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE_PCT.name, DataTypes.F32)) - sensor_list.appen self.process_into_dict(dict_to_update = self.ro_pump, decoder_list = sensor_list,