Explorar el Código

added MaKr3d Melzi board

Michael Mayer hace 11 años
padre
commit
99b7e926e7
Se han modificado 4 ficheros con 51 adiciones y 6 borrados
  1. 16
    4
      Marlin/Configuration.h
  2. 6
    0
      Marlin/Makefile
  3. 4
    0
      Marlin/dogm_lcd_implementation.h
  4. 25
    2
      Marlin/pins.h

+ 16
- 4
Marlin/Configuration.h Ver fichero

@@ -17,8 +17,7 @@
17 17
 #define SERIAL_PORT 0
18 18
 
19 19
 // This determines the communication speed of the printer
20
-#define BAUDRATE 250000
21
-//#define BAUDRATE 115200
20
+#define BAUDRATE 115200
22 21
 
23 22
 //// The following define selects which electronics board you have. Please choose the one that matches your setup
24 23
 // 10 = Gen7 custom (Alfons3 Version) "https://github.com/Alfons3/Generation_7_Electronics"
@@ -36,6 +35,7 @@
36 35
 // 63 = Melzi
37 36
 // 64 = STB V1.1
38 37
 // 65 = Azteeg X1
38
+// 66 = Melzi with ATmega1284 (MaKr3d version)
39 39
 // 7  = Ultimaker
40 40
 // 71 = Ultimaker (Older electronics. Pre 1.5.4. This is rare)
41 41
 // 77 = 3Drag Controller
@@ -371,10 +371,10 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
371 371
 // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
372 372
 // M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.
373 373
 //define this to enable eeprom support
374
-//#define EEPROM_SETTINGS
374
+#define EEPROM_SETTINGS
375 375
 //to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
376 376
 // please keep turned on if you can.
377
-//#define EEPROM_CHITCHAT
377
+#define EEPROM_CHITCHAT
378 378
 
379 379
 // Preheat Constants
380 380
 #define PLA_PREHEAT_HOTEND_TEMP 180 
@@ -394,6 +394,10 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
394 394
 //#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
395 395
 //#define ULTIPANEL  //the ultipanel as on thingiverse
396 396
 
397
+// The MaKr3d Makr-Panel with graphic controller and SD support
398
+// http://reprap.org/wiki/MaKr3d_MaKrPanel
399
+//#define MAKRPANEL
400
+
397 401
 // The RepRapDiscount Smart Controller (white PCB)
398 402
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
399 403
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
@@ -419,6 +423,14 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
419 423
 //#define RA_CONTROL_PANEL
420 424
 
421 425
 //automatic expansion
426
+#if defined (MAKRPANEL)
427
+ #define DOGLCD
428
+ #define SDSUPPORT
429
+ #define ULTIPANEL
430
+ #define NEWPANEL
431
+ #define DEFAULT_LCD_CONTRAST 17
432
+#endif
433
+
422 434
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
423 435
  #define DOGLCD
424 436
  #define U8GLIB_ST7920

+ 6
- 0
Marlin/Makefile Ver fichero

@@ -114,6 +114,12 @@ MCU              ?= atmega644p
114 114
 else ifeq  ($(HARDWARE_MOTHERBOARD),63)
115 115
 HARDWARE_VARIANT ?= Sanguino
116 116
 MCU              ?= atmega644p
117
+else ifeq  ($(HARDWARE_MOTHERBOARD),65)
118
+HARDWARE_VARIANT ?= Sanguino
119
+MCU              ?= atmega1284p
120
+else ifeq  ($(HARDWARE_MOTHERBOARD),66)
121
+HARDWARE_VARIANT ?= Sanguino
122
+MCU              ?= atmega1284p
117 123
 
118 124
 #Ultimaker
119 125
 else ifeq  ($(HARDWARE_MOTHERBOARD),7)

+ 4
- 0
Marlin/dogm_lcd_implementation.h Ver fichero

@@ -78,7 +78,11 @@
78 78
 #ifdef U8GLIB_ST7920
79 79
 //U8GLIB_ST7920_128X64_RRD u8g(0,0,0);
80 80
 U8GLIB_ST7920_128X64_RRD u8g(0);
81
+#elsif defined(MAKRPANEL)
82
+// The MaKrPanel display, ST7565 controller as well
83
+U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0);
81 84
 #else
85
+// for regular DOGM128 display with HW-SPI
82 86
 U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0);	// HW-SPI Com: CS, A0
83 87
 #endif
84 88
 

+ 25
- 2
Marlin/pins.h Ver fichero

@@ -843,13 +843,13 @@
843 843
 #if MOTHERBOARD == 64
844 844
 #define STB
845 845
 #endif
846
-#if MOTHERBOARD == 63
846
+#if MOTHERBOARD == 63 || MOTHERBOARD == 66
847 847
 #define MELZI
848 848
 #endif
849 849
 #if MOTHERBOARD == 65
850 850
 #define AZTEEG_X1
851 851
 #endif
852
-#if MOTHERBOARD == 62 || MOTHERBOARD == 63 || MOTHERBOARD == 64 || MOTHERBOARD == 65
852
+#if MOTHERBOARD == 62 || MOTHERBOARD == 63 || MOTHERBOARD == 64 || MOTHERBOARD == 65 || MOTHERBOARD == 66
853 853
 #undef MOTHERBOARD
854 854
 #define MOTHERBOARD 6
855 855
 #define SANGUINOLOLU_V_1_2
@@ -891,6 +891,8 @@
891 891
 
892 892
 #ifdef STB
893 893
 #define FAN_PIN            4
894
+	//  Uncomment this if you have the first generation (V1.10) of STBs board
895
+#define LCD_PIN_BL         17 // LCD backlight LED
894 896
 #endif
895 897
 
896 898
 #ifdef AZTEEG_X1
@@ -975,6 +977,27 @@
975 977
    #endif //Newpanel
976 978
  #endif //Ultipanel
977 979
 
980
+ #ifdef MAKRPANEL
981
+     #define BEEPER 29
982
+     // Pins for DOGM SPI LCD Support
983
+     #define DOGLCD_A0  30
984
+     #define DOGLCD_CS  17
985
+     #define LCD_PIN_BL	28	// backlight LED on PA3
986
+     // GLCD features
987
+     #define LCD_CONTRAST 1
988
+     // Uncomment screen orientation
989
+     #define LCD_SCREEN_ROT_0
990
+       // #define LCD_SCREEN_ROT_90
991
+       // #define LCD_SCREEN_ROT_180
992
+       // #define LCD_SCREEN_ROT_270
993
+     //The encoder and click button
994
+     #define BTN_EN1 11
995
+     #define BTN_EN2 10
996
+     #define BTN_ENC 16  //the click switch
997
+     //not connected to a pin
998
+     #define SDCARDDETECT -1    
999
+ #endif //Makrpanel
1000
+
978 1001
 #endif
979 1002
 
980 1003
 

Loading…
Cancelar
Guardar