Browse Source

Easier override of ST7920 LCD timing

Scott Lahteine 7 years ago
parent
commit
6689884910

+ 9
- 3
Marlin/src/pins/pins_ANET_10.h View File

176
     #define BTN_EN1          11
176
     #define BTN_EN1          11
177
     #define BTN_EN2          10
177
     #define BTN_EN2          10
178
     #define BTN_ENC          16
178
     #define BTN_ENC          16
179
-    #define ST7920_DELAY_1 DELAY_0_NOP
180
-    #define ST7920_DELAY_2 DELAY_1_NOP
181
-    #define ST7920_DELAY_3 DELAY_2_NOP
179
+    #ifndef ST7920_DELAY_1
180
+      #define ST7920_DELAY_1 DELAY_0_NOP
181
+    #endif
182
+    #ifndef ST7920_DELAY_2
183
+      #define ST7920_DELAY_2 DELAY_1_NOP
184
+    #endif
185
+    #ifndef ST7920_DELAY_3
186
+      #define ST7920_DELAY_3 DELAY_2_NOP
187
+    #endif
182
     #define STD_ENCODER_PULSES_PER_STEP 4
188
     #define STD_ENCODER_PULSES_PER_STEP 4
183
     #define STD_ENCODER_STEPS_PER_MENU_ITEM 1
189
     #define STD_ENCODER_STEPS_PER_MENU_ITEM 1
184
   #endif
190
   #endif

+ 9
- 3
Marlin/src/pins/pins_MELZI_CREALITY.h View File

54
 #define FIL_RUNOUT_PIN     -1 // Uses Beeper/LED Pin Pulled to GND
54
 #define FIL_RUNOUT_PIN     -1 // Uses Beeper/LED Pin Pulled to GND
55
 
55
 
56
 // Alter timing for graphical display
56
 // Alter timing for graphical display
57
-#define ST7920_DELAY_1 DELAY_2_NOP
58
-#define ST7920_DELAY_2 DELAY_2_NOP
59
-#define ST7920_DELAY_3 DELAY_2_NOP
57
+#ifndef ST7920_DELAY_1
58
+  #define ST7920_DELAY_1 DELAY_2_NOP
59
+#endif
60
+#ifndef ST7920_DELAY_2
61
+  #define ST7920_DELAY_2 DELAY_2_NOP
62
+#endif
63
+#ifndef ST7920_DELAY_3
64
+  #define ST7920_DELAY_3 DELAY_2_NOP
65
+#endif
60
 
66
 
61
 #if ENABLED(MINIPANEL)
67
 #if ENABLED(MINIPANEL)
62
   #undef DOGLCD_CS
68
   #undef DOGLCD_CS

+ 9
- 3
Marlin/src/pins/pins_MELZI_MALYAN.h View File

43
 #define BTN_ENC         28
43
 #define BTN_ENC         28
44
 
44
 
45
 // Alter timing for graphical display
45
 // Alter timing for graphical display
46
-#define ST7920_DELAY_1 DELAY_2_NOP
47
-#define ST7920_DELAY_2 DELAY_2_NOP
48
-#define ST7920_DELAY_3 DELAY_2_NOP
46
+#ifndef ST7920_DELAY_1
47
+  #define ST7920_DELAY_1 DELAY_2_NOP
48
+#endif
49
+#ifndef ST7920_DELAY_2
50
+  #define ST7920_DELAY_2 DELAY_2_NOP
51
+#endif
52
+#ifndef ST7920_DELAY_3
53
+  #define ST7920_DELAY_3 DELAY_2_NOP
54
+#endif

+ 9
- 3
Marlin/src/pins/pins_MELZI_TRONXY.h View File

50
 #define BTN_EN2         11
50
 #define BTN_EN2         11
51
 #define BTN_ENC         26
51
 #define BTN_ENC         26
52
 
52
 
53
-#define ST7920_DELAY_1 DELAY_0_NOP
54
-#define ST7920_DELAY_2 DELAY_2_NOP
55
-#define ST7920_DELAY_3 DELAY_0_NOP
53
+#ifndef ST7920_DELAY_1
54
+  #define ST7920_DELAY_1 DELAY_0_NOP
55
+#endif
56
+#ifndef ST7920_DELAY_2
57
+  #define ST7920_DELAY_2 DELAY_2_NOP
58
+#endif
59
+#ifndef ST7920_DELAY_3
60
+  #define ST7920_DELAY_3 DELAY_0_NOP
61
+#endif

+ 9
- 3
Marlin/src/pins/pins_PRINTRBOARD_REVF.h View File

243
     //#define MISO         23  //        13               B3                ICSP-06             EXP2-05
243
     //#define MISO         23  //        13               B3                ICSP-06             EXP2-05
244
 
244
 
245
     // increase delays
245
     // increase delays
246
-    #define ST7920_DELAY_1 DELAY_5_NOP
247
-    #define ST7920_DELAY_2 DELAY_5_NOP
248
-    #define ST7920_DELAY_3 DELAY_5_NOP
246
+    #ifndef ST7920_DELAY_1
247
+      #define ST7920_DELAY_1 DELAY_5_NOP
248
+    #endif
249
+    #ifndef ST7920_DELAY_2
250
+      #define ST7920_DELAY_2 DELAY_5_NOP
251
+    #endif
252
+    #ifndef ST7920_DELAY_3
253
+      #define ST7920_DELAY_3 DELAY_5_NOP
254
+    #endif
249
 
255
 
250
   #else
256
   #else
251
 
257
 

Loading…
Cancel
Save