Merge pull request #1903 from peternewman/master-resync

Master resync
OpenLightingProject · Sep 19, 2023 · 33a228b · 33a228b
2 parents 2666ce5 + e30a57c
commit 33a228b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/include/ola/io/MemoryBlock.h b/include/ola/io/MemoryBlock.h
@@ -63,7 +63,7 @@ class MemoryBlock {
 
     /**
      * @brief Move the insertation point to the end of the block.
-     * This is useful if you want to use the block in pre-pend mode.
+     * This is useful if you want to use the block in prepend mode.
      */
     void SeekBack() {
       m_first = m_data_end;

diff --git a/include/ola/rdm/StringMessageBuilder.h b/include/ola/rdm/StringMessageBuilder.h
@@ -22,7 +22,7 @@
  * @addtogroup rdm_helpers
  * @{
  * @file include/ola/rdm/StringMessageBuilder.h
- * @brief Builds a Messagse object from a list of strings and a Descriptor.
+ * @brief Builds a Message object from a list of strings and a Descriptor.
  * @}
  */
 

diff --git a/plugins/usbpro/DmxterWidget.cpp b/plugins/usbpro/DmxterWidget.cpp
@@ -325,7 +325,7 @@ void DmxterWidgetImpl::HandleRDMResponse(const uint8_t *data,
     case RC_NACK_FORMAT_ERROR:
     case RC_NACK_HARDWARE_FAULT:
     case RC_NACK_PROXY_REJECT:
-    case RC_NACK_WRITE_PROECT:
+    case RC_NACK_WRITE_PROTECT:
     case RC_NACK_COMMAND_CLASS:
     case RC_NACK_DATA_RANGE:
     case RC_NACK_BUFFER_FULL:

diff --git a/plugins/usbpro/DmxterWidget.h b/plugins/usbpro/DmxterWidget.h
@@ -107,7 +107,7 @@ class DmxterWidgetImpl: public BaseUsbProWidget,
       RC_NACK_FORMAT_ERROR = 25,
       RC_NACK_HARDWARE_FAULT = 26,
       RC_NACK_PROXY_REJECT = 27,
-      RC_NACK_WRITE_PROECT = 28,
+      RC_NACK_WRITE_PROTECT = 28,
       RC_NACK_COMMAND_CLASS = 29,
       RC_NACK_DATA_RANGE = 30,
       RC_NACK_BUFFER_FULL = 31,