Index: shared/scripts/names.py =================================================================== diff -u -rb7bd33f5c014ede4edf454fb1cd02052e93cf76e -redafb92233ef9a8281c8133cc3882f17ac39de64 --- shared/scripts/names.py (.../names.py) (revision b7bd33f5c014ede4edf454fb1cd02052e93cf76e) +++ shared/scripts/names.py (.../names.py) (revision edafb92233ef9a8281c8133cc3882f17ac39de64) @@ -12,7 +12,7 @@ # author Behrouz NematiPour # -AUT_NAME = "denaliSquish" # Squish +AUT_NAME = "denali" # Squish # Top Parents o_QQuickView = { "type": "QQuickView"} @@ -161,25 +161,25 @@ -# Settings Load Cell Readings -o_settingsHome_reservoir1Prim = {"container": o_settingsHome, "objectName": "_LoadCellReadings0", "type": "Text"} -o_settingsHome_reservoir1Bkup = {"container": o_settingsHome, "objectName": "_LoadCellReadings1", "type": "Text"} -o_settingsHome_reservoir2Prim = {"container": o_settingsHome, "objectName": "_LoadCellReadings2", "type": "Text"} -o_settingsHome_reservoir2Bkup = {"container": o_settingsHome, "objectName": "_LoadCellReadings3", "type": "Text"} +# 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"} -# Settings Temperature Sensors -o_settingsHome_inletPrimaryHeater = {"container": o_settingsHome, "objectName": "_TemperatureSensors0" , "type": "Text"} -o_settingsHome_outletPrimaryHeater = {"container": o_settingsHome, "objectName": "_TemperatureSensors1" , "type": "Text"} -o_settingsHome_conductivitySensor1 = {"container": o_settingsHome, "objectName": "_TemperatureSensors2" , "type": "Text"} -o_settingsHome_conductivitySensor2 = {"container": o_settingsHome, "objectName": "_TemperatureSensors3" , "type": "Text"} -o_settingsHome_outletRedundancy = {"container": o_settingsHome, "objectName": "_TemperatureSensors4" , "type": "Text"} -o_settingsHome_inletDialysate = {"container": o_settingsHome, "objectName": "_TemperatureSensors5" , "type": "Text"} -o_settingsHome_primaryHeaterThermoCouple = {"container": o_settingsHome, "objectName": "_TemperatureSensors6" , "type": "Text"} -o_settingsHome_trimmerHeaterThermoCouple = {"container": o_settingsHome, "objectName": "_TemperatureSensors7" , "type": "Text"} -o_settingsHome_primaryHeaterColdJunction = {"container": o_settingsHome, "objectName": "_TemperatureSensors8" , "type": "Text"} -o_settingsHome_trimmerHeaterColdJunction = {"container": o_settingsHome, "objectName": "_TemperatureSensors9" , "type": "Text"} -o_settingsHome_primaryHeaterInternal = {"container": o_settingsHome, "objectName": "_TemperatureSensors10", "type": "Text"} -o_settingsHome_trimmerHeaterInternal = {"container": o_settingsHome, "objectName": "_TemperatureSensors11", "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"} # Setting CANBusFaultCountText o_settingsHome_canbusFaultCount = {"container": o_settingsHome, "id": "_canbusFaultCountText", "type": "Text" }