Skip to content
Permalink
Browse files

Merge branch '0.10' of https://github.com/OpenLightingProject/ola int…

…o master-resync
  • Loading branch information
peternewman committed Dec 18, 2019
2 parents 90c2691 + cea3b67 commit b1f734c615db539891b035462fa870f285b2f418
File renamed without changes.
@@ -0,0 +1,3 @@
thead
acn
ACN
@@ -12,7 +12,8 @@ COVERITY_SCAN_BUILD_URL="https://scan.coverity.com/scripts/travisci_build_coveri
PYCHECKER_BLACKLIST="threading,unittest,cmd,optparse,google,google.protobuf,ssl,fftpack,lapack_lite,mtrand"

SPELLINGBLACKLIST=$(cat <<-BLACKLIST
-wholename "./.codespellignore" -or \
-wholename "./.codespellignorewords" -or \
-wholename "./.codespellignorelines" -or \
-wholename "./.git/*" -or \
-wholename "./aclocal.m4" -or \
-wholename "./config/config.guess" -or \
@@ -171,10 +172,10 @@ elif [[ $TASK = 'codespell' ]]; then
$SPELLINGBLACKLIST \
\) | xargs")
# count the number of codespell errors
spellingerrors=$(zrun codespell --check-filenames --check-hidden --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" --exclude-file .codespellignore $spellingfiles 2>&1 | wc -l)
spellingerrors=$(zrun codespell --check-filenames --check-hidden --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" --exclude-file .codespellignorelines --ignore-words .codespellignorewords $spellingfiles 2>&1 | wc -l)
if [[ $spellingerrors -ne 0 ]]; then
# print the output for info
zrun codespell --check-filenames --check-hidden --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" --exclude-file .codespellignore $spellingfiles
zrun codespell --check-filenames --check-hidden --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" --exclude-file .codespellignorelines --ignore-words .codespellignorewords $spellingfiles
echo "Found $spellingerrors spelling errors via codespell"
exit 1;
else
@@ -786,7 +786,7 @@ string SlotInfoToString(uint8_t slot_type, uint16_t slot_label) {
case SD_COLOR_SCROLL:
return "Primary, scroll";
case SD_COLOR_SEMAPHORE:
return "Primary, color semaphone";
return "Primary, color semaphore";
case SD_COLOR_ADD_AMBER:
return "Primary, additive amber";
case SD_COLOR_ADD_WHITE:
@@ -166,12 +166,13 @@ bool GPIODriver::UpdateGPIOPins(const DmxBuffer &dmx) {
TURN_OFF,
NO_CHANGE,
};
const uint16_t first_slot = m_options.start_address - 1;

for (uint16_t i = 0;
i < m_gpio_pins.size() && (i + m_options.start_address < dmx.Size());
i < m_gpio_pins.size() && (i + first_slot < dmx.Size());
i++) {
Action action = NO_CHANGE;
uint8_t slot_value = dmx.Get(i + m_options.start_address - 1);
uint8_t slot_value = dmx.Get(i + first_slot);

switch (m_gpio_pins[i].state) {
case ON:
@@ -37,7 +37,7 @@
'*/Makefile',
'*_pb2.py',
'*~',
'.codespellignore',
'.codespellignore*',
'.git',
'.git/*',
'.gitignore',

0 comments on commit b1f734c

Please sign in to comment.
You can’t perform that action at this time.