From 4dd6853079dc39028de3455596fb2d7b096039f3 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Wed, 13 Sep 2017 20:21:30 -0400 Subject: [PATCH] Adding support for booleans Adding some more logging --- src/Camera/QGCCameraControl.cc | 1 + src/Camera/QGCCameraIO.cc | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Camera/QGCCameraControl.cc b/src/Camera/QGCCameraControl.cc index a8fd614fb..db28ecd8c 100644 --- a/src/Camera/QGCCameraControl.cc +++ b/src/Camera/QGCCameraControl.cc @@ -671,6 +671,7 @@ QGCCameraControl::_loadSettings(const QDomNodeList nodeList) qWarning() << QStringLiteral("Duplicate fact name:") << factName; delete metaData; } else { + qCDebug(CameraControlLog) << "New parameter:" << factName; _nameToFactMetaDataMap[factName] = metaData; Fact* pFact = new Fact(_compID, factName, factType, this); QQmlEngine::setObjectOwnership(pFact, QQmlEngine::CppOwnership); diff --git a/src/Camera/QGCCameraIO.cc b/src/Camera/QGCCameraIO.cc index 7337d394f..1b52fa203 100644 --- a/src/Camera/QGCCameraIO.cc +++ b/src/Camera/QGCCameraIO.cc @@ -37,6 +37,7 @@ QGCCameraParamIO::QGCCameraParamIO(QGCCameraControl *control, Fact* fact, Vehicl // probably be updated. switch (_fact->type()) { case FactMetaData::valueTypeUint8: + case FactMetaData::valueTypeBool: _mavParamType = MAV_PARAM_TYPE_UINT8; break; case FactMetaData::valueTypeInt8: @@ -55,7 +56,7 @@ QGCCameraParamIO::QGCCameraParamIO(QGCCameraControl *control, Fact* fact, Vehicl _mavParamType = MAV_PARAM_TYPE_REAL32; break; default: - qWarning() << "Unsupported fact type" << _fact->type(); + qWarning() << "Unsupported fact type" << _fact->type() << "for" << _fact->name(); // Fall through case FactMetaData::valueTypeInt32: _mavParamType = MAV_PARAM_TYPE_INT32; @@ -119,6 +120,7 @@ QGCCameraParamIO::_sendParameter() p.param_type = _mavParamType; switch (factType) { case FactMetaData::valueTypeUint8: + case FactMetaData::valueTypeBool: union_value.param_uint8 = (uint8_t)_fact->rawValue().toUInt(); break; case FactMetaData::valueTypeInt8: @@ -137,7 +139,7 @@ QGCCameraParamIO::_sendParameter() union_value.param_float = _fact->rawValue().toFloat(); break; default: - qCritical() << "Unsupported fact type" << factType; + qCritical() << "Unsupported fact type" << factType << "for" << _fact->name(); // fall through case FactMetaData::valueTypeInt32: union_value.param_int32 = (int32_t)_fact->rawValue().toInt(); -- 2.22.0