Browse Source

added MaKr3d Melzi board

Michael Mayer 11 years ago
parent
commit
99b7e926e7
4 changed files with 51 additions and 6 deletions
  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 View File

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

+ 6
- 0
Marlin/Makefile View File

114
 else ifeq  ($(HARDWARE_MOTHERBOARD),63)
114
 else ifeq  ($(HARDWARE_MOTHERBOARD),63)
115
 HARDWARE_VARIANT ?= Sanguino
115
 HARDWARE_VARIANT ?= Sanguino
116
 MCU              ?= atmega644p
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
 #Ultimaker
124
 #Ultimaker
119
 else ifeq  ($(HARDWARE_MOTHERBOARD),7)
125
 else ifeq  ($(HARDWARE_MOTHERBOARD),7)

+ 4
- 0
Marlin/dogm_lcd_implementation.h View File

78
 #ifdef U8GLIB_ST7920
78
 #ifdef U8GLIB_ST7920
79
 //U8GLIB_ST7920_128X64_RRD u8g(0,0,0);
79
 //U8GLIB_ST7920_128X64_RRD u8g(0,0,0);
80
 U8GLIB_ST7920_128X64_RRD u8g(0);
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
 #else
84
 #else
85
+// for regular DOGM128 display with HW-SPI
82
 U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0);	// HW-SPI Com: CS, A0
86
 U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0);	// HW-SPI Com: CS, A0
83
 #endif
87
 #endif
84
 
88
 

+ 25
- 2
Marlin/pins.h View File

843
 #if MOTHERBOARD == 64
843
 #if MOTHERBOARD == 64
844
 #define STB
844
 #define STB
845
 #endif
845
 #endif
846
-#if MOTHERBOARD == 63
846
+#if MOTHERBOARD == 63 || MOTHERBOARD == 66
847
 #define MELZI
847
 #define MELZI
848
 #endif
848
 #endif
849
 #if MOTHERBOARD == 65
849
 #if MOTHERBOARD == 65
850
 #define AZTEEG_X1
850
 #define AZTEEG_X1
851
 #endif
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
 #undef MOTHERBOARD
853
 #undef MOTHERBOARD
854
 #define MOTHERBOARD 6
854
 #define MOTHERBOARD 6
855
 #define SANGUINOLOLU_V_1_2
855
 #define SANGUINOLOLU_V_1_2
891
 
891
 
892
 #ifdef STB
892
 #ifdef STB
893
 #define FAN_PIN            4
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
 #endif
896
 #endif
895
 
897
 
896
 #ifdef AZTEEG_X1
898
 #ifdef AZTEEG_X1
975
    #endif //Newpanel
977
    #endif //Newpanel
976
  #endif //Ultipanel
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
 #endif
1001
 #endif
979
 
1002
 
980
 
1003
 

Loading…
Cancel
Save