From 631d867dc9ef9e203e2e74479038974304ce1d68 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 20 Feb 2019 06:13:07 -0600 Subject: [PATCH] HAL cleanups --- Marlin/src/HAL/HAL_DUE/HAL.h | 2 -- Marlin/src/HAL/HAL_STM32/HAL.h | 12 ++++++++---- Marlin/src/HAL/HAL_STM32F1/HAL.h | 12 +++++++++--- Marlin/src/HAL/HAL_STM32F4/HAL.h | 11 +++++++++-- Marlin/src/inc/SanityCheck.h | 2 +- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/Marlin/src/HAL/HAL_DUE/HAL.h b/Marlin/src/HAL/HAL_DUE/HAL.h index 4814f0ff6..d430e6b64 100644 --- a/Marlin/src/HAL/HAL_DUE/HAL.h +++ b/Marlin/src/HAL/HAL_DUE/HAL.h @@ -112,10 +112,8 @@ uint8_t HAL_get_reset_source(void); // get reset reason // Write single byte to specified SPI channel void spiSend(uint32_t chan, byte b); - // Write buffer to specified SPI channel void spiSend(uint32_t chan, const uint8_t* buf, size_t n); - // Read single byte from specified SPI channel uint8_t spiRec(uint32_t chan); diff --git a/Marlin/src/HAL/HAL_STM32/HAL.h b/Marlin/src/HAL/HAL_STM32/HAL.h index 02a758c6a..7d369d36c 100644 --- a/Marlin/src/HAL/HAL_STM32/HAL.h +++ b/Marlin/src/HAL/HAL_STM32/HAL.h @@ -176,7 +176,10 @@ static inline int freeMemory() { return &top - reinterpret_cast(_sbrk(0)); } +// // SPI: Extended functions which take a channel number (hardware SPI only) +// + /** Write single byte to specified SPI channel */ void spiSend(uint32_t chan, byte b); /** Write buffer to specified SPI channel */ @@ -184,18 +187,19 @@ void spiSend(uint32_t chan, const uint8_t* buf, size_t n); /** Read single byte from specified SPI channel */ uint8_t spiRec(uint32_t chan); - +// // EEPROM +// -/** - * Wire library should work for i2c eeproms. - */ +// Wire library should work for i2c EEPROMs void eeprom_write_byte(uint8_t *pos, unsigned char value); uint8_t eeprom_read_byte(uint8_t *pos); void eeprom_read_block (void *__dst, const void *__src, size_t __n); void eeprom_update_block (const void *__src, void *__dst, size_t __n); +// // ADC +// #define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT) diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL.h b/Marlin/src/HAL/HAL_STM32F1/HAL.h index de1e0cdaa..84774b568 100644 --- a/Marlin/src/HAL/HAL_STM32F1/HAL.h +++ b/Marlin/src/HAL/HAL_STM32F1/HAL.h @@ -185,7 +185,10 @@ static int freeMemory() { return &top - reinterpret_cast(_sbrk(0)); } +// // SPI: Extended functions which take a channel number (hardware SPI only) +// + /** Write single byte to specified SPI channel */ void spiSend(uint32_t chan, byte b); /** Write buffer to specified SPI channel */ @@ -193,19 +196,22 @@ void spiSend(uint32_t chan, const uint8_t* buf, size_t n); /** Read single byte from specified SPI channel */ uint8_t spiRec(uint32_t chan); - +// // EEPROM +// /** - * TODO: Write all this eeprom stuff. Can emulate eeprom in flash as last resort. - * Wire library should work for i2c eeproms. + * TODO: Write all this EEPROM stuff. Can emulate EEPROM in flash as last resort. + * Wire library should work for i2c EEPROMs. */ void eeprom_write_byte(uint8_t *pos, unsigned char value); uint8_t eeprom_read_byte(uint8_t *pos); void eeprom_read_block (void *__dst, const void *__src, size_t __n); void eeprom_update_block (const void *__src, void *__dst, size_t __n); +// // ADC +// #define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT_ANALOG); diff --git a/Marlin/src/HAL/HAL_STM32F4/HAL.h b/Marlin/src/HAL/HAL_STM32F4/HAL.h index 8e513a14a..d009e26af 100644 --- a/Marlin/src/HAL/HAL_STM32F4/HAL.h +++ b/Marlin/src/HAL/HAL_STM32F4/HAL.h @@ -195,7 +195,10 @@ static int freeMemory() { return &top - reinterpret_cast(_sbrk(0)); } +// // SPI: Extended functions which take a channel number (hardware SPI only) +// + /** Write single byte to specified SPI channel */ void spiSend(uint32_t chan, byte b); /** Write buffer to specified SPI channel */ @@ -203,18 +206,22 @@ void spiSend(uint32_t chan, const uint8_t* buf, size_t n); /** Read single byte from specified SPI channel */ uint8_t spiRec(uint32_t chan); +// // EEPROM +// /** - * TODO: Write all this eeprom stuff. Can emulate eeprom in flash as last resort. - * Wire library should work for i2c eeproms. + * TODO: Write all this EEPROM stuff. Can emulate EEPROM in flash as last resort. + * Wire library should work for i2c EEPROMs. */ void eeprom_write_byte(uint8_t *pos, unsigned char value); uint8_t eeprom_read_byte(uint8_t *pos); void eeprom_read_block (void *__dst, const void *__src, size_t __n); void eeprom_update_block (const void *__src, void *__dst, size_t __n); +// // ADC +// #define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT) diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 0054b2c59..df6c8df1c 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -240,7 +240,7 @@ #error "Remove DELTA_PROBEABLE_RADIUS and use MIN_PROBE_EDGE to inset the probe area instead." #elif defined(UBL_MESH_INSET) #error "UBL_MESH_INSET is now just MESH_INSET. Please update your configuration." -#elif defined(UBL_MESH_MIN_X) || defined(UBL_MESH_MIN_Y) || defined(UBL_MESH_MAX_X) || defined(UBL_MESH_MAX_Y) +#elif defined(UBL_MESH_MIN_X) || defined(UBL_MESH_MIN_Y) || defined(UBL_MESH_MAX_X) || defined(UBL_MESH_MAX_Y) #error "UBL_MESH_(MIN|MAX)_[XY] is now just MESH_(MIN|MAX)_[XY]. Please update your configuration." #elif defined(ABL_PROBE_PT_1_X) || defined(ABL_PROBE_PT_1_Y) || defined(ABL_PROBE_PT_2_X) || defined(ABL_PROBE_PT_2_Y) || defined(ABL_PROBE_PT_3_X) || defined(ABL_PROBE_PT_3_Y) #error "ABL_PROBE_PT_[123]_[XY] is now PROBE_PT_[123]_[XY]. Please update your configuration."