Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Follow up HAL Refractor #23354

Merged
merged 4 commits into from
Dec 26, 2021
Merged

Follow up HAL Refractor #23354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97b0c4a
HAL adc_enable
robbycandra Dec 26, 2021
9391f8b
HAL_SPI isr typo
robbycandra Dec 25, 2021
88a50a6
Merge branch 'bugfix-2.0.x' into pr/23354
thinkyhead Dec 26, 2021
18b8165
Update HAL_SPI.cpp
thinkyhead Dec 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/HAL/SAMD51/HAL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ class MarlinHAL {
static void adc_init();

// Called by Temperature::init for each sensor at startup
static void adc_enable(const uint8_t ch);
static inline void adc_enable(const uint8_t ch) {}

// Begin ADC sampling on the given channel
static void adc_start(const pin_t pin);
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/STM32/HAL_SPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ static SPISettings spiConfig;
uint8_t spiRec() {
hal.isr_off(); // No interrupts during byte receive
const uint8_t data = HAL_SPI_STM32_SpiTransfer_Mode_3(0xFF);
hal.isr_off(); // Enable interrupts
hal.isr_on(); // Enable interrupts
return data;
}

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/STM32F1/HAL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ class MarlinHAL {
static void adc_init();

// Called by Temperature::init for each sensor at startup
static void adc_enable(const pin_t pin);
static inline void adc_enable(const pin_t pin) { pinMode(pin, INPUT_ANALOG); }

// Begin ADC sampling on the given channel
static void adc_start(const pin_t pin);
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/TEENSY31_32/HAL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class MarlinHAL {
static void adc_init();

// Called by Temperature::init for each sensor at startup
static void adc_enable(const pin_t ch);
static inline void adc_enable(const pin_t ch) {}

// Begin ADC sampling on the given channel
static void adc_start(const pin_t ch);
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/TEENSY40_41/HAL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ class MarlinHAL {
static void adc_init();

// Called by Temperature::init for each sensor at startup
static void adc_enable(const pin_t pin);
static inline void adc_enable(const pin_t pin) {}

// Begin ADC sampling on the given channel
static void adc_start(const pin_t pin);
Expand Down