merge followup

MarlinFirmware · Dec 27, 2023 · f60c86a · f60c86a
1 parent 3cbaa5a
commit f60c86a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 0 deletions.
diff --git a/...in/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp → ...rc/HAL/AVR/u8g/u8g_com_HAL_AVR_sw_spi.cpp b/...in/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp → ...rc/HAL/AVR/u8g/u8g_com_HAL_AVR_sw_spi.cpp
diff --git a/Marlin/src/HAL/STM32/u8g/LCD_defines.h b/Marlin/src/HAL/STM32/u8g/LCD_defines.h
@@ -27,6 +27,8 @@
 
 uint8_t u8g_com_std_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);         // See U8glib-HAL
 uint8_t u8g_com_stm32duino_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);  // See U8glib-HAL
+uint8_t u8g_com_stm32duino_ssd_i2c_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
 
 #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
+#define U8G_COM_SSD_I2C_HAL   u8g_com_stm32duino_ssd_i2c_fn
diff --git a/.../HAL/STM32/u8g_com_stm32duino_ssd_i2c.cpp → .../STM32/u8g/u8g_com_stm32duino_ssd_i2c.cpp b/.../HAL/STM32/u8g_com_stm32duino_ssd_i2c.cpp → .../STM32/u8g/u8g_com_stm32duino_ssd_i2c.cpp
diff --git a/...STM32F1/dogm/u8g_com_stm32duino_swspi.cpp → .../STM32F1/u8g/u8g_com_stm32duino_swspi.cpp b/...STM32F1/dogm/u8g_com_stm32duino_swspi.cpp → .../STM32F1/u8g/u8g_com_stm32duino_swspi.cpp