bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 Pragma GCC cleanup

Browse Source
This commit is contained in:
Scott Lahteine
2021-10-19 05:52:41 -05:00
committed by Scott Lahteine
parent 18b38fb58a
commit aa198e41dd
13 changed files with 26 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/lcd/dogm/status_screen_DOGM.cpp
View File

@ -862,17 +862,15 @@ void MarlinUI::draw_status_screen() {
mix_label = PSTR("Mx");
}
#pragma GCC diagnostic push
#if GCC_VERSION <= 50000
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-overflow"
#endif
sprintf_P(mixer_messages, PSTR(S_FMT " %d;%d%% "), mix_label, int(mixer.mix[0]), int(mixer.mix[1]));
lcd_put_u8str(X_LABEL_POS, XYZ_BASELINE, mixer_messages);
#if GCC_VERSION <= 50000
#pragma GCC diagnostic pop
#endif
#pragma GCC diagnostic pop
#else

6
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
View File

@ -27,8 +27,8 @@
#define ROUND(val) uint16_t((val)+0.5)
#pragma GCC diagnostic push
#if GCC_VERSION <= 50000
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wno-format"
#endif
@ -105,8 +105,6 @@ void format_position(char *str, float x, float y, float z) {
sprintf_P(str, PSTR("%s; %s; %s " S_FMT), num1, num2, num3, GET_TEXT(MSG_UNITS_MM));
}
#if GCC_VERSION <= 50000
#pragma GCC diagnostic pop
#endif
#pragma GCC diagnostic pop
#endif // TOUCH_UI_FTDI_EVE