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 Aug 24, 2019
2 parents 41d4201 + 33c3cb3 commit 8206ade97d74333d33bf2730b648085878dbaeb3
@@ -173,7 +173,4 @@ function ok(a,b){for(var c=a.wa[b].data.items,d=c.length,g=N(a.wa[b].id),h="",i=
import java.nio.ByteOrder;
byte[] header = ByteBuffer.allocate(4).order(ByteOrder.nativeOrder()).putInt(headerContent).array();
int headerValue = ByteBuffer.wrap(header).order(ByteOrder.nativeOrder()).getInt();
std::string ErrorString() const;
std::string SchemaErrorLogger::ErrorString() const {
return m_error_logger.ErrorString();
# This is a very bodgy workaround to the fact that the pip install of the archive doesn't seem to work properly now on Travis
@@ -196,7 +196,7 @@ void DmxBufferTest::testAssign() {
// assigning to ourself does nothing
buffer = buffer;

// assinging to a previously init'ed buffer
// assigning to a previously init'ed buffer
unsigned int size = result_length;
assignment_buffer = buffer;
assignment_buffer.Get(result, &size);
@@ -84,34 +84,34 @@ class JsonParserInterface {
virtual void End() = 0;

/**
* @brief Called when a string is encounted.
* @brief Called when a string is encountered.
*
* This is not called for object keys, see ObjectKey() below.
*/
virtual void String(const std::string &value) = 0;

/**
* @brief Called when a uint32_t is encounted.
* @brief Called when a uint32_t is encountered.
*/
virtual void Number(uint32_t value) = 0;

/**
* @brief Called when a int32_t is encounted.
* @brief Called when a int32_t is encountered.
*/
virtual void Number(int32_t value) = 0;

/**
* @brief Called when a uint64_t is encounted.
* @brief Called when a uint64_t is encountered.
*/
virtual void Number(uint64_t value) = 0;

/**
* @brief Called when a int64_t is encounted.
* @brief Called when a int64_t is encountered.
*/
virtual void Number(int64_t value) = 0;

/**
* @brief Called when a double value is encounted.
* @brief Called when a double value is encountered.
*
* MinGW struggles with long doubles
* http://mingw.5.n7.nabble.com/Strange-behaviour-of-gcc-4-8-1-with-long-double-td32949.html
@@ -121,17 +121,17 @@ class JsonParserInterface {
virtual void Number(const JsonDouble::DoubleRepresentation &rep) = 0;

/**
* @brief Called when a double value is encounted.
* @brief Called when a double value is encountered.
*/
virtual void Number(double d) = 0;

/**
* @brief Called when a bool is encounted.
* @brief Called when a bool is encountered.
*/
virtual void Bool(bool value) = 0;

/**
* @brief Called when a null token is encounted.
* @brief Called when a null token is encountered.
*/
virtual void Null() = 0;

@@ -151,7 +151,7 @@ class JsonParserInterface {
virtual void OpenObject() = 0;

/**
* @brief Called when a new key is encounted.
* @brief Called when a new key is encountered.
*
* This may be called multiple times for the same object. The standard
* doesn't specify how to handle duplicate keys, so I generally use the last
@@ -70,7 +70,7 @@ void DMPInflatorTest::testDecodeHeader() {
&bytes_used));
OLA_ASSERT_EQ((unsigned int) 0, bytes_used);

// test inherting the header from the prev call
// test inheriting the header from the prev call
OLA_ASSERT(inflator.DecodeHeader(&header_set2, NULL, 0, &bytes_used));
OLA_ASSERT_EQ((unsigned int) 0, bytes_used);
decoded_header = header_set2.GetDMPHeader();
@@ -88,7 +88,7 @@ void E131InflatorTest::testDecodeRev2Header() {
&bytes_used));
OLA_ASSERT_EQ((unsigned int) 0, bytes_used);

// test inherting the header from the prev call
// test inheriting the header from the prev call
OLA_ASSERT(inflator.DecodeHeader(&header_set2, NULL, 0, &bytes_used));
OLA_ASSERT_EQ((unsigned int) 0, bytes_used);
decoded_header = header_set2.GetE131Header();
@@ -136,7 +136,7 @@ void E131InflatorTest::testDecodeHeader() {
&bytes_used));
OLA_ASSERT_EQ((unsigned int) 0, bytes_used);

// test inherting the header from the prev call
// test inheriting the header from the prev call
OLA_ASSERT(inflator.DecodeHeader(&header_set2, NULL, 0, &bytes_used));
OLA_ASSERT_EQ((unsigned int) 0, bytes_used);
decoded_header = header_set2.GetE131Header();
@@ -84,7 +84,7 @@ void E133InflatorTest::testDecodeHeader() {
&bytes_used));
OLA_ASSERT_EQ((unsigned int) 0, bytes_used);

// test inherting the header from the prev call
// test inheriting the header from the prev call
OLA_ASSERT(inflator.DecodeHeader(&header_set2, NULL, 0, &bytes_used));
OLA_ASSERT_EQ((unsigned int) 0, bytes_used);
decoded_header = header_set2.GetE133Header();
@@ -1734,16 +1734,16 @@ def Test(self):
ack = self.AckSetResult(action=self.VerifySet)
nack = self.NackSetResult(RDMNack.NR_UNSUPPORTED_COMMAND_CLASS)

available_langugages = list(self.Property('languages_capabilities'))
if available_langugages:
if len(available_langugages) > 1:
available_languages = list(self.Property('languages_capabilities'))
if available_languages:
if len(available_languages) > 1:
# If the responder only supports 1 lang, we may not be able to set it
self.AddIfSetSupported(ack)
self.new_language = available_langugages[0]
self.new_language = available_languages[0]
if self.new_language == self.Property('language'):
self.new_language = available_langugages[1]
self.new_language = available_languages[1]
else:
self.new_language = available_langugages[0]
self.new_language = available_languages[0]
self.AddIfSetSupported([ack, nack])
else:
# Get languages returned no languages so we expect a nack

0 comments on commit 8206ade

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