amc application name updated in FirmwareUpdater gui (#1038)

Author: SanLordKevin

conf/iCubFindDependencies.cmake

@@ -64,7 +64,7 @@ checkandset_dependency(IPOPT)
 checkandset_dependency(OpenCV)
 checkandset_dependency(Qt5)
 
-set(MINIMUM_REQUIRED_icub_firmware_shared_VERSION 1.43.3)
+set(MINIMUM_REQUIRED_icub_firmware_shared_VERSION 1.43.4)
 
 if(icub_firmware_shared_FOUND AND ICUB_USE_icub_firmware_shared)
   if(icub_firmware_shared_VERSION VERSION_LESS ${MINIMUM_REQUIRED_icub_firmware_shared_VERSION})

src/tools/FirmwareUpdater/firmwareupdatercore.cpp

@@ -320,32 +320,27 @@ boardInfo2_t FirmwareUpdaterCore::getMoreDetails(int boardNum,QString *infoStrin
 
 }
 
-QString FirmwareUpdaterCore::getProcessFromUint(uint8_t id, bool isMultiCore, eObrd_ethtype_t boardtype)
+QString FirmwareUpdaterCore::getProcessFromUint(uint8_t id, bool isMultiCore)
 {
     switch (id) {
     case uprot_proc_Loader:
         return "eLoader";
     case uprot_proc_Updater:
         return "eUpdater";
     case uprot_proc_Application00:
-        if ((boardtype == eobrd_ethtype_amc) && isMultiCore)
-            return "eApplication_core_0";
-        else if ((boardtype == eobrd_ethtype_amcfoc) && isMultiCore)
-            return "app.yri" ;
+        if (isMultiCore)
+            return "appl.yri" ;
         else
             return "eApplication";
     case uprot_proc_Application01:
-        if ((boardtype == eobrd_ethtype_amc) && isMultiCore)
-            return "eApplication_core_1";
-        else if ((boardtype == eobrd_ethtype_amcfoc) && isMultiCore)
-            return "app.mot" ;
+        if (isMultiCore)
+            return "appl.mot" ;
         else
             return "eApplication_core_1";
     case uprot_proc_ApplPROGupdater:
         return "eApplPROGupdater";
     default:
         return "None";
-        break;
     }
 }
 

src/tools/FirmwareUpdater/firmwareupdatercore.h

@@ -56,7 +56,7 @@ class FirmwareUpdaterCore : public QObject
     bool goToMaintenance();
     bool eraseEthEprom();
     void eraseCanEprom();
-    QString getProcessFromUint(uint8_t id, bool isMultiCore = false, eObrd_ethtype_t boardtype = eobrd_ethtype_unknown);
+    QString getProcessFromUint(uint8_t id, bool isMultiCore = false);
 
     cDownloader *getDownloader();
     void selectCanBoardsByAddresses(const std::vector<std::pair<int, int>>& addresses);

src/tools/FirmwareUpdater/mainwindow.cpp

@@ -1097,14 +1097,14 @@ void MainWindow::onAppendInfo(boardInfo2_t info,eOipv4addr_t address)
 
     /*******************************************************************************/
     bool isMulticore = (eoboards_type2numberofcores(eoboards_ethtype2type(info.boardtype))) > 1 ? true : false;
-    QTreeWidgetItem *startUpNode = new QTreeWidgetItem(bootStrapNode, QStringList() << "Startup" << core->getProcessFromUint(info.processes.startup, isMulticore, info.boardtype));
+    QTreeWidgetItem *startUpNode = new QTreeWidgetItem(bootStrapNode, QStringList() << "Startup" << core->getProcessFromUint(info.processes.startup, isMulticore));
     bootStrapNode->addChild(startUpNode);
     bootStrapNode->setExpanded(true);
 
-    QTreeWidgetItem *defaultNode = new QTreeWidgetItem(bootStrapNode, QStringList() << "Default" << core->getProcessFromUint(info.processes.def2run, isMulticore, info.boardtype));
+    QTreeWidgetItem *defaultNode = new QTreeWidgetItem(bootStrapNode, QStringList() << "Default" << core->getProcessFromUint(info.processes.def2run, isMulticore));
     bootStrapNode->addChild(defaultNode);
 
-    QTreeWidgetItem *runningNode = new QTreeWidgetItem(bootStrapNode, QStringList() << "Running" << core->getProcessFromUint(info.processes.runningnow, isMulticore, info.boardtype));
+    QTreeWidgetItem *runningNode = new QTreeWidgetItem(bootStrapNode, QStringList() << "Running" << core->getProcessFromUint(info.processes.runningnow, isMulticore));
     bootStrapNode->addChild(runningNode);
 
     /*******************************************************************************/
@@ -1125,7 +1125,7 @@ void MainWindow::onAppendInfo(boardInfo2_t info,eOipv4addr_t address)
         propertiesNode->addChild(processNode);
         processNode->setExpanded(true);
 
-        QTreeWidgetItem *processType = new QTreeWidgetItem(processNode, QStringList() << "Type" << core->getProcessFromUint(pinfo.type, isMulticore, info.boardtype));
+        QTreeWidgetItem *processType = new QTreeWidgetItem(processNode, QStringList() << "Type" << core->getProcessFromUint(pinfo.type, isMulticore));
         processNode->addChild(processType);
 
         QTreeWidgetItem *processVersion = new QTreeWidgetItem(processNode, QStringList() << "Version" << QString("%1.%2").arg(pinfo.version.major).arg(pinfo.version.minor));