Bladeren bron

Anet 1.0 alternative graphical LCD wiring (#20022)

Darren Horrocks 4 jaren geleden
bovenliggende
commit
10fd9ed896
No account linked to committer's email address

+ 2
- 1
Marlin/Configuration.h Bestand weergeven

2095
 //
2095
 //
2096
 // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
2096
 // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
2097
 // A clone of the RepRapDiscount full graphics display but with
2097
 // A clone of the RepRapDiscount full graphics display but with
2098
-// different pins/wiring (see pins_ANET_10.h).
2098
+// different pins/wiring (see pins_ANET_10.h). Enable one of these.
2099
 //
2099
 //
2100
 //#define ANET_FULL_GRAPHICS_LCD
2100
 //#define ANET_FULL_GRAPHICS_LCD
2101
+//#define ANET_FULL_GRAPHICS_LCD_ALT_WIRING
2101
 
2102
 
2102
 //
2103
 //
2103
 // AZSMZ 12864 LCD with SD
2104
 // AZSMZ 12864 LCD with SD

+ 1
- 1
Marlin/src/inc/Conditionals_LCD.h Bestand weergeven

235
   #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
235
   #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
236
   #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
236
   #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
237
 
237
 
238
-#elif ANY(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, ANET_FULL_GRAPHICS_LCD, BQ_LCD_SMART_CONTROLLER)
238
+#elif ANY(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING, BQ_LCD_SMART_CONTROLLER)
239
 
239
 
240
   #define IS_RRD_FG_SC 1
240
   #define IS_RRD_FG_SC 1
241
 
241
 

+ 1
- 1
Marlin/src/inc/SanityCheck.h Bestand weergeven

2220
   + COUNT_ENABLED(TFTGLCD_PANEL_SPI, TFTGLCD_PANEL_I2C) \
2220
   + COUNT_ENABLED(TFTGLCD_PANEL_SPI, TFTGLCD_PANEL_I2C) \
2221
   + COUNT_ENABLED(VIKI2, miniVIKI) \
2221
   + COUNT_ENABLED(VIKI2, miniVIKI) \
2222
   + COUNT_ENABLED(ZONESTAR_12864LCD, ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306) \
2222
   + COUNT_ENABLED(ZONESTAR_12864LCD, ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306) \
2223
-  + ENABLED(ANET_FULL_GRAPHICS_LCD) \
2223
+  + COUNT_ENABLED(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING) \
2224
   + ENABLED(AZSMZ_12864) \
2224
   + ENABLED(AZSMZ_12864) \
2225
   + ENABLED(BQ_LCD_SMART_CONTROLLER) \
2225
   + ENABLED(BQ_LCD_SMART_CONTROLLER) \
2226
   + ENABLED(CARTESIO_UI) \
2226
   + ENABLED(CARTESIO_UI) \

+ 3
- 2
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h Bestand weergeven

215
 #define EXPA2_10_PIN                       P0_17
215
 #define EXPA2_10_PIN                       P0_17
216
 
216
 
217
 #if HAS_WIRED_LCD
217
 #if HAS_WIRED_LCD
218
+  #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
219
+    #error "ANET_FULL_GRAPHICS_LCD_ALT_WIRING only applies to the ANET 1.0 board."
218
 
220
 
219
-  #if ENABLED(ANET_FULL_GRAPHICS_LCD)
220
-
221
+  #elif ENABLED(ANET_FULL_GRAPHICS_LCD)
221
     #error "CAUTION! ANET_FULL_GRAPHICS_LCD requires wiring modifications. See 'pins_BTT_SKR_V1_3.h' for details. Comment out this line to continue."
222
     #error "CAUTION! ANET_FULL_GRAPHICS_LCD requires wiring modifications. See 'pins_BTT_SKR_V1_3.h' for details. Comment out this line to continue."
222
 
223
 
223
    /**
224
    /**

+ 4
- 1
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h Bestand weergeven

233
  *               EXP2                                              EXP1
233
  *               EXP2                                              EXP1
234
  */
234
  */
235
 #if HAS_WIRED_LCD
235
 #if HAS_WIRED_LCD
236
-  #if ENABLED(ANET_FULL_GRAPHICS_LCD)
236
+  #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
237
+    #error "ANET_FULL_GRAPHICS_LCD_ALT_WIRING only applies to the ANET 1.0 board."
238
+
239
+  #elif ENABLED(ANET_FULL_GRAPHICS_LCD)
237
     #error "CAUTION! ANET_FULL_GRAPHICS_LCD requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. Comment out this line to continue."
240
     #error "CAUTION! ANET_FULL_GRAPHICS_LCD requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. Comment out this line to continue."
238
 
241
 
239
    /**
242
    /**

+ 40
- 14
Marlin/src/pins/sanguino/pins_ANET_10.h Bestand weergeven

145
  *
145
  *
146
  * Only the following displays are supported:
146
  * Only the following displays are supported:
147
  *  ZONESTAR_LCD
147
  *  ZONESTAR_LCD
148
- *  ANET_FULL_GRAPHICS_LCD
148
+ *  ANET_FULL_GRAPHICS_LCD(_ALT_WIRING)?
149
  *  REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
149
  *  REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
150
  */
150
  */
151
 
151
 
152
 #if HAS_WIRED_LCD
152
 #if HAS_WIRED_LCD
153
+
153
   #define LCD_SDSS                            28
154
   #define LCD_SDSS                            28
155
+
154
   #if HAS_ADC_BUTTONS
156
   #if HAS_ADC_BUTTONS
157
+
155
     #define SERVO0_PIN                        27  // free for BLTouch/3D-Touch
158
     #define SERVO0_PIN                        27  // free for BLTouch/3D-Touch
156
     #define LCD_PINS_RS                       28
159
     #define LCD_PINS_RS                       28
157
     #define LCD_PINS_ENABLE                   29
160
     #define LCD_PINS_ENABLE                   29
160
     #define LCD_PINS_D6                       16
163
     #define LCD_PINS_D6                       16
161
     #define LCD_PINS_D7                       17
164
     #define LCD_PINS_D7                       17
162
     #define ADC_KEYPAD_PIN                     1
165
     #define ADC_KEYPAD_PIN                     1
166
+
163
   #elif IS_RRD_FG_SC
167
   #elif IS_RRD_FG_SC
168
+
164
     // Pin definitions for the Anet A6 Full Graphics display and the RepRapDiscount Full Graphics
169
     // Pin definitions for the Anet A6 Full Graphics display and the RepRapDiscount Full Graphics
165
     // display using an adapter board  // https://go.aisler.net/benlye/anet-lcd-adapter/pcb
170
     // display using an adapter board  // https://go.aisler.net/benlye/anet-lcd-adapter/pcb
166
     // See below for alternative pin definitions for use with https://www.thingiverse.com/thing:2103748
171
     // See below for alternative pin definitions for use with https://www.thingiverse.com/thing:2103748
167
-    #define SERVO0_PIN                        29  // free for BLTouch/3D-Touch
168
-    #define BEEPER_PIN                        17
169
-    #define LCD_PINS_RS                       27
170
-    #define LCD_PINS_ENABLE                   28
171
-    #define LCD_PINS_D4                       30
172
-    #define BTN_EN1                           11
173
-    #define BTN_EN2                           10
174
-    #define BTN_ENC                           16
175
-    #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
176
-    #define BOARD_ST7920_DELAY_2 DELAY_NS(63)
177
-    #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
178
-    #define STD_ENCODER_PULSES_PER_STEP        4
179
-    #define STD_ENCODER_STEPS_PER_MENU_ITEM    1
172
+
173
+    #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
174
+      #define SERVO0_PIN                      30
175
+      #define BEEPER_PIN                      27
176
+      #define LCD_PINS_RS                     29
177
+      #define LCD_PINS_ENABLE                 16
178
+      #define LCD_PINS_D4                     11
179
+      #define BTN_EN1                         28
180
+      #define BTN_EN2                         10
181
+      #define BTN_ENC                         17
182
+      #define BOARD_ST7920_DELAY_1 DELAY_NS(250)
183
+      #define BOARD_ST7920_DELAY_2 DELAY_NS(250)
184
+      #define BOARD_ST7920_DELAY_3 DELAY_NS(250)
185
+    #else
186
+      #define SERVO0_PIN                      29  // free for BLTouch/3D-Touch
187
+      #define BEEPER_PIN                      17
188
+      #define LCD_PINS_RS                     27
189
+      #define LCD_PINS_ENABLE                 28
190
+      #define LCD_PINS_D4                     30
191
+      #define BTN_EN1                         11
192
+      #define BTN_EN2                         10
193
+      #define BTN_ENC                         16
194
+      #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
195
+      #define BOARD_ST7920_DELAY_2 DELAY_NS(63)
196
+      #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
197
+    #endif
198
+
180
   #endif
199
   #endif
200
+
181
 #else
201
 #else
202
+
182
   #define SERVO0_PIN                          27
203
   #define SERVO0_PIN                          27
204
+
205
+#endif
206
+
207
+#ifndef FIL_RUNOUT_PIN
208
+  #define FIL_RUNOUT_PIN              SERVO0_PIN
183
 #endif
209
 #endif
184
 
210
 
185
 /**
211
 /**

Laden…
Annuleren
Opslaan