Ver código fonte

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

Scott Lahteine 6 anos atrás
pai
commit
ad12b9b46b

+ 1
- 1
Marlin/src/core/boards.h Ver arquivo

75
 #define BOARD_AZTEEG_X3_PRO     68    // Azteeg X3 Pro
75
 #define BOARD_AZTEEG_X3_PRO     68    // Azteeg X3 Pro
76
 #define BOARD_ULTIMAIN_2        72    // Ultimainboard 2.x (Uses TEMP_SENSOR 20)
76
 #define BOARD_ULTIMAIN_2        72    // Ultimainboard 2.x (Uses TEMP_SENSOR 20)
77
 #define BOARD_RUMBA             80    // Rumba
77
 #define BOARD_RUMBA             80    // Rumba
78
-#define BOARD_FORMBOT           81    // Formbot version 1.  A Rumba derivitive
78
+#define BOARD_FORMBOT           81    // Formbot version 1. (A Rumba derivative)
79
 #define BOARD_BQ_ZUM_MEGA_3D    503   // bq ZUM Mega 3D
79
 #define BOARD_BQ_ZUM_MEGA_3D    503   // bq ZUM Mega 3D
80
 #define BOARD_MAKEBOARD_MINI    431   // MakeBoard Mini v2.1.2 is a control board sold by MicroMake
80
 #define BOARD_MAKEBOARD_MINI    431   // MakeBoard Mini v2.1.2 is a control board sold by MicroMake
81
 #define BOARD_TRIGORILLA_13     343   // TriGorilla Anycubic version 1.3 based on RAMPS EFB
81
 #define BOARD_TRIGORILLA_13     343   // TriGorilla Anycubic version 1.3 based on RAMPS EFB

+ 2
- 0
Marlin/src/feature/bedlevel/bedlevel.cpp Ver arquivo

77
 
77
 
78
   if (can_change && enable != planner.leveling_active) {
78
   if (can_change && enable != planner.leveling_active) {
79
 
79
 
80
+    planner.synchronize();
81
+
80
     #if ENABLED(MESH_BED_LEVELING)
82
     #if ENABLED(MESH_BED_LEVELING)
81
 
83
 
82
       if (!enable)
84
       if (!enable)

+ 9
- 10
Marlin/src/module/tool_change.cpp Ver arquivo

355
   planner.synchronize();
355
   planner.synchronize();
356
 
356
 
357
   #if HAS_LEVELING
357
   #if HAS_LEVELING
358
-      // Set current position to the physical position
359
-      const bool leveling_was_active = planner.leveling_active;
360
-      set_bed_leveling_enabled(false);
361
-   #endif
362
-  
358
+    // Set current position to the physical position
359
+    const bool leveling_was_active = planner.leveling_active;
360
+    set_bed_leveling_enabled(false);
361
+  #endif
362
+
363
   #if ENABLED(MIXING_EXTRUDER) && MIXING_VIRTUAL_TOOLS > 1
363
   #if ENABLED(MIXING_EXTRUDER) && MIXING_VIRTUAL_TOOLS > 1
364
 
364
 
365
     mixing_tool_change(tmp_extruder);
365
     mixing_tool_change(tmp_extruder);
511
     #if HAS_FANMUX
511
     #if HAS_FANMUX
512
       fanmux_switch(active_extruder);
512
       fanmux_switch(active_extruder);
513
     #endif
513
     #endif
514
-  
514
+
515
     #if HAS_LEVELING
515
     #if HAS_LEVELING
516
-          planner.synchronize();
517
-          // Restore leveling to re-establish the logical position
518
-          set_bed_leveling_enabled(leveling_was_active);
516
+      // Restore leveling to re-establish the logical position
517
+      set_bed_leveling_enabled(leveling_was_active);
519
     #endif
518
     #endif
520
-  
519
+
521
     SERIAL_ECHO_START();
520
     SERIAL_ECHO_START();
522
     SERIAL_ECHOLNPAIR(MSG_ACTIVE_EXTRUDER, (int)active_extruder);
521
     SERIAL_ECHOLNPAIR(MSG_ACTIVE_EXTRUDER, (int)active_extruder);
523
 
522
 

+ 42
- 42
Marlin/src/pins/pins_FORMBOT.h Ver arquivo

35
 #define DEFAULT_MACHINE_NAME "Formbot"
35
 #define DEFAULT_MACHINE_NAME "Formbot"
36
 #define BOARD_NAME           "Formbot"
36
 #define BOARD_NAME           "Formbot"
37
 
37
 
38
-#define LARGE_FLASH true
39
-
40
 //
38
 //
41
 // Servos
39
 // Servos
42
 //
40
 //
43
-#define SERVO0_PIN          11
41
+#define SERVO0_PIN         11
44
 #define SERVO1_PIN          6
42
 #define SERVO1_PIN          6
45
 #define SERVO2_PIN          5
43
 #define SERVO2_PIN          5
46
-#define SERVO3_PIN          -1
44
+#define SERVO3_PIN         -1
47
 
45
 
48
 //
46
 //
49
 // Limit Switches
47
 // Limit Switches
64
   #define Z_MIN_PROBE_PIN  32
62
   #define Z_MIN_PROBE_PIN  32
65
 #endif
63
 #endif
66
 
64
 
67
-#define SLED_PIN           -1
68
-
69
 //
65
 //
70
 // Steppers
66
 // Steppers
71
 //
67
 //
72
 #define X_STEP_PIN         54
68
 #define X_STEP_PIN         54
73
 #define X_DIR_PIN          55
69
 #define X_DIR_PIN          55
74
 #define X_ENABLE_PIN       38
70
 #define X_ENABLE_PIN       38
75
-#define X_CS_PIN           53
71
+#ifndef X_CS_PIN
72
+  #define X_CS_PIN         53
73
+#endif
76
 
74
 
77
 #define Y_STEP_PIN         60
75
 #define Y_STEP_PIN         60
78
 #define Y_DIR_PIN          61
76
 #define Y_DIR_PIN          61
79
 #define Y_ENABLE_PIN       56
77
 #define Y_ENABLE_PIN       56
80
-#define Y_CS_PIN           49
78
+#ifndef Y_CS_PIN
79
+  #define Y_CS_PIN         49
80
+#endif
81
 
81
 
82
 #define Z_STEP_PIN         46
82
 #define Z_STEP_PIN         46
83
 #define Z_DIR_PIN          48
83
 #define Z_DIR_PIN          48
84
 #define Z_ENABLE_PIN       62
84
 #define Z_ENABLE_PIN       62
85
-#define Z_CS_PIN           40
85
+#ifndef Z_CS_PIN
86
+  #define Z_CS_PIN         40
87
+#endif
86
 
88
 
87
 #define E0_STEP_PIN        26
89
 #define E0_STEP_PIN        26
88
 #define E0_DIR_PIN         28
90
 #define E0_DIR_PIN         28
89
 #define E0_ENABLE_PIN      24
91
 #define E0_ENABLE_PIN      24
90
-#define E0_CS_PIN          42
92
+#ifndef E0_CS_PIN
93
+  #define E0_CS_PIN        42
94
+#endif
91
 
95
 
92
 #define E1_STEP_PIN        36
96
 #define E1_STEP_PIN        36
93
 #define E1_DIR_PIN         34
97
 #define E1_DIR_PIN         34
94
 #define E1_ENABLE_PIN      30
98
 #define E1_ENABLE_PIN      30
95
-#define E1_CS_PIN          44
99
+#ifndef E1_CS_PIN
100
+  #define E1_CS_PIN        44
101
+#endif
96
 
102
 
97
 #define E2_STEP_PIN        42
103
 #define E2_STEP_PIN        42
98
 #define E2_DIR_PIN         43
104
 #define E2_DIR_PIN         43
103
 //
109
 //
104
 #define TEMP_0_PIN         13   // Analog Input
110
 #define TEMP_0_PIN         13   // Analog Input
105
 #define TEMP_1_PIN         15   // Analog Input
111
 #define TEMP_1_PIN         15   // Analog Input
106
-#define TEMP_BED_PIN       3   // Analog Input
112
+#define TEMP_BED_PIN        3   // Analog Input
107
 
113
 
108
 // SPI for Max6675 or Max31855 Thermocouple
114
 // SPI for Max6675 or Max31855 Thermocouple
109
 #if DISABLED(SDSUPPORT)
115
 #if DISABLED(SDSUPPORT)
132
 //
138
 //
133
 // Heaters / Fans
139
 // Heaters / Fans
134
 //
140
 //
135
-#define HEATER_0_PIN        10
141
+#define HEATER_0_PIN       10
136
 #define HEATER_1_PIN        7
142
 #define HEATER_1_PIN        7
137
-#define HEATER_BED_PIN      58
143
+#define HEATER_BED_PIN     58
138
 
144
 
139
 #define LED4_PIN            8
145
 #define LED4_PIN            8
140
-#define LASER_PIN          -1
141
 
146
 
142
 #define FAN_PIN             9
147
 #define FAN_PIN             9
143
-#if(!ENABLED(FilamentSensor))
144
-  #define FAN1_PIN            4
148
+
149
+#if !ENABLED(FILAMENT_RUNOUT_SENSOR)
150
+  #define FAN1_PIN          4
145
 #endif
151
 #endif
146
 
152
 
147
 //
153
 //
153
 // Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
159
 // Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
154
 #define FILWIDTH_PIN        5   // Analog Input
160
 #define FILWIDTH_PIN        5   // Analog Input
155
 
161
 
156
-#define PS_ON_PIN          12
162
+#ifndef PS_ON_PIN
163
+  #define PS_ON_PIN        12
164
+#endif
157
 
165
 
158
 //
166
 //
159
 // LCD / Controller
167
 // LCD / Controller
160
 //
168
 //
161
-// Formbot boards only support the use of the REPRAP_DISCOUNT_SMART_CONTROLLER LCD Panel
162
-//
163
-
164
-#if ENABLED(ULTRA_LCD)
165
-
166
-    #define LCD_PINS_RS 16
167
-    #define LCD_PINS_ENABLE 17
168
-    #define LCD_PINS_D4 23
169
-    #define LCD_PINS_D5 25
170
-    #define LCD_PINS_D6 27
171
-    #define LCD_PINS_D7 29
172
-
173
-  #if ENABLED(NEWPANEL)
174
-    #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
175
-      #define BEEPER_PIN 37
176
-      #define BTN_EN1 31
177
-      #define BTN_EN2 33
178
-      #define BTN_ENC 35
179
-      #define SD_DETECT_PIN 49
180
-      #define KILL_PIN 41
181
-    #endif
182
-  #endif // NEWPANEL
183
-
184
-#endif // ULTRA_LCD
169
+// Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
170
+//
171
+#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
172
+  #define LCD_PINS_RS      16
173
+  #define LCD_PINS_ENABLE  17
174
+  #define LCD_PINS_D4      23
175
+  #define LCD_PINS_D5      25
176
+  #define LCD_PINS_D6      27
177
+  #define LCD_PINS_D7      29
178
+  #define BEEPER_PIN       37
179
+  #define BTN_EN1          31
180
+  #define BTN_EN2          33
181
+  #define BTN_ENC          35
182
+  #define SD_DETECT_PIN    49
183
+  #define KILL_PIN         41
184
+#endif

Carregando…
Cancelar
Salvar