From 82ae3646cb709537574869e469c242b406087827 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 6 Feb 2022 05:52:18 +1300
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20missing=20u8g=5Fesp32=5Fsp?=
=?UTF-8?q?i=20(#23562)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp | 99 +++++++++++++++++++++++
Marlin/src/lcd/dogm/HAL_LCD_com_defines.h | 5 ++
2 files changed, 104 insertions(+)
create mode 100644 Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
diff --git a/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp b/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
new file mode 100644
index 0000000000..e454130d43
--- /dev/null
+++ b/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
@@ -0,0 +1,99 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * Copypaste of SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+#ifdef ARDUINO_ARCH_ESP32
+
+#include "../../inc/MarlinConfigPre.h"
+
+#if ENABLED(FYSETC_MINI_12864_2_1)
+
+#include
+#include "Arduino.h"
+#include "../shared/HAL_SPI.h"
+#include "SPI.h"
+
+static SPISettings spiConfig;
+
+#define MDOGLCD_MOSI 23
+#define MDOGLCD_SCK 18
+#define MLCD_RESET_PIN 0
+#define MLCD_PINS_DC 4
+#define MDOGLCD_CS 21
+#define MDOGLCD_A0 4
+
+#ifndef LCD_SPI_SPEED
+ #ifdef SD_SPI_SPEED
+ #define LCD_SPI_SPEED SD_SPI_SPEED // Assume SPI speed shared with SD
+ #else
+ #define LCD_SPI_SPEED SPI_FULL_SPEED // Use full speed if SD speed is not supplied
+ #endif
+#endif
+
+uint8_t u8g_eps_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {
+ static uint8_t msgInitCount = 2; // Ignore all messages until 2nd U8G_COM_MSG_INIT
+ if (msgInitCount) {
+ if (msg == U8G_COM_MSG_INIT) msgInitCount--;
+ if (msgInitCount) return -1;
+ }
+
+ switch (msg) {
+ case U8G_COM_MSG_STOP: break;
+
+ case U8G_COM_MSG_INIT:
+ OUT_WRITE(MDOGLCD_CS, HIGH);
+ OUT_WRITE(MDOGLCD_A0, HIGH);
+ OUT_WRITE(MLCD_RESET_PIN, HIGH);
+ u8g_Delay(5);
+ spiBegin();
+ spiInit(LCD_SPI_SPEED);
+ break;
+
+ case U8G_COM_MSG_ADDRESS: /* define cmd (arg_val = 0) or data mode (arg_val = 1) */
+ WRITE(MDOGLCD_A0, arg_val ? HIGH : LOW);
+ break;
+
+ case U8G_COM_MSG_CHIP_SELECT: /* arg_val == 0 means HIGH level of U8G_PI_CS */
+ WRITE(MDOGLCD_CS, arg_val ? LOW : HIGH);
+ break;
+
+ case U8G_COM_MSG_RESET:
+ WRITE(MLCD_RESET_PIN, arg_val);
+ break;
+
+ case U8G_COM_MSG_WRITE_BYTE:
+ spiSend((uint8_t)arg_val);
+ break;
+
+ case U8G_COM_MSG_WRITE_SEQ:
+ uint8_t *ptr = (uint8_t*) arg_ptr;
+ while (arg_val > 0) {
+ spiSend(*ptr++);
+ arg_val--;
+ }
+ break;
+ }
+ return 1;
+}
+
+#endif // FYSETC_MINI_12864_2_1
+#endif // ARDUINO_ARCH_ESP32
diff --git a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
index a30dd4ca17..e5c6524a9e 100644
--- a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
+++ b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
@@ -57,6 +57,11 @@
#define U8G_COM_HAL_SW_SPI_FN u8g_com_std_sw_spi_fn
#define U8G_COM_HAL_HW_SPI_FN u8g_com_stm32duino_hw_spi_fn
+ #elif defined(ESP32)
+
+ uint8_t u8g_eps_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
+ #define U8G_COM_HAL_HW_SPI_FN u8g_eps_hw_spi_fn
+
#elif defined(__AVR__)
uint8_t u8g_com_HAL_AVR_sw_sp_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);