From 23d747d06746e2a80ec18ec9f88d7dd6ca5798fe Mon Sep 17 00:00:00 2001
From: Alberto Nidasio <nidasioalberto@gmail.com>
Date: Fri, 4 Oct 2024 17:16:39 +0200
Subject: [PATCH] Fixed a couple of things after rebase
---
.../Modules/ARPStateViewer/ARPStateViewer.cpp | 2 +-
src/shared/Modules/Mavlink/MavlinkCodec.cpp | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/shared/Modules/ARPStateViewer/ARPStateViewer.cpp b/src/shared/Modules/ARPStateViewer/ARPStateViewer.cpp
index 533107d2..2957284b 100644
--- a/src/shared/Modules/ARPStateViewer/ARPStateViewer.cpp
+++ b/src/shared/Modules/ARPStateViewer/ARPStateViewer.cpp
@@ -77,7 +77,7 @@ void ARPStateViewerModule::customContextMenuActionSetup()
void ARPStateViewerModule::onConfigureClicked()
{
- FilterSelector::selectFilter(
+ FilterSelector::editFilter(
filter, [this](const Filter& newFilter) { setFilter(newFilter); });
}
diff --git a/src/shared/Modules/Mavlink/MavlinkCodec.cpp b/src/shared/Modules/Mavlink/MavlinkCodec.cpp
index 3fb54f16..5b56970d 100644
--- a/src/shared/Modules/Mavlink/MavlinkCodec.cpp
+++ b/src/shared/Modules/Mavlink/MavlinkCodec.cpp
@@ -343,7 +343,7 @@ bool MavlinkCodec::encodeMessage(const Message& msg, SysIDs sysId,
else if (messageName == "ARP_COMMAND_TC")
{
mavlink_msg_arp_command_tc_pack(
- sysId, compId, &output,
+ sysIdInt, compId, &output,
msg.getField("command_id").getUnsignedInteger());
return true;
}
@@ -509,7 +509,7 @@ bool MavlinkCodec::encodeMessage(const Message& msg, SysIDs sysId,
else if (messageName == "SET_ANTENNA_COORDINATES_ARP_TC")
{
mavlink_msg_set_antenna_coordinates_arp_tc_pack(
- sysId, compId, &output, msg.getField("latitude").getDouble(),
+ sysIdInt, compId, &output, msg.getField("latitude").getDouble(),
msg.getField("longitude").getDouble(),
msg.getField("height").getDouble());
return true;
@@ -517,7 +517,7 @@ bool MavlinkCodec::encodeMessage(const Message& msg, SysIDs sysId,
else if (messageName == "SET_ROCKET_COORDINATES_ARP_TC")
{
mavlink_msg_set_rocket_coordinates_arp_tc_pack(
- sysId, compId, &output, msg.getField("latitude").getDouble(),
+ sysIdInt, compId, &output, msg.getField("latitude").getDouble(),
msg.getField("longitude").getDouble(),
msg.getField("height").getDouble());
return true;
@@ -525,7 +525,7 @@ bool MavlinkCodec::encodeMessage(const Message& msg, SysIDs sysId,
else if (messageName == "SET_STEPPER_ANGLE_TC")
{
mavlink_msg_set_stepper_angle_tc_pack(
- sysId, compId, &output,
+ sysIdInt, compId, &output,
msg.getField("stepper_id").getUnsignedInteger(),
msg.getField("angle").getDouble());
return true;
@@ -533,7 +533,7 @@ bool MavlinkCodec::encodeMessage(const Message& msg, SysIDs sysId,
else if (messageName == "SET_STEPPER_STEPS_TC")
{
mavlink_msg_set_stepper_steps_tc_pack(
- sysId, compId, &output,
+ sysIdInt, compId, &output,
msg.getField("stepper_id").getUnsignedInteger(),
msg.getField("steps").getDouble());
return true;
@@ -541,7 +541,7 @@ bool MavlinkCodec::encodeMessage(const Message& msg, SysIDs sysId,
else if (messageName == "SET_STEPPER_MULTIPLIER_TC")
{
mavlink_msg_set_stepper_multiplier_tc_pack(
- sysId, compId, &output,
+ sysIdInt, compId, &output,
msg.getField("stepper_id").getUnsignedInteger(),
msg.getField("multiplier").getDouble());
return true;
@@ -549,13 +549,13 @@ bool MavlinkCodec::encodeMessage(const Message& msg, SysIDs sysId,
else if (messageName == "SET_CALIBRATION_PRESSURE_TC")
{
mavlink_msg_set_calibration_pressure_tc_pack(
- sysId, compId, &output, msg.getField("pressure").getDouble());
+ sysIdInt, compId, &output, msg.getField("pressure").getDouble());
return true;
}
else if (messageName == "SET_INITIAL_MEA_MASS_TC")
{
mavlink_msg_set_calibration_pressure_tc_pack(
- sysId, compId, &output, msg.getField("mass").getDouble());
+ sysIdInt, compId, &output, msg.getField("mass").getDouble());
return true;
}
--
GitLab