melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a pair of compiler complaints

Browse Source
This commit is contained in:
Scott Lahteine 2017-04-22 00:07:37 -05:00
parent ff0018e287
commit 10da175be5
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/Marlin_main.cpp
View File

@ -4175,7 +4175,7 @@ inline void gcode_G28() {
ABL_VAR int abl_probe_index; ABL_VAR int abl_probe_index;
#endif #endif
#if HAS_SOFTWARE_ENDSTOPS #if HAS_SOFTWARE_ENDSTOPS && ENABLED(PROBE_MANUALLY)
ABL_VAR bool enable_soft_endstops = true; ABL_VAR bool enable_soft_endstops = true;
#endif #endif
@ -4599,7 +4599,6 @@ inline void gcode_G28() {
#endif // AUTO_BED_LEVELING_3POINT #endif // AUTO_BED_LEVELING_3POINT
#else // !PROBE_MANUALLY #else // !PROBE_MANUALLY
bool stow_probe_after_each = code_seen('E'); bool stow_probe_after_each = code_seen('E');

2
Marlin/fastio.h
View File

@ -138,7 +138,7 @@ typedef enum {
}while(0) }while(0)
#define SET_COM(T,Q,V) do{ \ #define SET_COM(T,Q,V) do{ \
TCCR##T##Q = (TCCR##T##Q & ~(0x3 << COM1##Q##0) | (int(V) & 0x3) << COM1##Q##0); \ TCCR##T##Q = (TCCR##T##Q & ~(0x3 << COM1##Q##0)) | ((int(V) & 0x3) << COM1##Q##0); \
}while(0) }while(0)
#define SET_COMA(T,V) SET_COM(T,A,V) #define SET_COMA(T,V) SET_COM(T,A,V)
#define SET_COMB(T,V) SET_COM(T,B,V) #define SET_COMB(T,V) SET_COM(T,B,V)