SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Whitespace cleanup

Browse source
This commit is contained in:
Scott Lahteine 2020-07-07 01:57:05 -05:00
parent 9546847dc1
commit d6682c8609
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/feature/leds/neopixel.cpp
View file

@ -53,11 +53,11 @@ Adafruit_NeoPixel Marlin_NeoPixel::adaneo1(NEOPIXEL_PIXELS, NEOPIXEL_PIN, NEOPIX
#endif #endif
void Marlin_NeoPixel::set_color(const uint32_t color) { void Marlin_NeoPixel::set_color(const uint32_t color) {
if (get_neo_index() >= 0) { if (get_neo_index() >= 0) {
set_pixel_color(get_neo_index(), color); set_pixel_color(get_neo_index(), color);
set_neo_index(-1); set_neo_index(-1);
} }
else { else {
for (uint16_t i = 0; i < pixels(); ++i) { for (uint16_t i = 0; i < pixels(); ++i) {
#ifdef NEOPIXEL_BKGD_LED_INDEX #ifdef NEOPIXEL_BKGD_LED_INDEX
if (i == NEOPIXEL_BKGD_LED_INDEX && color != 0x000000) { if (i == NEOPIXEL_BKGD_LED_INDEX && color != 0x000000) {

2
Marlin/src/gcode/feature/leds/M150.cpp
View file

@ -47,7 +47,7 @@
* M150 P127 ; Set LED 50% brightness * M150 P127 ; Set LED 50% brightness
* M150 P ; Set LED full brightness * M150 P ; Set LED full brightness
* M150 I1 R ; Set NEOPIXEL index 1 to red * M150 I1 R ; Set NEOPIXEL index 1 to red
*/ */
void GcodeSuite::M150() { void GcodeSuite::M150() {
#if ENABLED(NEOPIXEL_LED) #if ENABLED(NEOPIXEL_LED)
neo.set_neo_index(parser.intval('I', -1)); neo.set_neo_index(parser.intval('I', -1));

6
Marlin/src/inc/Conditionals_LCD.h
View file

@ -121,10 +121,10 @@
#define IS_U8GLIB_SSD1306 #define IS_U8GLIB_SSD1306
#elif ENABLED(FYSETC_242_OLED_12864) #elif ENABLED(FYSETC_242_OLED_12864)
#define IS_RRD_SC #define IS_RRD_SC
#define U8GLIB_SH1106 #define U8GLIB_SH1106
#define LED_CONTROL_MENU #define LED_CONTROL_MENU
#define NEOPIXEL_LED #define NEOPIXEL_LED
#undef NEOPIXEL_TYPE #undef NEOPIXEL_TYPE
@ -136,7 +136,7 @@
#ifndef NEOPIXEL_BRIGHTNESS #ifndef NEOPIXEL_BRIGHTNESS
#define NEOPIXEL_BRIGHTNESS 127 #define NEOPIXEL_BRIGHTNESS 127
#endif #endif
#if ENABLED(PSU_CONTROL) #if ENABLED(PSU_CONTROL)
#define LED_BACKLIGHT_TIMEOUT 10000 #define LED_BACKLIGHT_TIMEOUT 10000
#endif #endif

6
Marlin/src/lcd/dogm/ultralcd_DOGM.h
View file

@ -124,11 +124,11 @@
#endif #endif
#elif ENABLED(FYSETC_242_OLED_12864) #elif ENABLED(FYSETC_242_OLED_12864)
// FYSETC OLED 2.42" 128 × 64 FULL GRAPHICS CONTROLLER // FYSETC OLED 2.42" 128 × 64 FULL GRAPHICS CONTROLLER
#define FORCE_SOFT_SPI // SW-SPI #define FORCE_SOFT_SPI // SW-SPI
#if ENABLED(ALTERNATIVE_LCD) #if ENABLED(ALTERNATIVE_LCD)
#define U8G_CLASS U8GLIB_SSD1306_128X64_2X // 4 stripes #define U8G_CLASS U8GLIB_SSD1306_128X64_2X // 4 stripes
#else #else

2
Marlin/src/lcd/menu/menu_configuration.cpp
View file

@ -310,7 +310,7 @@ void menu_advanced_settings();
#if HAS_FAN #if HAS_FAN
editable.uint8 = uint8_t(ui.material_preset[m].fan_speed); editable.uint8 = uint8_t(ui.material_preset[m].fan_speed);
EDIT_ITEM_N(percent, m, MSG_FAN_SPEED, &editable.uint8, 0, 255, []{ ui.material_preset[MenuItemBase::itemIndex].fan_speed = editable.uint8; }); EDIT_ITEM_N(percent, m, MSG_FAN_SPEED, &editable.uint8, 0, 255, []{ ui.material_preset[MenuItemBase::itemIndex].fan_speed = editable.uint8; });
#endif #endif
#if HAS_TEMP_HOTEND #if HAS_TEMP_HOTEND
EDIT_ITEM(uint16_3, MSG_NOZZLE, &ui.material_preset[m].hotend_temp, MINTEMP_ALL, MAXTEMP_ALL - HOTEND_OVERSHOOT); EDIT_ITEM(uint16_3, MSG_NOZZLE, &ui.material_preset[m].hotend_temp, MINTEMP_ALL, MAXTEMP_ALL - HOTEND_OVERSHOOT);
#endif #endif

2
Marlin/src/module/motion.cpp
View file

@ -1502,7 +1502,7 @@ void set_axis_not_trusted(const AxisEnum axis) {
// Skip to next if target position is behind current. So it only moves away from endstop. // Skip to next if target position is behind current. So it only moves away from endstop.
if (phaseDelta < 0) phaseDelta += 1024; if (phaseDelta < 0) phaseDelta += 1024;
// Convert TMC µsteps(phase) to whole Marlin µsteps to effector backout direction to mm // Convert TMC µsteps(phase) to whole Marlin µsteps to effector backout direction to mm
const float mmDelta = int16_t(phaseDelta / phasePerUStep) * effectorBackoutDir * planner.steps_to_mm[axis]; const float mmDelta = int16_t(phaseDelta / phasePerUStep) * effectorBackoutDir * planner.steps_to_mm[axis];
// Optional debug messages // Optional debug messages

2
Marlin/src/pins/stm32f4/pins_LERDGE_K.h
View file

@ -100,7 +100,7 @@
#define TEMP_BED_PIN PC0 // Analog Input #define TEMP_BED_PIN PC0 // Analog Input
// Lergde-K can choose thermocouple/thermistor mode in software. // Lergde-K can choose thermocouple/thermistor mode in software.
// For use with thermistors, these pins must be OUT/LOW. // For use with thermistors, these pins must be OUT/LOW.
// This is done automatically. // This is done automatically.
#define TEMP_0_TR_ENABLE_PIN PF10 #define TEMP_0_TR_ENABLE_PIN PF10
#define TEMP_1_TR_ENABLE_PIN PF9 #define TEMP_1_TR_ENABLE_PIN PF9