Skip to content

Commit f0c547f

Browse files
committed
Release v2.8
2 parents 25a2c3c + 96ceece commit f0c547f

845 files changed

Lines changed: 1686 additions & 845 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CMakeLists.txt

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ cmake_minimum_required (VERSION 3.10)
22
project ("cc_ublox_cc_tools_qt_plugin")
33

44
# Build options:
5+
option (OPT_WARN_AS_ERR "Treat warnings as errors" ON)
6+
option (OPT_USE_CCACHE "Use ccache" OFF)
57
option (OPT_INSTALL_DEFAULT_CONFIG "Install default plugin configuration" ON)
68

79
# Configuration variables:
810
# OPT_QT_MAJOR_VERSION - The major Qt version, defaults to 5
11+
# OPT_CCACHE_EXECUTABLE - Custom ccache executable
912

1013
######################################################################
1114

@@ -30,8 +33,20 @@ set (CMAKE_AUTOMOC ON)
3033
set (CMAKE_AUTOUIC ON)
3134
set (CMAKE_AUTORCC ON)
3235

36+
set (extra_opts)
37+
if (OPT_WARN_AS_ERR)
38+
list(APPEND extra_opts WARN_AS_ERR)
39+
endif()
40+
41+
if (OPT_USE_CCACHE)
42+
list(APPEND extra_opts USE_CCACHE)
43+
if (NOT "${OPT_CCACHE_EXECUTABLE}" STREQUAL "")
44+
list(APPEND extra_opts CCACHE_EXECUTABLE "${OPT_CCACHE_EXECUTABLE}")
45+
endif()
46+
endif()
47+
3348
include(${LibComms_DIR}/CC_Compile.cmake)
34-
cc_compile(WARN_AS_ERR)
49+
cc_compile(${extra_opts})
3550
cc_msvc_force_warn_opt(/W4)
3651

3752
include(GNUInstallDirs)
@@ -416,6 +431,7 @@ function (cc_plugin_core)
416431
cc_tools_qt_plugin/cc_ublox/message/RxmImes.cpp
417432
cc_tools_qt_plugin/cc_ublox/message/RxmImesPoll.cpp
418433
cc_tools_qt_plugin/cc_ublox/message/RxmMeasx.cpp
434+
cc_tools_qt_plugin/cc_ublox/message/RxmMeasxPoll.cpp
419435
cc_tools_qt_plugin/cc_ublox/message/RxmPmreq.cpp
420436
cc_tools_qt_plugin/cc_ublox/message/RxmPmreqV0.cpp
421437
cc_tools_qt_plugin/cc_ublox/message/RxmRaw.cpp

cc_tools_qt_plugin/cc_ublox/Message.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#include "Message.h"
44

cc_tools_qt_plugin/cc_ublox/Message.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#pragma once
44

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#pragma once
44

55
#include "cc_tools_qt/version.h"
66

7-
static_assert(CC_TOOLS_QT_MAKE_VERSION(5, 2, 1) <= cc_tools_qt::version(),
7+
static_assert(CC_TOOLS_QT_MAKE_VERSION(5, 3, 1) <= cc_tools_qt::version(),
88
"The version of cc_tools_qt library is too old");

cc_tools_qt_plugin/cc_ublox/factory/AllMessagesDynMemMsgFactory.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#include "cc_tools_qt_plugin/cc_ublox/factory/AllMessagesDynMemMsgFactory.h"
44
#include "cc_tools_qt_plugin/cc_ublox/input/AllMessages.h"
@@ -341,6 +341,9 @@ AllMessagesDynMemMsgFactory::MsgPtr AllMessagesDynMemMsgFactory::createMsg(MsgId
341341
if (idx == 0) {
342342
return MsgPtr(new cc_ublox::message::RxmMeasx);
343343
}
344+
if (idx == 1) {
345+
return MsgPtr(new cc_ublox::message::RxmMeasxPoll);
346+
}
344347
break;
345348

346349
case ::cc_ublox::MsgId_RxmRawx:
@@ -1478,7 +1481,7 @@ std::size_t AllMessagesDynMemMsgFactory::msgCount(MsgIdParamType id) const
14781481
case ::cc_ublox::MsgId_RxmRaw: return 2U;
14791482
case ::cc_ublox::MsgId_RxmSfrb: return 1U;
14801483
case ::cc_ublox::MsgId_RxmSfrbx: return 1U;
1481-
case ::cc_ublox::MsgId_RxmMeasx: return 1U;
1484+
case ::cc_ublox::MsgId_RxmMeasx: return 2U;
14821485
case ::cc_ublox::MsgId_RxmRawx: return 2U;
14831486
case ::cc_ublox::MsgId_RxmSvsi: return 2U;
14841487
case ::cc_ublox::MsgId_RxmAlm: return 3U;

cc_tools_qt_plugin/cc_ublox/factory/AllMessagesDynMemMsgFactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#pragma once
44

cc_tools_qt_plugin/cc_ublox/field/Alt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#include "Alt.h"
44

cc_tools_qt_plugin/cc_ublox/field/Alt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#pragma once
44

cc_tools_qt_plugin/cc_ublox/field/AltHP.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#include "AltHP.h"
44

cc_tools_qt_plugin/cc_ublox/field/AltHP.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#pragma once
44

0 commit comments

Comments
 (0)