Quellcode durchsuchen

Merge pull request #3147 from thinkyhead/rc_stringify_macro

Promote STRINGIFY to macros.h
Scott Lahteine vor 8 Jahren
Ursprung
Commit
fc04b587cf
2 geänderte Dateien mit 5 neuen und 6 gelöschten Zeilen
  1. 1
    6
      Marlin/language.h
  2. 4
    0
      Marlin/macros.h

+ 1
- 6
Marlin/language.h Datei anzeigen

3
 
3
 
4
 #include "Configuration.h"
4
 #include "Configuration.h"
5
 
5
 
6
-#define LANGUAGE_CONCAT(M)       #M
7
-#define GENERATE_LANGUAGE_INCLUDE(M)  LANGUAGE_CONCAT(language_##M.h)
6
+#define GENERATE_LANGUAGE_INCLUDE(M)  STRINGIFY_(language_##M.h)
8
 
7
 
9
 
8
 
10
 // NOTE: IF YOU CHANGE LANGUAGE FILES OR MERGE A FILE WITH CHANGES
9
 // NOTE: IF YOU CHANGE LANGUAGE FILES OR MERGE A FILE WITH CHANGES
88
 #endif
87
 #endif
89
 
88
 
90
 
89
 
91
-#define STRINGIFY_(n) #n
92
-#define STRINGIFY(n) STRINGIFY_(n)
93
-
94
-
95
 // Common LCD messages
90
 // Common LCD messages
96
 
91
 
97
   /* nothing here yet */
92
   /* nothing here yet */

+ 4
- 0
Marlin/macros.h Datei anzeigen

1
 #ifndef MACROS_H
1
 #ifndef MACROS_H
2
 #define MACROS_H
2
 #define MACROS_H
3
 
3
 
4
+// Macros to make a string from a macro
5
+#define STRINGIFY_(n) #n
6
+#define STRINGIFY(n) STRINGIFY_(n)
7
+
4
 // Macros for bit masks
8
 // Macros for bit masks
5
 #define TEST(n,b) (((n)&_BV(b))!=0)
9
 #define TEST(n,b) (((n)&_BV(b))!=0)
6
 #define SBI(n,b) (n |= _BV(b))
10
 #define SBI(n,b) (n |= _BV(b))

Laden…
Abbrechen
Speichern