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

🔨 Prevent build attribute define conflicts

Browse Source
This commit is contained in:
Scott Lahteine
2022-05-05 18:55:43 -05:00
parent 6112277f9b
commit ceb99e89a0
7 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/module/endstops.cpp
View File

@ -494,7 +494,7 @@ static void print_es_state(const bool is_hit, FSTR_P const flabel=nullptr) {
#pragma GCC diagnostic pop
void _O2 Endstops::report_states() {
void __O2 Endstops::report_states() {
TERN_(BLTOUCH, bltouch._set_SW_mode());
SERIAL_ECHOLNPGM(STR_M119_REPORT);
#define ES_REPORT(S) print_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING, F(STR_##S))

2
Marlin/src/module/temperature.h
View File

@ -677,7 +677,7 @@ class Temperature {
/**
* Call periodically to manage heaters
*/
static void manage_heater() _O2; // Added _O2 to work around a compiler error
static void manage_heater() __O2; // __O2 added to work around a compiler error
/**
* Preheating hotends