Merge pull request #2043 from peternewman/nortle-ftdi

Revert some stuff via 146cf26 which accidentally snuck into #1999 by mistake

Author: peternewman

common/rdm/ResponderHelper.cpp

@@ -34,7 +34,6 @@
 #include "ola/network/MACAddress.h"
 #include "ola/network/NetworkUtils.h"
 #include "ola/rdm/RDMEnums.h"
-#include "ola/rdm/ResponderEndpointManager.h"
 #include "ola/rdm/ResponderHelper.h"
 #include "ola/rdm/ResponderSensor.h"
 #include "ola/strings/Utils.h"
@@ -1303,56 +1302,6 @@ RDMResponse *ResponderHelper::GetMetadataJSON(
       queued_message_count);
 }
 
-RDMResponse *ResponderHelper::GetEndpointList(
-    const RDMRequest *request,
-    const ola::rdm::EndpointManager *endpoint_manager,
-    uint8_t queued_message_count) {
-  PACK(
-  struct endpoint_info_s {
-    uint16_t endpoint_id;
-    uint8_t endpoint_type;
-  });
-  STATIC_ASSERT(sizeof(endpoint_info_s) == 3);
-
-  PACK(
-  struct endpoint_list_s {
-    uint32_t list_change_number;
-    endpoint_info_s endpoints[5];
-  });
-  STATIC_ASSERT(sizeof(endpoint_list_s) == (4 + (sizeof(endpoint_info_s) * 5)));
-
-  struct endpoint_list_s endpoint_list;
-  endpoint_list.list_change_number = HostToNetwork(endpoint_manager->list_change_number());
-
-  vector<uint16_t> endpoints;
-
-  endpoint_manager->EndpointIDs(&endpoints);
-  for (unsigned int i = 0; i < endpoints.size(); i++) {
-    endpoint_list.endpoints[i].endpoint_id = HostToNetwork(endpoints[i]);
-  }
-
-  unsigned int param_data_size = (
-      sizeof(endpoint_list) -
-      sizeof(endpoint_list.endpoints) + (sizeof(endpoint_info_s) * endpoints.size()));
-
-  return GetResponseFromData(
-      request,
-      reinterpret_cast<uint8_t*>(&endpoint_list),
-      param_data_size,
-      RDM_ACK,
-      queued_message_count);
-}
-
-RDMResponse *ResponderHelper::GetEndpointListChange(
-    const RDMRequest *request,
-    const ola::rdm::EndpointManager *endpoint_manager,
-    uint8_t queued_message_count) {
-  return GetUInt32Value(request,
-                        NetworkToHost(endpoint_manager->list_change_number()),
-                        queued_message_count);
-}
-
-
 /**
  * @brief Handle a request that returns a string
  * @note this truncates the string to max_length

include/ola/rdm/ResponderHelper.h

@@ -274,17 +274,6 @@ class ResponderHelper {
         const std::string &json,
         uint8_t queued_message_count = 0);
 
-    // E1.37-7 Helpers
-    static RDMResponse *GetEndpointList(
-        const RDMRequest *request,
-        const ola::rdm::EndpointManager *endpoint_manager,
-        uint8_t queued_message_count = 0);
-
-    static RDMResponse *GetEndpointListChange(
-        const RDMRequest *request,
-        const ola::rdm::EndpointManager *endpoint_manager,
-        uint8_t queued_message_count = 0);
-
     // Generic Helpers.
     static RDMResponse *GetString(
         const RDMRequest *request,