mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-22 06:03:20 +02:00
Code Issues Releases Wiki Activity

Change comment location to works ifdef

Browse Source 
Ifdef MACHINE_NAME did not work as intended due to the tail comment, so separate it.
This commit is contained in:
odaki
2020-03-22 21:02:24 +09:00
parent 4b5c286c61
commit 330ea2ad7e
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Grbl_Esp32/Grbl_Esp32.ino
View File

@@ -45,12 +45,13 @@ void setup() {
serial_init(); // Setup serial baud rate and interrupts serial_init(); // Setup serial baud rate and interrupts
grbl_msg_sendf(CLIENT_SERIAL, MSG_LEVEL_INFO, "Grbl_ESP32 Ver %s Date %s", GRBL_VERSION, GRBL_VERSION_BUILD); // print grbl_esp32 verion info grbl_msg_sendf(CLIENT_SERIAL, MSG_LEVEL_INFO, "Grbl_ESP32 Ver %s Date %s", GRBL_VERSION, GRBL_VERSION_BUILD); // print grbl_esp32 verion info
grbl_msg_sendf(CLIENT_SERIAL, MSG_LEVEL_INFO, "Compiled with ESP32 SDK:%s", ESP.getSdkVersion()); // print the SDK version grbl_msg_sendf(CLIENT_SERIAL, MSG_LEVEL_INFO, "Compiled with ESP32 SDK:%s", ESP.getSdkVersion()); // print the SDK version
#ifdef MACHINE_NAME // show the map name at startup // show the map name at startup
#ifdef MACHINE_EXTRA #ifdef MACHINE_NAME
#define MACHINE_STRING MACHINE_NAME MACHINE_EXTRA #ifdef MACHINE_EXTRA
#else #define MACHINE_STRING MACHINE_NAME MACHINE_EXTRA
#define MACHINE_STRING MACHINE_NAME #else
#endif #define MACHINE_STRING MACHINE_NAME
#endif
grbl_msg_sendf(CLIENT_SERIAL, MSG_LEVEL_INFO, "Using machine:%s", MACHINE_STRING); grbl_msg_sendf(CLIENT_SERIAL, MSG_LEVEL_INFO, "Using machine:%s", MACHINE_STRING);
#endif #endif
settings_init(); // Load Grbl settings from EEPROM settings_init(); // Load Grbl settings from EEPROM