From d680d7d0ed549c1dbff04f0868abbff381002d09 Mon Sep 17 00:00:00 2001 From: lm Date: Mon, 3 May 2010 18:02:21 +0200 Subject: [PATCH] Added minor fixes to simulation and parameter view --- src/comm/MAVLinkSimulationLink.cc | 8 ++++++++ src/uas/UAS.cc | 4 ++-- src/ui/QGCParamWidget.cc | 3 ++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/comm/MAVLinkSimulationLink.cc b/src/comm/MAVLinkSimulationLink.cc index c453595a7c..9239b431b4 100644 --- a/src/comm/MAVLinkSimulationLink.cc +++ b/src/comm/MAVLinkSimulationLink.cc @@ -620,6 +620,14 @@ void MAVLinkSimulationLink::writeBytes(const char* data, qint64 size) { onboardParams.remove(key); onboardParams.insert(key, set.param_value); + + // Pack message and get size of encoded byte string + mavlink_msg_param_value_pack(systemId, componentId, &msg, (int8_t*)key.toStdString().c_str(), set.param_value); + // Allocate buffer with packet data + bufferlength = mavlink_msg_to_send_buffer(buffer, &msg); + //add data into datastream + memcpy(stream+streampointer,buffer, bufferlength); + streampointer+=bufferlength; } } } diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc index 6ae1fd6858..9e12210e6b 100644 --- a/src/uas/UAS.cc +++ b/src/uas/UAS.cc @@ -631,8 +631,8 @@ void UAS::setParameter(int component, QString id, float value) mavlink_message_t msg; mavlink_param_set_t p; p.param_value = value; - p.target_system = uasId; - p.target_component = component; + p.target_system = (uint8_t)uasId; + p.target_component = (uint8_t)component; // Copy string into buffer, ensuring not to exceed the buffer size char* s = (char*)id.toStdString().c_str(); diff --git a/src/ui/QGCParamWidget.cc b/src/ui/QGCParamWidget.cc index c194fe9123..d31af497a7 100644 --- a/src/ui/QGCParamWidget.cc +++ b/src/ui/QGCParamWidget.cc @@ -153,8 +153,9 @@ void QGCParamWidget::setParameters() } } } + clear(); + //mav->requestParameters(); qDebug() << __FILE__ << __LINE__ << "SETTING ALL PARAMETERS"; - requestParameterList(); } void QGCParamWidget::writeParameters() -- GitLab