Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/openlightingproject/ola i…
Browse files Browse the repository at this point in the history
…nto mac-type-tests
  • Loading branch information
peternewman committed Sep 20, 2023
2 parents e22dbcb + 33a228b commit 9834b03
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion include/ola/io/MemoryBlock.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion include/ola/rdm/StringMessageBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
* @}
*/

Expand Down
2 changes: 1 addition & 1 deletion plugins/usbpro/DmxterWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion plugins/usbpro/DmxterWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 9834b03

Please sign in to comment.