From b615b492baae9def871d2c51704ca66c3911a7a8 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 28 Jun 2019 23:04:33 -0500 Subject: [PATCH] Update some HAL comments --- Marlin/src/HAL/HAL_STM32/HAL.cpp | 9 ++------- Marlin/src/HAL/HAL_STM32/HAL_Servo_STM32.cpp | 2 +- Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp | 2 +- Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.cpp | 2 +- Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp | 2 +- Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp | 2 +- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Marlin/src/HAL/HAL_STM32/HAL.cpp b/Marlin/src/HAL/HAL_STM32/HAL.cpp index a0f33637b..8eb3c588f 100644 --- a/Marlin/src/HAL/HAL_STM32/HAL.cpp +++ b/Marlin/src/HAL/HAL_STM32/HAL.cpp @@ -23,11 +23,6 @@ #if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) - -// -------------------------------------------------------------------------- -// Includes -// -------------------------------------------------------------------------- - #include "HAL.h" #include "../../inc/MarlinConfig.h" @@ -41,7 +36,7 @@ #else #error "EEPROM_EMULATED_WITH_SRAM is currently only supported for STM32F4xx and STM32F7xx" #endif -#endif // EEPROM_EMULATED_WITH_SRAM +#endif // -------------------------------------------------------------------------- // Externals @@ -146,4 +141,4 @@ uint16_t HAL_adc_get_result(void) { return HAL_adc_result; } -#endif // ARDUINO_ARCH_STM32 +#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC diff --git a/Marlin/src/HAL/HAL_STM32/HAL_Servo_STM32.cpp b/Marlin/src/HAL/HAL_STM32/HAL_Servo_STM32.cpp index 9d115322c..fa68c4834 100644 --- a/Marlin/src/HAL/HAL_STM32/HAL_Servo_STM32.cpp +++ b/Marlin/src/HAL/HAL_STM32/HAL_Servo_STM32.cpp @@ -54,4 +54,4 @@ void libServo::move(const int value) { } #endif // HAS_SERVOS -#endif // ARDUINO_ARCH_STM32 +#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC diff --git a/Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp b/Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp index a1e51c51c..cde28e7e1 100644 --- a/Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp +++ b/Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp @@ -152,4 +152,4 @@ void spiSendBlock(uint8_t token, const uint8_t* buf) { #endif // SOFTWARE_SPI -#endif // ARDUINO_ARCH_STM32 +#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC diff --git a/Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.cpp b/Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.cpp index 94b0202cb..f309b43f3 100644 --- a/Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.cpp +++ b/Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.cpp @@ -115,4 +115,4 @@ bool HAL_timer_interrupt_enabled(const uint8_t timer_num) { return NVIC->ISER[IRQ_Id >> 5] & _BV32(IRQ_Id & 0x1F); } -#endif // ARDUINO_ARCH_STM32 +#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC diff --git a/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp b/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp index b3b151cb3..01d7167b9 100644 --- a/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp +++ b/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp @@ -115,4 +115,4 @@ size_t PersistentStore::capacity() { } #endif // EEPROM_SETTINGS -#endif // ARDUINO_ARCH_STM32 +#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC diff --git a/Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp b/Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp index 4a2bc352d..6f8b070e7 100644 --- a/Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp +++ b/Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp @@ -39,4 +39,4 @@ } #endif // USE_WATCHDOG -#endif // ARDUINO_ARCH_STM32 +#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC