CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6209 from thinkyhead/rc_psu_zero

Browse Source 
Power Supply 0 as "General"
This commit is contained in:
Scott Lahteine 2017-04-02 16:44:42 -05:00 committed by GitHub
commit 3412950abc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/ultralcd.cpp
View File

@ -2688,13 +2688,13 @@ void kill_screen(const char* lcd_msg) {
STATIC_ITEM(BOARD_NAME, true, true); // MyPrinterController STATIC_ITEM(BOARD_NAME, true, true); // MyPrinterController
STATIC_ITEM(MSG_INFO_BAUDRATE ": " STRINGIFY(BAUDRATE), true); // Baud: 250000 STATIC_ITEM(MSG_INFO_BAUDRATE ": " STRINGIFY(BAUDRATE), true); // Baud: 250000
STATIC_ITEM(MSG_INFO_PROTOCOL ": " PROTOCOL_VERSION, true); // Protocol: 1.0 STATIC_ITEM(MSG_INFO_PROTOCOL ": " PROTOCOL_VERSION, true); // Protocol: 1.0
#ifdef POWER_SUPPLY #if POWER_SUPPLY == 0
#if (POWER_SUPPLY == 1) STATIC_ITEM(MSG_INFO_PSU ": Generic", true);
STATIC_ITEM(MSG_INFO_PSU ": ATX", true); // Power Supply: ATX #elif POWER_SUPPLY == 1
#elif (POWER_SUPPLY == 2) STATIC_ITEM(MSG_INFO_PSU ": ATX", true); // Power Supply: ATX
STATIC_ITEM(MSG_INFO_PSU ": XBox", true); // Power Supply: XBox #elif POWER_SUPPLY == 2
#endif STATIC_ITEM(MSG_INFO_PSU ": XBox", true); // Power Supply: XBox
#endif // POWER_SUPPLY #endif
END_SCREEN(); END_SCREEN();
} }