puts LoggerLevel strings also in program memory

snaewe · Jun 30, 2010 · 11c1379 · 11c1379
1 parent 35ea52d
commit 11c1379
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/include/logging/LoggerLevel.h b/include/logging/LoggerLevel.h
@@ -40,6 +40,8 @@
 #ifndef __LoggerLevel_h__
 #define __LoggerLevel_h__
 
+#include "logging/ProgramMemoryString.h"
+
 /*! \brief The macro genrate %logging levels
  *
  *  \param LEVELNAME is the typename of the generated level.
@@ -62,8 +64,8 @@ struct LEVELNAME {                                                            \
         return LEVEL;                                                         \
     }                                                                         \
     /*! \brief delivers the string reporting the current %level of %logging */\
-    static const char * desc() {                                              \
-        return DESC;                                                          \
+    static PROGMEMSTRINGTYPE desc() {                                         \
+        return PROGMEMSTRING(DESC);                                           \
     }                                                                         \
 }
 
@@ -114,8 +116,8 @@ namespace logging {
             return ::logging::Level::error;
         }
         /*! \brief delivers the string reporting the current %level of %logging */
-        static const char * desc() {
-            return "[ ERROR ] ";
+        static PROGMEMSTRINGTYPE desc() {
+            return PROGMEMSTRING("[ ERROR ] ");
         }
     };
 
@@ -131,8 +133,8 @@ namespace logging {
             return ::logging::Level::warning;
         }
         /*! \brief delivers the string reporting the current %level of %logging */
-        static const char * desc() {
-            return "[Warning] ";
+        static PROGMEMSTRINGTYPE desc() {
+            return PROGMEMSTRING("[Warning] ");
         }
     };
 
@@ -148,7 +150,7 @@ namespace logging {
             return ::logging::Level::normal;
         }
         /*! \brief delivers the string reporting the current %level of %logging */
-        static const char * desc() {
+        static const char* desc() {
             return 0;
         }
     };
@@ -168,8 +170,8 @@ namespace logging {
             return ::logging::Level::info;
         }
         /*! \brief delivers the string reporting the current %level of %logging */
-        static const char * desc() {
-            return "[ INFO  ] ";
+        static PROGMEMSTRINGTYPE desc() {
+            return PROGMEMSTRING("[ INFO  ] ");
         }
     };
 
@@ -185,8 +187,8 @@ namespace logging {
             return ::logging::Level::trace;
         }
         /*! \brief delivers the string reporting the current %level of %logging */
-        static const char * desc() {
-            return "[ TRACE ] ";
+        static PROGMEMSTRINGTYPE desc() {
+            return PROGMEMSTRING("[ TRACE ] ");
         }
     };
 
@@ -202,8 +204,8 @@ namespace logging {
             return ::logging::Level::debug;
         }
         /*! \brief delivers the string reporting the current %level of %logging */
-        static const char * desc() {
-            return "[ DEBUG ] ";
+        static PROGMEMSTRINGTYPE desc() {
+            return PROGMEMSTRING("[ DEBUG ] ");
         }
     };
 

diff --git a/include/logging/ProgramMemoryStringImpl.h b/include/logging/ProgramMemoryStringImpl.h
@@ -46,9 +46,6 @@
 
 #else /* !__AVR__ */
 
-#undef PROGMEMSTRING
-#define PROGMEMSTRING(S) S
-
 static inline char pgm_read_byte_far(const char* t) {
     return *t;
 }