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.

Sign up for GitHub

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

Fix some C++ comment typos and Python exception behaviour #1961

Merged
merged 4 commits into from
Apr 26, 2024
Merged

Fix some C++ comment typos and Python exception behaviour #1961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
faaf2a5
Correct a comment's instructions
peternewman Mar 30, 2024
8966a25
Fix a comment typo
peternewman Apr 21, 2024
d561605
Fix the formatting of some PID values in some Python exceptions
peternewman Apr 21, 2024
4828ff3
Merge branch '0.10' of https://github.com/openlightingproject/ola int…
peternewman Apr 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/protocol/Ola.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ enum PluginIds {
}

/**
* If you add more here be sure to update ResponseCodeToString in RDMHelper.cpp
* If you add more here be sure to update StatusCodeToString in RDMHelper.cpp
*/
enum RDMResponseCode {
// The request/response completed correctly
Expand Down
2 changes: 1 addition & 1 deletion plugins/spi/SPIOutput.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class SPIOutput: public ola::rdm::DiscoverableRDMControllerInterface {

private:
/**
* The RDM Operations for the MovingLightResponder.
* The RDM Operations for the SPIOutput.
*/
class RDMOps : public ola::rdm::ResponderOps<SPIOutput> {
public:
Expand Down
4 changes: 2 additions & 2 deletions python/ola/PidStore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,7 @@ def LoadFile(self, pid_file_name, validate, override=False):
if validate:
if ((pid_pb.value >= RDMConstants.RDM_MANUFACTURER_PID_MIN) and
(pid_pb.value <= RDMConstants.RDM_MANUFACTURER_PID_MAX)):
raise InvalidPidFormat('%0x04hx between %0x04hx and %0x04hx in %s' %
raise InvalidPidFormat('0x%04hx between 0x%04hx and 0x%04hx in %s' %
(pid_pb.value,
RDMConstants.RDM_MANUFACTURER_PID_MIN,
RDMConstants.RDM_MANUFACTURER_PID_MAX,
Expand Down Expand Up @@ -1067,7 +1067,7 @@ def LoadFile(self, pid_file_name, validate, override=False):
if ((pid_pb.value < RDMConstants.RDM_MANUFACTURER_PID_MIN) or
(pid_pb.value > RDMConstants.RDM_MANUFACTURER_PID_MAX)):
raise InvalidPidFormat(
'Manufacturer pid 0x%04hx not between %0x04hx and %0x04hx' %
'Manufacturer pid 0x%04hx not between 0x%04hx and 0x%04hx' %
(pid_pb.value,
RDMConstants.RDM_MANUFACTURER_PID_MIN,
RDMConstants.RDM_MANUFACTURER_PID_MAX))
Expand Down
Loading