Index: shared/scripts/names.py =================================================================== diff -u -r2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 --- shared/scripts/names.py (.../names.py) (revision 2c0da3c3cc87620d1ff7d65d1d102a611baf4b5f) +++ shared/scripts/names.py (.../names.py) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) @@ -161,47 +161,75 @@ -# Manager Load Cell Readings -o_managerHome_reservoir1Prim = {"container": o_managerHome, "objectName": "_DGLoadCellReadings0", "type": "Text"} -o_managerHome_reservoir1Bkup = {"container": o_managerHome, "objectName": "_DGLoadCellReadings1", "type": "Text"} -o_managerHome_reservoir2Prim = {"container": o_managerHome, "objectName": "_DGLoadCellReadings2", "type": "Text"} -o_managerHome_reservoir2Bkup = {"container": o_managerHome, "objectName": "_DGLoadCellReadings3", "type": "Text"} -# Manager Temperature Sensors -o_managerHome_inletPrimaryHeater = {"container": o_managerHome, "objectName": "_DGTemperatures0" , "type": "Text"} -o_managerHome_outletPrimaryHeater = {"container": o_managerHome, "objectName": "_DGTemperatures1" , "type": "Text"} -o_managerHome_conductivitySensor1 = {"container": o_managerHome, "objectName": "_DGTemperatures2" , "type": "Text"} -o_managerHome_conductivitySensor2 = {"container": o_managerHome, "objectName": "_DGTemperatures3" , "type": "Text"} -o_managerHome_outletRedundancy = {"container": o_managerHome, "objectName": "_DGTemperatures4" , "type": "Text"} -o_managerHome_inletDialysate = {"container": o_managerHome, "objectName": "_DGTemperatures5" , "type": "Text"} -o_managerHome_primaryHeaterThermoCouple = {"container": o_managerHome, "objectName": "_DGTemperatures6" , "type": "Text"} -o_managerHome_trimmerHeaterThermoCouple = {"container": o_managerHome, "objectName": "_DGTemperatures7" , "type": "Text"} -o_managerHome_primaryHeaterColdJunction = {"container": o_managerHome, "objectName": "_DGTemperatures8" , "type": "Text"} -o_managerHome_trimmerHeaterColdJunction = {"container": o_managerHome, "objectName": "_DGTemperatures9" , "type": "Text"} -o_managerHome_primaryHeaterInternal = {"container": o_managerHome, "objectName": "_DGTemperatures10", "type": "Text"} -o_managerHome_trimmerHeaterInternal = {"container": o_managerHome, "objectName": "_DGTemperatures11", "type": "Text"} -# Manager DG Drain Pump -o_managerHome_DGDrainPump_RPM = {"container": o_managerHome, "objectName": "_DGDrainPump0", "type": "Text", "visible": True} -o_managerHome_DGDrainPump_DAC = {"container": o_managerHome, "objectName": "_DGDrainPump1", "type": "Text", "visible": True} +# DGROPumpData +o_managerHome_DGROPumpData_SetPtPressure = {"container": o_managerHome, "objectName": "_DGROPumpData0", "type": "Text"} +o_managerHome_DGROPumpData_FlowRate = {"container": o_managerHome, "objectName": "_DGROPumpData1", "type": "Text"} +o_managerHome_DGROPumpData_PWM = {"container": o_managerHome, "objectName": "_DGROPumpData2", "type": "Text"} -# Manager DG Heaters -o_managerHome_DGHeaters_MainPrimaryDC = {"container": o_managerHome, "objectName": "_DGHeaters0", "type": "Text", "visible": True} -o_managerHome_DGHeaters_SmallPrimaryDC = {"container": o_managerHome, "objectName": "_DGHeaters1", "type": "Text", "visible": True} -o_managerHome_DGHeaters_TrimmerDC = {"container": o_managerHome, "objectName": "_DGHeaters2", "type": "Text", "visible": True} +# DGPressuresData +o_managerHome_DGPressuresData_ROInletPSI = {"container": o_managerHome, "objectName": "_DGPressuresData0", "type": "Text"} +o_managerHome_DGPressuresData_ROOutletPSI = {"container": o_managerHome, "objectName": "_DGPressuresData1", "type": "Text"} +o_managerHome_DGPressuresData_DrainInletPSI = {"container": o_managerHome, "objectName": "_DGPressuresData2", "type": "Text"} +o_managerHome_DGPressuresData_DrainOutletPSI = {"container": o_managerHome, "objectName": "_DGPressuresData3", "type": "Text"} -# Manager DG RO Pump -o_managerHome_DGROPumpData_SetPtPressure = {"container": o_managerHome, "objectName": "_DGROPump0", "type": "Text", "visible": True} -o_managerHome_DGROPumpData_FlowRate = {"container": o_managerHome, "objectName": "_DGROPump1", "type": "Text", "visible": True} -o_managerHome_DGROPumpData_PWM = {"container": o_managerHome, "objectName": "_DGROPump2", "type": "Text", "visible": True} +# DGDrainPumpData +o_managerHome_DGDrainPumpData_SetPtRPM = {"container": o_managerHome, "objectName": "_DGDrainPumpData0", "type": "Text"} +o_managerHome_DGDrainPumpData_DACValue = {"container": o_managerHome, "objectName": "_DGDrainPumpData1", "type": "Text"} -# Manager DG Pressure -o_managerHome_DGPressure_ROInletPSI = {"container": o_managerHome, "objectName": "_DGPressures0", "type": "Text"} -o_managerHome_DGPressure_ROOutletPSI = {"container": o_managerHome, "objectName": "_DGPressures1", "type": "Text"} -o_managerHome_DGPressure_DrainInletPSI = {"container": o_managerHome, "objectName": "_DGPressures2", "type": "Text"} -o_managerHome_DGPressure_DrainOutletPSI = {"container": o_managerHome, "objectName": "_DGPressures3", "type": "Text"} +# DGOperationMode +o_managerHome_DGOperationModeData_DGOpMode = {"container": o_managerHome, "objectName": "_DGOperationModeData", "type": "Text"} +# DGReservoirData +o_managerHome_DGReservoirData_ActiveReservoir = {"container": o_managerHome, "objectName": "_DGReservoirData0", "type": "Text"} +o_managerHome_DGReservoirData_FillToVolML = {"container": o_managerHome, "objectName": "_DGReservoirData1", "type": "Text"} +o_managerHome_DGReservoirData_DrainToVolML = {"container": o_managerHome, "objectName": "_DGReservoirData2", "type": "Text"} + +# DGValvesStates +o_managerHome_DGValvesStatesData_ValvesStates = {"container": o_managerHome, "objectName": "_DGValvesStatesData", "type": "Text"} + +# DGHeatersData +o_managerHome_DGHeatersData_MainPriMaryDC = {"container": o_managerHome, "objectName": "_DGHeatersData0", "type": "Text"} +o_managerHome_DGHeatersData_SmallPrimaryDC = {"container": o_managerHome, "objectName": "_DGHeatersData1", "type": "Text"} +o_managerHome_DGHeatersData_TrimmerDC = {"container": o_managerHome, "objectName": "_DGHeatersData2", "type": "Text"} + +# DGLoadCellReadingsData +o_managerHome_DGLoadCellReadingsData_Rs1Prim = {"container": o_managerHome, "objectName": "_DGLoadCellReadingsData0", "type": "Text"} +o_managerHome_DGLoadCellReadingsData_Rs1Bkup = {"container": o_managerHome, "objectName": "_DGLoadCellReadingsData1", "type": "Text"} +o_managerHome_DGLoadCellReadingsData_Rs2Prim = {"container": o_managerHome, "objectName": "_DGLoadCellReadingsData2", "type": "Text"} +o_managerHome_DGLoadCellReadingsData_Rs2Bkup = {"container": o_managerHome, "objectName": "_DGLoadCellReadingsData3", "type": "Text"} + +# DGTemperaturesData +o_managerHome_DGTemperaturesData_InletPrimaryHeater = {"container": o_managerHome, "objectName": "_DGTemperaturesData0", "type": "Text"} +o_managerHome_DGTemperaturesData_OutletPrimaryHeater = {"container": o_managerHome, "objectName": "_DGTemperaturesData1", "type": "Text"} +o_managerHome_DGTemperaturesData_ConductivitySensor1 = {"container": o_managerHome, "objectName": "_DGTemperaturesData2", "type": "Text"} +o_managerHome_DGTemperaturesData_ConductivitySensor2 = {"container": o_managerHome, "objectName": "_DGTemperaturesData3", "type": "Text"} +o_managerHome_DGTemperaturesData_OutletRedundancy = {"container": o_managerHome, "objectName": "_DGTemperaturesData4", "type": "Text"} +o_managerHome_DGTemperaturesData_InletDialysate = {"container": o_managerHome, "objectName": "_DGTemperaturesData5", "type": "Text"} +o_managerHome_DGTemperaturesData_PrimaryHeaterThermocouple = {"container": o_managerHome, "objectName": "_DGTemperaturesData6", "type": "Text"} +o_managerHome_DGTemperaturesData_TrimmerHeaterThermocouple = {"container": o_managerHome, "objectName": "_DGTemperaturesData7", "type": "Text"} +o_managerHome_DGTemperaturesData_PrimaryHeaterColdJunction = {"container": o_managerHome, "objectName": "_DGTemperaturesData8", "type": "Text"} +o_managerHome_DGTemperaturesData_TrimmerHeaterColdJunction = {"container": o_managerHome, "objectName": "_DGTemperaturesData9", "type": "Text"} +o_managerHome_DGTemperaturesData_PrimaryHeaterInternalTemperature = {"container": o_managerHome, "objectName": "_DGTemperaturesData10", "type": "Text"} +o_managerHome_DGTemperaturesData_TrimmerHeaterInternalTemperature = {"container": o_managerHome, "objectName": "_DGTemperaturesData11", "type": "Text"} + +# HDOperationModeData +o_settingsHome_HDOperationModeData_OpMode = {"container": o_settingsHome, "objectName": "_HDOperationModeData", "type": "Text"} + +# TreatmentStatesData +o_settingsHome_TreatmentStatesData_SubMode = {"container": o_settingsHome, "objectName": "_TreatmentStatesData0", "type": "Text"} +o_settingsHome_TreatmentStatesData_UFState = {"container": o_settingsHome, "objectName": "_TreatmentStatesData1", "type": "Text"} +o_settingsHome_TreatmentStatesData_SalineState = {"container": o_settingsHome, "objectName": "_TreatmentStatesData2", "type": "Text"} + +# PressureOcclusionData +o_settingsHome_PressureOcclusionData_ArterialPressure = {"container": o_settingsHome, "objectName": "_PressureOcclusionData0", "type": "Text"} +o_settingsHome_PressureOcclusionData_VenousPressure = {"container": o_settingsHome, "objectName": "_PressureOcclusionData1", "type": "Text"} +o_settingsHome_PressureOcclusionData_BloodPumpOcclusion = {"container": o_settingsHome, "objectName": "_PressureOcclusionData2", "type": "Text"} +o_settingsHome_PressureOcclusionData_DialysateInletPumpOcclusion = {"container": o_settingsHome, "objectName": "_PressureOcclusionData3", "type": "Text"} +o_settingsHome_PressureOcclusionData_DialysateOutletPumpOcclusion = {"container": o_settingsHome, "objectName": "_PressureOcclusionData4", "type": "Text"} + # Setting CANBusFaultCountText -o_settingsHome_canbusFaultCount = {"container": o_settingsHome, "id": "_canbusFaultCountText", "type": "Text" } +o_settingsHome_canbusFaultCount = {"container": o_settingsHome, "id": "_canbusFaultCountText", "type": "Text" }