Release v0.8

CMakeLists.txt

@@ -63,7 +63,7 @@ set (CC_EXTERNAL_TGT "comms_champion_external")
 macro (externals install_dir build_cc)
  include(ExternalProject)
 
- set (cc_tag "v0.15.2")
+ set (cc_tag "v0.16")
  set (cc_main_dir "${CMAKE_BINARY_DIR}/comms_champion")
  set (cc_src_dir "${cc_main_dir}/src")
  set (cc_bin_dir "${cc_main_dir}/build")
@@ -175,6 +175,10 @@ if ((CMAKE_COMPILER_IS_GNUCC) OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${extra_flags}")
 elseif (MSVC)
  add_definitions( "/wd4503" "/wd4309" "/wd4267" "-D_SCL_SECURE_NO_WARNINGS")
+
+ if (NOT CC_NO_WARN_AS_ERR)
+ add_definitions("/WX")
+ endif ()
 endif ()
 
 if ((UNIX) AND (NOT CC_UBLOX_NO_CCACHE))

README.md

@@ -18,7 +18,7 @@ allows cherry-picking limited number of the selected messages the product requir
 which provides a great flexibility in terms of the final code size.
 
 Full [doxygen](www.doxygen.org) generated documentation with the full tutorial inside can be
-downloaded as zip archive from [Dropbox](https://www.dropbox.com/s/vov9k3rx1e5blzv/doc_ublox_v0.7.zip).
+downloaded as zip archive from [Dropbox](https://www.dropbox.com/s/6hl6nyqjnjhh5bo/doc_ublox_v0.8.zip?dl=1).
 
 # CommsChampion Plugin
 In addition to the library described above, this project provides a protocol

cc_plugin/AllMessages.h

@@ -209,6 +209,8 @@
 #include "cc_plugin/message/MonPatchPoll.h"
 #include "cc_plugin/message/MonGnss.h"
 #include "cc_plugin/message/MonGnssPoll.h"
+#include "cc_plugin/message/MonSmgr.h"
+#include "cc_plugin/message/MonSmgrPoll.h"
 
 #include "cc_plugin/message/AidReq.h"
 #include "cc_plugin/message/AidIni.h"
@@ -310,7 +312,7 @@ namespace ublox
 namespace cc_plugin
 {
 
-typedef std::tuple<
+using AllMessages = std::tuple<
  cc_plugin::message::NavPosecef,
  cc_plugin::message::NavPosecefPoll,
  cc_plugin::message::NavPosllh,
@@ -493,6 +495,8 @@ typedef std::tuple<
  cc_plugin::message::MonPatchPoll,
  cc_plugin::message::MonGnss,
  cc_plugin::message::MonGnssPoll,
+ cc_plugin::message::MonSmgr,
+ cc_plugin::message::MonSmgrPoll,
  cc_plugin::message::AidReq,
  cc_plugin::message::AidIni,
  cc_plugin::message::AidIniPoll,
@@ -580,7 +584,7 @@ typedef std::tuple<
  cc_plugin::message::LogRetrieveposextra,
  cc_plugin::message::SecSign,
  cc_plugin::message::SecUniqid
-> AllMessages;
+>;
 
 } // namespace cc_plugin
 

cc_plugin/CMakeLists.txt

@@ -203,6 +203,8 @@ function (cc_plugin_ublox)
  message/MonPatchPoll.cpp
  message/MonGnss.cpp
  message/MonGnssPoll.cpp
+ message/MonSmgr.cpp
+ message/MonSmgrPoll.cpp
  message/AidReq.cpp
  message/AidIni.cpp
  message/AidIniPoll.cpp

cc_plugin/Message.h

@@ -28,15 +28,15 @@ namespace ublox
 namespace cc_plugin
 {
 
-typedef std::tuple<
+using ExtraMessageOptions = std::tuple<
  comms::option::ValidCheckInterface,
  comms::option::LengthInfoInterface
-> ExtraMessageOptions;
+>;
 
 template <typename... TOptions>
 class MessageT : public comms_champion::MessageBase<ublox::MessageT, ExtraMessageOptions, TOptions...>
 {
- typedef comms_champion::MessageBase<ublox::MessageT, ExtraMessageOptions, TOptions...> Base;
+ using Base = comms_champion::MessageBase<ublox::MessageT, ExtraMessageOptions, TOptions...>;
 public:
  virtual ~MessageT() = default;
 
@@ -54,7 +54,7 @@ class MessageT : public comms_champion::MessageBase<ublox::MessageT, ExtraMessag
  }
 };
 
-typedef MessageT<> Message;
+using Message = MessageT<>;
 
 } // namespace cc_plugin
 

cc_plugin/Protocol.cpp

@@ -34,10 +34,10 @@ class ProtocolImpl : public
  cc_plugin::TransportMessage
  >
 {
- typedef comms_champion::ProtocolBase<
+ using Base = comms_champion::ProtocolBase<
  cc_plugin::Stack,
  cc_plugin::TransportMessage
- > Base;
+ >;
 public:
  friend class ublox::cc_plugin::Protocol;
 

cc_plugin/ProtocolMessageBase.h

@@ -29,7 +29,7 @@ namespace cc_plugin
 template <typename TMsgBase, typename TActualMsg>
 class ProtocolMessageBase : public comms_champion::ProtocolMessageBase<TMsgBase, TActualMsg>
 {
- typedef comms_champion::ProtocolMessageBase<TMsgBase, TActualMsg> Base;
+ using Base = comms_champion::ProtocolMessageBase<TMsgBase, TActualMsg>;
 public:
  ProtocolMessageBase() = default;
  ProtocolMessageBase(const ProtocolMessageBase&) = default;

cc_plugin/Stack.h

@@ -28,10 +28,10 @@ namespace ublox
 namespace cc_plugin
 {
 
-typedef ublox::Stack<
+using Stack = ublox::Stack<
  cc_plugin::Message,
  cc_plugin::AllMessages
-> Stack;
+>;
 
 } // namespace cc_plugin
 

cc_plugin/TransportMessage.cpp

@@ -34,35 +34,35 @@ namespace cc_plugin
 namespace
 {
 
-typedef cc_plugin::Message::Field FieldBase;
+using FieldBase = cc_plugin::Message::Field;
 
 QVariantMap createSync1MemberData()
 {
- typedef ublox::details::SyncField1<FieldBase> SyncField1;
+ using SyncField1 = ublox::details::SyncField1<FieldBase>;
  return cc::property::field::ForField<SyncField1>().name("SYNC 1").asMap();
 }
 
 QVariantMap createSync2MemberData()
 {
- typedef ublox::details::SyncField2<FieldBase> SyncField2;
+ using SyncField2 = ublox::details::SyncField2<FieldBase>;
  return cc::property::field::ForField<SyncField2>().name("SYNC 2").asMap();
 }
 
 QVariantMap createLengthProperties()
 {
- typedef ublox::details::LengthField<FieldBase> LengthField;
+ using LengthField = ublox::details::LengthField<FieldBase>;
  return cc::property::field::ForField<LengthField>().name("LENGTH").asMap();
 }
 
 QVariantMap createPayloadProperties()
 {
- typedef ublox::details::DataField<FieldBase> DataField;
+ using DataField = ublox::details::DataField<FieldBase>;
  return cc::property::field::ForField<DataField>().name("PAYLOAD").asMap();
 }
 
 QVariantMap createChecksumProperties()
 {
- typedef ublox::details::ChecksumField<FieldBase> ChecksumField;
+ using ChecksumField = ublox::details::ChecksumField<FieldBase>;
  return cc::property::field::ForField<ChecksumField>().name("CK").asMap();
 }
 

cc_plugin/TransportMessage.h

@@ -48,9 +48,9 @@ class TransportMessage : public
  cc_plugin::Message,
  details::TransportMessageFields>
 {
- typedef comms_champion::TransportMessageBase<
+ using Base = comms_champion::TransportMessageBase<
  cc_plugin::Message,
- details::TransportMessageFields> Base;
+ details::TransportMessageFields>;
 public:
  enum FieldIdx
  {

cc_plugin/field/common.cpp

@@ -166,7 +166,7 @@ QVariantMap createProps_reservedBundleTwoParts(unsigned idx)
 
 QVariantMap createProps_utcStandard(bool serialisedHidden)
 {
- typedef ublox::field::common::utcStandard Field;
+ using Field = ublox::field::common::utcStandard;
  auto props =
  cc::property::field::ForField<Field>()
  .name("utcStandard")

cc_plugin/message/CfgTp5.cpp

@@ -45,6 +45,68 @@ namespace
 
 using ublox::message::CfgTp5Fields;
 
+QVariantMap createProps_optIntValue(const QString& name)
+{
+ return
+ cc::property::field::Optional()
+ .name(name)
+ .uncheckable()
+ .field(cc::property::field::IntValue().name(name).asMap())
+ .asMap();
+}
+
+QVariantMap createProps_freqPeriod()
+{
+ auto props =
+ cc::property::field::ForField<CfgTp5Fields::freqPeriod>()
+ .name("freqPeriod")
+ .serialisedHidden()
+ .add(createProps_optIntValue("freq"))
+ .add(createProps_optIntValue("period"));
+
+ assert(props.members().size() == CfgTp5Fields::freqPeriod::FieldIdx_numOfValues);
+ return props.asMap();
+}
+
+QVariantMap createProps_freqPeriodLock()
+{
+ auto props =
+ cc::property::field::ForField<CfgTp5Fields::freqPeriodLock>()
+ .name("freqPeriodLock")
+ .serialisedHidden()
+ .add(createProps_optIntValue("freqLock"))
+ .add(createProps_optIntValue("periodLock"));
+
+ assert(props.members().size() == CfgTp5Fields::freqPeriodLock::FieldIdx_numOfValues);
+ return props.asMap();
+}
+
+QVariantMap createProps_pulseLenRatio()
+{
+ auto props =
+ cc::property::field::ForField<CfgTp5Fields::pulseLenRatio>()
+ .name("pulseLenRatio")
+ .serialisedHidden()
+ .add(createProps_optIntValue("pulseLen"))
+ .add(createProps_optIntValue("ratio"));
+
+ assert(props.members().size() == CfgTp5Fields::pulseLenRatio::FieldIdx_numOfValues);
+ return props.asMap();
+}
+
+QVariantMap createProps_pulseLenRatioLock()
+{
+ auto props =
+ cc::property::field::ForField<CfgTp5Fields::pulseLenRatio>()
+ .name("pulseLenRatioLock")
+ .serialisedHidden()
+ .add(createProps_optIntValue("pulseLenLock"))
+ .add(createProps_optIntValue("ratioLock"));
+
+ assert(props.members().size() == CfgTp5Fields::pulseLenRatioLock::FieldIdx_numOfValues);
+ return props.asMap();
+}
+
 QVariantMap createProps_flagsLow()
 {
  cc::property::field::ForField<CfgTp5Fields::flagsLow> props;
@@ -108,14 +170,10 @@ QVariantList createFieldsProperties()
  cc::property::field::ForField<CfgTp5Fields::antCableDelay>().name("antCableDelay").asMap());
  props.append(
  cc::property::field::ForField<CfgTp5Fields::rfGroupDelay>().name("rfGroupDelay").asMap());
- props.append(
- cc::property::field::ForField<CfgTp5Fields::freqPeriod>().name("freqPeriod").asMap());
- props.append(
- cc::property::field::ForField<CfgTp5Fields::freqPeriodLock>().name("freqPeriodLock").asMap());
- props.append(
- cc::property::field::ForField<CfgTp5Fields::pulseLenRatio>().name("pulseLenRatio").asMap());
- props.append(
- cc::property::field::ForField<CfgTp5Fields::pulseLenRatioLock>().name("pulseLenRatioLock").asMap());
+ props.append(createProps_freqPeriod());
+ props.append(createProps_freqPeriodLock());
+ props.append(createProps_pulseLenRatio());
+ props.append(createProps_pulseLenRatioLock());
  props.append(
  cc::property::field::ForField<CfgTp5Fields::userConfigDelay>().name("userConfigDelay").asMap());
  props.append(createProps_flags());