thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

🐛 Fix `freeMemory` endless loop 

Followup to #23295
Scott Lahteine 3 years ago
parent
bdb071688e
commit
4f0932e5c1
11 changed files with 11 additions and 11 deletions
Unified View Show Diff Stats
  1. 1
    1
      Marlin/src/HAL/AVR/HAL.h
  2. 1
    1
      Marlin/src/HAL/DUE/HAL.h
  3. 1
    1
      Marlin/src/HAL/LINUX/HAL.h
  4. 1
    1
      Marlin/src/HAL/LPC1768/HAL.h
  5. 1
    1
      Marlin/src/HAL/NATIVE_SIM/HAL.h
  6. 1
    1
      Marlin/src/HAL/SAMD51/HAL.h
  7. 1
    1
      Marlin/src/HAL/STM32/HAL.h
  8. 1
    1
      Marlin/src/HAL/STM32F1/HAL.h
  9. 1
    1
      Marlin/src/HAL/TEENSY31_32/HAL.h
  10. 1
    1
      Marlin/src/HAL/TEENSY35_36/HAL.h
  11. 1
    1
      Marlin/src/HAL/TEENSY40_41/HAL.h

+ 1
- 1
Marlin/src/HAL/AVR/HAL.h View File

205 
   static inline void clear_reset_source() { MCUSR = 0; }
 205 
   static inline void clear_reset_source() { MCUSR = 0; }
206
206
207 
   // Free SRAM
 207 
   // Free SRAM
208 
-  static inline int freeMemory() { return freeMemory(); }
208 
+  static inline int freeMemory() { return ::freeMemory(); }
209
209
210 
   //
 210 
   //
211 
   // ADC Methods
 211 
   // ADC Methods

+ 1
- 1
Marlin/src/HAL/DUE/HAL.h View File

196 
   static inline void clear_reset_source() {}
 196 
   static inline void clear_reset_source() {}
197
197
198 
   // Free SRAM
 198 
   // Free SRAM
199 
-  static inline int freeMemory() { return freeMemory(); }
199 
+  static inline int freeMemory() { return ::freeMemory(); }
200
200
201 
   //
 201 
   //
202 
   // ADC Methods
 202 
   // ADC Methods

+ 1
- 1
Marlin/src/HAL/LINUX/HAL.h View File

126 
   static inline void clear_reset_source() {}
 126 
   static inline void clear_reset_source() {}
127
127
128 
   // Free SRAM
 128 
   // Free SRAM
129 
-  static inline int freeMemory() { return freeMemory(); }
129 
+  static inline int freeMemory() { return ::freeMemory(); }
130
130
131 
   //
 131 
   //
132 
   // ADC Methods
 132 
   // ADC Methods

+ 1
- 1
Marlin/src/HAL/LPC1768/HAL.h View File

219 
   static void clear_reset_source();
 219 
   static void clear_reset_source();
220
220
221 
   // Free SRAM
 221 
   // Free SRAM
222 
-  static inline int freeMemory() { return freeMemory(); }
222 
+  static inline int freeMemory() { return ::freeMemory(); }
223
223
224 
   //
 224 
   //
225 
   // ADC Methods
 225 
   // ADC Methods

+ 1
- 1
Marlin/src/HAL/NATIVE_SIM/HAL.h View File

228 
   static inline void clear_reset_source() {}
 228 
   static inline void clear_reset_source() {}
229
229
230 
   // Free SRAM
 230 
   // Free SRAM
231 
-  static inline int freeMemory() { return freeMemory(); }
231 
+  static inline int freeMemory() { return ::freeMemory(); }
232
232
233 
   //
 233 
   //
234 
   // ADC Methods
 234 
   // ADC Methods

+ 1
- 1
Marlin/src/HAL/SAMD51/HAL.h View File

176 
   static inline void clear_reset_source() {}
 176 
   static inline void clear_reset_source() {}
177
177
178 
   // Free SRAM
 178 
   // Free SRAM
179 
-  static inline int freeMemory() { return freeMemory(); }
179 
+  static inline int freeMemory() { return ::freeMemory(); }
180
180
181 
   //
 181 
   //
182 
   // ADC Methods
 182 
   // ADC Methods

+ 1
- 1
Marlin/src/HAL/STM32/HAL.h View File

226 
   static void clear_reset_source();
 226 
   static void clear_reset_source();
227
227
228 
   // Free SRAM
 228 
   // Free SRAM
229 
-  static inline int freeMemory() { return freeMemory(); }
229 
+  static inline int freeMemory() { return ::freeMemory(); }
230
230
231 
   //
 231 
   //
232 
   // ADC Methods
 232 
   // ADC Methods

+ 1
- 1
Marlin/src/HAL/STM32F1/HAL.h View File

270 
   static inline void clear_reset_source() {}
 270 
   static inline void clear_reset_source() {}
271
271
272 
   // Free SRAM
 272 
   // Free SRAM
273 
-  static inline int freeMemory() { return freeMemory(); }
273 
+  static inline int freeMemory() { return ::freeMemory(); }
274
274
275 
   //
 275 
   //
276 
   // ADC Methods
 276 
   // ADC Methods

+ 1
- 1
Marlin/src/HAL/TEENSY31_32/HAL.h View File

155 
   static inline void clear_reset_source() {}
 155 
   static inline void clear_reset_source() {}
156
156
157 
   // Free SRAM
 157 
   // Free SRAM
158 
-  static inline int freeMemory() { return freeMemory(); }
158 
+  static inline int freeMemory() { return ::freeMemory(); }
159
159
160 
   //
 160 
   //
161 
   // ADC Methods
 161 
   // ADC Methods

+ 1
- 1
Marlin/src/HAL/TEENSY35_36/HAL.h View File

160 
   static inline void clear_reset_source() {}
 160 
   static inline void clear_reset_source() {}
161
161
162 
   // Free SRAM
 162 
   // Free SRAM
163 
-  static inline int freeMemory() { return freeMemory(); }
163 
+  static inline int freeMemory() { return ::freeMemory(); }
164
164
165 
   //
 165 
   //
166 
   // ADC Methods
 166 
   // ADC Methods

+ 1
- 1
Marlin/src/HAL/TEENSY40_41/HAL.h View File

182 
   static void clear_reset_source();
 182 
   static void clear_reset_source();
183
183
184 
   // Free SRAM
 184 
   // Free SRAM
185 
-  static inline int freeMemory() { return freeMemory(); }
185 
+  static inline int freeMemory() { return ::freeMemory(); }
186
186
187 
   //
 187 
   //
188 
   // ADC Methods
 188 
   // ADC Methods

Write Preview
Loading…
Cancel
Save