Diff: current.cpp

Revision:

3:30c96bd77160

Parent:

0:b26c3526ee89

--- a/current.cpp	Fri Sep 19 05:24:41 2014 +0000
+++ b/current.cpp	Fri Sep 26 05:55:55 2014 +0000
@@ -5,7 +5,7 @@
 #include "NSPio.h"
 #include "MBEDCurrent.h"
 
-extern ErrorHandler *error_handler;
+extern Logger *logger;
 NSPio *current = NULL;
 
 // observation support
@@ -16,19 +16,19 @@
 // send our current observation
 void send_current_observation() {
     if (current_obs_token_ptr != NULL && current_obs_number != 0) {
-        //if (error_handler != NULL) error_handler->log("Sending Observation (current): %s",current->resource()->getValuePointer());
+        //if (m_logger != NULL) m_logger->log("Sending Observation (current): %s",current->resource()->getValuePointer());
         sn_nsdl_send_observation_notification(current_obs_token_ptr,current_obs_token_len,(uint8_t*)current->resource()->getValuePointer(),strlen(current->resource()->getValuePointer()),&current_obs_number,sizeof(current_obs_number),COAP_MSG_TYPE_NON_CONFIRMABLE, 0);
     }
 }
 
 // init current
 void init_current(Resource *resource) {
-    if (current == NULL && resource != NULL) current = new NSPio(new MBEDCurrent(error_handler,resource),&send_current_observation);
+    if (current == NULL && resource != NULL) current = new NSPio(new MBEDCurrent(m_logger,resource),&send_current_observation);
 }
 
 // update our current observation
 void update_current_observation(sn_coap_hdr_s *received_coap_ptr,sn_coap_hdr_s *coap_res_ptr) {
-    //if (error_handler != NULL) error_handler->log("Updating Observation (current)...starting");
+    //if (m_logger != NULL) m_logger->log("Updating Observation (current)...starting");
     if (received_coap_ptr->token_ptr != NULL) {
         if (current_obs_token_ptr != NULL) free(current_obs_token_ptr);
         current_obs_token_ptr = (uint8_t *)malloc(received_coap_ptr->token_len);
@@ -44,7 +44,7 @@
         coap_res_ptr->options_list_ptr->observe_len = 1;
         current_obs_number++;
     }
-    //if (error_handler != NULL) error_handler->log("Updating Observation (current)...done");
+    //if (m_logger != NULL) m_logger->log("Updating Observation (current)...done");
 }
 
 /* Only GET method allowed */