From ee2a5b6740ba0728e49f04709f5bb7d7c60b3021 Mon Sep 17 00:00:00 2001 From: Pos <pierpaolo.mancini@mail.polimi.it> Date: Wed, 29 Sep 2021 20:37:44 +0200 Subject: [PATCH] fixed telemetry request and value converter --- Modules/CommandPad/telemetryrequestmodule.cpp | 20 ++++---- Modules/CommandPad/telemetryrequestmodule.h | 4 +- Modules/CommandPad/telemetryrequestmodule.ui | 48 +++++++------------ Modules/Mavlink/mavlink_skyward_lib | 2 +- Modules/Mavlink/mavlinkmodule.cpp | 18 +++---- .../valuesconverterviewermodule.cpp | 3 +- SkywardHub.pro | 1 + SkywardHub.pro.user | 2 +- 8 files changed, 43 insertions(+), 55 deletions(-) diff --git a/Modules/CommandPad/telemetryrequestmodule.cpp b/Modules/CommandPad/telemetryrequestmodule.cpp index 1328c877..343e7a7d 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 d59a7031..261736d3 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 8c5e8cd9..4fc71b92 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 3417d291..d7c4c017 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 c04c98d2..f49eb3ba 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 cf5b13c8..5c0ddefd 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 b68a2b5e..d19665bc 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 41c60662..d5bf3928 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> -- GitLab