Diff: switch.cpp

Revision:

3:30c96bd77160

Parent:

0:b26c3526ee89

--- a/switch.cpp	Fri Sep 19 05:24:41 2014 +0000
+++ b/switch.cpp	Fri Sep 26 05:55:55 2014 +0000
@@ -6,7 +6,7 @@
 #include "NSPLightSwitchAction.h"
 #include "NSPio.h"
 
-extern ErrorHandler *error_handler;
+extern Logger *logger;
 extern NSPLightSwitchAction *_switchAction;
 
 NSPio *light_sw = NULL;
@@ -19,20 +19,20 @@
 // send our light_sw observation
 void send_light_sw_observation() {
     if (light_sw_obs_token_ptr != NULL && light_sw_obs_number != 0) {
-        //if (error_handler != NULL) error_handler->log("Sending Observation (switch): %s",light_sw->resource()->getValuePointer());
+        //if (m_logger != NULL) m_logger->log("Sending Observation (switch): %s",light_sw->resource()->getValuePointer());
         sn_nsdl_send_observation_notification(light_sw_obs_token_ptr,light_sw_obs_token_len,(uint8_t*)light_sw->resource()->getValuePointer(),strlen(light_sw->resource()->getValuePointer()),&light_sw_obs_number,sizeof(light_sw_obs_number),COAP_MSG_TYPE_NON_CONFIRMABLE, 0);
     }
 }
 
 // init light switch
 void init_switch(Resource *resource) {
-    if (light_sw == NULL && resource != NULL) light_sw = new NSPio(error_handler,resource,&send_light_sw_observation);
+    if (light_sw == NULL && resource != NULL) light_sw = new NSPio(m_logger,resource,&send_light_sw_observation);
 }
 
 
 // update our light_sw observation
 void update_light_sw_observation(sn_coap_hdr_s *received_coap_ptr,sn_coap_hdr_s *coap_res_ptr) {
-    //if (error_handler != NULL) error_handler->log("Updating Observation (switch)...starting");
+    //if (m_logger != NULL) m_logger->log("Updating Observation (switch)...starting");
     if (received_coap_ptr->token_ptr != NULL) {
         if (light_sw_obs_token_ptr != NULL) free(light_sw_obs_token_ptr);
         light_sw_obs_token_ptr = (uint8_t *)malloc(received_coap_ptr->token_len);
@@ -48,7 +48,7 @@
         coap_res_ptr->options_list_ptr->observe_len = 1;
         light_sw_obs_number++;
     }
-    //if (error_handler != NULL) error_handler->log("Updating Observation (switch)...done");
+    //if (m_logger != NULL) m_logger->log("Updating Observation (switch)...done");
 }
 
 /* Only GET and PUT method allowed */