Diff: StatusReporter.cpp

Revision:

19:1cf0bad37c62

Parent:

18:a89333f9f671

Child:

21:2b85d1442d34

--- a/StatusReporter.cpp	Wed Sep 24 19:09:30 2014 +0000
+++ b/StatusReporter.cpp	Fri Sep 26 04:34:10 2014 +0000
@@ -1,5 +1,7 @@
 /* Copyright C2014 ARM, MIT License
  *
+ * Author: Doug Anson (doug.anson@arm.com)
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
  * and associated documentation files the "Software", to deal in the Software without restriction,
  * including without limitation the rights to use, copy, modify, merge, publish, distribute,
@@ -18,23 +20,28 @@
  
  #include "StatusReporter.h"
  
+ // Logging
+ #define LOG_CONSOLE(...) { if (this->logger() != NULL) { this->logger()->logConsole(__VA_ARGS__); } }
+ 
  // temperature sensor
  AnalogIn tmp36_temp_sensor(TEMP_PIN);
  
- StatusReporter::StatusReporter(ErrorHandler *logger,void *transport) : m_case_generator(logger,transport), m_db(), m_rfid_reader(RFID_TX_PIN,RFID_RX_PIN) {
+ StatusReporter::StatusReporter(HTTPClient *http,Logger *logger) : m_case_generator(http,logger), m_db(), m_rfid_reader(RFID_TX_PIN,RFID_RX_PIN) {
      this->m_logger = logger;
  }
  
  StatusReporter::~StatusReporter() {
  }
  
+ Logger *StatusReporter::logger() { return this->m_logger; }
+ 
  // Calculate the ambient temperature of the TMP36 sensor in C...
  int StatusReporter::getLocalTemperature() {
      //conversion to degrees C - from sensor output voltage per TMP36 data sheet
      float tempC = (float)(((float)tmp36_temp_sensor*3.3)-0.600)*100.0;
      
      // DEBUG
-     this->m_logger->log("Ambient Temp: %.1f C",tempC);
+     LOG_CONSOLE("Ambient Temp: %.1f C",tempC);
      
      // convert to int for brevity...
      return (int)tempC;
@@ -44,9 +51,9 @@
     // look for a readable RFID tag
     if(this->m_rfid_reader.readable()) {
         // capture the RFID id...
-        this->m_logger->log("RFID: Found RFID.\r\nReading...");
+        LOG_CONSOLE("RFID: Found RFID.\r\nReading...");
         int rfid = this->m_rfid_reader.read();
-        this->m_logger->log("RFID: ID %d found...\r\nProcessing...",rfid);
+        LOG_CONSOLE("RFID: ID %d found...\r\nProcessing...",rfid);
         
         // look it up in our ReportDB... proceed only if we find something we know about...
         char *name = this->m_db.lookupReportName(rfid);
@@ -63,19 +70,19 @@
             int temperature = this->getLocalTemperature();
             char *latitude = this->m_db.lookupReportLatitude(rfid);
             char *longitude = this->m_db.lookupReportLongitude(rfid);
-            bool success = this->m_case_generator.createCase(subject,description,condition,temperature,latitude,longitude);
+            bool success = this->m_case_generator.createAnonymousCase(subject,description,condition,temperature,latitude,longitude);
             if (success == true) {
-                this->m_logger->log("Case Generated!\r\nScanning...");
+                LOG_CONSOLE("Case Generated!\r\nScanning...");
                 this->m_logger->turnLEDGreen();
             }
             else {
-                this->m_logger->log("Case Generation FAILED\r\nScanning...");
+                LOG_CONSOLE("Case Generation FAILED\r\nScanning...");
                 this->m_logger->turnLEDYellow();
             }
         }
         else {
             // unrecognized RFID
-            this->m_logger->log("RFID %d unknown.\r\nScanning...",rfid);
+            LOG_CONSOLE("RFID %d unknown.\r\nScanning...",rfid);
         }
      }
  }
\ No newline at end of file