From 1fc66aa0ebc23d74dbe9b5a2368f98f9348c89d9 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 25 Dec 2021 20:00:48 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20`freeMemory`=20endless=20l?= =?UTF-8?q?oop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Followup to #23295 --- Marlin/src/HAL/AVR/HAL.h | 2 +- Marlin/src/HAL/DUE/HAL.h | 2 +- Marlin/src/HAL/LINUX/HAL.h | 2 +- Marlin/src/HAL/LPC1768/HAL.h | 2 +- Marlin/src/HAL/NATIVE_SIM/HAL.h | 2 +- Marlin/src/HAL/SAMD51/HAL.h | 2 +- Marlin/src/HAL/STM32/HAL.h | 2 +- Marlin/src/HAL/STM32F1/HAL.h | 2 +- Marlin/src/HAL/TEENSY31_32/HAL.h | 2 +- Marlin/src/HAL/TEENSY35_36/HAL.h | 2 +- Marlin/src/HAL/TEENSY40_41/HAL.h | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h index 9babe2d60352..682374b4ac84 100644 --- a/Marlin/src/HAL/AVR/HAL.h +++ b/Marlin/src/HAL/AVR/HAL.h @@ -205,7 +205,7 @@ class MarlinHAL { static inline void clear_reset_source() { MCUSR = 0; } // Free SRAM - static inline int freeMemory() { return freeMemory(); } + static inline int freeMemory() { return ::freeMemory(); } // // ADC Methods diff --git a/Marlin/src/HAL/DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h index 0dd123acdd51..5d1d2cf236d7 100644 --- a/Marlin/src/HAL/DUE/HAL.h +++ b/Marlin/src/HAL/DUE/HAL.h @@ -196,7 +196,7 @@ class MarlinHAL { static inline void clear_reset_source() {} // Free SRAM - static inline int freeMemory() { return freeMemory(); } + static inline int freeMemory() { return ::freeMemory(); } // // ADC Methods diff --git a/Marlin/src/HAL/LINUX/HAL.h b/Marlin/src/HAL/LINUX/HAL.h index 0bd8635c9045..c1b7a5499706 100644 --- a/Marlin/src/HAL/LINUX/HAL.h +++ b/Marlin/src/HAL/LINUX/HAL.h @@ -126,7 +126,7 @@ class MarlinHAL { static inline void clear_reset_source() {} // Free SRAM - static inline int freeMemory() { return freeMemory(); } + static inline int freeMemory() { return ::freeMemory(); } // // ADC Methods diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h index ba0729590f5b..f1cdbe6f078d 100644 --- a/Marlin/src/HAL/LPC1768/HAL.h +++ b/Marlin/src/HAL/LPC1768/HAL.h @@ -219,7 +219,7 @@ class MarlinHAL { static void clear_reset_source(); // Free SRAM - static inline int freeMemory() { return freeMemory(); } + static inline int freeMemory() { return ::freeMemory(); } // // ADC Methods diff --git a/Marlin/src/HAL/NATIVE_SIM/HAL.h b/Marlin/src/HAL/NATIVE_SIM/HAL.h index bfbdaf211ff3..0798bdde393d 100644 --- a/Marlin/src/HAL/NATIVE_SIM/HAL.h +++ b/Marlin/src/HAL/NATIVE_SIM/HAL.h @@ -228,7 +228,7 @@ class MarlinHAL { static inline void clear_reset_source() {} // Free SRAM - static inline int freeMemory() { return freeMemory(); } + static inline int freeMemory() { return ::freeMemory(); } // // ADC Methods diff --git a/Marlin/src/HAL/SAMD51/HAL.h b/Marlin/src/HAL/SAMD51/HAL.h index 144bf9c08dfa..9fcd73e9b64b 100644 --- a/Marlin/src/HAL/SAMD51/HAL.h +++ b/Marlin/src/HAL/SAMD51/HAL.h @@ -176,7 +176,7 @@ class MarlinHAL { static inline void clear_reset_source() {} // Free SRAM - static inline int freeMemory() { return freeMemory(); } + static inline int freeMemory() { return ::freeMemory(); } // // ADC Methods diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h index d71ccd796b2f..c23ddf69bdaa 100644 --- a/Marlin/src/HAL/STM32/HAL.h +++ b/Marlin/src/HAL/STM32/HAL.h @@ -226,7 +226,7 @@ class MarlinHAL { static void clear_reset_source(); // Free SRAM - static inline int freeMemory() { return freeMemory(); } + static inline int freeMemory() { return ::freeMemory(); } // // ADC Methods diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h index 517c8f2cb808..8fb4c9299ff5 100644 --- a/Marlin/src/HAL/STM32F1/HAL.h +++ b/Marlin/src/HAL/STM32F1/HAL.h @@ -270,7 +270,7 @@ class MarlinHAL { static inline void clear_reset_source() {} // Free SRAM - static inline int freeMemory() { return freeMemory(); } + static inline int freeMemory() { return ::freeMemory(); } // // ADC Methods diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h index fdf914b1b02e..a5f67a50f0aa 100644 --- a/Marlin/src/HAL/TEENSY31_32/HAL.h +++ b/Marlin/src/HAL/TEENSY31_32/HAL.h @@ -155,7 +155,7 @@ class MarlinHAL { static inline void clear_reset_source() {} // Free SRAM - static inline int freeMemory() { return freeMemory(); } + static inline int freeMemory() { return ::freeMemory(); } // // ADC Methods diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.h b/Marlin/src/HAL/TEENSY35_36/HAL.h index 5506599cdf03..8ca76dc6368b 100644 --- a/Marlin/src/HAL/TEENSY35_36/HAL.h +++ b/Marlin/src/HAL/TEENSY35_36/HAL.h @@ -160,7 +160,7 @@ class MarlinHAL { static inline void clear_reset_source() {} // Free SRAM - static inline int freeMemory() { return freeMemory(); } + static inline int freeMemory() { return ::freeMemory(); } // // ADC Methods diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h index 4a0b5688d77c..10263ecb394a 100644 --- a/Marlin/src/HAL/TEENSY40_41/HAL.h +++ b/Marlin/src/HAL/TEENSY40_41/HAL.h @@ -182,7 +182,7 @@ class MarlinHAL { static void clear_reset_source(); // Free SRAM - static inline int freeMemory() { return freeMemory(); } + static inline int freeMemory() { return ::freeMemory(); } // // ADC Methods