Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Firmwareupdater – Add support for other processes on multi-core boards #850

Merged
merged 6 commits into from
Feb 9, 2023
Merged

Firmwareupdater – Add support for other processes on multi-core boards #850

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b621d5d
Align all the `cmake_minimum_required` to VERSION 3.12
sgiraz Dec 29, 2022
b0991c7
Remove previous existing warnings:
sgiraz Dec 29, 2022
aeceaa1
Add support for `extraprocesses`
sgiraz Dec 29, 2022
e0c0e63
Disable the `Erase Application` button by default
sgiraz Dec 29, 2022
cc8bc4a
FirmwareUpdater: fixes and minor improvements:
sgiraz Jan 20, 2023
8f7403d
Update `iCubFindDependencies` considering the new `icub-firmware-shar…
sgiraz Feb 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libraries/learningMachine/standalone/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Authors: Arjan Gijsberts
# CopyPolicy: Released under the terms of the GNU GPL v2.0.

cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 3.12)

set(PROJECTNAME learningMachine)
project(${PROJECTNAME})
Expand Down
2 changes: 1 addition & 1 deletion src/modules/learningMachine/standalone/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Authors: Arjan Gijsberts
# CopyPolicy: Released under the terms of the GNU GPL v2.0.

cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 3.12)

set(PROJECTNAME learningMachine)

Expand Down
18 changes: 13 additions & 5 deletions src/tools/FirmwareUpdater/firmwareupdatercore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,14 @@ bool FirmwareUpdaterCore::init(Searchable& config, int port, QString address, in

hostIPaddress = EO_COMMON_IPV4ADDR(ipv0, ipv1, ipv2, ipv3);

qDebug() << "Invalid IP address found in .ini file (format is 10.0.X.Y:Z , 0 < X,Y < 255 , Z port number)";
qDebug() << "Skipped , using defaults!";
qDebug() << "Missing or invalid IP address found in .ini file (format is 10.0.X.Y:Z , 0 < X,Y < 255 , Z port number)";
qDebug() << "Skipped, using defaults:";
if(verbosity >= 1)
{
qInfo() << " - IP address:" << DEFAULT_IP_ADDRESS;
qInfo() << " - IP port: " << DEFAULT_IP_PORT;
}

}
}

Expand Down Expand Up @@ -314,15 +320,17 @@ boardInfo2_t FirmwareUpdaterCore::getMoreDetails(int boardNum,QString *infoStrin

}

QString FirmwareUpdaterCore::getProcessFromUint(uint8_t id)
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_Application:
return "eApplication";
case uprot_proc_Application00:
return isMultiCore ? "eApplication_core_0" : "eApplication";
case uprot_proc_Application01:
return "eApplication_core_1";
case uprot_proc_ApplPROGupdater:
return "eApplPROGupdater";
default:
Expand Down
6 changes: 5 additions & 1 deletion src/tools/FirmwareUpdater/firmwareupdatercore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@

using namespace yarp::os;

#define DEFAULT_IP_ADDRESS "10.0.1.104"
#define DEFAULT_IP_PORT 3333

class FirmwareUpdaterCore : public QObject
{
Q_OBJECT
Expand Down Expand Up @@ -53,7 +56,8 @@ class FirmwareUpdaterCore : public QObject
bool goToMaintenance();
bool eraseEthEprom();
void eraseCanEprom();
QString getProcessFromUint(uint8_t id);
QString getProcessFromUint(uint8_t id, bool isMultiCore = false);

cDownloader *getDownloader();


Expand Down
Loading