Merge branch 'master' of https://github.com/openlightingproject/ola into plugfest

Author: peternewman

common/rdm/ResponderPersonality.cpp

@@ -47,6 +47,11 @@ Personality::Personality(uint16_t footprint, const string &description,
     : m_footprint(footprint),
       m_description(description),
       m_slot_data(slot_data) {
+  if (m_slot_data.SlotCount() > m_footprint) {
+    OLA_WARN << "Provided slot count of " << m_slot_data.SlotCount()
+             << " for personality \"" << description
+             << "\" is greater than it's footprint of " << m_footprint;
+  }
 }
 
 /**
@@ -90,8 +95,13 @@ uint8_t PersonalityManager::PersonalityCount() const {
 }
 
 bool PersonalityManager::SetActivePersonality(uint8_t personality) {
-  if (personality == 0 || personality > m_personalities->PersonalityCount())
+  if (personality == 0 || personality > m_personalities->PersonalityCount()) {
+    OLA_WARN << "Tried to set to invalid personality "
+             << static_cast<int>(personality) << ", only 1 to "
+             << static_cast<int>(m_personalities->PersonalityCount())
+             << " are valid";
     return false;
+  }
   m_active_personality = personality;
   return true;
 }

tools/rdm/TestDefinitions.py

@@ -2517,6 +2517,7 @@ class GetSlotInfo(OptionalParameterTestFixture):
   """Get SLOT_INFO."""
   CATEGORY = TestCategory.DMX_SETUP
   PID = 'SLOT_INFO'
+  REQUIRES = ['dmx_footprint']
   PROVIDES = ['defined_slots', 'undefined_definition_slots',
               'undefined_type_sec_slots']
 
@@ -2531,12 +2532,31 @@ def VerifyResult(self, response, fields):
       self.SetProperty('undefined_type_sec_slots', [])
       return
 
-    slots = [d['slot_offset'] for d in fields['slots']]
-    self.SetProperty('defined_slots', set(slots))
+    slots = {}
+    # check for duplicates
+    for d in fields['slots']:
+      if d['slot_offset'] in slots:
+        self.AddWarning('SLOT_INFO contained slot %d more than once' %
+                        (d['slot_offset']))
+      else:
+        slots[d['slot_offset']] = d
+
+    self.SetProperty('defined_slots', set(slots.keys()))
     undefined_definition_slots = []
     undefined_type_sec_slots = []
 
+    # do more thorough checking of each (non-duplicate) slot
     for slot in fields['slots']:
+      if slot['slot_offset'] > TestMixins.MAX_DMX_ADDRESS:
+        self.AddWarning(
+            "SLOT_INFO slot %d has an offset more than %d"
+            % (slot['slot_offset'], TestMixins.MAX_DMX_ADDRESS))
+      # footprint is 1 based, offset is 0 based
+      if slot['slot_offset'] >= self.Property('dmx_footprint'):
+        self.AddWarning(
+            "SLOT_INFO slot %d has an offset greater than or equal to the "
+            "personality's defined footprint (%d)"
+            % (slot['slot_offset'], self.Property('dmx_footprint')))
       if slot['slot_type'] not in RDMConstants.SLOT_TYPE_TO_NAME:
         self.AddWarning('Unknown slot type %d for slot %d' %
                         (slot['slot_type'], slot['slot_offset']))
@@ -2554,10 +2574,26 @@ def VerifyResult(self, response, fields):
           undefined_definition_slots.append(slot['slot_offset'])
       else:
         # slot_label_id must reference a defined slot
+        # we've already validated the offset of the parent slot, so we don't
+        # need to check it again here
         if slot['slot_label_id'] not in slots:
           self.AddWarning(
               'Slot %d is of type secondary and references an unknown slot %d'
               % (slot['slot_offset'], slot['slot_label_id']))
+        else:
+          # the defined slot must be a primary slot
+          # slot exists, so find it
+          primary_slot = slots.get(slot['slot_label_id'], None)
+          # check the type of the parent slot
+          if primary_slot is None:
+            self.SetBroken('Failed to find primary slot for %d (%d)'
+                           % (slot['slot_offset'], slot['slot_label_id']))
+          elif (primary_slot['slot_type'] !=
+                RDMConstants.SLOT_TYPES['ST_PRIMARY']):
+            self.AddWarning(
+                "Slot %d is of type secondary and references slot %d which "
+                "isn't a primary slot"
+                % (slot['slot_offset'], slot['slot_label_id']))
         if slot['slot_type'] == RDMConstants.SLOT_TYPES['ST_SEC_UNDEFINED']:
           undefined_type_sec_slots.append(slot['slot_offset'])
 
@@ -2737,7 +2773,7 @@ class GetDefaultSlotValues(OptionalParameterTestFixture):
   """Get DEFAULT_SLOT_VALUE."""
   CATEGORY = TestCategory.DMX_SETUP
   PID = 'DEFAULT_SLOT_VALUE'
-  REQUIRES = ['defined_slots']
+  REQUIRES = ['dmx_footprint', 'defined_slots']
 
   def Test(self):
     self.AddIfGetSupported(self.AckGetResult())
@@ -2751,17 +2787,31 @@ def VerifyResult(self, response, fields):
     default_slots = set()
 
     for slot in fields['slot_values']:
+      if slot['slot_offset'] > TestMixins.MAX_DMX_ADDRESS:
+        self.AddWarning(
+            "DEFAULT_SLOT_VALUE slot %d has an offset more than %d"
+            % (slot['slot_offset'], TestMixins.MAX_DMX_ADDRESS))
+      # footprint is 1 based, offset is 0 based
+      if slot['slot_offset'] >= self.Property('dmx_footprint'):
+        self.AddWarning(
+            "SLOT_INFO slot %d has an offset greater than or equal to the "
+            "personality's defined footprint (%d)"
+            % (slot['slot_offset'], self.Property('dmx_footprint')))
+      if slot['slot_offset'] in default_slots:
+        self.AddWarning(
+            "DEFAULT_SLOT_VALUE contained slot %d more than once" %
+            slot['slot_offset'])
       if slot['slot_offset'] not in defined_slots:
         self.AddWarning(
-          "DEFAULT_SLOT_VALUE contained slot %d, which wasn't in SLOT_INFO" %
-          slot['slot_offset'])
+            "DEFAULT_SLOT_VALUE contained slot %d, which wasn't in SLOT_INFO" %
+            slot['slot_offset'])
       default_slots.add(slot['slot_offset'])
 
     for slot_offset in defined_slots:
       if slot_offset not in default_slots:
         self.AddAdvisory(
-          "SLOT_INFO contained slot %d, which wasn't in DEFAULT_SLOT_VALUE" %
-          slot_offset)
+            "SLOT_INFO contained slot %d, which wasn't in DEFAULT_SLOT_VALUE" %
+            slot_offset)
 
 
 class GetDefaultSlotValueWithData(TestMixins.GetWithDataMixin,