Clean up u8g defines

Marlin/src/lcd/dogm/HAL_LCD_com_defines.h

@@ -27,91 +27,95 @@
 
 #ifndef U8G_HAL_LINKS
 
-  // generic prototypes
-  uint8_t u8g_com_arduino_std_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
-  uint8_t u8g_com_arduino_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
-  uint8_t u8g_com_arduino_st7920_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
-  uint8_t u8g_com_arduino_st7920_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
-
   #ifdef __SAM3X8E__
+
     uint8_t u8g_com_HAL_DUE_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
-    #define U8G_COM_HAL_SW_SPI_FN       u8g_com_HAL_DUE_sw_spi_fn
     uint8_t u8g_com_HAL_DUE_shared_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
-    #define U8G_COM_HAL_HW_SPI_FN       u8g_com_HAL_DUE_shared_hw_spi_fn
     uint8_t u8g_com_HAL_DUE_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
-    #define U8G_COM_ST7920_HAL_SW_SPI   u8g_com_HAL_DUE_ST7920_sw_spi_fn
+    #define U8G_COM_HAL_SW_SPI_FN     u8g_com_HAL_DUE_sw_spi_fn
-    #define U8G_COM_ST7920_HAL_HW_SPI   u8g_com_arduino_st7920_hw_spi_fn
+    #define U8G_COM_HAL_HW_SPI_FN     u8g_com_HAL_DUE_shared_hw_spi_fn
+    #define U8G_COM_ST7920_HAL_SW_SPI u8g_com_HAL_DUE_ST7920_sw_spi_fn
+
+  #elif defined(__SAMD51__)
+
+    #define U8G_COM_HAL_HW_SPI_FN     u8g_com_samd51_hw_spi_fn
+    #define U8G_COM_ST7920_HAL_HW_SPI u8g_com_samd51_st7920_hw_spi_fn
+
   #elif defined(__STM32F1__)
+
     uint8_t u8g_com_HAL_STM32F1_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
-    #define U8G_COM_HAL_SW_SPI_FN       u8g_com_HAL_STM32F1_sw_spi_fn
     uint8_t u8g_com_stm32duino_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
-    #define U8G_COM_HAL_HW_SPI_FN       u8g_com_stm32duino_hw_spi_fn
+    #define U8G_COM_HAL_SW_SPI_FN     u8g_com_HAL_STM32F1_sw_spi_fn
-    #define U8G_COM_ST7920_HAL_SW_SPI   u8g_com_std_sw_spi_fn
+    #define U8G_COM_HAL_HW_SPI_FN     u8g_com_stm32duino_hw_spi_fn
-    #define U8G_COM_ST7920_HAL_HW_SPI   u8g_com_stm32duino_hw_spi_fn
+    #define U8G_COM_ST7920_HAL_SW_SPI u8g_com_std_sw_spi_fn
+    #define U8G_COM_ST7920_HAL_HW_SPI u8g_com_stm32duino_hw_spi_fn
+
   #elif defined(ARDUINO_ARCH_STM32)
-    #define U8G_COM_HAL_SW_SPI_FN       u8g_com_arduino_std_sw_spi_fn
+
     uint8_t u8g_com_stm32duino_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
-    #define U8G_COM_HAL_HW_SPI_FN       u8g_com_stm32duino_hw_spi_fn
+    #define U8G_COM_HAL_HW_SPI_FN     u8g_com_stm32duino_hw_spi_fn
-    #define U8G_COM_ST7920_HAL_SW_SPI   u8g_com_arduino_st7920_spi_fn
+
-    #define U8G_COM_ST7920_HAL_HW_SPI   u8g_com_arduino_st7920_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);
-    #define U8G_COM_HAL_SW_SPI_FN       u8g_com_HAL_AVR_sw_sp_fn
+    #define U8G_COM_HAL_SW_SPI_FN     u8g_com_HAL_AVR_sw_sp_fn
-    #define U8G_COM_HAL_HW_SPI_FN       u8g_com_arduino_hw_spi_fn
+
-    #define U8G_COM_ST7920_HAL_SW_SPI   u8g_com_arduino_st7920_spi_fn
+  #endif
-    #define U8G_COM_ST7920_HAL_HW_SPI   u8g_com_arduino_st7920_hw_spi_fn
+
-  #elif defined(__SAMD51__)
+  #ifndef U8G_COM_HAL_SW_SPI_FN
-    #define U8G_COM_HAL_SW_SPI_FN       u8g_com_arduino_std_sw_spi_fn
+    #define U8G_COM_HAL_SW_SPI_FN     u8g_com_arduino_std_sw_spi_fn
-    #define U8G_COM_HAL_HW_SPI_FN       u8g_com_samd51_hw_spi_fn
+  #endif
-    #define U8G_COM_ST7920_HAL_SW_SPI   u8g_com_arduino_st7920_spi_fn
+  #ifndef U8G_COM_HAL_HW_SPI_FN
-    #define U8G_COM_ST7920_HAL_HW_SPI   u8g_com_samd51_st7920_hw_spi_fn
+    #define U8G_COM_HAL_HW_SPI_FN     u8g_com_arduino_hw_spi_fn
-  #else
+  #endif
-    #define U8G_COM_HAL_SW_SPI_FN       u8g_com_arduino_std_sw_spi_fn
+  #ifndef U8G_COM_ST7920_HAL_SW_SPI
-    #define U8G_COM_HAL_HW_SPI_FN       u8g_com_arduino_hw_spi_fn
+    #define U8G_COM_ST7920_HAL_SW_SPI u8g_com_arduino_st7920_spi_fn
-    #define U8G_COM_ST7920_HAL_SW_SPI   u8g_com_arduino_st7920_spi_fn
+  #endif
-    #define U8G_COM_ST7920_HAL_HW_SPI   u8g_com_arduino_st7920_hw_spi_fn
+  #ifndef U8G_COM_ST7920_HAL_HW_SPI
+    #define U8G_COM_ST7920_HAL_HW_SPI u8g_com_arduino_st7920_hw_spi_fn
   #endif
 
   #ifdef TARGET_LPC1768
     uint8_t u8g_com_HAL_LPC1768_ssd_hw_i2c_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
   #endif
 
-  #define U8G_COM_SSD_I2C_HAL     u8g_com_arduino_ssd_i2c_fn
+  #define U8G_COM_SSD_I2C_HAL         u8g_com_arduino_ssd_i2c_fn
 
   #if PIN_EXISTS(FSMC_CS)
     uint8_t u8g_com_stm32duino_fsmc_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
-    #define U8G_COM_HAL_FSMC_FN   u8g_com_stm32duino_fsmc_fn
+    #define U8G_COM_HAL_FSMC_FN       u8g_com_stm32duino_fsmc_fn
-  #else
-    #define U8G_COM_HAL_FSMC_FN   u8g_com_null_fn
   #endif
 
 #elif defined(TARGET_LPC1768)
 
   uint8_t u8g_com_HAL_LPC1768_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
-  #define U8G_COM_HAL_SW_SPI_FN       u8g_com_HAL_LPC1768_sw_spi_fn
-
   uint8_t u8g_com_HAL_LPC1768_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
-  #define U8G_COM_HAL_HW_SPI_FN       u8g_com_HAL_LPC1768_hw_spi_fn
-
   uint8_t u8g_com_HAL_LPC1768_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
-  #define U8G_COM_ST7920_HAL_SW_SPI   u8g_com_HAL_LPC1768_ST7920_sw_spi_fn
-
   uint8_t u8g_com_HAL_LPC1768_ST7920_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
-  #define U8G_COM_ST7920_HAL_HW_SPI   u8g_com_HAL_LPC1768_ST7920_hw_spi_fn
-
   uint8_t u8g_com_HAL_LPC1768_ssd_hw_i2c_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
+  #define U8G_COM_HAL_SW_SPI_FN       u8g_com_HAL_LPC1768_sw_spi_fn
+  #define U8G_COM_HAL_HW_SPI_FN       u8g_com_HAL_LPC1768_hw_spi_fn
+  #define U8G_COM_ST7920_HAL_SW_SPI   u8g_com_HAL_LPC1768_ST7920_sw_spi_fn
+  #define U8G_COM_ST7920_HAL_HW_SPI   u8g_com_HAL_LPC1768_ST7920_hw_spi_fn
   #define U8G_COM_SSD_I2C_HAL         u8g_com_HAL_LPC1768_ssd_hw_i2c_fn
 
-  #define U8G_COM_HAL_FSMC_FN         u8g_com_null_fn
+#endif
-
-#else  // need to give them some definition or else get compiler errors
-
-  uint8_t u8g_com_null_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
-  #define U8G_COM_HAL_SW_SPI_FN       u8g_com_null_fn
-  #define U8G_COM_HAL_HW_SPI_FN       u8g_com_null_fn
-  #define U8G_COM_ST7920_HAL_SW_SPI   u8g_com_null_fn
-  #define U8G_COM_ST7920_HAL_HW_SPI   u8g_com_null_fn
-  #define U8G_COM_SSD_I2C_HAL         u8g_com_null_fn
-  #define U8G_COM_HAL_FSMC_FN         u8g_com_null_fn
 
+#ifndef U8G_COM_HAL_SW_SPI_FN
+  #define U8G_COM_HAL_SW_SPI_FN     u8g_com_null_fn
+#endif
+#ifndef U8G_COM_HAL_HW_SPI_FN
+  #define U8G_COM_HAL_HW_SPI_FN     u8g_com_null_fn
+#endif
+#ifndef U8G_COM_ST7920_HAL_SW_SPI
+  #define U8G_COM_ST7920_HAL_SW_SPI u8g_com_null_fn
+#endif
+#ifndef U8G_COM_ST7920_HAL_HW_SPI
+  #define U8G_COM_ST7920_HAL_HW_SPI u8g_com_null_fn
+#endif
+#ifndef U8G_COM_SSD_I2C_HAL
+  #define U8G_COM_SSD_I2C_HAL       u8g_com_null_fn
+#endif
+#ifndef U8G_COM_HAL_FSMC_FN
+  #define U8G_COM_HAL_FSMC_FN       u8g_com_null_fn
 #endif