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

add _delay_ms to esp32 HAL, fix u8g_esp32_spi.cpp #23810

Merged
merged 1 commit into from Feb 26, 2022
Merged

add _delay_ms to esp32 HAL, fix u8g_esp32_spi.cpp #23810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Marlin/src/HAL/ESP32/HAL.cpp
View file
Open in desktop
Expand Up @@ -167,6 +167,8 @@ uint8_t MarlinHAL::get_reset_source() { return rtc_get_reset_reason(1); }

void MarlinHAL::reboot() { ESP.restart(); }

void _delay_ms(int delay_ms) { delay(delay_ms); }

// return free memory between end of heap (or end bss) and whatever is current
int MarlinHAL::freeMemory() { return ESP.getFreeHeap(); }

Expand Down
1 change: 1 addition & 0 deletions Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@
#include <U8glib-HAL.h>
#include "Arduino.h"
#include "../shared/HAL_SPI.h"
#include "HAL.h"
#include "SPI.h"

static SPISettings spiConfig;
Expand Down