Streaming.h is gone. It conflicted with PROGMEM. And saving memory is more important...

diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index 99cd8021b31e411140412ddbd2d16c4fe055f60b..1e36b61e88d1e8c7b027d628e0523aaafd9110b2 100644 (file)
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -5,7 +5,6 @@
 // Licence: GPL
 #include <WProgram.h>
 #include "fastio.h"
-#include "streaming.h"
 #include <avr/pgmspace.h>
 
 //#define SERIAL_ECHO(x) Serial << "echo: " << x;

diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
index 7b67cfcf5b501350356a66d2a764684ab2a8342d..dee095d84fd9dbbf5553d00d7e079f7b1460457d 100644 (file)
--- a/Marlin/Marlin.pde
+++ b/Marlin/Marlin.pde
@@ -32,7 +32,6 @@
 #include "pins.h"
 #include "Marlin.h"
 #include "ultralcd.h"
-#include "streaming.h"
 #include "planner.h"
 #include "stepper.h"
 #include "temperature.h"

diff --git a/Marlin/streaming.h b/Marlin/streaming.h
deleted file mode 100644 (file)
index 1a6afe7..0000000
--- a/Marlin/streaming.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*\r
-Streaming.h - Arduino library for supporting the << streaming operator\r
-Copyright (c) 2010 Mikal Hart.  All rights reserved.\r
-\r
-This library is free software; you can redistribute it and/or\r
-modify it under the terms of the GNU Lesser General Public\r
-License as published by the Free Software Foundation; either\r
-version 2.1 of the License, or (at your option) any later version.\r
-\r
-This library is distributed in the hope that it will be useful,\r
-but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
-Lesser General Public License for more details.\r
-\r
-You should have received a copy of the GNU Lesser General Public\r
-License along with this library; if not, write to the Free Software\r
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\r
-*/\r
-\r
-#ifndef ARDUINO_STREAMING\r
-#define ARDUINO_STREAMING\r
-\r
-//#include <WProgram.h>\r
-\r
-#define STREAMING_LIBRARY_VERSION 4\r
-\r
-// Generic template\r
-template<class T> \r
-inline Print &operator <<(Print &stream, T arg) \r
-{ stream.print(arg); return stream; }\r
-\r
-struct _BASED \r
-{ \r
-  long val; \r
-  int base;\r
-  _BASED(long v, int b): val(v), base(b) \r
-  {}\r
-};\r
-\r
-#define _HEX(a)     _BASED(a, HEX)\r
-#define _DEC(a)     _BASED(a, DEC)\r
-#define _OCT(a)     _BASED(a, OCT)\r
-#define _BIN(a)     _BASED(a, BIN)\r
-#define _BYTE(a)    _BASED(a, BYTE)\r
-\r
-// Specialization for class _BASED\r
-// Thanks to Arduino forum user Ben Combee who suggested this \r
-// clever technique to allow for expressions like\r
-//   Serial << _HEX(a);\r
-\r
-inline Print &operator <<(Print &obj, const _BASED &arg)\r
-{ obj.print(arg.val, arg.base); return obj; } \r
-\r
-#if ARDUINO >= 18\r
-// Specialization for class _FLOAT\r
-// Thanks to Michael Margolis for suggesting a way\r
-// to accommodate Arduino 0018's floating point precision\r
-// feature like this:\r
-//   Serial << _FLOAT(gps_latitude, 6); // 6 digits of precision\r
-\r
-struct _FLOAT\r
-{\r
-  float val;\r
-  int digits;\r
-  _FLOAT(double v, int d): val(v), digits(d)\r
-  {}\r
-};\r
-\r
-inline Print &operator <<(Print &obj, const _FLOAT &arg)\r
-{ obj.print(arg.val, arg.digits); return obj; }\r
-#endif\r
-\r
-// Specialization for enum _EndLineCode\r
-// Thanks to Arduino forum user Paul V. who suggested this\r
-// clever technique to allow for expressions like\r
-//   Serial << "Hello!" << endl;\r
-\r
-enum _EndLineCode { endl };\r
-\r
-inline Print &operator <<(Print &obj, _EndLineCode arg) \r
-{ obj.println(); return obj; }\r
-\r
-#endif\r
-\r

diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index 87d9ee54348f6242ccfcddf48ac530ae87243c44..83c173b28c06804ba825b48760ca3b6f12364919 100644 (file)
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -34,7 +34,6 @@
 #include "pins.h"\r
 #include "Marlin.h"\r
 #include "ultralcd.h"\r
-#include "streaming.h"\r
 #include "temperature.h"\r
 #include "watchdog.h"\r
 \r