Diff: main.cpp

Revision:

10:4c526b2bd92c

Parent:

6:d5a7ca880c20

Child:

15:bbb1cf6d0b38

diff -r 186f28de71a4 -r 4c526b2bd92c main.cpp
--- a/main.cpp	Fri Sep 26 02:48:01 2014 +0000
+++ b/main.cpp	Fri Sep 26 03:43:36 2014 +0000
@@ -19,7 +19,7 @@
  */
 
  #include "Definitions.h"       // definitions including platform specifics...
- #include "ErrorHandler.h"
+ #include "Logger.h"
  
  // include salesforce.com credentials
  #include "sf_creds.h"
@@ -75,7 +75,7 @@
  DEFINE_SML_BUFFER(bpm_record_id);                           
  
  // Create the heart rate record in Salesforce.com
- void create_heartrate_record(ErrorHandler *logger,SalesforceInterface *sf) {
+ void create_heartrate_record(Logger *logger,SalesforceInterface *sf) {
      // create a new record
      MbedJSONValue bpm_record;
      int heartrate = (int)earbud.getHeartRate();
@@ -113,7 +113,7 @@
  }
  
  // Update the heart rate record in Salesforce.com
- void update_heartrate_record(ErrorHandler *logger,SalesforceInterface *sf) {
+ void update_heartrate_record(Logger *logger,SalesforceInterface *sf) {
      logger->turnLEDOrange();
      
      // get our latest heartrate
@@ -174,7 +174,7 @@
  }
  
  // Report heart rate to Salesforce.com
- void report_heartrate(ErrorHandler *logger,SalesforceInterface *sf) {
+ void report_heartrate(Logger *logger,SalesforceInterface *sf) {
      if (iteration_counter == 1) create_heartrate_record(logger,sf);
      else update_heartrate_record(logger,sf);
  }
@@ -183,7 +183,7 @@
  void mainTask(void const *v) {
         
     // create our object instances 
-    ErrorHandler logger(&pc,&lcd);    
+    Logger logger(&pc,&lcd);    
     SalesforceInterface *sf = NULL;
     
     // announce
@@ -204,7 +204,7 @@
         
         // allocate the Salesforce.com interface
         logger.logConsole("Allocating the Saleforce.com interface...");
-        sf = new SalesforceInterface(&logger,&http);
+        sf = new SalesforceInterface(&http,&logger);
         
         // set our Salesforce.com credentials
         logger.logConsole("Setting credentials in the Salesforce.com interface...");