Browse Source

Fix compiler warnings

QGC4.4
Gus Grubba 6 years ago
parent
commit
32b82fb1c6
  1. 42
      src/Camera/QGCCameraIO.cc

42
src/Camera/QGCCameraIO.cc

@ -76,7 +76,7 @@ QGCCameraParamIO::QGCCameraParamIO(QGCCameraControl *control, Fact* fact, Vehicl
break; break;
default: default:
qWarning() << "Unsupported fact type" << _fact->type() << "for" << _fact->name(); qWarning() << "Unsupported fact type" << _fact->type() << "for" << _fact->name();
// Fall through //-- Fall Through (screw clang)
case FactMetaData::valueTypeInt32: case FactMetaData::valueTypeInt32:
_mavParamType = MAV_PARAM_EXT_TYPE_INT32; _mavParamType = MAV_PARAM_EXT_TYPE_INT32;
break; break;
@ -140,25 +140,25 @@ QGCCameraParamIO::_sendParameter()
switch (factType) { switch (factType) {
case FactMetaData::valueTypeUint8: case FactMetaData::valueTypeUint8:
case FactMetaData::valueTypeBool: case FactMetaData::valueTypeBool:
union_value.param_uint8 = (uint8_t)_fact->rawValue().toUInt(); union_value.param_uint8 = static_cast<uint8_t>(_fact->rawValue().toUInt());
break; break;
case FactMetaData::valueTypeInt8: case FactMetaData::valueTypeInt8:
union_value.param_int8 = (int8_t)_fact->rawValue().toInt(); union_value.param_int8 = static_cast<int8_t>(_fact->rawValue().toInt());
break; break;
case FactMetaData::valueTypeUint16: case FactMetaData::valueTypeUint16:
union_value.param_uint16 = (uint16_t)_fact->rawValue().toUInt(); union_value.param_uint16 = static_cast<uint16_t>(_fact->rawValue().toUInt());
break; break;
case FactMetaData::valueTypeInt16: case FactMetaData::valueTypeInt16:
union_value.param_int16 = (int16_t)_fact->rawValue().toInt(); union_value.param_int16 = static_cast<int16_t>(_fact->rawValue().toInt());
break; break;
case FactMetaData::valueTypeUint32: case FactMetaData::valueTypeUint32:
union_value.param_uint32 = (uint32_t)_fact->rawValue().toUInt(); union_value.param_uint32 = static_cast<uint32_t>(_fact->rawValue().toUInt());
break; break;
case FactMetaData::valueTypeInt64: case FactMetaData::valueTypeInt64:
union_value.param_int64 = (int64_t)_fact->rawValue().toLongLong(); union_value.param_int64 = static_cast<int64_t>(_fact->rawValue().toLongLong());
break; break;
case FactMetaData::valueTypeUint64: case FactMetaData::valueTypeUint64:
union_value.param_uint64 = (uint64_t)_fact->rawValue().toULongLong(); union_value.param_uint64 = static_cast<uint64_t>(_fact->rawValue().toULongLong());
break; break;
case FactMetaData::valueTypeFloat: case FactMetaData::valueTypeFloat:
union_value.param_float = _fact->rawValue().toFloat(); union_value.param_float = _fact->rawValue().toFloat();
@ -171,23 +171,23 @@ QGCCameraParamIO::_sendParameter()
case FactMetaData::valueTypeCustom: case FactMetaData::valueTypeCustom:
{ {
QByteArray custom = _fact->rawValue().toByteArray(); QByteArray custom = _fact->rawValue().toByteArray();
memcpy(union_value.bytes, custom.data(), std::max(custom.size(), MAVLINK_MSG_PARAM_EXT_SET_FIELD_PARAM_VALUE_LEN)); memcpy(union_value.bytes, custom.data(), static_cast<size_t>(std::max(custom.size(), MAVLINK_MSG_PARAM_EXT_SET_FIELD_PARAM_VALUE_LEN)));
} }
break; break;
default: default:
qCritical() << "Unsupported fact type" << factType << "for" << _fact->name(); qCritical() << "Unsupported fact type" << factType << "for" << _fact->name();
// fall through //-- Fall Through (screw clang)
case FactMetaData::valueTypeInt32: case FactMetaData::valueTypeInt32:
union_value.param_int32 = (int32_t)_fact->rawValue().toInt(); union_value.param_int32 = static_cast<int32_t>(_fact->rawValue().toInt());
break; break;
} }
memcpy(&p.param_value[0], &union_value.bytes[0], MAVLINK_MSG_PARAM_EXT_SET_FIELD_PARAM_VALUE_LEN); memcpy(&p.param_value[0], &union_value.bytes[0], MAVLINK_MSG_PARAM_EXT_SET_FIELD_PARAM_VALUE_LEN);
p.target_system = (uint8_t)_vehicle->id(); p.target_system = static_cast<uint8_t>(_vehicle->id());
p.target_component = (uint8_t)_control->compID(); p.target_component = static_cast<uint8_t>(_control->compID());
strncpy(p.param_id, _fact->name().toStdString().c_str(), MAVLINK_MSG_PARAM_EXT_SET_FIELD_PARAM_ID_LEN); strncpy(p.param_id, _fact->name().toStdString().c_str(), MAVLINK_MSG_PARAM_EXT_SET_FIELD_PARAM_ID_LEN);
mavlink_msg_param_ext_set_encode_chan( mavlink_msg_param_ext_set_encode_chan(
_pMavlink->getSystemId(), static_cast<uint8_t>(_pMavlink->getSystemId()),
_pMavlink->getComponentId(), static_cast<uint8_t>(_pMavlink->getComponentId()),
_vehicle->priorityLink()->mavlinkChannel(), _vehicle->priorityLink()->mavlinkChannel(),
&msg, &msg,
&p); &p);
@ -301,10 +301,10 @@ QGCCameraParamIO::_valueFromMessage(const char* value, uint8_t param_type)
var = QVariant(u.param_int32); var = QVariant(u.param_int32);
break; break;
case MAV_PARAM_EXT_TYPE_UINT64: case MAV_PARAM_EXT_TYPE_UINT64:
var = QVariant((qulonglong)u.param_uint64); var = QVariant(static_cast<qulonglong>(u.param_uint64));
break; break;
case MAV_PARAM_EXT_TYPE_INT64: case MAV_PARAM_EXT_TYPE_INT64:
var = QVariant((qlonglong)u.param_int64); var = QVariant(static_cast<qulonglong>(u.param_int64));
break; break;
case MAV_PARAM_EXT_TYPE_CUSTOM: case MAV_PARAM_EXT_TYPE_CUSTOM:
var = QVariant(QByteArray(value, MAVLINK_MSG_PARAM_EXT_SET_FIELD_PARAM_VALUE_LEN)); var = QVariant(QByteArray(value, MAVLINK_MSG_PARAM_EXT_SET_FIELD_PARAM_VALUE_LEN));
@ -356,12 +356,12 @@ QGCCameraParamIO::paramRequest(bool reset)
strncpy(param_id, _fact->name().toStdString().c_str(), MAVLINK_MSG_PARAM_EXT_REQUEST_READ_FIELD_PARAM_ID_LEN); strncpy(param_id, _fact->name().toStdString().c_str(), MAVLINK_MSG_PARAM_EXT_REQUEST_READ_FIELD_PARAM_ID_LEN);
mavlink_message_t msg; mavlink_message_t msg;
mavlink_msg_param_ext_request_read_pack_chan( mavlink_msg_param_ext_request_read_pack_chan(
_pMavlink->getSystemId(), static_cast<uint8_t>(_pMavlink->getSystemId()),
_pMavlink->getComponentId(), static_cast<uint8_t>(_pMavlink->getComponentId()),
_vehicle->priorityLink()->mavlinkChannel(), _vehicle->priorityLink()->mavlinkChannel(),
&msg, &msg,
_vehicle->id(), static_cast<uint8_t>(_vehicle->id()),
_control->compID(), static_cast<uint8_t>(_control->compID()),
param_id, param_id,
-1); -1);
_vehicle->sendMessageOnLink(_vehicle->priorityLink(), msg); _vehicle->sendMessageOnLink(_vehicle->priorityLink(), msg);

Loading…
Cancel
Save