diff --git a/Modules/CommandPad/telemetryrequestmodule.cpp b/Modules/CommandPad/telemetryrequestmodule.cpp
index 1328c87726bae152132da3e790cdb4ac5d771a5f..343e7a7dcc32b6edf35c9821fd2e6684dcce13b7 100644
--- a/Modules/CommandPad/telemetryrequestmodule.cpp
+++ b/Modules/CommandPad/telemetryrequestmodule.cpp
@@ -39,7 +39,7 @@ void TelemetryRequestModule::connectUI()
connect(ui->tmtc_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_TMTC_TM_Clicked);
connect(ui->dpl_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_DPL_TM_Clicked);
connect(ui->ada_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_ADA_TM_Clicked);
- connect(ui->can_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_CAN_TM_Clicked);
+// connect(ui->can_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_CAN_TM_Clicked);
connect(ui->adc_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_ADC_TM_Clicked);
connect(ui->gps_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_GPS_TM_Clicked);
connect(ui->hr_tm_pushButton, &QPushButton::clicked, this, &TelemetryRequestModule::on_HR_TM_Clicked);
@@ -53,7 +53,7 @@ void TelemetryRequestModule::connectUI()
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->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);
@@ -101,10 +101,10 @@ void TelemetryRequestModule::on_ADA_TM_Clicked()
send(createTmMessage("MAV_ADA_TM_ID"));
}
-void TelemetryRequestModule::on_CAN_TM_Clicked()
-{
- send(createTmMessage("MAV_CAN_TM_ID"));
-}
+//void TelemetryRequestModule::on_CAN_TM_Clicked()
+//{
+// send(createTmMessage("MAV_CAN_TM_ID"));
+//}
void TelemetryRequestModule::on_ADC_TM_Clicked()
{
@@ -176,9 +176,9 @@ 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"));
-}
+//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 d59a7031ad3c2a66162f114589dc99e9dee4080f..261736d3c02020b6da59c2a078f3384a9f8fba2d 100644
--- a/Modules/CommandPad/telemetryrequestmodule.h
+++ b/Modules/CommandPad/telemetryrequestmodule.h
@@ -33,7 +33,7 @@ protected:
void on_TMTC_TM_Clicked();
void on_DPL_TM_Clicked();
void on_ADA_TM_Clicked();
- void on_CAN_TM_Clicked();
+// void on_CAN_TM_Clicked();
void on_ADC_TM_Clicked();
void on_GPS_TM_Clicked();
void on_HR_TM_Clicked();
@@ -47,7 +47,7 @@ protected:
void on_MS5803_TM_Clicked();
void on_BMX160_TM_Clicked();
void on_LIS3MDL_TM_Clicked();
- void on_STRAIN_BOARD_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 8c5e8cd9736fa416a6ee189e958d7565104001d1..4fc71b920f7596adbe789b1191fd83eaf6fbb2ac 100644
--- a/Modules/CommandPad/telemetryrequestmodule.ui
+++ b/Modules/CommandPad/telemetryrequestmodule.ui
@@ -49,23 +49,30 @@
</widget>
</item>
<item>
- <widget class="QPushButton" name="fmm_tm_pushButton">
+ <widget class="QPushButton" name="logger_tm_pushButton">
<property name="text">
- <string>FMM</string>
+ <string>LOGGER</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="logger_tm_pushButton">
+ <widget class="QPushButton" name="ada_tm_pushButton">
<property name="text">
- <string>LOGGER</string>
+ <string>ADA</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="tmtc_tm_pushButton">
+ <widget class="QPushButton" name="pin_obs_tm_pushButton">
<property name="text">
- <string>TMTC</string>
+ <string>PIN OBS</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="sensors_tm_pushButton">
+ <property name="text">
+ <string>SENSORS</string>
</property>
</widget>
</item>
@@ -77,16 +84,16 @@
</widget>
</item>
<item>
- <widget class="QPushButton" name="ada_tm_pushButton">
+ <widget class="QPushButton" name="fmm_tm_pushButton">
<property name="text">
- <string>ADA</string>
+ <string>FMM</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="can_tm_pushButton">
+ <widget class="QPushButton" name="tmtc_tm_pushButton">
<property name="text">
- <string>CAN</string>
+ <string>TMTC</string>
</property>
</widget>
</item>
@@ -132,20 +139,6 @@
</property>
</widget>
</item>
- <item>
- <widget class="QPushButton" name="sensors_tm_pushButton">
- <property name="text">
- <string>SENSORS</string>
- </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">
@@ -188,13 +181,6 @@
</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/Mavlink/mavlink_skyward_lib b/Modules/Mavlink/mavlink_skyward_lib
index 3417d291cb7d6ced723e18d43b7263b055d0f2a7..d7c4c0179f0cde99b3346181b51c6cd1a95747a8 160000
--- a/Modules/Mavlink/mavlink_skyward_lib
+++ b/Modules/Mavlink/mavlink_skyward_lib
@@ -1 +1 @@
-Subproject commit 3417d291cb7d6ced723e18d43b7263b055d0f2a7
+Subproject commit d7c4c0179f0cde99b3346181b51c6cd1a95747a8
diff --git a/Modules/Mavlink/mavlinkmodule.cpp b/Modules/Mavlink/mavlinkmodule.cpp
index c04c98d28db6137c9bd6a04bbbe675da27fc4b3c..f49eb3ba0da8efe61b24a089fa7e1006e199ab25 100644
--- a/Modules/Mavlink/mavlinkmodule.cpp
+++ b/Modules/Mavlink/mavlinkmodule.cpp
@@ -337,9 +337,9 @@ void MavlinkModule::onCommandReceived(const ModuleMessage &msg)
else if(arg == "MAV_CMD_START_LOGGING"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_START_LOGGING);
}
- else if(arg == "MAV_CMD_STOP_LOGGING"){
- encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_STOP_LOGGING);
- }
+// else if(arg == "MAV_CMD_STOP_LOGGING"){
+// encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_STOP_LOGGING);
+// }
else if(arg == "MAV_CMD_CLOSE_LOG"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_NOARG_TC(MAV_CMD_CLOSE_LOG);
}
@@ -430,9 +430,9 @@ void MavlinkModule::onTelemetryRequestReceived(const ModuleMessage &msg)
else if(arg == "MAV_ADA_TM_ID"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_TELEMETRY_REQUEST_TC(MAV_ADA_TM_ID);
}
- else if(arg == "MAV_CAN_TM_ID"){
- encoded_mvl_msg = mavlinkCommandAdapter.encode_TELEMETRY_REQUEST_TC(MAV_CAN_TM_ID);
- }
+// else if(arg == "MAV_CAN_TM_ID"){
+// encoded_mvl_msg = mavlinkCommandAdapter.encode_TELEMETRY_REQUEST_TC(MAV_CAN_TM_ID);
+// }
else if(arg == "MAV_ADC_TM_ID"){
encoded_mvl_msg = mavlinkCommandAdapter.encode_TELEMETRY_REQUEST_TC(MAV_ADC_TM_ID);
}
@@ -476,9 +476,9 @@ void MavlinkModule::onTelemetryRequestReceived(const ModuleMessage &msg)
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);
- }
+// 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/ValuesConverterViewer/valuesconverterviewermodule.cpp b/Modules/ValuesConverterViewer/valuesconverterviewermodule.cpp
index cf5b13c80dba721440539737ad3ace80d35f72a7..5c0ddefde3376f7e4decdb5f718ee453ef57add7 100644
--- a/Modules/ValuesConverterViewer/valuesconverterviewermodule.cpp
+++ b/Modules/ValuesConverterViewer/valuesconverterviewermodule.cpp
@@ -151,7 +151,8 @@ void ValuesConverterViewerModule::onMsgReceived(const ModuleMessage &msg)
for (int i = 0; i < rules.count(); i++ ) {
if(rules[i].getTopic() == msg.topic()){
if(rules[i].updateCurrentValue(msg.payload())){
- labels[i]->setText(rules[i].getName()+"\n"+rules[i].getCurrentValue());
+ QString time = "(" + msg.timestamp().toString("HH:mm:ss") + ")\n";
+ labels[i]->setText(rules[i].getName()+"\n"+time+rules[i].getCurrentValue());
if(rules[i].getColor() != ""){
labels[i]->setStyleSheet("color:"+rules[i].getColor()+";");
}
diff --git a/SkywardHub.pro b/SkywardHub.pro
index b68a2b5e53881b3010448aaab1112fa0d58b2022..d19665bc9f25128c843ea8e136d1e41b83db467f 100644
--- a/SkywardHub.pro
+++ b/SkywardHub.pro
@@ -8,6 +8,7 @@ CONFIG += c++11
# In order to do so, uncomment the following line.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
+
SOURCES += \
Core/module.cpp \
Core/moduleeventshandler.cpp \
diff --git a/SkywardHub.pro.user b/SkywardHub.pro.user
index 41c6066259ed2caaf6a0eb6d0f73b8be72cfdd06..d5bf39281b046c8c0b24785ec2c5be7c133eef91 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-09-07T22:18:51. -->
+<!-- Written by QtCreator 4.14.2, 2021-09-12T23:02:44. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>