Browse Source

Fixing a build error for melzi and gfx display

When a melzi board and a full gfx are both selected, the build fails
blaming for some missing defines.

This is a fix for the issue: now my configuration works.
roglio 9 years ago
parent
commit
ccdbeda526
1 changed files with 14 additions and 7 deletions
  1. 14
    7
      Marlin/pins.h

+ 14
- 7
Marlin/pins.h View File

@@ -1279,15 +1279,21 @@
1279 1279
      #define BEEPER -1
1280 1280
      //LCD Pins
1281 1281
      #ifdef DOGLCD
1282
-       // Pins for DOGM SPI LCD Support
1283
-       #define DOGLCD_A0  30
1284
-       #define DOGLCD_CS  29
1285
-       // GLCD features
1286
-       #define LCD_CONTRAST 1
1282
+	   #ifdef U8GLIB_ST7920 //SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
1283
+	  	 #define LCD_PINS_RS 30 //CS chip select /SS chip slave select
1284
+	  	 #define LCD_PINS_ENABLE 29 //SID (MOSI)
1285
+	  	 #define LCD_PINS_D4 17 //SCK (CLK) clock
1286
+	  	 #define BEEPER 27 // Pin 27 is take by LED_Pin, but Melzi LED do nothing with Marlin and I take this pin for BEEPER.... See here > [github.com] , If you want use this pin with Gcode M42 instead BEEPER
1287
+	   #else
1288
+	  	 // Pins for DOGM SPI LCD Support
1289
+	  	 #define DOGLCD_A0 30
1290
+	  	 #define DOGLCD_CS 29
1291
+	  	 #define LCD_CONTRAST 1
1292
+	   #endif
1287 1293
        // Uncomment screen orientation
1288
-         // #define LCD_SCREEN_ROT_0
1294
+       #define LCD_SCREEN_ROT_0
1289 1295
          // #define LCD_SCREEN_ROT_90
1290
-       #define LCD_SCREEN_ROT_180
1296
+         // #define LCD_SCREEN_ROT_180
1291 1297
          // #define LCD_SCREEN_ROT_270
1292 1298
        #else // standard Hitachi LCD controller
1293 1299
        #define LCD_PINS_RS        4
@@ -1309,6 +1315,7 @@
1309 1315
        #endif
1310 1316
      #else
1311 1317
        #define BTN_ENC 16  //the click switch
1318
+       #define LCD_SDSS 28 //to use the SD card reader on the smart controller rather than the melzi board
1312 1319
      #endif //Panelolu2
1313 1320
      //not connected to a pin
1314 1321
      #define SDCARDDETECT -1

Loading…
Cancel
Save