Merge pull request #1734 from DonLakeFlyer/APMParamFix

Fix APM type conversion

Merge pull request #1734 from DonLakeFlyer/APMParamFix
Fix APM type conversion
a9c1cfe3 · Don Gagne · ca326958 · 588218b7 · a9c1cfe3
Commit a9c1cfe3 authored Jul 23, 2015 by Don Gagne
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

UAS.cc src/uas/UAS.cc +4 -4

No files found.
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -2221,17 +2221,17 @@ void UAS::processParamValueMsg(mavlink_message_t& msg, const QString& paramName,

        case MAV_PARAM_TYPE_UINT8:
            if (getAutopilotType() == MAV_AUTOPILOT_ARDUPILOTMEGA) {
-                paramValue = QVariant(QChar((unsigned char)paramUnion.param_float));
+                paramValue = QVariant((unsigned short)paramUnion.param_float);
            } else {
-                paramValue = QVariant(QChar((unsigned char)paramUnion.param_uint8));
+                paramValue = QVariant(paramUnion.param_uint8);
            }
            break;

        case MAV_PARAM_TYPE_INT8:
            if (getAutopilotType() == MAV_AUTOPILOT_ARDUPILOTMEGA) {
-                paramValue = QVariant(QChar((char)paramUnion.param_float));
+                paramValue = QVariant((short)paramUnion.param_float);
            } else  {
-                paramValue = QVariant(QChar((char)paramUnion.param_int8));
+                paramValue = QVariant(paramUnion.param_int8);
            }
            break;