diff --git a/.gitmodules b/.gitmodules index a392a2d7..54a9919a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,3 +6,7 @@ path = Ph2_ACF url = https://gitlab.cern.ch/cms_tk_ph2/Ph2_ACF.git branch = Dev +[submodule "icicle"] + path = icicle + url = ssh://git@gitlab.cern.ch:7999/escobarf/icicle.git + branch = dirigent diff --git a/Configuration/Settings/GlobalSettings.py b/Configuration/Settings/GlobalSettings.py index d678c0b2..3979fa59 100644 --- a/Configuration/Settings/GlobalSettings.py +++ b/Configuration/Settings/GlobalSettings.py @@ -9,22 +9,22 @@ 'EN_CORE_COL_DIFF_1' : "0", 'EN_CORE_COL_DIFF_2' : "0", -'EN_MACRO_COL_CAL_LIN_1' : "65535", -'EN_MACRO_COL_CAL_LIN_2' : "65535", -'EN_MACRO_COL_CAL_LIN_3' : "65535", -'EN_MACRO_COL_CAL_LIN_4' : "65535", -'EN_MACRO_COL_CAL_LIN_5' : "15", - -'EN_MACRO_COL_CAL_SYNC_1': "65535", -'EN_MACRO_COL_CAL_SYNC_2': "65535", -'EN_MACRO_COL_CAL_SYNC_3': "65535", -'EN_MACRO_COL_CAL_SYNC_4': "65535", - -'EN_MACRO_COL_CAL_DIFF_1': "65535", -'EN_MACRO_COL_CAL_DIFF_2': "65535", -'EN_MACRO_COL_CAL_DIFF_3': "65535", -'EN_MACRO_COL_CAL_DIFF_4': "65535", -'EN_MACRO_COL_CAL_DIFF_5': "15", +'EN_CORE_COL_CAL_LIN_1' : "65535", +'EN_CORE_COL_CAL_LIN_2' : "65535", +'EN_CORE_COL_CAL_LIN_3' : "65535", +'EN_CORE_COL_CAL_LIN_4' : "65535", +'EN_CORE_COL_CAL_LIN_5' : "15", + +'EN_CORE_COL_CAL_SYNC_1': "65535", +'EN_CORE_COL_CAL_SYNC_2': "65535", +'EN_CORE_COL_CAL_SYNC_3': "65535", +'EN_CORE_COL_CAL_SYNC_4': "65535", + +'EN_CORE_COL_CAL_DIFF_1': "65535", +'EN_CORE_COL_CAL_DIFF_2': "65535", +'EN_CORE_COL_CAL_DIFF_3': "65535", +'EN_CORE_COL_CAL_DIFF_4': "65535", +'EN_CORE_COL_CAL_DIFF_5': "15", 'HITOR_0_MASK_LIN_0' : "0", 'HITOR_0_MASK_LIN_1' : "0", @@ -145,53 +145,6 @@ 'GenericDAC-DAC' : globalSettingsB, 'Physics' : globalSettingsB, 'IVCurve' : globalSettingsB, + } -globalSettingsA_v48 = copy.deepcopy(globalSettingsA) -globalSettingsA_v48.pop('EN_MACRO_COL_CAL_LIN_1') -globalSettingsA_v48.pop('EN_MACRO_COL_CAL_LIN_2') -globalSettingsA_v48.pop('EN_MACRO_COL_CAL_LIN_3') -globalSettingsA_v48.pop('EN_MACRO_COL_CAL_LIN_4') -globalSettingsA_v48.pop('EN_MACRO_COL_CAL_LIN_5') - -globalSettingsA_v48.pop('EN_MACRO_COL_CAL_SYNC_1') -globalSettingsA_v48.pop('EN_MACRO_COL_CAL_SYNC_2') -globalSettingsA_v48.pop('EN_MACRO_COL_CAL_SYNC_3') -globalSettingsA_v48.pop('EN_MACRO_COL_CAL_SYNC_4') - -globalSettingsA_v48.pop('EN_MACRO_COL_CAL_DIFF_1') -globalSettingsA_v48.pop('EN_MACRO_COL_CAL_DIFF_2') -globalSettingsA_v48.pop('EN_MACRO_COL_CAL_DIFF_3') -globalSettingsA_v48.pop('EN_MACRO_COL_CAL_DIFF_4') -globalSettingsA_v48.pop('EN_MACRO_COL_CAL_DIFF_5') - -globalSettingsA_v48['EN_CORE_COL_CAL_LIN_1'] = "65535" -globalSettingsA_v48['EN_CORE_COL_CAL_LIN_2'] = "65535" -globalSettingsA_v48['EN_CORE_COL_CAL_LIN_3'] = "65535" -globalSettingsA_v48['EN_CORE_COL_CAL_LIN_4'] = "65535" -globalSettingsA_v48['EN_CORE_COL_CAL_LIN_5'] = "15" - -globalSettingsA_v48['EN_CORE_COL_CAL_SYNC_1'] = "65535" -globalSettingsA_v48['EN_CORE_COL_CAL_SYNC_2'] = "65535" -globalSettingsA_v48['EN_CORE_COL_CAL_SYNC_3'] = "65535" -globalSettingsA_v48['EN_CORE_COL_CAL_SYNC_4'] = "65535" - -globalSettingsA_v48['EN_CORE_COL_CAL_DIFF_1'] = "65535" -globalSettingsA_v48['EN_CORE_COL_CAL_DIFF_2'] = "65535" -globalSettingsA_v48['EN_CORE_COL_CAL_DIFF_3'] = "65535" -globalSettingsA_v48['EN_CORE_COL_CAL_DIFF_4'] = "65535" -globalSettingsA_v48['EN_CORE_COL_CAL_DIFF_5'] = "15" - -globalSettingsA_v49 = copy.deepcopy(globalSettingsA_v48) - - -if "v4-11" in Ph2_ACF_VERSION: - for key in globalSettings_DictA.keys(): - globalSettings_DictA[key] = globalSettingsA_v49 - -if "v4-13" in Ph2_ACF_VERSION: - for key in globalSettings_DictA.keys(): - globalSettings_DictA[key] = globalSettingsA_v49 - -if "v4-14" in Ph2_ACF_VERSION: - for key in globalSettings_DictA.keys(): - globalSettings_DictA[key] = globalSettingsA_v49 \ No newline at end of file + diff --git a/Configuration/Settings/HWSettings.py b/Configuration/Settings/HWSettings.py index f1ba6fd9..7867e2c7 100644 --- a/Configuration/Settings/HWSettings.py +++ b/Configuration/Settings/HWSettings.py @@ -172,7 +172,7 @@ HWSettingsB_NoiseScan["nEvents"] = 1e7 HWSettingsB_NoiseScan["nEvtsBurst"] = 1e4 HWSettingsB_NoiseScan["INJtype"] = 0 -HWSettingsB_NoiseScan["nClkDelays"] = 10 +HWSettingsB_NoiseScan["nClkDelays"] = 70 HWSettingsB_NoiseScan["nTRIGxEvent"] = 1 HWSettingsB_SCurve = copy.deepcopy(HWSettingsB_v49) @@ -193,13 +193,13 @@ HWSettingsB_ThresMin["nEvents"] = 1e7 HWSettingsB_ThresMin["nEvtsBurst"] = 1e4 HWSettingsB_ThresMin["INJtype"] = 0 -HWSettingsB_ThresMin["nClkDelays"] = 10 +HWSettingsB_ThresMin["nClkDelays"] = 70 HWSettingsB_ThresMin["ThrStart"] = 370 HWSettingsB_ThresMin["nTRIGxEvent"] = 1 HWSettingsB_ThresAdj = copy.deepcopy(HWSettingsB_v49) -HWSettingsB_ThresAdj["ThrStart"] = 405 -HWSettingsB_ThresAdj["ThrStop"] = 505 +HWSettingsB_ThresAdj["ThrStart"] = 380 +HWSettingsB_ThresAdj["ThrStop"] = 500 HWSettingsB_InjDelay = copy.deepcopy(HWSettingsB_v49) HWSettingsB_InjDelay["LatencyStart"] = 110 diff --git a/Configuration/XMLUtil.py b/Configuration/XMLUtil.py index 73a0cd80..e85e2227 100644 --- a/Configuration/XMLUtil.py +++ b/Configuration/XMLUtil.py @@ -104,10 +104,12 @@ class OGModule(): def __init__(self): self.Id="0" self.FMCId="0" + self.isOpticalLink = False self.HyBridList = [] - def SetOpticalGrp(self, Id, FMCId): + def SetOpticalGrp(self, Id, FMCId, isOptLink=False): self.Id=Id self.FMCId=FMCId + self.isOpticalLink = isOptLink def AddHyBrid(self, HybridModule): self.HyBridList.append(HybridModule) @@ -180,8 +182,8 @@ def __init__(self,boardtype): if 'RD53A' in boardtype: self.Enable="1" else: - self.Enable="0" - self.SleepTime=5000 + self.Enable="1" + self.SleepTime=10000 self.MonitoringList = {} def SetType(self, Type): self.Type=Type @@ -241,7 +243,7 @@ def SetMonitoring(Node, MonitoringItem): Node_MonitoringElements = SetNodeAttribute(Node_MonitoringElements,{'device':"RD53",'register':element,'enable':MonitoringItem.MonitoringList[element]}) return Node -def GenerateHWDescriptionXML(HWDescription,outputFile = "CMSIT_gen.xml", boardtype = "RD53A"): +def GenerateHWDescriptionXML(HWDescription,outputFile = "CMSIT_gen.xml", boardtype = "RD53A", isOpticalLink = False): Node_HWInterface = ET.Element('HwDescription') BeBoardList = HWDescription.BeBoardList for BeBoard in BeBoardList: @@ -263,6 +265,14 @@ def GenerateHWDescriptionXML(HWDescription,outputFile = "CMSIT_gen.xml", boardty for OGModule in OpticalGroupList: Node_OGModule = ET.SubElement(Node_BeBoard, 'OpticalGroup') Node_OGModule = SetNodeAttribute(Node_OGModule,{'Id':OGModule.Id,'FMCId':OGModule.FMCId}) + if isOpticalLink: + #FIXME: Add additional stuff for optical link here. + Node_OpFiles = ET.SubElement(Node_OGModule, 'lqGBT_Files') + Node_OpFiles = SetNodeAttribute(Node_OpFiles,{'path':"${PWD}/"}) + Node_lqGBT = ET.SubElement(Node_OGModule, 'lqGBT') + Node_lqGBT = SetNodeAttribute( Node_lqGBT, {'Id':'0','version':'1','configfile':'CMSIT_LqGBT-v1.txt','ChipAddress':'0x70','RxDataRate':'1280','RxHSLPolarity':'0','TxDataRate':'160','TxHSLPolarity':'1'}) + Node_lqGBTsettings = ET.SubElement(Node_lqGBT, 'Settings') + HyBridList = OGModule.HyBridList @@ -275,6 +285,7 @@ def GenerateHWDescriptionXML(HWDescription,outputFile = "CMSIT_gen.xml", boardty StatusStr = 'enable' if "v4-14" in Ph2_ACF_VERSION: StatusStr = 'enable' + Node_HyBrid = SetNodeAttribute(Node_HyBrid,{'Id':HyBridModule.Id,StatusStr:HyBridModule.Status,'Name':HyBridModule.Name}) #### This is where the RD53_Files is setup #### ##FIXME Add in logic to change depending on version of Ph2_ACF -> Done! diff --git a/Dockerfile b/Dockerfile index c6b22ae3..9767fdec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV PYTHONPATH=${PYTHONPATH}:${GUI_dir} USER root -LABEL Name=ph2acfgui Version=4.13.1 +LABEL Name=ph2acfgui Version=4.14.1 WORKDIR /home/cmsTkUser/Ph2_ACF_GUI/ ADD . /home/cmsTkUser/Ph2_ACF_GUI/ RUN ls -lrt diff --git a/FirmwareImages/QUAD_OPT_CROC_v4-6.bit b/FirmwareImages/QUAD_OPT_CROC_v4-6.bit new file mode 100644 index 00000000..5340008c Binary files /dev/null and b/FirmwareImages/QUAD_OPT_CROC_v4-6.bit differ diff --git a/FirmwareImages/QUAD_OPT_RD53A_v4-6.bit b/FirmwareImages/QUAD_OPT_RD53A_v4-6.bit new file mode 100644 index 00000000..56440406 Binary files /dev/null and b/FirmwareImages/QUAD_OPT_RD53A_v4-6.bit differ diff --git a/FirmwareImages/SCC_OPT_CROC_v4-6.bit b/FirmwareImages/SCC_OPT_CROC_v4-6.bit new file mode 100644 index 00000000..6fe70717 Binary files /dev/null and b/FirmwareImages/SCC_OPT_CROC_v4-6.bit differ diff --git a/FirmwareImages/SCC_OPT_RD53A_v4-6.bit b/FirmwareImages/SCC_OPT_RD53A_v4-6.bit new file mode 100644 index 00000000..f9fe02ff Binary files /dev/null and b/FirmwareImages/SCC_OPT_RD53A_v4-6.bit differ diff --git a/Gui/GUIutils/settings.py b/Gui/GUIutils/settings.py index df65bee0..7cbe781e 100644 --- a/Gui/GUIutils/settings.py +++ b/Gui/GUIutils/settings.py @@ -90,23 +90,27 @@ def __init__(self,DBhostname,DBIP,DBName): "SingleSCC" : {"v4-11":"SCC_ELE_RD53A_v4-5.bit", "v4-13":"SCC_ELE_RD53A_v4-6.bit", - "v4-14":"SCC_ELE_RD53A_v4-6.bit", - }, + + "v4-14":"SCC_ELE_RD53A_v4-6.bit", + }, "Yellow Module (Purdue)" : {"v4-11":"QUAD_ELE_RD53A_v4-5.bit", "v4-13":"QUAD_ELE_RD53A_v4-6.bit", - "v4-14":"QUAD_ELE_RD53A_v4-6.bit", - }, + "v4-14":"QUAD_ELE_RD53A_v4-6.bit", + "v4-02":"QUAD_ELE_RD53A_v4-2.bit", + }, "TFPX Quad" : {"v4-11":"QUAD_ELE_RD53A_v4-5.bit", "v4-13":"QUAD_ELE_RD53A_v4-6.bit", - "v4-14":"QUAD_ELE_RD53A_v4-6.bit", - }, + "v4-14":"QUAD_ELE_RD53A_v4-6.bit", + }, "TEPX Quad" : {"v4-11":"QUAD_ELE_RD53A_v4-5.bit", + "v4-10":"QUAD_ELE_RD53A_v4-5.bit", "v4-13":"QUAD_ELE_RD53A_v4-6.bit", - "v4-14":"QUAD_ELE_RD53A_v4-6.bit", - }, + "v4-14":"QUAD_ELE_RD53A_v4-6.bit", + }, + "TBPX Quad" : {"v4-11":"QUAD_ELE_RD53A_v4-5.bit", "v4-13":"QUAD_ELE_RD53A_v4-6.bit", diff --git a/Gui/QtGUIutils/QtRunWindow.py b/Gui/QtGUIutils/QtRunWindow.py index 5ce39afd..5f405e43 100644 --- a/Gui/QtGUIutils/QtRunWindow.py +++ b/Gui/QtGUIutils/QtRunWindow.py @@ -278,12 +278,36 @@ def createMain(self): self.HistoryLayout.addWidget(self.StatusTable) self.HistoryBox.setLayout(self.HistoryLayout) + self.TempBox = QGroupBox("&Chip Temperature") + TempBoxSP = self.TempBox.sizePolicy() + TempBoxSP.setVerticalStretch(self.VerticalSegCol1[1]) + self.TempBox.setSizePolicy(TempBoxSP) + self.TempLayout = QGridLayout() + self.type = self.ModuleType + self.LabelList = [] + self.TempLabelList = [] + for key,value in ModuleLaneMap[self.type].items(): + self.Label = QLabel() + self.Label.setText("Chip: " + str(value)) + self.TempLabel = QLabel() + self.LabelList.append(self.Label) + self.TempLabelList.append(self.TempLabel) + + for index in range(len(self.LabelList)): + self.TempLayout.addWidget(self.LabelList[index], index +1, 0, 1, 1) + self.TempLayout.addWidget(self.TempLabelList[index], index +1, 1, 1, 1) + self.TempBox.setLayout(self.TempLayout) + + + LeftColSplitter.addWidget(ControllerBox) LeftColSplitter.addWidget(TerminalBox) + LeftColSplitter.addWidget(self.TempBox) RightColSplitter.addWidget(OutputBox) RightColSplitter.addWidget(self.HistoryBox) + LeftColSplitterSP = LeftColSplitter.sizePolicy() LeftColSplitterSP.setHorizontalStretch(self.HorizontalSeg[0]) @@ -306,6 +330,11 @@ def createMain(self): self.MainBodyBox.setLayout(mainbodylayout) self.mainLayout.addWidget(self.MainBodyBox, sum(self.GroupBoxSeg[0:1]), 0, self.GroupBoxSeg[1], 1) + + def updatetemp(self, index, sensorMeasure): + index = index % len(self.TempLabelList) + self.TempLabelList[index].setText(sensorMeasure) + def destroyMain(self): self.MainBodyBox.deleteLater() self.mainLayout.removeWidget(self.MainBodyBox) diff --git a/Gui/QtGUIutils/QtStartWindow.py b/Gui/QtGUIutils/QtStartWindow.py index 8de82b0a..bd6a85c9 100644 --- a/Gui/QtGUIutils/QtStartWindow.py +++ b/Gui/QtGUIutils/QtStartWindow.py @@ -79,16 +79,16 @@ def measureFwPar(self): value[item] = 1.0 self.verboseResult[key] = value - def checkFwPar(self): + def checkFwPar(self, pfirmwareName): # To be finished try: - if not os.access(os.environ.get('GUI_dir'),os.W_OK): - QMessageBox.warning(None, "Error",'write access to GUI_dir is {0}'.format(os.access(os.environ.get('GUI_dir'),os.W_OK)), QMessageBox.Ok) - return - if not os.access("{0}/test".format(os.environ.get('PH2ACF_BASE_DIR')),os.W_OK): - QMessageBox.warning(None, "Error",'write access to Ph2_ACF is {0}'.format(os.access(os.environ.get('PH2ACF_BASE_DIR'),os.W_OK)), QMessageBox.Ok) - return + #if not os.access(os.environ.get('GUI_dir'),os.W_OK): + # QMessageBox.warning(None, "Error",'write access to GUI_dir is {0}'.format(os.access(os.environ.get('GUI_dir'),os.W_OK)), QMessageBox.Ok) + # return + #if not os.access("{0}/test".format(os.environ.get('PH2ACF_BASE_DIR')),os.W_OK): + # QMessageBox.warning(None, "Error",'write access to Ph2_ACF is {0}'.format(os.access(os.environ.get('PH2ACF_BASE_DIR'),os.W_OK)), QMessageBox.Ok) + # return FWisPresent = False if 'CROC' in self.module.getType(): @@ -97,10 +97,13 @@ def checkFwPar(self): boardtype = 'RD53A' #updating uri value in template xml file with correct fc7 ip address, as specified in siteSettings.py - print('write access to GUI_dir is {0}'.format(os.access(os.environ.get('GUI_dir'),os.W_OK))) - print('write access to Ph2_ACF is {0}'.format(os.access(os.environ.get('PH2ACF_BASE_DIR'),os.W_OK))) + #print('write access to GUI_dir is {0}'.format(os.access(os.environ.get('GUI_dir'),os.W_OK))) + #print('write access to Ph2_ACF is {0}'.format(os.access(os.environ.get('PH2ACF_BASE_DIR'),os.W_OK))) + + ###FIXME: Here I need to modify the CMSIT - fc7_ip = FirmwareList[defaultFC7] + #fc7_ip = FirmwareList[defaultFC7] + fc7_ip = FirmwareList[pfirmwareName] uricmd = "sed -i -e 's/192.168.1.80/{0}/g' {1}/Gui/CMSIT_{2}.xml".format(fc7_ip, os.environ.get('GUI_dir'),boardtype) updateuri = subprocess.call([uricmd], shell=True) @@ -337,10 +340,10 @@ def release(self): self.master.ExitButton.setDisabled(False) - def checkFwPar(self): + def checkFwPar(self, pfirmwareName): GlobalCheck = True for item in self.ModuleList: - item.checkFwPar() + item.checkFwPar(pfirmwareName) GlobalCheck = GlobalCheck and item.getResult() self.passCheck = GlobalCheck return GlobalCheck @@ -351,12 +354,12 @@ def setupBeBoard(self): def openRunWindow(self): - if not os.access(os.environ.get('GUI_dir'),os.W_OK): - QMessageBox.warning(None, "Error",'write access to GUI_dir is {0}'.format(os.access(os.environ.get('GUI_dir'),os.W_OK)), QMessageBox.Ok) - return - if not os.access("{0}/test".format(os.environ.get('PH2ACF_BASE_DIR')),os.W_OK): - QMessageBox.warning(None, "Error",'write access to Ph2_ACF is {0}'.format(os.access(os.environ.get('PH2ACF_BASE_DIR'),os.W_OK)), QMessageBox.Ok) - return + #if not os.access(os.environ.get('GUI_dir'),os.W_OK): + # QMessageBox.warning(None, "Error",'write access to GUI_dir is {0}'.format(os.access(os.environ.get('GUI_dir'),os.W_OK)), QMessageBox.Ok) + # return + #if not os.access("{0}/test".format(os.environ.get('PH2ACF_BASE_DIR')),os.W_OK): + # QMessageBox.warning(None, "Error",'write access to Ph2_ACF is {0}'.format(os.access(os.environ.get('PH2ACF_BASE_DIR'),os.W_OK)), QMessageBox.Ok) + # return for module in self.BeBoardWidget.getModules(): if module.getSerialNumber() == "": QMessageBox.information(None,"Error","No valid serial number!", QMessageBox.Ok) @@ -364,7 +367,7 @@ def openRunWindow(self): if module.getID() == "": QMessageBox.information(None,"Error","No valid ID!", QMessageBox.Ok) return - self.checkFwPar() + self.checkFwPar(self.firmwareName) if self.passCheck == False: reply = QMessageBox().question(None, "Error", "Front-End parameter check failed, forced to continue?", QMessageBox.Yes | QMessageBox.No, QMessageBox.No) if reply == QMessageBox.No: diff --git a/Gui/python/CustomizedWidget.py b/Gui/python/CustomizedWidget.py index 7069876d..87899e8b 100644 --- a/Gui/python/CustomizedWidget.py +++ b/Gui/python/CustomizedWidget.py @@ -97,7 +97,7 @@ class ChipBox(QWidget): chipchanged = pyqtSignal(int, int) def __init__(self,pChipType): - super(ChipBox, self).__init__() + super().__init__() self.chipType = pChipType self.mainLayout = QHBoxLayout() self.ChipList = [] @@ -128,11 +128,15 @@ def makeChipBox(self, pChipID): self.ChipLabel.setObjectName('ChipStatus_{0}'.format(pChipID)) self.ChipVDDDLabel = QLabel('VDDD:') self.ChipVDDDEdit = QLineEdit() - self.ChipVDDDEdit.setText('8') self.ChipVDDDEdit.setObjectName('VDDDEdit_{0}'.format(pChipID)) self.ChipVDDALabel = QLabel('VDDA:') self.ChipVDDAEdit = QLineEdit() - self.ChipVDDAEdit.setText('8') + if 'CROC' in self.chipType: + self.ChipVDDDEdit.setText('8') + self.ChipVDDAEdit.setText('8') + else: + self.ChipVDDDEdit.setText('16') + self.ChipVDDAEdit.setText('16') self.ChipVDDAEdit.setObjectName('VDDAEdit_{0}'.format(pChipID)) self.VChipLayout = QGridLayout() diff --git a/Gui/python/TestHandler.py b/Gui/python/TestHandler.py index 12dfe4dc..f6b1d9ca 100644 --- a/Gui/python/TestHandler.py +++ b/Gui/python/TestHandler.py @@ -313,7 +313,7 @@ def runSingleTest(self,testName): self.SLDOScanHandler.SLDOScan() return - + self.tempindex = 0 self.starttime = None self.ProgressingMode = "None" self.currentTest = testName @@ -623,14 +623,29 @@ def on_readyReadStandardOutput(self): pass elif "TEMPSENS_" in textStr: try: - # Chip status monitoring to be added - sensorMeasure = re.sub(r'.*->','',textStr) + output = textStr.split("[") + sensor = output[8] + sensorMeasure = sensor[3:] print(sensorMeasure) - #self.runwindow.MonitorWidget.Temperature.SetValue(sensorMeasure) - except: - pass + if sensorMeasure != "": + self.runwindow.updatetemp(self.tempindex, sensorMeasure) + self.tempindex += 1 + except Exception as e: + print ("Failed due to {0}".format(e)) + elif "INTERNAL_NTC" in textStr: + try: + output = textStr.split("[") + sensor = output[8] + sensorMeasure = sensor[3:] + print(sensorMeasure) + if sensorMeasure != "": + self.runwindow.updatetemp(self.tempindex, sensorMeasure) + self.tempindex += 1 + except Exception as e: + print ("Failed due to {0}".format(e)) continue - # if ("Global threshold for" in textStr): + + elif (self.ProgressingMode == "Summary"): toUpdate, UpdatedFEKey, valueIndex = self.updateNeeded(textStr) diff --git a/Gui/siteConfig.py b/Gui/siteConfig.py index b7ed0eed..bf9e3aa5 100644 --- a/Gui/siteConfig.py +++ b/Gui/siteConfig.py @@ -52,7 +52,9 @@ "TEPX Quad" : 6, "TBPX Quad" : 6.5, "Yellow Module (Purdue)": 6.5, - "CROC 1x2" : 4.0, + + "CROC 1x2" : 4.5, + "TFPX CROC Quad" : 6.5, "CROC SCC" : 2.0, } @@ -64,7 +66,9 @@ "TEPX Quad" : 2.0, "TBPX Quad" : 2.98, "Yellow Module (Purdue)": 2.8, - "CROC 1x2" : 2.0, + + "CROC 1x2" : 2.2, + "TFPX CROC Quad" : 2.98, "CROC SCC" : 1.8, } diff --git a/Ph2_ACF b/Ph2_ACF index 9e302c41..f74b2a44 160000 --- a/Ph2_ACF +++ b/Ph2_ACF @@ -1 +1 @@ -Subproject commit 9e302c41f6fd71d96c0df643daa58e4f470a1c85 +Subproject commit f74b2a445d34ca11a6e3181332f2a198a6cf9ae3 diff --git a/fc7_ip_address.txt b/fc7_ip_address.txt index b9d387fc..dcf0b920 100644 --- a/fc7_ip_address.txt +++ b/fc7_ip_address.txt @@ -1,3 +1,4 @@ #List of FC7 board IP fc7.board.1 192.168.1.80 fc7.board.2 192.168.1.81 +fc7.board.3 192.168.1.11 diff --git a/icicle b/icicle new file mode 160000 index 00000000..f05dd0be --- /dev/null +++ b/icicle @@ -0,0 +1 @@ +Subproject commit f05dd0be597acfdfe9163abf471d5852907c24b9