From cce49313422e81e23c1bf1502da8871830d32da1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 16 Oct 2018 06:45:44 -0500
Subject: [PATCH] Clean up recent contribs
---
Marlin/src/HAL/HAL_LPC1768/watchdog.cpp | 4 +++-
Marlin/src/HAL/HAL_STM32/endstop_interrupts.h | 3 +--
Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp | 8 +++-----
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Marlin/src/HAL/HAL_LPC1768/watchdog.cpp b/Marlin/src/HAL/HAL_LPC1768/watchdog.cpp
index dde282d247..97a508c96a 100644
--- a/Marlin/src/HAL/HAL_LPC1768/watchdog.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/watchdog.cpp
@@ -67,14 +67,16 @@ uint8_t HAL_get_reset_source(void) {
void watchdog_reset() {
WDT_Feed();
- #if !defined(PINS_DEBUGGING) && PIN_EXISTS(LED)
+ #if DISABLED(PINS_DEBUGGING) && PIN_EXISTS(LED)
TOGGLE(LED_PIN); // heart beat indicator
#endif
}
#else
+
void HAL_clear_reset_source(void) {}
uint8_t HAL_get_reset_source(void) { return RST_POWER_ON; }
+
#endif // USE_WATCHDOG
#endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/HAL_STM32/endstop_interrupts.h b/Marlin/src/HAL/HAL_STM32/endstop_interrupts.h
index 5f40be4055..e4a243b43e 100644
--- a/Marlin/src/HAL/HAL_STM32/endstop_interrupts.h
+++ b/Marlin/src/HAL/HAL_STM32/endstop_interrupts.h
@@ -57,9 +57,8 @@ void setup_endstop_interrupts(void) {
#endif
#if HAS_Z3_MIN
attachInterrupt(Z3_MIN_PIN, endstop_ISR, CHANGE);
- #endif
+ #endif
#if HAS_Z_MIN_PROBE_PIN
attachInterrupt(Z_MIN_PROBE_PIN, endstop_ISR, CHANGE);
#endif
}
-
diff --git a/Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp b/Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp
index ceb18bed1a..7b049f1551 100644
--- a/Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp
+++ b/Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp
@@ -31,12 +31,10 @@
void watchdog_init() { IWatchdog.begin(4000000); } // 4 sec timeout
- void watchdog_reset()
- {
- IWatchdog.reload();
-
+ void watchdog_reset() {
+ IWatchdog.reload();
#if PIN_EXISTS(LED)
- TOGGLE(LED_PIN); // heart beat indicator
+ TOGGLE(LED_PIN); // heartbeat indicator
#endif
}
--
GitLab