Diff: wattage.cpp

Revision:

3:30c96bd77160

Parent:

0:b26c3526ee89

--- a/wattage.cpp	Fri Sep 19 05:24:41 2014 +0000
+++ b/wattage.cpp	Fri Sep 26 05:55:55 2014 +0000
@@ -5,7 +5,7 @@
 #include "NSPio.h"
 #include "MBEDWattage.h"
 
-extern ErrorHandler *error_handler;
+extern Logger *logger;
 
 NSPio *wattage = NULL;
 
@@ -17,19 +17,19 @@
 // send our wattage observation
 void send_wattage_observation() {
     if (wattage_obs_token_ptr != NULL && wattage_obs_number != 0) {
-        //if (error_handler != NULL) error_handler->log("Sending Observation (wattage): %s",wattage->resource()->getValuePointer());
+        //if (m_logger != NULL) logger->log("Sending Observation (wattage): %s",wattage->resource()->getValuePointer());
         sn_nsdl_send_observation_notification(wattage_obs_token_ptr,wattage_obs_token_len,(uint8_t*)wattage->resource()->getValuePointer(),strlen(wattage->resource()->getValuePointer()),&wattage_obs_number,sizeof(wattage_obs_number),COAP_MSG_TYPE_NON_CONFIRMABLE, 0);
     }
 }
 
 // init wattage
 void init_wattage(Resource *resource) {
-    if (wattage == NULL && resource != NULL) wattage = new NSPio(new MBEDWattage(error_handler,resource),&send_wattage_observation);
+    if (wattage == NULL && resource != NULL) wattage = new NSPio(new MBEDWattage(m_logger,resource),&send_wattage_observation);
 }
 
 // update our wattage observation
 void update_wattage_observation(sn_coap_hdr_s *received_coap_ptr,sn_coap_hdr_s *coap_res_ptr) {
-    //if (error_handler != NULL) error_handler->log("Updating Observation (wattage)...starting");
+    //if (m_logger != NULL) logger->log("Updating Observation (wattage)...starting");
     if (received_coap_ptr->token_ptr != NULL) {
         if (wattage_obs_token_ptr != NULL) free(wattage_obs_token_ptr);
         wattage_obs_token_ptr = (uint8_t *)malloc(received_coap_ptr->token_len);
@@ -45,7 +45,7 @@
         coap_res_ptr->options_list_ptr->observe_len = 1;
         wattage_obs_number++;
     }
-    //if (error_handler != NULL) error_handler->log("Updating Observation (wattage)...done");
+    //if (m_logger != NULL) logger->log("Updating Observation (wattage)...done");
 }
 
 /* Only GET method allowed */