3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-23 20:18:52 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3147 from thinkyhead/rc_stringify_macro

Browse Source 
Promote STRINGIFY to macros.h
This commit is contained in:
Scott Lahteine 2016-03-15 17:37:03 -07:00
commit fc04b587cf
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/language.h
View File

@ -3,8 +3,7 @@
#include "Configuration.h"
#define LANGUAGE_CONCAT(M) #M
#define GENERATE_LANGUAGE_INCLUDE(M) LANGUAGE_CONCAT(language_##M.h)
#define GENERATE_LANGUAGE_INCLUDE(M) STRINGIFY_(language_##M.h)
// NOTE: IF YOU CHANGE LANGUAGE FILES OR MERGE A FILE WITH CHANGES
@ -88,10 +87,6 @@
#endif
#define STRINGIFY_(n) #n
#define STRINGIFY(n) STRINGIFY_(n)
// Common LCD messages
/* nothing here yet */

4
Marlin/macros.h
View File

@ -1,6 +1,10 @@
#ifndef MACROS_H
#define MACROS_H
// Macros to make a string from a macro
#define STRINGIFY_(n) #n
#define STRINGIFY(n) STRINGIFY_(n)
// Macros for bit masks
#define TEST(n,b) (((n)&_BV(b))!=0)
#define SBI(n,b) (n |= _BV(b))