Revision 11:9ae0fe4517c1, committed 2014-03-28

Comitter:

ansond

Date:

Fri Mar 28 17:49:19 2014 +0000

Parent:

10:d96c57c19611

Child:

12:0114a6493457

Commit message:

updates

Changed in this revision

--- a/EmulatedLightResourceFactory.cpp	Fri Mar 28 16:50:02 2014 +0000
+++ b/EmulatedLightResourceFactory.cpp	Fri Mar 28 17:49:19 2014 +0000
@@ -74,7 +74,7 @@
  // initialize our GPS coords
  void EmulatedLightResourceFactory::initGPSCoords() {
      memset(this->m_gps_coords,0,PREFERENCE_VALUE_LEN+1);
-     MBEDEndpoint *endpoint = (MBEDEndpoint *)this->m_endpoint;
+     MBEDEndpoint *endpoint = (MBEDEndpoint *)this->getEndpoint();
      endpoint->preferences()->getPreference("coords",this->m_gps_coords,PREFERENCE_VALUE_LEN,ENDPOINT_GPS_COORDS);
  }
  

--- a/EmulatedResourceFactory.cpp	Fri Mar 28 16:50:02 2014 +0000
+++ b/EmulatedResourceFactory.cpp	Fri Mar 28 17:49:19 2014 +0000
@@ -34,7 +34,7 @@
  void EmulatedResourceFactory::createResource(char *name,char *value) { ResourceFactory::createResource(name,value); }
  void EmulatedResourceFactory::createResource(char *ep_name,char *name,char *value,void *cb) { ResourceFactory::createResource(ep_name,name,value,cb); }
  void EmulatedResourceFactory::createResource(char *name,char *value,void *io,void *notused) {
-     MBEDEndpoint *endpoint = (MBEDEndpoint *)this->m_endpoint;
+     MBEDEndpoint *endpoint = (MBEDEndpoint *)this->getEndpoint();
      char *ep_name = NULL; if (endpoint != NULL) ep_name = endpoint->getEndpointName();
      this->m_list[this->m_count] = new Resource(this->logger(),ep_name,name,value,NULL);
      if (io != NULL && this->m_list[this->m_count] != NULL) {

--- a/IOCEndpoint.cpp	Fri Mar 28 16:50:02 2014 +0000
+++ b/IOCEndpoint.cpp	Fri Mar 28 17:49:19 2014 +0000
@@ -23,9 +23,7 @@
  #include "MBEDEndpoint.h"
   
  // default constructor
- IOCEndpoint::IOCEndpoint(ErrorHandler *error_handler,void *endpoint) {
-     this->m_error_handler = error_handler;
-     this->m_endpoint = endpoint;
+ IOCEndpoint::IOCEndpoint(ErrorHandler *error_handler,void *endpoint) : BaseClass(error_handler,endpoint) {
  }
  
  // default destructor
@@ -37,7 +35,7 @@
      char tmp[TEMP_BUFFER_LEN+1];
      
      // MBED Endpoint
-     MBEDEndpoint *endpoint = (MBEDEndpoint *)this->m_endpoint;
+     MBEDEndpoint *endpoint = (MBEDEndpoint *)this->getEndpoint();
       
      // construct the payload for Load/Updates
      ResourceFactory *factory = light->getResourceFactory();
@@ -140,7 +138,4 @@
              this->logger()->log("JSON: %s",json);
         }
      }
- }
- 
- // get our error handler
- ErrorHandler *IOCEndpoint::logger() { return this->m_error_handler; }
\ No newline at end of file
+ }
\ No newline at end of file

--- a/IOCEndpoint.h	Fri Mar 28 16:50:02 2014 +0000
+++ b/IOCEndpoint.h	Fri Mar 28 17:49:19 2014 +0000
@@ -19,27 +19,19 @@
 #ifndef _IOC_ENDPOINT_H_
 #define _IOC_ENDPOINT_H_
 
-// Error handler support
-#include "ErrorHandler.h"
+// BaseClass support
+#include "BaseClass.h"
 
 // Personality support - Lights
 #include "Light.h"
 
-class IOCEndpoint {
-    private:
-        ErrorHandler    *m_error_handler;
-        void            *m_endpoint;
-        
+class IOCEndpoint : public BaseClass {        
     public:
         IOCEndpoint(ErrorHandler *error_handler,void *endpoint);
-       ~IOCEndpoint();
+        virtual ~IOCEndpoint();
        
        char *buildLightPayload(char *data,int data_length,Light *light);
-       
        void saveExternalID(Personality *instance,char *data);
-       
-    private:
-        ErrorHandler *logger(); 
 };
 
 #endif // _IOC_ENDPOINT_H_
\ No newline at end of file

--- a/MBEDEndpoint.cpp	Fri Mar 28 16:50:02 2014 +0000
+++ b/MBEDEndpoint.cpp	Fri Mar 28 17:49:19 2014 +0000
@@ -37,16 +37,14 @@
  extern void closedown(int code);
   
  // default constructor
- MBEDEndpoint::MBEDEndpoint(ErrorHandler *error_handler,EthernetInterface *ethernet) {
+ MBEDEndpoint::MBEDEndpoint(ErrorHandler *error_handler,EthernetInterface *ethernet) : BaseClass(error_handler,new IOCEndpoint(error_handler,(void *)this)) {
      bool success = true;
      this->m_instance_id = 0;
      this->m_preferences = NULL;
      memset(this->m_lcd_status,0,TEMP_BUFFER_LEN+1);
      memset(this->m_gw_address,0,PREFERENCE_VALUE_LEN+1);
      for(int i=0;i<NUM_TRANSPORTS;++i) this->m_transports[i] = NULL;
-     this->m_error_handler = error_handler;
-     this->m_ioc_endpoint = new IOCEndpoint(error_handler,(void *)this);
-     this->m_error_handler->setEndpoint((void *)this);
+     this->logger()->setEndpoint((void *)this);
      if (success) this->initPreferences();
      if (success) this->initEndpointName();
      if (success) this->logger()->turnLEDBlue();
@@ -266,7 +264,7 @@
      // build the personality payload
       char *data = NULL;
 #ifdef LIGHT_PERSONALITY
-     data = this->iocEndpoint()->buildLightPayload(payload,IOC_PAYLOAD_LEN,(Light *)instance);
+     data = ((IOCEndpoint *)this->getEndpoint())->buildLightPayload(payload,IOC_PAYLOAD_LEN,(Light *)instance);
 #endif
       
      // issue the request
@@ -282,7 +280,7 @@
      //if (success) this->logger()->log("Saving IOC ID for Light: %s...",light->getName());
      
      // update the External ID if found
-     if (success) this->iocEndpoint()->saveExternalID(instance,result);
+     if (success) ((IOCEndpoint *)this->getEndpoint())->saveExternalID(instance,result);
      
      // DEBUG
      if (success) this->logger()->log("Personality(%s): %s IOC ID=%d sent successfully",instance->getType(),instance->getName(),instance->getExternalID());
@@ -324,7 +322,7 @@
      char *data = NULL;
 
 #ifdef LIGHT_PERSONALITY     
-     data = this->iocEndpoint()->buildLightPayload(payload,IOC_PAYLOAD_LEN,(Light *)instance);
+     data = ((IOCEndpoint *)this->getEndpoint())->buildLightPayload(payload,IOC_PAYLOAD_LEN,(Light *)instance);
 #endif
 
      // issue the request  
@@ -389,13 +387,7 @@
     if (value1 < value2) return value1;
     return value2;
  }
- 
- // get our error handler
- ErrorHandler *MBEDEndpoint::logger() { return this->m_error_handler; }
- 
- // get our IOC endpoint
- IOCEndpoint *MBEDEndpoint::iocEndpoint() { return this->m_ioc_endpoint; }
- 
+   
  // main running loop
  void MBEDEndpoint::run() {
      this->logger()->log("Endpoint Main Loop");

--- a/MBEDEndpoint.h	Fri Mar 28 16:50:02 2014 +0000
+++ b/MBEDEndpoint.h	Fri Mar 28 17:49:19 2014 +0000
@@ -22,8 +22,8 @@
 // Ethernet Interface
 #include "EthernetInterface.h"
 
-// ErrorHandler support
-#include "ErrorHandler.h"
+// BaseClass support
+#include "BaseClass.h"
 
 // MBED to IOC Resource Map
 #include "MBEDToIOCResourceMap.h"
@@ -44,7 +44,7 @@
 // Preferences Support
 #include "Preferences.h"
   
-class MBEDEndpoint {
+class MBEDEndpoint : public BaseClass {
     private:
         EthernetInterface    *m_ethernet;                                  // ethernet interface
         ErrorHandler         *m_error_handler;                             // our error handler
@@ -60,7 +60,7 @@
          
     public:
         MBEDEndpoint(ErrorHandler *error_handler,EthernetInterface *ethernet);
-       ~MBEDEndpoint();
+        virtual ~MBEDEndpoint();
         ResourceFactory *initResourceFactory();
         void run();
         
@@ -101,9 +101,7 @@
         bool closeTransport(int index,char *key);
         bool closeTransports();
         bool closeEthernet(); 
-        ErrorHandler *logger(); 
         int min(int value1, int value2);
-        IOCEndpoint *iocEndpoint();
 };
 
 #endif // _MBED_ENDPOINT_H_