Fix indentation, whitespace, spelling, formbot pins...

MarlinFirmware · Aug 21, 2018 · ad12b9b · ad12b9b
1 parent b5537dd
commit ad12b9b
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 53 deletions.
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
@@ -75,7 +75,7 @@
 #define BOARD_AZTEEG_X3_PRO     68    // Azteeg X3 Pro
 #define BOARD_ULTIMAIN_2        72    // Ultimainboard 2.x (Uses TEMP_SENSOR 20)
 #define BOARD_RUMBA             80    // Rumba
-#define BOARD_FORMBOT           81    // Formbot version 1.  A Rumba derivitive
+#define BOARD_FORMBOT           81    // Formbot version 1. (A Rumba derivative)
 #define BOARD_BQ_ZUM_MEGA_3D    503   // bq ZUM Mega 3D
 #define BOARD_MAKEBOARD_MINI    431   // MakeBoard Mini v2.1.2 is a control board sold by MicroMake
 #define BOARD_TRIGORILLA_13     343   // TriGorilla Anycubic version 1.3 based on RAMPS EFB

diff --git a/Marlin/src/feature/bedlevel/bedlevel.cpp b/Marlin/src/feature/bedlevel/bedlevel.cpp
@@ -77,6 +77,8 @@ void set_bed_leveling_enabled(const bool enable/*=true*/) {
 
   if (can_change && enable != planner.leveling_active) {
 
+    planner.synchronize();
+
     #if ENABLED(MESH_BED_LEVELING)
 
       if (!enable)

diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
@@ -355,11 +355,11 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
   planner.synchronize();
 
   #if HAS_LEVELING
-      // Set current position to the physical position
-      const bool leveling_was_active = planner.leveling_active;
-      set_bed_leveling_enabled(false);
-   #endif
-  
+    // Set current position to the physical position
+    const bool leveling_was_active = planner.leveling_active;
+    set_bed_leveling_enabled(false);
+  #endif
+
   #if ENABLED(MIXING_EXTRUDER) && MIXING_VIRTUAL_TOOLS > 1
 
     mixing_tool_change(tmp_extruder);
@@ -511,13 +511,12 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
     #if HAS_FANMUX
       fanmux_switch(active_extruder);
     #endif
-  
+
     #if HAS_LEVELING
-          planner.synchronize();
-          // Restore leveling to re-establish the logical position
-          set_bed_leveling_enabled(leveling_was_active);
+      // Restore leveling to re-establish the logical position
+      set_bed_leveling_enabled(leveling_was_active);
     #endif
-  
+
     SERIAL_ECHO_START();
     SERIAL_ECHOLNPAIR(MSG_ACTIVE_EXTRUDER, (int)active_extruder);
 

diff --git a/Marlin/src/pins/pins_FORMBOT.h b/Marlin/src/pins/pins_FORMBOT.h
@@ -35,15 +35,13 @@
 #define DEFAULT_MACHINE_NAME "Formbot"
 #define BOARD_NAME           "Formbot"
 
-#define LARGE_FLASH true
-
 //
 // Servos
 //
-#define SERVO0_PIN          11
+#define SERVO0_PIN         11
 #define SERVO1_PIN          6
 #define SERVO2_PIN          5
-#define SERVO3_PIN          -1
+#define SERVO3_PIN         -1
 
 //
 // Limit Switches
@@ -64,35 +62,43 @@
   #define Z_MIN_PROBE_PIN  32
 #endif
 
-#define SLED_PIN           -1
-
 //
 // Steppers
 //
 #define X_STEP_PIN         54
 #define X_DIR_PIN          55
 #define X_ENABLE_PIN       38
-#define X_CS_PIN           53
+#ifndef X_CS_PIN
+  #define X_CS_PIN         53
+#endif
 
 #define Y_STEP_PIN         60
 #define Y_DIR_PIN          61
 #define Y_ENABLE_PIN       56
-#define Y_CS_PIN           49
+#ifndef Y_CS_PIN
+  #define Y_CS_PIN         49
+#endif
 
 #define Z_STEP_PIN         46
 #define Z_DIR_PIN          48
 #define Z_ENABLE_PIN       62
-#define Z_CS_PIN           40
+#ifndef Z_CS_PIN
+  #define Z_CS_PIN         40
+#endif
 
 #define E0_STEP_PIN        26
 #define E0_DIR_PIN         28
 #define E0_ENABLE_PIN      24
-#define E0_CS_PIN          42
+#ifndef E0_CS_PIN
+  #define E0_CS_PIN        42
+#endif
 
 #define E1_STEP_PIN        36
 #define E1_DIR_PIN         34
 #define E1_ENABLE_PIN      30
-#define E1_CS_PIN          44
+#ifndef E1_CS_PIN
+  #define E1_CS_PIN        44
+#endif
 
 #define E2_STEP_PIN        42
 #define E2_DIR_PIN         43
@@ -103,7 +109,7 @@
 //
 #define TEMP_0_PIN         13   // Analog Input
 #define TEMP_1_PIN         15   // Analog Input
-#define TEMP_BED_PIN       3   // Analog Input
+#define TEMP_BED_PIN        3   // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
@@ -132,16 +138,16 @@
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        10
+#define HEATER_0_PIN       10
 #define HEATER_1_PIN        7
-#define HEATER_BED_PIN      58
+#define HEATER_BED_PIN     58
 
 #define LED4_PIN            8
-#define LASER_PIN          -1
 
 #define FAN_PIN             9
-#if(!ENABLED(FilamentSensor))
-  #define FAN1_PIN            4
+
+#if !ENABLED(FILAMENT_RUNOUT_SENSOR)
+  #define FAN1_PIN          4
 #endif
 
 //
@@ -153,32 +159,26 @@
 // Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
 #define FILWIDTH_PIN        5   // Analog Input
 
-#define PS_ON_PIN          12
+#ifndef PS_ON_PIN
+  #define PS_ON_PIN        12
+#endif
 
 //
 // LCD / Controller
 //
-// Formbot boards only support the use of the REPRAP_DISCOUNT_SMART_CONTROLLER LCD Panel
-//
-
-#if ENABLED(ULTRA_LCD)
-
-    #define LCD_PINS_RS 16
-    #define LCD_PINS_ENABLE 17
-    #define LCD_PINS_D4 23
-    #define LCD_PINS_D5 25
-    #define LCD_PINS_D6 27
-    #define LCD_PINS_D7 29
-
-  #if ENABLED(NEWPANEL)
-    #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-      #define BEEPER_PIN 37
-      #define BTN_EN1 31
-      #define BTN_EN2 33
-      #define BTN_ENC 35
-      #define SD_DETECT_PIN 49
-      #define KILL_PIN 41
-    #endif
-  #endif // NEWPANEL
-
-#endif // ULTRA_LCD
+// Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
+//
+#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
+  #define LCD_PINS_RS      16
+  #define LCD_PINS_ENABLE  17
+  #define LCD_PINS_D4      23
+  #define LCD_PINS_D5      25
+  #define LCD_PINS_D6      27
+  #define LCD_PINS_D7      29
+  #define BEEPER_PIN       37
+  #define BTN_EN1          31
+  #define BTN_EN2          33
+  #define BTN_ENC          35
+  #define SD_DETECT_PIN    49
+  #define KILL_PIN         41
+#endif