Scott Lahteine 6 лет назад
Родитель
Сommit
cacec5764a

+ 1
- 1
Marlin/src/Marlin.cpp Просмотреть файл

@@ -1145,7 +1145,7 @@ void loop() {
1145 1145
         #endif
1146 1146
         #ifdef EVENT_GCODE_SD_STOP
1147 1147
           enqueue_and_echo_commands_P(PSTR(EVENT_GCODE_SD_STOP));
1148
-        #endif  
1148
+        #endif
1149 1149
       }
1150 1150
     #endif // SDSUPPORT
1151 1151
 

+ 2
- 2
Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp Просмотреть файл

@@ -49,8 +49,8 @@
49 49
     ZERO(z_values);
50 50
     #if ENABLED(EXTENSIBLE_UI)
51 51
       for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
52
-        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) 
53
-            ExtUI::onMeshUpdate(x, y, 0);
52
+        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
53
+          ExtUI::onMeshUpdate(x, y, 0);
54 54
     #endif
55 55
   }
56 56
 

+ 3
- 3
Marlin/src/feature/bedlevel/ubl/ubl.cpp Просмотреть файл

@@ -35,7 +35,7 @@
35 35
   #if ENABLED(EXTENSIBLE_UI)
36 36
     #include "../../../lcd/extensible_ui/ui_api.h"
37 37
   #endif
38
-  
38
+
39 39
   #include "math.h"
40 40
 
41 41
   void unified_bed_leveling::echo_name() {
@@ -135,8 +135,8 @@
135 135
     ZERO(z_values);
136 136
     #if ENABLED(EXTENSIBLE_UI)
137 137
       for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
138
-        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) 
139
-            ExtUI::onMeshUpdate(x, y, 0);
138
+        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
139
+          ExtUI::onMeshUpdate(x, y, 0);
140 140
     #endif
141 141
     if (was_enabled) report_current_position();
142 142
   }

+ 2
- 4
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp Просмотреть файл

@@ -765,14 +765,12 @@
765 765
 
766 766
         if (location.x_index >= 0) {    // mesh point found and is reachable by probe
767 767
           const float rawx = mesh_index_to_xpos(location.x_index),
768
-                      rawy = mesh_index_to_ypos(location.y_index);
769
-
770
-          const float measured_z = probe_pt(rawx, rawy, stow_probe ? PROBE_PT_STOW : PROBE_PT_RAISE, g29_verbose_level); // TODO: Needs error handling
768
+                      rawy = mesh_index_to_ypos(location.y_index),
769
+                      measured_z = probe_pt(rawx, rawy, stow_probe ? PROBE_PT_STOW : PROBE_PT_RAISE, g29_verbose_level); // TODO: Needs error handling
771 770
           z_values[location.x_index][location.y_index] = measured_z;
772 771
           #if ENABLED(EXTENSIBLE_UI)
773 772
             ExtUI::onMeshUpdate(location.x_index, location.y_index, measured_z);
774 773
           #endif
775
-          
776 774
         }
777 775
         SERIAL_FLUSH(); // Prevent host M105 buffer overrun.
778 776
       } while (location.x_index >= 0 && --count);

+ 2
- 2
Marlin/src/gcode/control/M605.cpp Просмотреть файл

@@ -42,10 +42,10 @@
42 42
    *
43 43
    *   M605 S0 : (FULL_CONTROL) The slicer has full control over both X-carriages and can achieve optimal travel
44 44
    *             results as long as it supports dual X-carriages.
45
-   * 
45
+   *
46 46
    *   M605 S1 : (AUTO_PARK) The firmware automatically parks and unparks the X-carriages on tool-change so that
47 47
    *             additional slicer support is not required.
48
-   * 
48
+   *
49 49
    *   M605 S2 X R : (DUPLICATION) The firmware moves the second X-carriage and extruder in synchronization with
50 50
    *             the first X-carriage and extruder, to print 2 copies of the same object at the same time.
51 51
    *             Set the constant X-offset and temperature differential with M605 S2 X[offs] R[deg] and

+ 1
- 1
Marlin/src/lcd/extensible_ui/ui_api.h Просмотреть файл

@@ -105,7 +105,7 @@ namespace ExtUI {
105 105
   float getFeedrate_percent();
106 106
   uint8_t getProgress_percent();
107 107
   uint32_t getProgress_seconds_elapsed();
108
-  
108
+
109 109
   #if HAS_LEVELING
110 110
     bool getLevelingActive();
111 111
     void setLevelingActive(const bool);

+ 1
- 1
platformio.ini Просмотреть файл

@@ -307,7 +307,7 @@ framework     = arduino
307 307
 board         = genericSTM32F103ZE
308 308
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin.py
309 309
 build_flags   = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
310
- -DSTM32_XL_DENSITY 
310
+ -DSTM32_XL_DENSITY
311 311
   ${common.build_flags}
312 312
   -DSTM32_XL_DENSITY
313 313
 src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>

Загрузка…
Отмена
Сохранить