Improve error transparency

Flydroid · May 22, 2016 · f864204 · f864204
1 parent c3cb1be
commit f864204
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 14 deletions.
diff --git a/src/ak_logger.cpp b/src/ak_logger.cpp
@@ -15,21 +15,35 @@ AKLogger::~AKLogger() {
 }
 
 void AKLogger::addOutputStream(OutputStream* ostream){
+        if(!isActive)
+                return;
+
         if(ostream == nullptr)
                 return;
 
-        if(ostream->open()) {
-                Serial.println("opened");
+        int err = ostream->open();
+        if(err == AKSTREAM_SUCC) {
+                Serial.println("Successully opened '"+ostream->getName()+"'");
                 ostreams.push_back(ostream);
+        } else {
+                Serial.println("Failed to open '"+ostream->getName()+"': "+String(err));
         }
 }
 
 void AKLogger::addInputStream(InputStream* istream) {
+        if(!isActive)
+                return;
+
         if(istream == nullptr)
                 return;
 
-        if(istream->open())
+        int err = istream->open();
+        if(err == AKSTREAM_SUCC) {
+                Serial.println("Successully opened '"+istream->getName()+"'");
                 istreams.push_back(istream);
+        } else {
+                Serial.println("Failed to open '"+istream->getName()+"': "+String(err));
+        }
 }
 
 void AKLogger::logLineFormat() {

diff --git a/src/akstream.h b/src/akstream.h
@@ -1,11 +1,17 @@
 #pragma once
 
+#include <Arduino.h>
+
+#define AKSTREAM_SUCC 0
+
 class AKStream {
 public:
         virtual ~AKStream() {
 
         }
 
+        virtual String getName()=0;
+
         virtual int open()=0;
         virtual int close()=0;
 };
diff --git a/src/console_stream.cpp b/src/console_stream.cpp
@@ -12,14 +12,14 @@ ConsoleStream::~ConsoleStream() {
 
 int ConsoleStream::open() {
         //Expects the Serial output already opened with Serial.begin
-        return CONSOLE_SUCC;
+        return AKSTREAM_SUCC;
 }
 
 int ConsoleStream::close() {
         //Serial.end should not be called since Serial might
         //still be used somewhere else.
         //We didnt open it so we dont close it.
-        return CONSOLE_SUCC;
+        return AKSTREAM_SUCC;
 }
 
 void ConsoleStream::writeLine(String line) {
@@ -29,3 +29,7 @@ void ConsoleStream::writeLine(String line) {
 void ConsoleStream::flush() {
         Serial.flush();
 }
+
+String ConsoleStream::getName() {
+        return "ConsoleStream";
+}
diff --git a/src/console_stream.h b/src/console_stream.h
@@ -4,8 +4,6 @@
 
 #include "output_stream.h"
 
-#define CONSOLE_SUCC 0
-
 class ConsoleStream: public OutputStream {
 public:
         ConsoleStream();
@@ -16,4 +14,6 @@ class ConsoleStream: public OutputStream {
 
         void writeLine(String line);
         void flush();
+
+        String getName();
 };
diff --git a/src/sdcard_stream.cpp b/src/sdcard_stream.cpp
@@ -18,11 +18,11 @@ int SDCardStream::open() {
         }
 
         isOpened = true;
-        return SD_CARD_SUCC;
+        return AKSTREAM_SUCC;
 }
 
 int SDCardStream::close() {
-        return SD_CARD_SUCC;
+        return AKSTREAM_SUCC;
 }
 
 void SDCardStream::writeLine(String line) {
@@ -40,3 +40,7 @@ void SDCardStream::writeLine(String line) {
 void SDCardStream::flush() {
         //Nothing to do
 }
+
+String SDCardStream::getName() {
+        return "SDCardStream";
+}
diff --git a/src/sdcard_stream.h b/src/sdcard_stream.h
@@ -6,7 +6,6 @@
 
 #define SD_CARD_PIN 14
 #define ERR_INIT_SD_CARD 1
-#define SD_CARD_SUCC 0
 
 class SDCardStream: public OutputStream {
 public:
@@ -19,6 +18,8 @@ class SDCardStream: public OutputStream {
         void writeLine(String line);
         void flush();
 
+        String getName();
+
 private:
         String filename;
         bool isOpened;

diff --git a/src/sensirion_stream.cpp b/src/sensirion_stream.cpp
@@ -14,13 +14,13 @@ SensirionStream::~SensirionStream() {
 int SensirionStream::open() {
         sensor.reset();
 
-        return SENSIRION_SUCC;
+        return AKSTREAM_SUCC;
 }
 
 int SensirionStream::close() {
         sensor.reset();
 
-        return SENSIRION_SUCC;
+        return AKSTREAM_SUCC;
 }
 
 String SensirionStream::getLineFormat() {
@@ -43,3 +43,7 @@ String SensirionStream::readNextLine() {
 
         return result;
 }
+
+String SensirionStream::getName() {
+        return "SensirionStream";
+}
diff --git a/src/sensirion_stream.h b/src/sensirion_stream.h
@@ -5,8 +5,6 @@
 #define SENSIRION_DATA_PIN 22
 #define SENSIRION_CLOCK_PIN 23
 
-#define SENSIRION_SUCC 0
-
 #include <Sensirion.h>
 
 #include "input_stream.h"
@@ -22,6 +20,8 @@ class SensirionStream: public InputStream {
         String getLineFormat();
         String readNextLine();
 
+        String getName();
+
 private:
         Sensirion sensor;