Browse Source

Clean up whitespace

pull/1/head
Scott Lahteine 6 years ago
parent
commit
cacec5764a
  1. 2
      Marlin/src/Marlin.cpp
  2. 4
      Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
  3. 6
      Marlin/src/feature/bedlevel/ubl/ubl.cpp
  4. 6
      Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
  5. 4
      Marlin/src/gcode/control/M605.cpp
  6. 2
      Marlin/src/lcd/extensible_ui/ui_api.h
  7. 2
      platformio.ini

2
Marlin/src/Marlin.cpp

@ -1145,7 +1145,7 @@ void loop() {
#endif #endif
#ifdef EVENT_GCODE_SD_STOP #ifdef EVENT_GCODE_SD_STOP
enqueue_and_echo_commands_P(PSTR(EVENT_GCODE_SD_STOP)); enqueue_and_echo_commands_P(PSTR(EVENT_GCODE_SD_STOP));
#endif #endif
} }
#endif // SDSUPPORT #endif // SDSUPPORT

4
Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp

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

6
Marlin/src/feature/bedlevel/ubl/ubl.cpp

@ -35,7 +35,7 @@
#if ENABLED(EXTENSIBLE_UI) #if ENABLED(EXTENSIBLE_UI)
#include "../../../lcd/extensible_ui/ui_api.h" #include "../../../lcd/extensible_ui/ui_api.h"
#endif #endif
#include "math.h" #include "math.h"
void unified_bed_leveling::echo_name() { void unified_bed_leveling::echo_name() {
@ -135,8 +135,8 @@
ZERO(z_values); ZERO(z_values);
#if ENABLED(EXTENSIBLE_UI) #if ENABLED(EXTENSIBLE_UI)
for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
ExtUI::onMeshUpdate(x, y, 0); ExtUI::onMeshUpdate(x, y, 0);
#endif #endif
if (was_enabled) report_current_position(); if (was_enabled) report_current_position();
} }

6
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp

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

4
Marlin/src/gcode/control/M605.cpp

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

2
Marlin/src/lcd/extensible_ui/ui_api.h

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

2
platformio.ini

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

Loading…
Cancel
Save