Kaynağa Gözat

Fix MAKRPANEL assignments

MAKRPANEL is a DOGLCD+ULTRA_LCD+NEWPANEL so customize its pins within
that block.
Scott Lahteine 7 yıl önce
ebeveyn
işleme
53f5086905
1 değiştirilmiş dosya ile 18 ekleme ve 33 silme
  1. 18
    33
      Marlin/pins_SANGUINOLOLU_11.h

+ 18
- 33
Marlin/pins_SANGUINOLOLU_11.h Dosyayı Görüntüle

@@ -121,10 +121,6 @@
121 121
 //
122 122
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
123 123
 
124
-  // No buzzer installed
125
-  #define BEEPER_PIN -1
126
-
127
-  // LCD Pins
128 124
   #if ENABLED(DOGLCD)
129 125
 
130 126
     #if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
@@ -137,7 +133,7 @@
137 133
         // Marlin so this can be used for BEEPER_PIN. You can use this pin
138 134
         // with M42 instead of BEEPER_PIN.
139 135
         #define BEEPER_PIN      27
140
-      #else         // Sanguinololu 1.3
136
+      #else        // Sanguinololu 1.3
141 137
         #define LCD_PINS_RS      4
142 138
         #define LCD_PINS_ENABLE 17
143 139
         #define LCD_PINS_D4     30
@@ -149,9 +145,20 @@
149 145
     #else // DOGM SPI LCD Support
150 146
 
151 147
       #define DOGLCD_A0         30
152
-      #define DOGLCD_CS         29
153 148
       #define LCD_CONTRAST       1
154 149
 
150
+      #if ENABLED(MAKRPANEL)
151
+
152
+        #define BEEPER_PIN      29
153
+        #define DOGLCD_CS       17
154
+        #define LCD_BACKLIGHT_PIN 28 // PA3
155
+
156
+      #else // !MAKRPANEL
157
+
158
+        #define DOGLCD_CS       29
159
+
160
+      #endif
161
+
155 162
     #endif
156 163
 
157 164
     // Uncomment screen orientation
@@ -160,7 +167,7 @@
160 167
     //#define LCD_SCREEN_ROT_180
161 168
     //#define LCD_SCREEN_ROT_270
162 169
 
163
-  #else // !DOGLCD - Standard Hitachi LCD controller
170
+  #else // !DOGLCD
164 171
 
165 172
     #define LCD_PINS_RS          4
166 173
     #define LCD_PINS_ENABLE     17
@@ -171,9 +178,9 @@
171 178
 
172 179
   #endif // !DOGLCD
173 180
 
174
-  //The encoder and click button
175 181
   #define BTN_EN1               11
176 182
   #define BTN_EN2               10
183
+
177 184
   #if ENABLED(LCD_I2C_PANELOLU2)
178 185
     #if IS_MELZI
179 186
       #define BTN_ENC           29
@@ -181,33 +188,11 @@
181 188
     #else
182 189
       #define BTN_ENC           30
183 190
     #endif
184
-  #else
191
+  #else  // !Panelolu2
185 192
     #define BTN_ENC             16
186 193
     #define LCD_SDSS            28 // Smart Controller SD card reader rather than the Melzi
187
-  #endif // Panelolu2
188
-
189
-  #define SD_DETECT_PIN         -1
190
-
191
-#elif ENABLED(MAKRPANEL)
192
-
193
-  #define BEEPER_PIN            29
194
-
195
-  // Pins for DOGM SPI LCD Support
196
-  #define DOGLCD_A0             30
197
-  #define DOGLCD_CS             17
198
-  #define LCD_BACKLIGHT_PIN     28 // backlight LED on PA3
199
-  // GLCD features
200
-  #define LCD_CONTRAST           1
201
-  // Uncomment screen orientation
202
-  #define LCD_SCREEN_ROT_0
203
-  //#define LCD_SCREEN_ROT_90
204
-  //#define LCD_SCREEN_ROT_180
205
-  //#define LCD_SCREEN_ROT_270
206
-  //The encoder and click button
207
-  #define BTN_EN1               11
208
-  #define BTN_EN2               10
209
-  #define BTN_ENC               16
194
+  #endif // !Panelolu2
210 195
 
211 196
   #define SD_DETECT_PIN         -1
212 197
 
213
-#endif // MAKRPANEL
198
+#endif // ULTRA_LCD && NEWPANEL

Loading…
İptal
Kaydet