From a2c013c8c748815699b03bc862b61b6143b60199 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 13 Nov 2017 00:10:27 -0600
Subject: [PATCH] Fix LCD pins for Printrboard v1

---
 Marlin/pins_PRINTRBOARD.h | 62 +++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/Marlin/pins_PRINTRBOARD.h b/Marlin/pins_PRINTRBOARD.h
index 91cb632152..8b659389e8 100755
--- a/Marlin/pins_PRINTRBOARD.h
+++ b/Marlin/pins_PRINTRBOARD.h
@@ -130,18 +130,6 @@
 //
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
 
-  // LCD Pins
-  #if ENABLED(LCD_I2C_PANELOLU2)
-    #define BTN_EN1         3   // D3 RX1   JP2-7
-    #define BTN_EN2         2   // D2 TX1   JP2-5
-    #define BTN_ENC        41   // F3       JP2-4
-    #define SDSS           38   // F0       B-THERM connector - use SD card on Panelolu2
-  #else
-    #define BTN_EN1        10   // C0       JP11-12
-    #define BTN_EN2        11   // C1       JP11-13
-    #define BTN_ENC        12   // C2       JP11-14
-  #endif
-
   #define LCD_PINS_RS       9   // E1       JP11-11
   #define LCD_PINS_ENABLE   8   // E0       JP11-10
   #define LCD_PINS_D4       7   // D7       JP11-8
@@ -149,23 +137,35 @@
   #define LCD_PINS_D6       5   // D5       JP11-6
   #define LCD_PINS_D7       4   // D4       JP11-5
 
+  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
+    #define BEEPER_PIN      8   // E0       JP11-10
+
+    #define DOGLCD_A0      40   // F2       JP2-2
+    #define DOGLCD_CS      41   // F3       JP2-4
+    #define LCD_SCREEN_ROT_180
+
+    #define BTN_EN1         2   // D2 TX1   JP2-5
+    #define BTN_EN2         3   // D3 RX1   JP2-7
+    #define BTN_ENC        45   // F7 TDI   JP2-12
+
+    #define SDSS           43   // F5 TMS   JP2-8
+
+    #define STAT_LED_RED_PIN  12  // C2       JP11-14
+    #define STAT_LED_BLUE_PIN 10  // C0       JP11-12
+
+  #elif ENABLED(LCD_I2C_PANELOLU2)
+
+    #define BTN_EN1         3   // D3 RX1   JP2-7
+    #define BTN_EN2         2   // D2 TX1   JP2-5
+    #define BTN_ENC        41   // F3       JP2-4
+    #define SDSS           38   // F0       B-THERM connector - use SD card on Panelolu2
+
+  #else
+
+    #define BTN_EN1        10   // C0       JP11-12
+    #define BTN_EN2        11   // C1       JP11-13
+    #define BTN_ENC        12   // C2       JP11-14
+
+  #endif
+
 #endif // ULTRA_LCD && NEWPANEL
-
-#if ENABLED(VIKI2) || ENABLED(miniVIKI)
-  #define BEEPER_PIN        8   // E0       JP11-10
-  // Pins for DOGM SPI LCD Support
-  #define DOGLCD_A0        40   // F2       JP2-2
-  #define DOGLCD_CS        41   // F3       JP2-4
-  #define LCD_SCREEN_ROT_180
-
-  // The encoder and click button
-  #define BTN_EN1           2   // D2 TX1   JP2-5
-  #define BTN_EN2           3   // D3 RX1   JP2-7
-  #define BTN_ENC          45   // F7 TDI   JP2-12
-
-  #define SDSS             43   // F5 TMS   JP2-8
-
-  #define STAT_LED_RED_PIN  12  // C2       JP11-14
-  #define STAT_LED_BLUE_PIN 10  // C0       JP11-12
-
-#endif