Skip to content

Commit

Permalink
🐛 ESP32 _delay_ms, fix u8g_esp32_spi.cpp (MarlinFirmware#23810)
Browse files Browse the repository at this point in the history
  • Loading branch information
ellensp authored and Omkar Dhekne committed Mar 25, 2024
1 parent b63ba97 commit 29c42cb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Marlin/src/HAL/ESP32/HAL.cpp
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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

0 comments on commit 29c42cb

Please sign in to comment.