From f6c735616a616f5ea54a802fcb2b69cf515a2bd0 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 26 Feb 2024 22:08:05 +0000 Subject: [PATCH 1/7] Ignore more minified files that might contain spelling false positives --- scripts/spelling.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/spelling.sh b/scripts/spelling.sh index bcc82af8a..c20c9c2c3 100755 --- a/scripts/spelling.sh +++ b/scripts/spelling.sh @@ -70,11 +70,14 @@ SPELLINGBLACKLIST=$(cat <<-BLACKLIST -wholename "./olad/www/new/js/app.min.js" -or \ -wholename "./olad/www/new/js/app.min.js.map" -or \ -wholename "./olad/www/new/libs/angular/js/angular.min.js" -or \ + -wholename "./olad/www/new/libs/bootstrap/js/bootstrap.min.js" -or \ + -wholename "./olad/www/new/libs/jquery/js/jquery.min.js" -or \ -wholename "./olad/www/new/libs/marked/js/marked.min.js" -or \ -wholename "./olad/www/ola.js" -or \ -wholename "./plugins/artnet/messages/ArtNetConfigMessages.pb.*" -or \ -wholename "./tools/ola_trigger/config.tab.*" -or \ - -wholename "./tools/ola_trigger/lex.yy.cpp" + -wholename "./tools/ola_trigger/lex.yy.cpp" -or \ + -wholename "./tools/rdm/static/jquery-1.7.2.min.js" BLACKLIST ) From 5880cc2a0f182ab8dd50eee02bbbe7d3dbc42b29 Mon Sep 17 00:00:00 2001 From: Perry Naseck Date: Mon, 26 Feb 2024 19:59:51 -0500 Subject: [PATCH 2/7] coverage workaround gcovr race parse bug --- Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 25d13bada..f3efd1ec0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -271,6 +271,8 @@ COVERAGE_OUTPUTS = --txt coverage/coverage.txt \ --cobertura coverage/coverage.cobertura.xml \ --html-details coverage/details.html/coverage.details.html \ --coveralls coverage/coverage.coveralls.json +# See https://gcovr.com/en/stable/guide/gcov_parser.html#negative-hit-counts +COVERAGE_FLAGS=--gcov-ignore-parse-errors=negative_hits.warn_once_per_file COVERAGE_GCOV_EXE=--gcov-executable /usr/bin/gcov COVERAGE_FILTERS=-e '.*Test\.cpp$$' \ -e '.*\.pb\.cc$$' \ @@ -287,7 +289,7 @@ if !BUILD_GCOV else if FOUND_GCOVR mkdir -p coverage/details.html/ - gcovr --print-summary $(COVERAGE_OUTPUTS) $(COVERAGE_GCOV_EXE) --root . $(COVERAGE_FILTERS) + gcovr $(COVERAGE_FLAGS) --print-summary $(COVERAGE_OUTPUTS) $(COVERAGE_GCOV_EXE) --root . $(COVERAGE_FILTERS) else $(error gcovr not found. Install gcovr (e.g. via pip for the latest version) and re-run configure.) endif From 69565aa18d576880b429ba28a0a3301334f7e002 Mon Sep 17 00:00:00 2001 From: Perry Naseck <4472083+DaAwesomeP@users.noreply.github.com> Date: Tue, 27 Feb 2024 20:26:37 -0500 Subject: [PATCH 3/7] Update Makefile.am Co-authored-by: Peter Newman --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index f3efd1ec0..1da6851cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -272,9 +272,9 @@ COVERAGE_OUTPUTS = --txt coverage/coverage.txt \ --html-details coverage/details.html/coverage.details.html \ --coveralls coverage/coverage.coveralls.json # See https://gcovr.com/en/stable/guide/gcov_parser.html#negative-hit-counts -COVERAGE_FLAGS=--gcov-ignore-parse-errors=negative_hits.warn_once_per_file -COVERAGE_GCOV_EXE=--gcov-executable /usr/bin/gcov -COVERAGE_FILTERS=-e '.*Test\.cpp$$' \ +COVERAGE_FLAGS = --gcov-ignore-parse-errors=negative_hits.warn_once_per_file +COVERAGE_GCOV_EXE = --gcov-executable /usr/bin/gcov +COVERAGE_FILTERS = -e '.*Test\.cpp$$' \ -e '.*\.pb\.cc$$' \ -e '.*\.pb\.cpp$$' \ -e '.*\.pb\.h$$' \ From bb597ce1891ec1d315d5ec77e826393d5b0d3bc5 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sat, 2 Mar 2024 22:03:00 +0000 Subject: [PATCH 4/7] Correct the documentation about the SPI sync port option --- plugins/spi/SPIPlugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/spi/SPIPlugin.cpp b/plugins/spi/SPIPlugin.cpp index 57954a1a0..fda2963c8 100644 --- a/plugins/spi/SPIPlugin.cpp +++ b/plugins/spi/SPIPlugin.cpp @@ -159,7 +159,7 @@ string SPIPlugin::Description() const { "If the software backend is used, this defines the number of ports which\n" "will be created.\n" "\n" -"-sync-ports = \n" +"-sync-port = \n" "Controls which port triggers a flush (write) of the SPI data. If set to -1\n" "the SPI data is written when any port changes. This can result in a lot of\n" "data writes (slow) and partial frames. If set to -2, the last port is used.\n" From 3fff0809800eb54600105e011789b0da02323a08 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 13 Mar 2024 16:23:52 +0000 Subject: [PATCH 5/7] Fix a typo in a private constant --- plugins/usbpro/DmxterWidget.cpp | 4 ++-- plugins/usbpro/DmxterWidget.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/usbpro/DmxterWidget.cpp b/plugins/usbpro/DmxterWidget.cpp index 4b061aa3b..5158bd028 100644 --- a/plugins/usbpro/DmxterWidget.cpp +++ b/plugins/usbpro/DmxterWidget.cpp @@ -50,7 +50,7 @@ const uint8_t DmxterWidgetImpl::TOD_LABEL = 0x82; const uint8_t DmxterWidgetImpl::DISCOVERY_BRANCH_LABEL = 0x83; const uint8_t DmxterWidgetImpl::FULL_DISCOVERY_LABEL = 0x84; const uint8_t DmxterWidgetImpl::INCREMENTAL_DISCOVERY_LABEL = 0x85; -const uint8_t DmxterWidgetImpl::SHUTDOWN_LABAEL = 0xf0; +const uint8_t DmxterWidgetImpl::SHUTDOWN_LABEL = 0xf0; /* @@ -195,7 +195,7 @@ void DmxterWidgetImpl::HandleMessage(uint8_t label, case RDM_BCAST_REQUEST_LABEL: HandleBroadcastRDMResponse(data, length); break; - case SHUTDOWN_LABAEL: + case SHUTDOWN_LABEL: HandleShutdown(data, length); break; default: diff --git a/plugins/usbpro/DmxterWidget.h b/plugins/usbpro/DmxterWidget.h index 3e48ef176..8a2355f4d 100644 --- a/plugins/usbpro/DmxterWidget.h +++ b/plugins/usbpro/DmxterWidget.h @@ -77,7 +77,7 @@ class DmxterWidgetImpl: public BaseUsbProWidget, static const uint8_t DISCOVERY_BRANCH_LABEL; static const uint8_t FULL_DISCOVERY_LABEL; static const uint8_t INCREMENTAL_DISCOVERY_LABEL; - static const uint8_t SHUTDOWN_LABAEL; + static const uint8_t SHUTDOWN_LABEL; typedef enum { RC_CHECKSUM_ERROR = 1, From 2e0a388a767dcc9dbb1a70d86efc22e4966bf514 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 13 Mar 2024 16:27:21 +0000 Subject: [PATCH 6/7] Fix some minor comments --- common/rdm/QueueingRDMController.cpp | 2 +- common/rdm/QueueingRDMControllerTest.cpp | 2 +- include/ola/rdm/QueueingRDMController.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/rdm/QueueingRDMController.cpp b/common/rdm/QueueingRDMController.cpp index c8c4a8b33..22b581426 100644 --- a/common/rdm/QueueingRDMController.cpp +++ b/common/rdm/QueueingRDMController.cpp @@ -14,7 +14,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * QueueingRDMController.cpp - * The Jese DMX TRI device. + * An RDM Controller that sends a single message at a time. * Copyright (C) 2010 Simon Newton */ diff --git a/common/rdm/QueueingRDMControllerTest.cpp b/common/rdm/QueueingRDMControllerTest.cpp index 28a22ee0b..fbdd09a16 100644 --- a/common/rdm/QueueingRDMControllerTest.cpp +++ b/common/rdm/QueueingRDMControllerTest.cpp @@ -14,7 +14,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * QueueingRDMControllerTest.cpp - * Test fixture for the UID classes + * Test fixture for the QueueingRDMController * Copyright (C) 2005 Simon Newton */ diff --git a/include/ola/rdm/QueueingRDMController.h b/include/ola/rdm/QueueingRDMController.h index acb6527ec..8311b7122 100644 --- a/include/ola/rdm/QueueingRDMController.h +++ b/include/ola/rdm/QueueingRDMController.h @@ -14,7 +14,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * QueueingRDMController.h - * A RDM Controller that sends a single message at a time. + * An RDM Controller that sends a single message at a time. * Copyright (C) 2010 Simon Newton */ From 8d94b7c6801f56cd618faecefd6aff17e9bfa062 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Thu, 28 Mar 2024 16:28:47 +0000 Subject: [PATCH 7/7] Fix a comment typo --- common/rdm/VariableFieldSizeCalculator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/rdm/VariableFieldSizeCalculator.cpp b/common/rdm/VariableFieldSizeCalculator.cpp index b054a3858..cf904b12d 100644 --- a/common/rdm/VariableFieldSizeCalculator.cpp +++ b/common/rdm/VariableFieldSizeCalculator.cpp @@ -69,7 +69,7 @@ VariableFieldSizeCalculator::calculator_state return data_size > m_fixed_size_sum ? TOO_LARGE : FIXED_SIZE; // we know there is only one, now we need to work out the number of - // repeatitions or length if it's a string + // repetitions or length if it's a string unsigned int bytes_remaining = data_size - m_fixed_size_sum; if (variable_string_field_count) { // variable string