Merge branch 'e1.33' of https://github.com/peternewman/ola into e1.33…

…-controller
OpenLightingProject · Jul 3, 2023 · 064e2f5 · 064e2f5
2 parents a577535 + 7686be6
commit 064e2f5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 189 deletions.
diff --git a/data/rdm/pids.proto b/data/rdm/pids.proto
@@ -4010,142 +4010,6 @@ pid {
   }
   set_sub_device_range: ROOT_OR_ALL_SUBDEVICE
 }
-pid {
-  name: "COMPONENT_SCOPE"
-  value: 2048
-  get_request {
-    field {
-      type: UINT16
-      name: "scope_slot"
-      range {
-        min: 1
-        max: 65535
-      }
-    }
-  }
-  get_response {
-    field {
-      type: UINT16
-      name: "scope_slot"
-      range {
-        min: 1
-        max: 65535
-      }
-    }
-    field {
-      type: STRING
-      name: "scope_string"
-      max_size: 63
-    }
-    field {
-      type: UINT8
-      name: "static_config_type"
-      label {
-        value: 0
-        label: "No static config"
-      }
-      label {
-        value: 1
-        label: "Static config IPv4"
-      }
-      label {
-        value: 1
-        label: "Static config IPv6"
-      }
-      range {
-        min: 0
-        max: 2
-      }
-    }
-    field {
-      type: IPV4
-      name: "static_broker_ipv4_address"
-      label {
-        value: 0
-        label: "No static broker IPv4 address"
-      }
-    }
-    field {
-      type: IPV6
-      name: "static_broker_ipv6_address"
-      label {
-        value: 0
-        label: "No static broker IPv6 address"
-      }
-    }
-    field {
-      type: UINT16
-      name: "static_broker_port"
-      label {
-        value: 0
-        label: "No static broker port"
-      }
-    }
-  }
-  get_sub_device_range: ROOT_DEVICE
-  set_request {
-    field {
-      type: UINT16
-      name: "scope_slot"
-      range {
-        min: 1
-        max: 65535
-      }
-    }
-    field {
-      type: STRING
-      name: "scope_string"
-      max_size: 63
-    }
-    field {
-      type: UINT8
-      name: "static_config_type"
-      label {
-        value: 0
-        label: "No static config"
-      }
-      label {
-        value: 1
-        label: "Static config IPv4"
-      }
-      label {
-        value: 1
-        label: "Static config IPv6"
-      }
-      range {
-        min: 0
-        max: 2
-      }
-    }
-    field {
-      type: IPV4
-      name: "static_broker_ipv4_address"
-      label {
-        value: 0
-        label: "No static broker IPv4 address"
-      }
-    }
-    field {
-      type: IPV6
-      name: "static_broker_ipv6_address"
-      label {
-        value: 0
-        label: "No static broker IPv6 address"
-      }
-    }
-    field {
-      type: UINT16
-      name: "static_broker_port"
-      label {
-        value: 0
-        label: "No static broker port"
-      }
-    }
-  }
-  set_response {
-  }
-  set_sub_device_range: ROOT_DEVICE
-}
 pid {
   name: "SEARCH_DOMAIN"
   value: 2049
@@ -4172,58 +4036,6 @@ pid {
   }
   set_sub_device_range: ROOT_DEVICE
 }
-pid {
-  name: "TCP_COMMS_STATUS"
-  value: 2050
-  get_request {
-  }
-  get_response {
-    field {
-      type: GROUP
-      name: "comms_statuses"
-      field {
-        type: STRING
-        name: "scope_string"
-        max_size: 63
-      }
-      field {
-        type: IPV4
-        name: "broker_ipv4_address"
-        label {
-          value: 0
-          label: "No IPv4 Connection"
-        }
-      }
-      field {
-        type: IPV6
-        name: "broker_ipv6_address"
-        label {
-          value: 0
-          label: "No IPv6 Connection"
-        }
-      }
-      field {
-        type: UINT16
-        name: "broker_port"
-      }
-      field {
-        type: UINT16
-        name: "unhealthy_tcp_events"
-      }
-    }
-  }
-  get_sub_device_range: ROOT_DEVICE
-  set_request {
-    field {
-      type: STRING
-      name: "scope_string"
-      max_size: 63
-    }
-  }
-  set_response {
-  }
-  set_sub_device_range: ROOT_DEVICE
-}
 pid {
   name: "BROKER_STATUS"
   value: 2051

diff --git a/libs/acn/LLRPProbeReplyInflator.cpp b/libs/acn/LLRPProbeReplyInflator.cpp
@@ -44,7 +44,7 @@ LLRPProbeReplyInflator::LLRPProbeReplyInflator()
 /**
  * Set an LLRPProbeReplyHandler to run when receiving an LLRP Probe Reply
  * message.
- * @param handler the callback to invoke when there is and LLRP Probe Reply.
+ * @param handler the callback to invoke when there is an LLRP Probe Reply.
  */
 void LLRPProbeReplyInflator::SetLLRPProbeReplyHandler(
     LLRPProbeReplyHandler *handler) {