From 58c82d541df1e05756f6bab3e45ac8c5fc60fe1f Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Fri, 30 Oct 2020 20:08:01 -0700 Subject: [PATCH] Add missing TERN_ --- Marlin/src/HAL/STM32/HAL.h | 1 - Marlin/src/HAL/STM32/eeprom_flash.cpp | 4 ++-- Marlin/src/inc/Conditionals_post.h | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h index 8d3b24cf73..c10f910699 100644 --- a/Marlin/src/HAL/STM32/HAL.h +++ b/Marlin/src/HAL/STM32/HAL.h @@ -113,7 +113,6 @@ typedef int16_t pin_t; #define HAL_SERVO_LIB libServo #define PAUSE_SERVO_OUTPUT() libServo::pause_all_servos() #define RESUME_SERVO_OUTPUT() libServo::resume_all_servos() -#define HAS_PAUSE_SERVO_OUTPUT HAS_SERVOS // ------------------------ // Public Variables diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp index 5b9590b467..95b7938618 100644 --- a/Marlin/src/HAL/STM32/eeprom_flash.cpp +++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp @@ -163,11 +163,11 @@ bool PersistentStore::access_finish() { current_slot = EEPROM_SLOTS - 1; UNLOCK_FLASH(); - PAUSE_SERVO_OUTPUT(); + TERN_(HAS_PAUSE_SERVO_OUTPUT, PAUSE_SERVO_OUTPUT()); DISABLE_ISRS(); status = HAL_FLASHEx_Erase(&EraseInitStruct, &SectorError); ENABLE_ISRS(); - RESUME_SERVO_OUTPUT(); + TERN_(HAS_PAUSE_SERVO_OUTPUT, RESUME_SERVO_OUTPUT()); if (status != HAL_OK) { DEBUG_ECHOLNPAIR("HAL_FLASHEx_Erase=", status); DEBUG_ECHOLNPAIR("GetError=", HAL_FLASH_GetError()); diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index ba16b9e39f..268d7839f1 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -1999,8 +1999,8 @@ #if NUM_SERVOS > 0 #define HAS_SERVOS 1 #endif -#ifndef HAS_PAUSE_SERVO_OUTPUT - #define HAS_PAUSE_SERVO_OUTPUT 0 +#if HAS_SERVOS && defined(PAUSE_SERVO_OUTPUT) && defined(RESUME_SERVO_OUTPUT) + #define HAS_PAUSE_SERVO_OUTPUT 1 #endif // Sensors