From 86d0bc1af562968976332088e95ef18c15ab0596 Mon Sep 17 00:00:00 2001 From: Chris Pepper Date: Sun, 10 Nov 2019 23:30:28 +0000 Subject: [PATCH] Update lpc176x framework version requirement (#15868) --- Marlin/src/HAL/HAL_LPC1768/HAL.h | 5 ++--- Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL.h b/Marlin/src/HAL/HAL_LPC1768/HAL.h index 1ec71e7e42..1648905453 100644 --- a/Marlin/src/HAL/HAL_LPC1768/HAL.h +++ b/Marlin/src/HAL/HAL_LPC1768/HAL.h @@ -131,14 +131,13 @@ int freeMemory(); // K = 6, 565 samples, 500Hz sample rate, 1.13s convergence on full range step // Memory usage per ADC channel (bytes): 4 (32 Bytes for 8 channels) -#define HAL_ADC_RESULT_BITS 12 // 15 bit maximum, raw temperature is stored as int16_t +#define HAL_ADC_RESOLUTION 12 // 15 bit maximum, raw temperature is stored as int16_t #define HAL_ADC_FILTERED // Disable oversampling done in Marlin as ADC values already filtered in HAL -#define HAL_ADC_RESOLUTION HAL_ADC_RESULT_BITS using FilteredADC = LPC176x::ADC; extern uint32_t HAL_adc_reading; [[gnu::always_inline]] inline void HAL_start_adc(const pin_t pin) { - HAL_adc_reading = FilteredADC::read(pin) >> (16 - HAL_ADC_RESULT_BITS); // returns 16bit value, reduce to required bits + HAL_adc_reading = FilteredADC::read(pin) >> (16 - HAL_ADC_RESOLUTION); // returns 16bit value, reduce to required bits } [[gnu::always_inline]] inline uint16_t HAL_read_adc() { return HAL_adc_reading; diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h index fd9b5445db..54539df9cf 100644 --- a/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h +++ b/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h @@ -24,7 +24,7 @@ #if PIO_PLATFORM_VERSION < 000001000 #error "nxplpc-arduino-lpc176x package is out of date, Please update the PlatformIO platforms, frameworks and libraries. You may need to remove the platform and let it reinstall automatically." #endif -#if PIO_FRAMEWORK_VERSION < 000002000 +#if PIO_FRAMEWORK_VERSION < 000002001 #error "framework-arduino-lpc176x package is out of date, Please update the PlatformIO platforms, frameworks and libraries." #endif