From c3d2ffc09c8a15398894bb2050397b9653878923 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 23 Jun 2020 20:37:19 -0500
Subject: [PATCH] Board-based ST7920 delays
---
Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h | 12 ++++++------
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h | 12 ++++++------
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h | 12 ++++++------
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h | 12 ++++++------
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h | 12 ++++++------
Marlin/src/pins/stm32f4/pins_FLYF407ZG.h | 12 ++++++------
Marlin/src/pins/stm32f4/pins_FYSETC_S6.h | 12 ++++++------
Marlin/src/pins/stm32f4/pins_VAKE403D.h | 12 ++++++------
8 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
index aa61c172c7..242368a672 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
@@ -169,14 +169,14 @@
#endif
#if HAS_GRAPHICAL_LCD
- #ifndef ST7920_DELAY_1
- #define ST7920_DELAY_1 DELAY_NS(96)
+ #ifndef BOARD_ST7920_DELAY_1
+ #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif
- #ifndef ST7920_DELAY_2
- #define ST7920_DELAY_2 DELAY_NS(48)
+ #ifndef BOARD_ST7920_DELAY_2
+ #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
#endif
- #ifndef ST7920_DELAY_3
- #define ST7920_DELAY_3 DELAY_NS(715)
+ #ifndef BOARD_ST7920_DELAY_3
+ #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
#endif
#endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index b575b2483f..6d09b09aab 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -177,12 +177,12 @@
#define MOSI_PIN PB15
#define SS_PIN PA15
-#ifndef ST7920_DELAY_1
- #define ST7920_DELAY_1 DELAY_NS(125)
+#ifndef BOARD_ST7920_DELAY_1
+ #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#endif
-#ifndef ST7920_DELAY_2
- #define ST7920_DELAY_2 DELAY_NS(125)
+#ifndef BOARD_ST7920_DELAY_2
+ #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
#endif
-#ifndef ST7920_DELAY_3
- #define ST7920_DELAY_3 DELAY_NS(125)
+#ifndef BOARD_ST7920_DELAY_3
+ #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
index 5f94a15099..ab52cd6d1e 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
@@ -140,12 +140,12 @@
#define MOSI_PIN PB15
#define SS_PIN PA15
-#ifndef ST7920_DELAY_1
- #define ST7920_DELAY_1 DELAY_NS(125)
+#ifndef BOARD_ST7920_DELAY_1
+ #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#endif
-#ifndef ST7920_DELAY_2
- #define ST7920_DELAY_2 DELAY_NS(125)
+#ifndef BOARD_ST7920_DELAY_2
+ #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
#endif
-#ifndef ST7920_DELAY_3
- #define ST7920_DELAY_3 DELAY_NS(125)
+#ifndef BOARD_ST7920_DELAY_3
+ #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
index 2b10f086e9..9812224593 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -193,14 +193,14 @@
#define LCD_PINS_D7 PD10
#endif
- #ifndef ST7920_DELAY_1
- #define ST7920_DELAY_1 DELAY_NS(125)
+ #ifndef BOARD_ST7920_DELAY_1
+ #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#endif
- #ifndef ST7920_DELAY_2
- #define ST7920_DELAY_2 DELAY_NS(125)
+ #ifndef BOARD_ST7920_DELAY_2
+ #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
#endif
- #ifndef ST7920_DELAY_3
- #define ST7920_DELAY_3 DELAY_NS(125)
+ #ifndef BOARD_ST7920_DELAY_3
+ #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#endif
#endif // !MKS_MINI_12864
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index b42856721d..fee9f0baa9 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -263,12 +263,12 @@
#endif // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
#endif
-#ifndef ST7920_DELAY_1
- #define ST7920_DELAY_1 DELAY_NS(125)
+#ifndef BOARD_ST7920_DELAY_1
+ #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#endif
-#ifndef ST7920_DELAY_2
- #define ST7920_DELAY_2 DELAY_NS(125)
+#ifndef BOARD_ST7920_DELAY_2
+ #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
#endif
-#ifndef ST7920_DELAY_3
- #define ST7920_DELAY_3 DELAY_NS(125)
+#ifndef BOARD_ST7920_DELAY_3
+ #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#endif
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
index 2c8f0a95bc..984cd13d86 100644
--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -257,12 +257,12 @@
//
// ST7920 Delays
//
-#ifndef ST7920_DELAY_1
- #define ST7920_DELAY_1 DELAY_NS(96)
+#ifndef BOARD_ST7920_DELAY_1
+ #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif
-#ifndef ST7920_DELAY_2
- #define ST7920_DELAY_2 DELAY_NS(48)
+#ifndef BOARD_ST7920_DELAY_2
+ #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
#endif
-#ifndef ST7920_DELAY_3
- #define ST7920_DELAY_3 DELAY_NS(715)
+#ifndef BOARD_ST7920_DELAY_3
+ #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
#endif
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 2d931f3783..701bf2d7ad 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -241,14 +241,14 @@
// Alter timing for graphical display
#if HAS_GRAPHICAL_LCD
- #ifndef ST7920_DELAY_1
- #define ST7920_DELAY_1 DELAY_NS(96)
+ #ifndef BOARD_ST7920_DELAY_1
+ #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif
- #ifndef ST7920_DELAY_2
- #define ST7920_DELAY_2 DELAY_NS(48)
+ #ifndef BOARD_ST7920_DELAY_2
+ #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
#endif
- #ifndef ST7920_DELAY_3
- #define ST7920_DELAY_3 DELAY_NS(600)
+ #ifndef BOARD_ST7920_DELAY_3
+ #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
#endif
#endif
diff --git a/Marlin/src/pins/stm32f4/pins_VAKE403D.h b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
index ccfc76146c..3a884f3544 100644
--- a/Marlin/src/pins/stm32f4/pins_VAKE403D.h
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@@ -184,12 +184,12 @@
//
// ST7920 Delays
//
-#ifndef ST7920_DELAY_1
- #define ST7920_DELAY_1 DELAY_NS(96)
+#ifndef BOARD_ST7920_DELAY_1
+ #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif
-#ifndef ST7920_DELAY_2
- #define ST7920_DELAY_2 DELAY_NS(48)
+#ifndef BOARD_ST7920_DELAY_2
+ #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
#endif
-#ifndef ST7920_DELAY_3
- #define ST7920_DELAY_3 DELAY_NS(715)
+#ifndef BOARD_ST7920_DELAY_3
+ #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
#endif
--
GitLab