diff --git a/Core/modulemessage.cpp b/Core/modulemessage.cpp
index f4b5654cfe984c723250926d09046c6bc1dd47d4..3c7f8691ce3d0b8612de5849cd24c74eeaf009c0 100644
--- a/Core/modulemessage.cpp
+++ b/Core/modulemessage.cpp
@@ -4,7 +4,7 @@
ModuleMessage::ModuleMessage()
{
- setTimestamp(QDateTime::currentDateTime());
+ setTimestamp(QTime::currentTime());
}
ModuleMessage::ModuleMessage(const QString &topic) : ModuleMessage()
@@ -17,7 +17,7 @@ ModuleMessage::ModuleMessage(const QString &topic, const QString &msg) : ModuleM
setPayload(msg);
}
-ModuleMessage::ModuleMessage(const QString &topic, const QString &payload, const QDateTime &time) : ModuleMessage(topic, payload)
+ModuleMessage::ModuleMessage(const QString &topic, const QString &payload, const QTime &time) : ModuleMessage(topic, payload)
{
setTimestamp(time);
}
@@ -58,12 +58,12 @@ void ModuleMessage::setTopic(const QString &value)
_topic = value;
}
-QDateTime ModuleMessage::timestamp() const
+QTime ModuleMessage::timestamp() const
{
return _timestamp;
}
-void ModuleMessage::setTimestamp(const QDateTime ×tamp)
+void ModuleMessage::setTimestamp(const QTime ×tamp)
{
_timestamp = timestamp;
}
diff --git a/Core/modulemessage.h b/Core/modulemessage.h
index d5877f886dab1f2220ac917613c8b0f52d30a94b..e0f05aef80c8aeaf68a0817431fe9f978a22133d 100644
--- a/Core/modulemessage.h
+++ b/Core/modulemessage.h
@@ -12,7 +12,7 @@ public:
ModuleMessage();
ModuleMessage(const QString &topic);
ModuleMessage(const QString &_topic, const QString &payload);
- ModuleMessage(const QString &_topic, const QString &payload, const QDateTime &time);
+ ModuleMessage(const QString &_topic, const QString &payload, const QTime &time);
ModuleMessage(const ModuleMessage &other);
ModuleMessage operator=(const ModuleMessage &other);
@@ -24,8 +24,8 @@ public:
QString topic() const;
void setTopic(const QString &value);
- QDateTime timestamp() const;
- void setTimestamp(const QDateTime ×tamp);
+ QTime timestamp() const;
+ void setTimestamp(const QTime ×tamp);
QString getHigherHierarchyTopic() const;
@@ -57,7 +57,7 @@ private:
QString _payload;
QString _topic;
QString _originalTopic;
- QDateTime _timestamp;
+ QTime _timestamp;
const QChar _separator = '/';
XmlObject options;
};
diff --git a/Modules/CommandPad/telemetryrequestmodule.cpp b/Modules/CommandPad/telemetryrequestmodule.cpp
index 97ff201932b4d556baf7dcd4fa33a341af6171b0..1328c87726bae152132da3e790cdb4ac5d771a5f 100644
--- a/Modules/CommandPad/telemetryrequestmodule.cpp
+++ b/Modules/CommandPad/telemetryrequestmodule.cpp
@@ -46,6 +46,15 @@ void TelemetryRequestModule::connectUI()
connect(ui->lr_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_LR_TM_Clicked);
connect(ui->test_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_TEST_TM_Clicked);
+ connect(ui->pin_obs_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_PIN_OBS_TM_Clicked);
+ connect(ui->task_stats_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_TASK_STATS_TM_Clicked);
+ connect(ui->abk_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_ABK_TM_Clicked);
+ connect(ui->nas_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_NAS_TM_Clicked);
+ connect(ui->ms5803_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_MS5803_TM_Clicked);
+ connect(ui->bmx160_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_BMX160_TM_Clicked);
+ connect(ui->lis3mdl_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_LIS3MDL_TM_Clicked);
+ connect(ui->strain_board_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_STRAIN_BOARD_TM_Clicked);
+
connect(ui->windtunnel_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_WINDTUNNEL_TM_Clicked);
connect(ui->sensors_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_SENSORS_TM_Clicked);
}
@@ -132,4 +141,44 @@ void TelemetryRequestModule::on_SENSORS_TM_Clicked()
send(createTmMessage("MAV_SENSORS_TM_ID"));
}
+void TelemetryRequestModule::on_PIN_OBS_TM_Clicked()
+{
+ send(createTmMessage("MAV_PIN_OBS_TM_ID"));
+}
+
+void TelemetryRequestModule::on_TASK_STATS_TM_Clicked()
+{
+ send(createTmMessage("MAV_TASK_STATS_TM_ID"));
+}
+
+void TelemetryRequestModule::on_ABK_TM_Clicked()
+{
+ send(createTmMessage("MAV_ABK_TM_ID"));
+}
+
+void TelemetryRequestModule::on_NAS_TM_Clicked()
+{
+ send(createTmMessage("MAV_NAS_TM_ID"));
+}
+
+void TelemetryRequestModule::on_MS5803_TM_Clicked()
+{
+ send(createTmMessage("MAV_MS5803_TM_ID"));
+}
+
+void TelemetryRequestModule::on_BMX160_TM_Clicked()
+{
+ send(createTmMessage("MAV_BMX160_TM_ID"));
+}
+
+void TelemetryRequestModule::on_LIS3MDL_TM_Clicked()
+{
+ send(createTmMessage("MAV_LIS3MDL_TM_ID"));
+}
+
+void TelemetryRequestModule::on_STRAIN_BOARD_TM_Clicked()
+{
+ send(createTmMessage("MAV_STRAIN_BOARD_TM_ID"));
+}
+
diff --git a/Modules/CommandPad/telemetryrequestmodule.h b/Modules/CommandPad/telemetryrequestmodule.h
index 9f59eb876217aac37040262361e630247a61e3f6..d59a7031ad3c2a66162f114589dc99e9dee4080f 100644
--- a/Modules/CommandPad/telemetryrequestmodule.h
+++ b/Modules/CommandPad/telemetryrequestmodule.h
@@ -40,6 +40,15 @@ protected:
void on_LR_TM_Clicked();
void on_TEST_TM_Clicked();
+ void on_PIN_OBS_TM_Clicked();
+ void on_TASK_STATS_TM_Clicked();
+ void on_ABK_TM_Clicked();
+ void on_NAS_TM_Clicked();
+ void on_MS5803_TM_Clicked();
+ void on_BMX160_TM_Clicked();
+ void on_LIS3MDL_TM_Clicked();
+ void on_STRAIN_BOARD_TM_Clicked();
+
void on_WINDTUNNEL_TM_Clicked();
void on_SENSORS_TM_Clicked();
diff --git a/Modules/CommandPad/telemetryrequestmodule.ui b/Modules/CommandPad/telemetryrequestmodule.ui
index d6ada9f2892468ce0d0b877dc68f048a84c8528d..8c5e8cd9736fa416a6ee189e958d7565104001d1 100644
--- a/Modules/CommandPad/telemetryrequestmodule.ui
+++ b/Modules/CommandPad/telemetryrequestmodule.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>224</width>
- <height>495</height>
+ <width>228</width>
+ <height>721</height>
</rect>
</property>
<property name="windowTitle">
@@ -27,8 +27,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>202</width>
- <height>473</height>
+ <width>206</width>
+ <height>699</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
@@ -139,6 +139,62 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="QPushButton" name="pin_obs_tm_pushButton">
+ <property name="text">
+ <string>PIN OBS</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="task_stats_tm_pushButton">
+ <property name="text">
+ <string>TASK STATS</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="abk_tm_pushButton">
+ <property name="text">
+ <string>ABK</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="nas_tm_pushButton">
+ <property name="text">
+ <string>NAS</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="ms5803_tm_pushButton">
+ <property name="text">
+ <string>MS5803</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="bmx160_tm_pushButton">
+ <property name="text">
+ <string>BMX160</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="lis3mdl_tm_pushButton">
+ <property name="text">
+ <string>LIS3MDL</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="strain_board_tm_pushButton">
+ <property name="text">
+ <string>STRAIN BOARD</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
diff --git a/Modules/Graph/graphmodule.cpp b/Modules/Graph/graphmodule.cpp
index bb931369ee82ac3905f0457882d172b7b441b39e..317b27f4ba598417c762d73a9c2a2161d79a0c1a 100644
--- a/Modules/Graph/graphmodule.cpp
+++ b/Modules/Graph/graphmodule.cpp
@@ -39,13 +39,13 @@ void GraphModule::buildCentralGraphView()
//cPlot.xAxis2->setTicker(textTicker);
//graphCentralView.xAxis2->setTickLabels(true);
- QSharedPointer<QCPAxisTickerDateTime> dateTimeTicker(new QCPAxisTickerDateTime);
+ QSharedPointer<QCPAxisTickerTime> dateTimeTicker(new QCPAxisTickerTime);
graphCentralView.xAxis->setTicker(dateTimeTicker);
//QDateTime rangeLowerBound = QDateTime::currentDateTime().addDays(-2);
- double now = QDateTime::currentDateTime().toTime_t();
- QDateTime rangeUpperBound = QDateTime::currentDateTime().addDays(+2);
- graphCentralView.xAxis->setRange(now, QCPAxisTickerDateTime::dateTimeToKey(rangeUpperBound));
- dateTimeTicker->setDateTimeFormat(dateFormat);
+// double now = QDateTime::currentDateTime().toTime_t();
+// QDateTime rangeUpperBound = QDateTime::currentDateTime().addDays(+2);
+// graphCentralView.xAxis->setRange(now, QCPAxisTickerDateTime::(rangeUpperBound));
+ dateTimeTicker->setTimeFormat(dateFormat);
graphCentralView.legend->setVisible(true);
@@ -194,8 +194,8 @@ void GraphModule::onMsgReceived(const ModuleMessage &msg)
if(subscriptions.contains(msg.originalTopic())){
QCPGraph *graph = subscriptions[msg.originalTopic()];
- double x = 0,y = 0;
- x = msg.timestamp().toTime_t();
+ double x = 0, y = 0;
+ x = msg.timestamp().msecsSinceStartOfDay();
bool ok;
y = msg.payload().toDouble(&ok);
if(ok && graph != nullptr){
diff --git a/Modules/Graph/graphmodule.h b/Modules/Graph/graphmodule.h
index 8d4c272885393c3eed34951d84e0d4f8db456be2..b2bf068794a707b198bbb0a3c7012f82daf8b66d 100644
--- a/Modules/Graph/graphmodule.h
+++ b/Modules/Graph/graphmodule.h
@@ -51,7 +51,7 @@ private:
QMap<QString,QCPGraph*> subscriptions;
int followedGraphIndex = -1;
- QString dateFormat = "HH:mm:ss\n(zzz)";
+ QString dateFormat = "%h:%m:%s (%z)"; //"HH:mm:ss\n(zzz)";
//QSharedPointer<QCPAxisTickerDateTime> dateTicker;
QTimer updaterTimer;
int updatePeriod = 1000; // [ms]
diff --git a/Modules/Mavlink/mavlink_skyward_lib b/Modules/Mavlink/mavlink_skyward_lib
index 190c10d9ed7dcf06a64b3370d83e83624cf446be..93850b6237b2922fa7960e8fd6c105e1ed427b1b 160000
--- a/Modules/Mavlink/mavlink_skyward_lib
+++ b/Modules/Mavlink/mavlink_skyward_lib
@@ -1 +1 @@
-Subproject commit 190c10d9ed7dcf06a64b3370d83e83624cf446be
+Subproject commit 93850b6237b2922fa7960e8fd6c105e1ed427b1b
diff --git a/Modules/Mavlink/mavlinkmodule.cpp b/Modules/Mavlink/mavlinkmodule.cpp
index bc87203a9a4bd7fa094c6ac0550dc6c6c4504b30..ec16d1ead14a4ec75febd795523df9deea5ce644 100644
--- a/Modules/Mavlink/mavlinkmodule.cpp
+++ b/Modules/Mavlink/mavlinkmodule.cpp
@@ -292,10 +292,10 @@ void MavlinkModule::onCommandReceived(const ModuleMessage &msg)
else if(arg == "MAV_CMD_FORCE_LAUNCH"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_FORCE_LAUNCH);
}
- else if(arg == "MAV_CMD_CALIBRATE_SENSORS"){ // New Lynx
+ else if(arg == "MAV_CMD_CALIBRATE_SENSORS"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_CALIBRATE_SENSORS);
}
- else if(arg == "MAV_CMD_CALIBRATE_ALGOS"){ // New Lynx
+ else if(arg == "MAV_CMD_CALIBRATE_ALGOS"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_CALIBRATE_ALGOS);
}
else if(arg == "MAV_CMD_FORCE_INIT"){
@@ -304,25 +304,25 @@ void MavlinkModule::onCommandReceived(const ModuleMessage &msg)
else if(arg == "MAV_CMD_NOSECONE_OPEN"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_NOSECONE_OPEN);
}
- else if(arg == "MAV_CMD_DPL_WIGGLE_SERVO"){ // New Lynx
+ else if(arg == "MAV_CMD_DPL_WIGGLE_SERVO"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_DPL_WIGGLE_SERVO);
}
- else if(arg == "MAV_CMD_ARB_WIGGLE_SERVO"){ // New Lynx
+ else if(arg == "MAV_CMD_ARB_WIGGLE_SERVO"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_ARB_WIGGLE_SERVO);
}
- else if(arg == "MAV_CMD_DPL_RESET_SERVO"){ // New Lynx
+ else if(arg == "MAV_CMD_DPL_RESET_SERVO"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_DPL_RESET_SERVO);
}
- else if(arg == "MAV_CMD_ARB_RESET_SERVO"){ // New Lynx
+ else if(arg == "MAV_CMD_ARB_RESET_SERVO"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_ARB_RESET_SERVO);
}
- else if(arg == "MAV_CMD_CUT_DROGUE"){ // New Lynx
+ else if(arg == "MAV_CMD_CUT_DROGUE"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_CUT_DROGUE);
}
- else if(arg == "MAV_CMD_CUT_PRIMARY"){ // New Lynx
+ else if(arg == "MAV_CMD_CUT_PRIMARY"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_CUT_PRIMARY);
}
- else if(arg == "MAV_CMD_CUT_BACKUP"){ // New Lynx
+ else if(arg == "MAV_CMD_CUT_BACKUP"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_CUT_BACKUP);
}
else if(arg == "MAV_CMD_TEST_PRIMARY_CUTTER"){
@@ -340,10 +340,10 @@ void MavlinkModule::onCommandReceived(const ModuleMessage &msg)
else if(arg == "MAV_CMD_CLOSE_LOG"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_CLOSE_LOG);
}
- else if(arg == "MAV_CMD_TEST_AEROBRAKES"){ // New Lynx
+ else if(arg == "MAV_CMD_TEST_AEROBRAKES"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_TEST_AEROBRAKES);
}
- else if(arg == "MAV_CMD_DISABLE_AEROBRAKES"){ // New Lynx
+ else if(arg == "MAV_CMD_DISABLE_AEROBRAKES"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_DISABLE_AEROBRAKES);
}
else if(arg == "MAV_CMD_END_MISSION"){
@@ -439,13 +439,38 @@ void MavlinkModule::onTelemetryRequestReceived(const ModuleMessage &msg)
else if(arg == "MAV_TEST_TM_ID"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_TELEMETRY_REQUEST_TC(MAV_TEST_TM_ID);
}
- else if(arg == "MAV_WINDTUNNEL_TM_ID"){ // New Lynx
+ else if(arg == "MAV_WINDTUNNEL_TM_ID"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_TELEMETRY_REQUEST_TC(MAV_WINDTUNNEL_TM_ID);
}
- else if(arg == "MAV_SENSORS_TM_ID"){ // New Lynx
+ else if(arg == "MAV_SENSORS_TM_ID"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_TELEMETRY_REQUEST_TC(MAV_SENSORS_TM_ID);
}
+ else if(arg == "MAV_PIN_OBS_TM_ID"){
+ encoded_mvl_msg = mavlinkCommandAdapter.encode_TELEMETRY_REQUEST_TC(MAV_PIN_OBS_TM_ID);
+ }
+ else if(arg == "MAV_TASK_STATS_TM_ID"){
+ encoded_mvl_msg = mavlinkCommandAdapter.encode_TELEMETRY_REQUEST_TC(MAV_TASK_STATS_TM_ID);
+ }
+ else if(arg == "MAV_ABK_TM_ID"){
+ encoded_mvl_msg = mavlinkCommandAdapter.encode_TELEMETRY_REQUEST_TC(MAV_ABK_TM_ID);
+ }
+ else if(arg == "MAV_NAS_TM_ID"){
+ encoded_mvl_msg = mavlinkCommandAdapter.encode_TELEMETRY_REQUEST_TC(MAV_NAS_TM_ID);
+ }
+ else if(arg == "MAV_MS5803_TM_ID"){
+ encoded_mvl_msg = mavlinkCommandAdapter.encode_TELEMETRY_REQUEST_TC(MAV_MS5803_TM_ID);
+ }
+ else if(arg == "MAV_BMX160_TM_ID"){
+ encoded_mvl_msg = mavlinkCommandAdapter.encode_TELEMETRY_REQUEST_TC(MAV_BMX160_TM_ID);
+ }
+ else if(arg == "MAV_LIS3MDL_TM_ID"){
+ encoded_mvl_msg = mavlinkCommandAdapter.encode_TELEMETRY_REQUEST_TC(MAV_LIS3MDL_TM_ID);
+ }
+ else if(arg == "MAV_STRAIN_BOARD_TM_ID"){
+ encoded_mvl_msg = mavlinkCommandAdapter.encode_TELEMETRY_REQUEST_TC(MAV_STRAIN_BOARD_TM_ID);
+ }
+
if(portOpen && portNumber >= 0){
mavlinkCommandAdapter.send(encoded_mvl_msg);
}
diff --git a/Modules/Mavlink/mavlinkreader.cpp b/Modules/Mavlink/mavlinkreader.cpp
index 9150a1f70ec2fee8057298c081364ef2c45245db..0d1ff15013a75851b3b45c51e2610138a0328fd3 100644
--- a/Modules/Mavlink/mavlinkreader.cpp
+++ b/Modules/Mavlink/mavlinkreader.cpp
@@ -214,31 +214,42 @@ QString MavlinkReader::extractFields(mavlink_message_t *msg, const mavlink_field
QList<ModuleMessage> MavlinkReader::translateToGsMessage(mavlink_message_t *msg, const QString &msgName, const QMap<QString,QString> &payloads)
{
- QDateTime timestamp;
+ QTime timestamp(0, 0, 0, 0);
bool timeOK = false;
double t;
if(payloads.contains("timestamp")){
t = payloads["timestamp"].toDouble(&timeOK);
}
- if(!timeOK){
- timestamp = timestamp.currentDateTime();
- }
- else{
- timestamp.setTime_t(t);
+ if(timeOK){
+ timestamp = timestamp.addMSecs(t);
}
QList<ModuleMessage> messagesReceived;
for(QString fieldName : payloads.keys()){
QString topic = SkywardHubStrings::mavlink_received_msg_topic + "/" + msgName + "/" + fieldName;
- ModuleMessage msg(topic, payloads[fieldName],timestamp);
+ ModuleMessage msg(topic, payloads[fieldName], timestamp);
emit msgReceived(msg);
messagesReceived.append(msg);
}
return messagesReceived;
}
+
+//QDateTime MavlinkReader::convertTimestampToDatatime(const double ×tamp) const
+//{
+// // The timestamp measure the ms from the start of the board.
+
+//// double secondsFromStart = timestamp/1000;
+//// double minutes = secondsFromStart/60;
+//// double hours = minutes/60;
+
+// QDateTime date;
+// return date.addMSecs(timestamp);
+//}
+
+
void MavlinkReader::closeLog()
{
if(logFile.isOpen())
diff --git a/Modules/Mavlink/mavlinkreader.h b/Modules/Mavlink/mavlinkreader.h
index f6d40f6f10cd51db6ef65e918b897fc507720494..09d6a559bc87d7cd7ead8c0e348f0f03a409573f 100644
--- a/Modules/Mavlink/mavlinkreader.h
+++ b/Modules/Mavlink/mavlinkreader.h
@@ -47,6 +47,7 @@ protected:
void handleError();
void setLogFilePath();
+// QDateTime convertTimestampToDatatime(const double ×tamp) const;
/*
* This method emit the signal msgReceived
diff --git a/Modules/Test/testmodule.cpp b/Modules/Test/testmodule.cpp
index 5a1969c7c317403370543b9fb8eb2aa3c37d16e7..4a858d718cb0660328ea8bed21ffa8103dbe9b99 100644
--- a/Modules/Test/testmodule.cpp
+++ b/Modules/Test/testmodule.cpp
@@ -38,7 +38,7 @@ void TestModule::on_publish_button_clicked()
{
QString topic = ui->topic_lineEdit->text().trimmed();
QString payload = ui->payload_lineEdit->text().trimmed();
- ModuleMessage msg(topic,payload, QDateTime::currentDateTime());
+ ModuleMessage msg(topic,payload, QTime::currentTime());
getCore()->getModuleMessagesBroker()->publish(msg);
}
diff --git a/SkywardHub.pro.user b/SkywardHub.pro.user
index bca3057bfe05398764f23326620889aefacc4732..50d9fc9941b2b0183a8fe5b96a64bb838e6fd46b 100644
--- a/SkywardHub.pro.user
+++ b/SkywardHub.pro.user
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.14.2, 2021-07-24T17:30:27. -->
+<!-- Written by QtCreator 4.14.2, 2021-07-28T17:18:26. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
@@ -8,7 +8,7 @@
</data>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
- <value type="int">1</value>
+ <value type="int">0</value>
</data>
<data>
<variable>ProjectExplorer.Project.EditorSettings</variable>
@@ -88,16 +88,16 @@
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
<value type="QString" key="DeviceType">Desktop</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.1 MinGW 64-bit</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.1 MinGW 64-bit</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5151.win64_mingw81_kit</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.1 MinGW 32-bit</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.1 MinGW 32-bit</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5151.win32_mingw81_kit</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="int" key="EnableQmlDebugging">0</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Debug</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Debug</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Debug</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -135,8 +135,8 @@
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Release</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Release</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Release</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -176,8 +176,8 @@
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
<value type="int" key="EnableQmlDebugging">0</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Profile</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Profile</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Profile</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Profile</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -298,7 +298,7 @@
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Debug</value>
+ <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Debug</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>
@@ -307,16 +307,16 @@
<variable>ProjectExplorer.Project.Target.1</variable>
<valuemap type="QVariantMap">
<value type="QString" key="DeviceType">Desktop</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.1 MinGW 32-bit</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.1 MinGW 32-bit</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5151.win32_mingw81_kit</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.1 MinGW 64-bit</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.1 MinGW 64-bit</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5151.win64_mingw81_kit</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="int" key="EnableQmlDebugging">0</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Debug</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Debug</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Debug</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -354,8 +354,8 @@
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Release</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Release</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Release</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -395,8 +395,8 @@
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
<value type="int" key="EnableQmlDebugging">0</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Profile</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Profile</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Profile</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Profile</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -517,7 +517,6 @@
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Debug</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>