Merge pull request #1961 from peternewman/0.10-clang-latest

Fix some C++ comment typos and Python exception behaviour
OpenLightingProject · Apr 26, 2024 · df08473 · df08473
2 parents 578b2fb + 4828ff3
commit df08473
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/common/protocol/Ola.proto b/common/protocol/Ola.proto
@@ -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

diff --git a/plugins/spi/SPIOutput.h b/plugins/spi/SPIOutput.h
@@ -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:

diff --git a/python/ola/PidStore.py b/python/ola/PidStore.py
@@ -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,
@@ -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))