MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Trust STM32 gcc versions

Browse Source
This commit is contained in:
Scott Lahteine 2020-12-15 00:53:53 -06:00
parent be7aab204f
commit 82b6044dbb
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/HAL/STM32/HAL.h
View File

@ -143,19 +143,15 @@ void _delay_ms(const int delay);
extern "C" char* _sbrk(int incr); extern "C" char* _sbrk(int incr);
#if GCC_VERSION <= 50000
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
#endif
static inline int freeMemory() { static inline int freeMemory() {
volatile char top; volatile char top;
return &top - reinterpret_cast<char*>(_sbrk(0)); return &top - reinterpret_cast<char*>(_sbrk(0));
} }
#if GCC_VERSION <= 50000
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif
// //
// ADC // ADC

4
Marlin/src/HAL/STM32F1/HAL.h
View File

@ -191,10 +191,8 @@ inline void HAL_reboot() {} // reboot the board or restart the bootloader
void _delay_ms(const int delay); void _delay_ms(const int delay);
#if GCC_VERSION <= 50000
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
#endif
/* /*
extern "C" { extern "C" {
@ -209,9 +207,7 @@ static inline int freeMemory() {
return &top - _sbrk(0); return &top - _sbrk(0);
} }
#if GCC_VERSION <= 50000
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif
// //
// ADC // ADC