diff --git a/Makefile.am b/Makefile.am index 64dff2c0f4..3ba22470bd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -272,8 +272,10 @@ COVERAGE_OUTPUTS = --txt coverage/coverage.txt \ --cobertura coverage/coverage.cobertura.xml \ --html-details coverage/details.html/coverage.details.html \ --coveralls coverage/coverage.coveralls.json -COVERAGE_GCOV_EXE=--gcov-executable /usr/bin/gcov -COVERAGE_FILTERS=-e '.*Test\.cpp$$' \ +# 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$$' \ -e '.*\.pb\.cpp$$' \ -e '.*\.pb\.h$$' \ @@ -288,7 +290,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 diff --git a/common/rdm/QueueingRDMController.cpp b/common/rdm/QueueingRDMController.cpp index c8c4a8b332..22b5814267 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 28a22ee0ba..fbdd09a16a 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/common/rdm/VariableFieldSizeCalculator.cpp b/common/rdm/VariableFieldSizeCalculator.cpp index 4ef46ba2d0..f30c55f4ed 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 diff --git a/include/ola/rdm/QueueingRDMController.h b/include/ola/rdm/QueueingRDMController.h index acb6527eca..8311b7122a 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 */ diff --git a/plugins/spi/README.md b/plugins/spi/README.md index 41de19056b..f5aac524c5 100644 --- a/plugins/spi/README.md +++ b/plugins/spi/README.md @@ -44,7 +44,7 @@ pin. The number of ports will be 2 ^ (# of pins). If the software backend is used, this defines the number of ports which will be created. -`-sync-ports = ` +`-sync-port = ` Controls which port triggers a flush (write) of the SPI data. If set to -1 the SPI data is written when any port changes. This can result in a lot of data writes (slow) and partial frames. If set to -2, the last port is used. diff --git a/plugins/usbpro/DmxterWidget.cpp b/plugins/usbpro/DmxterWidget.cpp index 4b061aa3b9..5158bd0288 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 3e48ef1763..8a2355f4d9 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, diff --git a/scripts/spelling.sh b/scripts/spelling.sh index bcc82af8ac..c20c9c2c30 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 )