Skip to content
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 #1939

Merged
merged 6 commits into from
Mar 16, 2024

Conversation

peternewman
Copy link
Member

No description provided.

All there apart from flags should always be 0xF0 rather than 0x70

(cherry picked from commit 23a00bb)
(cherry picked from commit 674ea51)
@peternewman peternewman added this to the 0.11.0 milestone Mar 2, 2024
@peternewman peternewman requested a review from kripton March 2, 2024 01:56
(cherry picked from commit f1cc481)
(cherry picked from commit 2d0ed43)
@peternewman peternewman requested review from kripton and removed request for kripton March 2, 2024 16:29
@peternewman
Copy link
Member Author

This first block is ready for review when you get a chance @kripton ...

Copy link
Member

@kripton kripton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It all makes sense and I added some inline comments.
I just did a view-code-only review, no compile testing done locally. I trust our actions to verify that it compiles and tests properly and I trust you that it does what you intended ;)
Having said that, it looks good, go ahead 👍 Thanks for your work!

include/ola/acn/ACNFlags.h Show resolved Hide resolved
include/ola/acn/ACNVectors.h Show resolved Hide resolved
include/ola/acn/ACNVectors.h Show resolved Hide resolved
// masks for the flag fields
/**
* @brief This indicates a 20 bit length field (default is 12 bits)
*/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

github colors this line in the diff, not sure why?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see any special colour in mine, just that the whole file is new. 🤷

libs/acn/LLRPHeader.h Outdated Show resolved Hide resolved
libs/acn/LLRPInflatorTest.cpp Show resolved Hide resolved
libs/acn/PDU.cpp Show resolved Hide resolved
uint16_t flags_and_length = static_cast<uint16_t>(size);
flags_and_length |= (VFLAG_MASK | HFLAG_MASK | DFLAG_MASK) << 8u;
*stream << HostToNetwork(flags_and_length);
} else {
uint8_t vhl_flags = static_cast<uint8_t>((size & 0x0f0000) >> 16);
vhl_flags |= VFLAG_MASK | HFLAG_MASK | DFLAG_MASK;
if (m_force_length_flag) {
// TODO(Peter): Should this happen regardless of the force as we're
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added a note to check these in #1841

libs/acn/PDU.cpp Show resolved Hide resolved
libs/acn/LLRPHeader.h Outdated Show resolved Hide resolved
@peternewman
Copy link
Member Author

It all makes sense and I added some inline comments.

Thanks very much!

I just did a view-code-only review, no compile testing done locally. I trust our actions to verify that it compiles and tests properly

Yeah that makes sense, that's the level I was expecting really. Plus the code in each of the main PRs has been well tested and I just keep cherry-picking into this from those until it passed the tests!

and I trust you that it does what you intended ;)

Hopefully, I certainly appreciate you probably don't want to read all he standards too yourself!

Having said that, it looks good, go ahead 👍 Thanks for your work!

Thanks. Do you want to review my responses/merge that suggestion if it was what you intended or indeed this whole PR @kripton ? Then onto the next one!

Was this about right in terms of review size or would you prefer bigger or smaller?

@kripton
Copy link
Member

kripton commented Mar 13, 2024

Size was just about right :) A bit more changes / longer PR is okay. You want to merge this before making the next PR? Go ahead!

@peternewman peternewman enabled auto-merge March 16, 2024 12:44
@peternewman peternewman merged commit e7b4039 into OpenLightingProject:master Mar 16, 2024
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants