Просмотр исходного кода

Support for REPRAPWORLD_GRAPHICAL_LCD

brupje 9 лет назад
Родитель
Сommit
a60a668f6b

+ 7
- 0
Marlin/Conditionals.h Просмотреть файл

@@ -130,6 +130,13 @@
130 130
     #define NEWPANEL
131 131
   #endif
132 132
 
133
+
134
+  #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
135
+    #define DOGLCD
136
+    #define U8GLIB_ST7920
137
+    #define ULTIPANEL
138
+  #endif
139
+
133 140
   /**
134 141
    * I2C PANELS
135 142
    */

+ 7
- 0
Marlin/Configuration.h Просмотреть файл

@@ -1119,6 +1119,13 @@
1119 1119
 //#define MAKRPANEL
1120 1120
 
1121 1121
 //
1122
+// ReprapWorld Graphical LCD
1123
+// https://reprapworld.com/?products_details&products_id/1218
1124
+//
1125
+//#define REPRAPWORLD_GRAPHICAL_LCD
1126
+
1127
+
1128
+//
1122 1129
 // Activate one of these if you have a Panucatt Devices
1123 1130
 // Viki 2.0 or mini Viki with Graphic LCD
1124 1131
 // http://panucatt.com

+ 43
- 11
Marlin/pins_MEGATRONICS_3.h Просмотреть файл

@@ -106,17 +106,49 @@
106 106
 
107 107
 #define BEEPER_PIN 61
108 108
 
109
-#define LCD_PINS_RS 32
110
-#define LCD_PINS_ENABLE 31
111
-#define LCD_PINS_D4 14
112
-#define LCD_PINS_D5 30
113
-#define LCD_PINS_D6 39
114
-#define LCD_PINS_D7 15
115
-
116
-#define SHIFT_CLK 43
117
-#define SHIFT_LD 35
118
-#define SHIFT_OUT 34
119
-#define SHIFT_EN 44
109
+
110
+
111
+
112
+#if ENABLED(DOGLCD)
113
+
114
+    #if ENABLED(U8GLIB_ST7920)
115
+    
116
+        #define LCD_PINS_RS     56 //CS chip select /SS chip slave select
117
+        #define LCD_PINS_ENABLE 51 //SID (MOSI)
118
+        #define LCD_PINS_D4     52 //SCK (CLK) clock     
119
+
120
+        #define BTN_EN1             44
121
+        #define BTN_EN2             45
122
+        #define BTN_ENC             33
123
+
124
+        
125
+        #define SD_DETECT_PIN 35
126
+    #endif
127
+
128
+#else
129
+  #define LCD_PINS_RS 32
130
+  #define LCD_PINS_ENABLE 31
131
+  #define LCD_PINS_D4 14
132
+  #define LCD_PINS_D5 30
133
+  #define LCD_PINS_D6 39
134
+  #define LCD_PINS_D7 15
135
+  
136
+  #define SHIFT_CLK 43
137
+  #define SHIFT_LD 35
138
+  #define SHIFT_OUT 34
139
+  #define SHIFT_EN 44
140
+  //buttons are directly attached using keypad
141
+  #define BTN_EN1 44
142
+  #define BTN_EN2 45
143
+  #define BTN_ENC 33 //the click
144
+
145
+  #define BLEN_C 2
146
+  #define BLEN_B 1
147
+  #define BLEN_A 0
148
+
149
+  #define SD_DETECT_PIN 56 // Megatronics v3.1 only
150
+#endif
151
+
120 152
 
121 153
 // Buttons are directly attached using keypad
122 154
 #define BTN_EN1 44

+ 21
- 0
Marlin/pins_MINITRONICS.h Просмотреть файл

@@ -76,6 +76,25 @@
76 76
 
77 77
 #define BEEPER_PIN -1
78 78
 
79
+
80
+
81
+#if ENABLED(DOGLCD)
82
+
83
+    #if ENABLED(U8GLIB_ST7920)
84
+    
85
+        #define LCD_PINS_RS     15 //CS chip select /SS chip slave select
86
+        #define LCD_PINS_ENABLE 11 //SID (MOSI)
87
+        #define LCD_PINS_D4     10 //SCK (CLK) clock     
88
+
89
+        #define BTN_EN1             18
90
+        #define BTN_EN2             17
91
+        #define BTN_ENC             25
92
+
93
+        
94
+        #define SD_DETECT_PIN 30
95
+    #endif
96
+
97
+#else
79 98
 #define LCD_PINS_RS -1
80 99
 #define LCD_PINS_ENABLE -1
81 100
 #define LCD_PINS_D4 -1
@@ -92,3 +111,5 @@
92 111
 #define BLEN_B 1
93 112
 #define BLEN_A 0
94 113
 
114
+#define SD_DETECT_PIN -1  // Minitronics doesn't use this
115
+#endif

+ 17
- 1
Marlin/pins_RAMPS_14.h Просмотреть файл

@@ -139,7 +139,23 @@
139 139
   #define SLED_PIN           -1
140 140
 #endif
141 141
 
142
-#if ENABLED(ULTRA_LCD)
142
+
143
+
144
+#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
145
+
146
+
147
+  #define LCD_PINS_RS     49 //CS chip select /SS chip slave select
148
+  #define LCD_PINS_ENABLE 51 //SID (MOSI)
149
+  #define LCD_PINS_D4     52 //SCK (CLK) clock     
150
+
151
+  #define BTN_EN1             64
152
+  #define BTN_EN2             59
153
+  #define BTN_ENC             63
154
+
155
+  
156
+  #define SD_DETECT_PIN 42
157
+
158
+#elif ENABLED(ULTRA_LCD)
143 159
 
144 160
   #if ENABLED(NEWPANEL) && ENABLED(PANEL_ONE)
145 161
     #define LCD_PINS_RS 40

+ 3
- 1
Marlin/ultralcd_impl_DOGM.h Просмотреть файл

@@ -141,7 +141,9 @@
141 141
 #define START_COL              0
142 142
 
143 143
 // LCD selection
144
-#if ENABLED(U8GLIB_ST7920)
144
+#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
145
+  U8GLIB_ST7920_128X64_4X u8g(LCD_PINS_RS);
146
+#elif ENABLED(U8GLIB_ST7920)
145 147
   //U8GLIB_ST7920_128X64_RRD u8g(0,0,0);
146 148
   U8GLIB_ST7920_128X64_RRD u8g(0);
147 149
 #elif defined(CARTESIO_UI)

Загрузка…
Отмена
Сохранить