remove unused variable in Kernel

[clinton/Smoothieware.git] / src / libs / StreamOutput.h

diff --git a/src/libs/StreamOutput.h b/src/libs/StreamOutput.h
index 1750602..ffb905b 100644 (file)
--- a/src/libs/StreamOutput.h
+++ b/src/libs/StreamOutput.h
@@ -8,34 +8,33 @@
 #ifndef STREAMOUTPUT_H
 #define STREAMOUTPUT_H
 
-#include <Stream.h>
 #include <cstdarg>
+#include <cstring>
+#include <stdio.h>
 
-class StreamOutput : public mbed::Stream {
+// This is a base class for all StreamOutput objects.
+// StreamOutputs are basically "things you can sent strings to". They are passed along with gcodes for example so modules can answer to those gcodes.
+// They are usually associated with a command source, but can also be a NullStreamOutput if we just want to ignore whatever is sent
+
+class NullStreamOutput;
+
+class StreamOutput {
     public:
         StreamOutput(){}
-//         virtual int puts(const char *str) = 0;
-        virtual int printf(const char* format, ...) __attribute__ ((format(printf, 2, 3))) {
-            char *buffer;
-            // Make the message
-            va_list args;
-            va_start(args, format);
-
-            int size = vsnprintf(NULL, 0, format, args)
-                + 1; // we add one to take into account space for the terminating \0
-
-            buffer = new char[size];
-            vsnprintf(buffer, size, format, args);
-            va_end(args);
-
-            puts(buffer);
-
-            delete[] buffer;
-            return size - 1;
-        }
-        virtual int _putc(int c) { return 0; }
+        virtual ~StreamOutput(){}
+
+        virtual int printf(const char *format, ...) __attribute__ ((format(printf, 2, 3)));
+        virtual int _putc(int c) { return 1; }
         virtual int _getc(void) { return 0; }
-        virtual int puts(const char*) = 0;
+        virtual int puts(const char* str) = 0;
+        virtual bool ready() { return true; };
+
+        static NullStreamOutput NullStream;
+};
+
+class NullStreamOutput : public StreamOutput {
+    public:
+        int puts(const char* str) { return strlen(str); }
 };
 
 #endif