Diff: MBEDEndpoint.h

Revision:

4:7f7fe167d9c0

Parent:

0:e1c4378df3fe

Child:

5:94d000e6fa70

--- a/MBEDEndpoint.h	Thu Mar 27 03:53:23 2014 +0000
+++ b/MBEDEndpoint.h	Fri Mar 28 17:08:22 2014 +0000
@@ -31,26 +31,23 @@
 // HTTP Transport support
 #include "HTTPTransport.h"
 
-// MBED Light Support
-#include "MBEDLight.h"
-
-// NSP ResourceFactory Support
-#include "NSPResourceFactory.h"
+// Personality Support
+#include "Personality.h"
 
 // Preferences Support
 #include "Preferences.h"
   
 class MBEDEndpoint {
     private:
-        EthernetInterface *m_ethernet;                              // ethernet interface
-        ErrorHandler      *m_error_handler;                         // our error handler
-        Transport         *m_transports[NUM_TRANSPORTS];            // our transport
-        Light             *m_lights[NUM_LIGHTS];                    // our lights (at least 1)
-        char               m_endpoint_name[LIGHT_NAME_LEN+1];       // our endpoint name (light[0])
-        Preferences       *m_preferences;                           // preference support
-        char               m_lcd_status[TEMP_BUFFER_LEN+1];         // LCD status buffer
-        char               m_nsp_address[PREFERENCE_VALUE_LEN+1];   // NSP address buffer
-        int                m_instance_id;                           // Instance ID for this endpoint
+        EthernetInterface *m_ethernet;                                      // ethernet interface
+        ErrorHandler      *m_error_handler;                                 // our error handler
+        Transport         *m_transports[NUM_TRANSPORTS];                    // our transport
+        Personality       *m_personalities[NUM_PERSONALITY_INSTANCES];      // our personalities (at least 1 instance)
+        char               m_endpoint_name[PERSONALITY_NAME_LEN+1];         // our endpoint name (personalities[0])
+        Preferences       *m_preferences;                                   // preference support
+        char               m_lcd_status[TEMP_BUFFER_LEN+1];                 // LCD status buffer
+        char               m_nsp_address[PREFERENCE_VALUE_LEN+1];           // NSP address buffer
+        int                m_instance_id;                                   // Instance ID for this endpoint
         
     public:
         MBEDEndpoint(ErrorHandler *error_handler,EthernetInterface *ethernet);
@@ -72,11 +69,12 @@
         void initPreferences();
         void initNSPAddress();
         void initEndpointName();
+        bool initializePersonalities();
         bool initializeLights();
         bool initializeTransport(int index,char *key,Transport *transport);
         bool initializeTransports();
         bool initializeEthernet(EthernetInterface *ethernet);
-        bool closeLights();
+        bool closePersonalities();
         bool closeTransport(int index,char *key);
         bool closeTransports();
         bool closeEthernet();