Browse Source

add MINIPANEL defines

AndySze 10 years ago
parent
commit
00dbf69b6d

+ 8
- 0
Marlin/Conditionals.h View File

75
     #define NEWPANEL
75
     #define NEWPANEL
76
   #endif
76
   #endif
77
 
77
 
78
+  #ifdef MINIPANEL
79
+   #define DOGLCD
80
+   #define SDSUPPORT
81
+   #define ULTIPANEL
82
+   #define NEWPANEL
83
+   #define DEFAULT_LCD_CONTRAST 17
84
+  #endif
85
+
78
   /**
86
   /**
79
    * I2C PANELS
87
    * I2C PANELS
80
    */
88
    */

+ 4
- 0
Marlin/Configuration.h View File

694
 // REMEMBER TO INSTALL LiquidCrystal_I2C.h in your ARDUINO library folder: https://github.com/kiyoshigawa/LiquidCrystal_I2C
694
 // REMEMBER TO INSTALL LiquidCrystal_I2C.h in your ARDUINO library folder: https://github.com/kiyoshigawa/LiquidCrystal_I2C
695
 //#define RA_CONTROL_PANEL
695
 //#define RA_CONTROL_PANEL
696
 
696
 
697
+// The MakerLab Mini Panel with graphic controller and SD support
698
+// http://reprap.org/wiki/Mini_panel
699
+// #define MINIPANEL
700
+
697
 /**
701
 /**
698
  * I2C Panels
702
  * I2C Panels
699
  */
703
  */

+ 6
- 2
Marlin/dogm_lcd_implementation.h View File

128
 #elif defined U8GLIB_SSD1306
128
 #elif defined U8GLIB_SSD1306
129
   // Generic support for SSD1306 OLED I2C LCDs
129
   // Generic support for SSD1306 OLED I2C LCDs
130
   U8GLIB_SSD1306_128X64 u8g(U8G_I2C_OPT_NONE);
130
   U8GLIB_SSD1306_128X64 u8g(U8G_I2C_OPT_NONE);
131
+#elif defined(MINIPANEL)
132
+  // The MINIPanel display
133
+  U8GLIB_MINI12864 u8g(DOGLCD_CS, DOGLCD_A0);
131
 #else
134
 #else
132
   // for regular DOGM128 display with HW-SPI
135
   // for regular DOGM128 display with HW-SPI
133
   U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0);  // HW-SPI Com: CS, A0
136
   U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0);  // HW-SPI Com: CS, A0
201
     pinMode(LCD_PIN_RESET, OUTPUT);           
204
     pinMode(LCD_PIN_RESET, OUTPUT);           
202
     digitalWrite(LCD_PIN_RESET, HIGH);
205
     digitalWrite(LCD_PIN_RESET, HIGH);
203
   #endif
206
   #endif
204
-
205
-  u8g.setContrast(lcd_contrast);	
207
+  #ifndef MINIPANEL//setContrast not working for Mini Panel
208
+    u8g.setContrast(lcd_contrast);	
209
+  #endif
206
 	// FIXME: remove this workaround
210
 	// FIXME: remove this workaround
207
   // Uncomment this if you have the first generation (V1.10) of STBs board
211
   // Uncomment this if you have the first generation (V1.10) of STBs board
208
   // pinMode(17, OUTPUT);	// Enable LCD backlight
212
   // pinMode(17, OUTPUT);	// Enable LCD backlight

+ 4
- 0
Marlin/example_configurations/SCARA/Configuration.h View File

702
 // REMEMBER TO INSTALL LiquidCrystal_I2C.h in your ARDUINO library folder: https://github.com/kiyoshigawa/LiquidCrystal_I2C
702
 // REMEMBER TO INSTALL LiquidCrystal_I2C.h in your ARDUINO library folder: https://github.com/kiyoshigawa/LiquidCrystal_I2C
703
 //#define RA_CONTROL_PANEL
703
 //#define RA_CONTROL_PANEL
704
 
704
 
705
+// The MakerLab Mini Panel with graphic controller and SD support
706
+// http://reprap.org/wiki/Mini_panel
707
+// #define MINIPANEL
708
+
705
 /**
709
 /**
706
  * I2C Panels
710
  * I2C Panels
707
  */
711
  */

+ 4
- 0
Marlin/example_configurations/delta/generic/Configuration.h View File

821
 // in ultralcd.cpp@lcd_delta_calibrate_menu()
821
 // in ultralcd.cpp@lcd_delta_calibrate_menu()
822
 // #define DELTA_CALIBRATION_MENU
822
 // #define DELTA_CALIBRATION_MENU
823
 
823
 
824
+// The MakerLab Mini Panel with graphic controller and SD support
825
+// http://reprap.org/wiki/Mini_panel
826
+// #define MINIPANEL
827
+
824
 /**
828
 /**
825
  * I2C Panels
829
  * I2C Panels
826
  */
830
  */

+ 21
- 0
Marlin/pins_RAMPS_13.h View File

191
       #define DOGLCD_CS 29
191
       #define DOGLCD_CS 29
192
       #define DOGLCD_A0 27
192
       #define DOGLCD_A0 27
193
       #define LCD_PIN_BL 33
193
       #define LCD_PIN_BL 33
194
+    #elif defined(MINIPANEL)
195
+       #define BEEPER 42
196
+       // Pins for DOGM SPI LCD Support
197
+       #define DOGLCD_A0  44
198
+       #define DOGLCD_CS  66
199
+       #define LCD_PIN_BL	65	// backlight LED on A11/D65
200
+       #define SDSS   53
201
+       
202
+       #define KILL_PIN 64
203
+       // GLCD features
204
+       //#define LCD_CONTRAST 190
205
+       // Uncomment screen orientation
206
+         // #define LCD_SCREEN_ROT_90
207
+         // #define LCD_SCREEN_ROT_180
208
+         // #define LCD_SCREEN_ROT_270
209
+       //The encoder and click button
210
+       #define BTN_EN1 40
211
+       #define BTN_EN2 63
212
+       #define BTN_ENC 59  //the click switch
213
+       //not connected to a pin
214
+       #define SDCARDDETECT 49
194
     #else
215
     #else
195
       // arduino pin which triggers an piezzo beeper
216
       // arduino pin which triggers an piezzo beeper
196
       #define BEEPER 33  // Beeper on AUX-4
217
       #define BEEPER 33  // Beeper on AUX-4

Loading…
Cancel
Save