Browse Source

Fix _temp_error-related compile error (#13768)

Kajetan Rzepecki 5 years ago
parent
commit
5f70c876ae
1 changed files with 5 additions and 5 deletions
  1. 5
    5
      Marlin/src/module/temperature.cpp

+ 5
- 5
Marlin/src/module/temperature.cpp View File

86
  */
86
  */
87
 
87
 
88
 #if HAS_HEATED_BED
88
 #if HAS_HEATED_BED
89
-  #define _BED_PSTR(M,E) (E) == -1 ? PSTR(M ## _BED) :
89
+  #define _BED_PSTR(M,E) (E) == -1 ? PSTR(M) :
90
 #else
90
 #else
91
   #define _BED_PSTR(M,E)
91
   #define _BED_PSTR(M,E)
92
 #endif
92
 #endif
93
 #if HAS_HEATED_CHAMBER
93
 #if HAS_HEATED_CHAMBER
94
-  #define _CHAMBER_PSTR(M,E) (E) == -2 ? PSTR(M ## _CHAMBER) :
94
+  #define _CHAMBER_PSTR(M,E) (E) == -2 ? PSTR(M) :
95
 #else
95
 #else
96
   #define _CHAMBER_PSTR(M,E)
96
   #define _CHAMBER_PSTR(M,E)
97
 #endif
97
 #endif
98
 #define _E_PSTR(M,E,N) ((HOTENDS) >= (N) && (E) == (N)-1) ? PSTR(MSG_E##N " " M) :
98
 #define _E_PSTR(M,E,N) ((HOTENDS) >= (N) && (E) == (N)-1) ? PSTR(MSG_E##N " " M) :
99
-#define TEMP_ERR_PSTR(M,E) _BED_PSTR(M,E) _CHAMBER_PSTR(M,E) _E_PSTR(M,E,2) _E_PSTR(M,E,3) _E_PSTR(M,E,4) _E_PSTR(M,E,5) _E_PSTR(M,E,6) PSTR(MSG_E1 " " M)
99
+#define TEMP_ERR_PSTR(M,E) _BED_PSTR(M##_BED,E) _CHAMBER_PSTR(M##_CHAMBER,E) _E_PSTR(M,E,2) _E_PSTR(M,E,3) _E_PSTR(M,E,4) _E_PSTR(M,E,5) _E_PSTR(M,E,6) PSTR(MSG_E1 " " M)
100
 
100
 
101
 // public:
101
 // public:
102
 
102
 
1004
   #if HAS_HEATED_BED
1004
   #if HAS_HEATED_BED
1005
 
1005
 
1006
     if (degBed() > BED_MAXTEMP)
1006
     if (degBed() > BED_MAXTEMP)
1007
-      temp_error(-1, PSTR(MSG_T_THERMAL_RUNAWAY), TEMP_ERR_PSTR(MSG_THERMAL_RUNAWAY, -1));
1007
+      _temp_error(-1, PSTR(MSG_T_THERMAL_RUNAWAY), TEMP_ERR_PSTR(MSG_THERMAL_RUNAWAY, -1));
1008
 
1008
 
1009
     #if WATCH_BED
1009
     #if WATCH_BED
1010
       // Make sure temperature is increasing
1010
       // Make sure temperature is increasing
1077
     #if HAS_HEATED_CHAMBER
1077
     #if HAS_HEATED_CHAMBER
1078
 
1078
 
1079
       if (degChamber() > CHAMBER_MAXTEMP)
1079
       if (degChamber() > CHAMBER_MAXTEMP)
1080
-        temp_error(-2, PSTR(MSG_T_THERMAL_RUNAWAY), TEMP_ERR_PSTR(MSG_THERMAL_RUNAWAY, -2));
1080
+        _temp_error(-2, PSTR(MSG_T_THERMAL_RUNAWAY), TEMP_ERR_PSTR(MSG_THERMAL_RUNAWAY, -2));
1081
 
1081
 
1082
       #if WATCH_CHAMBER
1082
       #if WATCH_CHAMBER
1083
         // Make sure temperature is increasing
1083
         // Make sure temperature is increasing

Loading…
Cancel
Save