-
Notifications
You must be signed in to change notification settings - Fork 204
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
E1.33 cherry pick third time lucky #1947
Merged
peternewman
merged 33 commits into
OpenLightingProject:master
from
peternewman:e1.33-cherry-pick
Mar 27, 2024
Merged
Changes from 31 commits
Commits
Show all changes
33 commits
Select commit
Hold shift + click to select a range
05b0dbd
Add whitespace after single line code sections in readme so they wrap…
peternewman e85c5a5
Fix a typo
peternewman 740de39
Merge branch 'master' of https://github.com/openlightingproject/ola i…
peternewman 2e0d488
Initial handling of LLRPProbeRequest PDUs
peternewman f608d4e
Allow the RDMInflator to be used with both native E1.33 and LLRP RDM …
peternewman 7e821e2
Add the ability to pack an RDMPDU
peternewman 76d73f3
Add the ability to inflate an LLRP Probe Reply and build a Probe Request
peternewman 0906483
First attempt at the E1.33 Broker PDU
peternewman a81c83d
First attempt at BrokerClientEntryPDU
peternewman cf6c53b
First go at BrokerConnectPDU, could do with more tests
peternewman 87cb468
Add the BrokerNullPDU and tests
peternewman 77eefe4
Correct the byte order for the E1.33 version field
peternewman 17b625e
Correct the size of the BrokerPDU's vector
peternewman 3ce250c
Correct a broker endian check for the E1.33 version in our tests
peternewman f4db0ee
Add a testPrepend test for the BrokerClientEntryPDU base class
peternewman b14741f
Allow the timeout interval of the HealthCheckedConnection to be custo…
peternewman f70cb7d
Add some more new simple E1.33 inflators
peternewman a44aa2c
More E1.33 vectors
peternewman f6710a4
Fix a minor typo
peternewman 97c8f81
A few more E1.33 enums
peternewman f64d20f
Fix a lint issue
peternewman efe0f47
Remove some duplicate enums from a broken merge
peternewman 6cc4d2f
Fix another broken merge
peternewman fd70744
Fix lint in LLRPProbeRequestPDU.cpp
peternewman a7a9d97
Remove some reundant using statements
peternewman 6f26169
Fix lots of lint issues
peternewman 684d700
Lint RDMPDU
peternewman db18da4
Fix a number of Broker lint issues
peternewman 76e6181
Fix a number of LLRP lint issues
peternewman 58e0a58
Fix RDM Inflator lint issues
peternewman f0b01b3
Fix more lint issues
peternewman baf60c9
Add a todo for future callback changes
peternewman a58d5e6
Fix some minor comments
peternewman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
/* | ||
* This program is free software; you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation; either version 2 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Library General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program; if not, write to the Free Software | ||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* BrokerClientAddInflator.h | ||
* Interface for the BrokerClientAddInflator class. | ||
* Copyright (C) 2023 Peter Newman | ||
*/ | ||
|
||
#ifndef LIBS_ACN_BROKERCLIENTADDINFLATOR_H_ | ||
#define LIBS_ACN_BROKERCLIENTADDINFLATOR_H_ | ||
|
||
#include "ola/acn/ACNVectors.h" | ||
#include "libs/acn/BaseInflator.h" | ||
|
||
namespace ola { | ||
namespace acn { | ||
|
||
class BrokerClientAddInflator: public BaseInflator { | ||
friend class BrokerClientAddInflatorTest; | ||
|
||
public: | ||
BrokerClientAddInflator() | ||
: BaseInflator() { | ||
} | ||
~BrokerClientAddInflator() {} | ||
|
||
uint32_t Id() const { return ola::acn::VECTOR_BROKER_CLIENT_ADD; } | ||
|
||
protected: | ||
// The 'header' is 0 bytes in length. | ||
bool DecodeHeader(HeaderSet*, | ||
const uint8_t*, | ||
unsigned int, | ||
unsigned int *bytes_used) { | ||
*bytes_used = 0; | ||
return true; | ||
} | ||
|
||
void ResetHeaderField() {} // namespace noop | ||
}; | ||
} // namespace acn | ||
} // namespace ola | ||
#endif // LIBS_ACN_BROKERCLIENTADDINFLATOR_H_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
/* | ||
* This program is free software; you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation; either version 2 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Library General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program; if not, write to the Free Software | ||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* BrokerClientEntryChangeInflator.h | ||
* Interface for the BrokerClientEntryChangeInflator class. | ||
* Copyright (C) 2023 Peter Newman | ||
*/ | ||
|
||
#ifndef LIBS_ACN_BROKERCLIENTENTRYCHANGEINFLATOR_H_ | ||
#define LIBS_ACN_BROKERCLIENTENTRYCHANGEINFLATOR_H_ | ||
|
||
#include "ola/acn/ACNVectors.h" | ||
#include "libs/acn/BaseInflator.h" | ||
|
||
namespace ola { | ||
namespace acn { | ||
|
||
class BrokerClientEntryChangeInflator: public BaseInflator { | ||
friend class BrokerClientEntryChangeInflatorTest; | ||
|
||
public: | ||
BrokerClientEntryChangeInflator() | ||
: BaseInflator() { | ||
} | ||
~BrokerClientEntryChangeInflator() {} | ||
|
||
uint32_t Id() const { return ola::acn::VECTOR_BROKER_CLIENT_ENTRY_CHANGE; } | ||
|
||
protected: | ||
// The 'header' is 0 bytes in length. | ||
bool DecodeHeader(HeaderSet*, | ||
const uint8_t*, | ||
unsigned int, | ||
unsigned int *bytes_used) { | ||
*bytes_used = 0; | ||
return true; | ||
} | ||
|
||
void ResetHeaderField() {} // namespace noop | ||
}; | ||
} // namespace acn | ||
} // namespace ola | ||
#endif // LIBS_ACN_BROKERCLIENTENTRYCHANGEINFLATOR_H_ |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mh, you use single-element enums here and
static const uint8_t
in include/ola/rdm/RDMEnums.h (seeMAX_RDM_DOMAIN_NAME_LENGTH
). Is this on purpose or an inconsistency? Same for E133_VERSION below.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ask @nomis52 from 11 years ago! 😆
https://github.com/OpenLightingProject/ola/blame/f0b01b359b4bfc3e24eb0a7a2aa96028638128ef/include/ola/e133/E133Enums.h#L95
I just copied it for the version, but I guess we could theoretically support a few versions at the same time so maybe they should be an enum at least?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, if multiple values make sense, keep it as an enum. How about this MAX_STRING_SIZE?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not entirely sure they do necessarily. I've kicked it down the road a bit and added a todo in #1841 anyway.