From e18b11cdd75fbc511a3873d021782b19434b48d1 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 3 Feb 2011 22:35:30 +1100 Subject: [PATCH] fixed build name element of mavlink_named_value is uint8_t --- src/comm/MAVLinkSimulationMAV.cc | 4 ++-- src/uas/UAS.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/comm/MAVLinkSimulationMAV.cc b/src/comm/MAVLinkSimulationMAV.cc index 8f8e8eebb..957639934 100644 --- a/src/comm/MAVLinkSimulationMAV.cc +++ b/src/comm/MAVLinkSimulationMAV.cc @@ -167,7 +167,7 @@ void MAVLinkSimulationMAV::mainloop() // Name of the value, maximum 10 characters // see full message specs at: // http://pixhawk.ethz.ch/wiki/mavlink/ - strcpy(val.name, "FLOAT"); + strcpy((char *)val.name, "FLOAT"); // Value, in this case 0.5 val.value = 0.5f; @@ -195,7 +195,7 @@ void MAVLinkSimulationMAV::mainloop() // Name of the value, maximum 10 characters // see full message specs at: // http://pixhawk.ethz.ch/wiki/mavlink/ - strcpy(valint.name, "INTEGER"); + strcpy((char *)valint.name, "INTEGER"); // Value, in this case 18000 valint.value = 18000; diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc index 37b8ad3c5..a68c0eb75 100644 --- a/src/uas/UAS.cc +++ b/src/uas/UAS.cc @@ -170,13 +170,13 @@ void UAS::receiveMessageNamedValue(const mavlink_message_t& message) { mavlink_named_value_float_t val; mavlink_msg_named_value_float_decode(&message, &val); - emit valueChanged(this->getUASID(), QString(val.name), tr("raw"), val.value, getUnixTime(0)); + emit valueChanged(this->getUASID(), QString((char *)val.name), tr("raw"), val.value, getUnixTime(0)); } else if (message.msgid == MAVLINK_MSG_ID_NAMED_VALUE_INT) { mavlink_named_value_int_t val; mavlink_msg_named_value_int_decode(&message, &val); - emit valueChanged(this->getUASID(), QString(val.name), tr("raw"), (float)val.value, getUnixTime(0)); + emit valueChanged(this->getUASID(), QString((char *)val.name), tr("raw"), (float)val.value, getUnixTime(0)); } } -- 2.22.0