Better Sanguinololu & Graphical Controller (PR#2504)

- Change suggested at
https://github.com/MarlinFirmware/Marlin/issues/2482#issuecomment-123553
266

Marlin/pins_SANGUINOLOLU_11.h

@@ -22,26 +22,15 @@
 #define E0_DIR_PIN          0
 
 #define LED_PIN            -1
-
 #define FAN_PIN            -1
 
-// #if FAN_PIN == 12 || FAN_PIN ==13
+#if MB(AZTEEG_X1) || MB(STB_11) || MB(MELZI)
-//   #define FAN_SOFT_PWM
-// #endif
-
-#if MB(MELZI)
-  #define LED_PIN            27 /* On some broken versions of the Sanguino libraries the pin definitions are wrong, which then needs LED_PIN as pin 28. But you better upgrade your Sanguino libraries! See #368. */
   #define FAN_PIN           4 // Works for Panelolu2 too
-#endif
+  #if MB(MELZI)
-
+    #define LED_PIN        27 // On some broken versions of the Sanguino libraries the pin definitions are wrong, so LED_PIN needs to be 28. But you should upgrade your Sanguino libraries! See #368.
-#if MB(STB_11)
+  #elif MB(STB_11)
-  #define FAN_PIN            4
-  //  Uncomment this if you have the first generation (V1.10) of STBs board
     #define LCD_PIN_BL     17 // LCD backlight LED
-#endif
+  #endif
-
-#if MB(AZTEEG_X1)
-  #define FAN_PIN            4
 #endif
 
 #ifdef Z_PROBE_SLED
@@ -97,60 +86,80 @@
 #define SDPOWER            -1
 #define SDSS               31
 
-/* On some broken versions of the Sanguino libraries the pin definitions are wrong, which then needs SDSS as pin 24. But you better upgrade your Sanguino libraries! See #368. */
+/**
+ * On some broken versions of the Sanguino libraries the pin definitions are wrong,
+ * which then needs SDSS as pin 24. But you should upgrade your Sanguino libraries! See #368.
+ */
 //#define SDSS               24
 
-#ifdef ULTRA_LCD
+#if defined(ULTRA_LCD) && defined(NEWPANEL)
- #ifdef NEWPANEL
+
-   //we have no buzzer installed
+  // No buzzer installed
   #define BEEPER -1
-   //LCD Pins
+
+  // LCD Pins
   #ifdef DOGLCD
+
     #ifdef U8GLIB_ST7920 //SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
+
+      #if MB(MELZI) // Melzi board
         #define LCD_PINS_RS     30 //CS chip select /SS chip slave select
         #define LCD_PINS_ENABLE 29 //SID (MOSI)
         #define LCD_PINS_D4     17 //SCK (CLK) clock
         #define BEEPER          27 // Pin 27 is take by LED_Pin, but Melzi LED do nothing with Marlin and I take this pin for BEEPER.... See here > [github.com] , If you want use this pin with Gcode M42 instead BEEPER
-   #else
+      #else         // Sanguinololu 1.3
-     // Pins for DOGM SPI LCD Support
+        #define LCD_PINS_RS      4 
+        #define LCD_PINS_ENABLE 17 
+        #define LCD_PINS_D4     30 
+        #define LCD_PINS_D5     29
+        #define LCD_PINS_D6     28
+        #define LCD_PINS_D7     27
+      #endif
+
+    #else // DOGM SPI LCD Support
+
       #define DOGLCD_A0         30
       #define DOGLCD_CS         29
       #define LCD_CONTRAST       1
+
     #endif
+  
     // Uncomment screen orientation
     #define LCD_SCREEN_ROT_0
     // #define LCD_SCREEN_ROT_90
     // #define LCD_SCREEN_ROT_180
     // #define LCD_SCREEN_ROT_270
-     #else // standard Hitachi LCD controller
+
+  #else // !DOGLCD - Standard Hitachi LCD controller
+
     #define LCD_PINS_RS          4
     #define LCD_PINS_ENABLE     17
     #define LCD_PINS_D4         30
     #define LCD_PINS_D5         29
     #define LCD_PINS_D6         28
     #define LCD_PINS_D7         27
-   #endif
+
+  #endif // !DOGLCD
+
   //The encoder and click button
   #define BTN_EN1               11
   #define BTN_EN2               10
   #ifdef LCD_I2C_PANELOLU2
     #if MB(MELZI)
-       #define BTN_ENC 29 //the click switch
+      #define BTN_ENC           29
-       #define LCD_SDSS 30 //to use the SD card reader on the Panelolu2 rather than the melzi board
+      #define LCD_SDSS          30 // Panelolu2 SD card reader rather than the Melzi
     #else
-       #define BTN_ENC 30 //the click switch
+      #define BTN_ENC           30
     #endif
   #else
-     #define BTN_ENC 16  //the click switch
+    #define BTN_ENC             16
-     #define LCD_SDSS 28 //to use the SD card reader on the smart controller rather than the melzi board
+    #define LCD_SDSS            28 // Smart Controller SD card reader rather than the Melzi
   #endif //Panelolu2
-   //not connected to a pin
+
   #define SDCARDDETECT          -1
 
- #endif //NEWPANEL
+#elif defined(MAKRPANEL)
-#endif //ULTRA_LCD
 
-#ifdef MAKRPANEL
   #define BEEPER                29
   // Pins for DOGM SPI LCD Support
   #define DOGLCD_A0             30
@@ -166,8 +175,12 @@
   //The encoder and click button
   #define BTN_EN1               11
   #define BTN_EN2               10
-  #define BTN_ENC 16  //the click switch
+  #define BTN_ENC               16
-  //not connected to a pin
+
   #define SDCARDDETECT          -1
-#endif //Makrpanel
 
+#endif // MAKRPANEL
+
+// #if FAN_PIN == 12 || FAN_PIN ==13
+//   #define FAN_SOFT_PWM
+// #endif