bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Whitespace cleanup

Browse Source
This commit is contained in:
Scott Lahteine
2020-09-06 22:51:53 -05:00
parent ef1d154a4a
commit b709baba7a
7 changed files with 227 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/feature/leds/leds.cpp
View File

@ -183,14 +183,14 @@ void LEDLights::set_color(const LEDColor &incol
: neo2.Color(incol.r, incol.g, incol.b, incol.w);
neo2.set_brightness(incol.i);
neo2.set_color(neocolor);
#if ENABLED(LED_CONTROL_MENU)
// Don't update the color when OFF
lights_on = !incol.is_off();
if (lights_on) color = incol;
#endif
}
#if ENABLED(LED_CONTROL_MENU)
void LEDLights2::toggle() { if (lights_on) set_off(); else update(); }
#endif

2
Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.cpp
View File

@ -413,7 +413,7 @@ void AnycubicTFTClass::RenderCurrentFileList() {
uint16_t selectedNumber = 0;
SelectedDirectory[0] = 0;
SelectedFile[0] = 0;
ExtUI::FileList currentFileList;
ExtUI::FileList currentFileList;
SENDLINE_PGM("FN "); // Filelist start

10
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
View File

@ -117,11 +117,12 @@ bool DLCache::store(uint32_t min_bytes /* = 0*/) {
// If we are allocating new space...
dl_slot_addr = CLCD::mem_read_32(DL_FREE_ADDR);
dl_slot_size = max(dl_size, min_bytes);
const uint32_t free_space = MAP::RAM_G_SIZE - dl_slot_addr;
if(dl_slot_size <= free_space) {
if (dl_slot_size <= free_space) {
CLCD::mem_write_32(DL_FREE_ADDR, dl_slot_addr + dl_slot_size);
} else {
}
else {
dl_slot_addr = 0;
dl_slot_size = 0;
dl_slot_used = 0;
@ -138,7 +139,8 @@ bool DLCache::store(uint32_t min_bytes /* = 0*/) {
dl_slot_used = 0;
save_slot();
return false;
} else {
}
else {
#if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHO_START();
SERIAL_ECHOPAIR ("Saving DL to RAMG cache, bytes: ", dl_slot_used);

2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
View File

@ -51,7 +51,7 @@ class DLCache {
void load_slot() {load_slot(dl_slot_indx, dl_slot_addr, dl_slot_size, dl_slot_used);}
void save_slot() {save_slot(dl_slot_indx, dl_slot_addr, dl_slot_size, dl_slot_used);}
static void load_slot(uint8_t indx, uint32_t &addr, uint16_t &size, uint16_t &used);
static void save_slot(uint8_t indx, uint32_t addr, uint16_t size, uint16_t used);

4
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
View File

@ -87,7 +87,7 @@
#define MOTOR_CURRENT_PWM_E_PIN PB0
#define MOTOR_CURRENT_PWM_RANGE 1500 // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
#ifndef DEFAULT_PWM_MOTOR_CURRENT
#define DEFAULT_PWM_MOTOR_CURRENT { 800, 800, 800 }
#define DEFAULT_PWM_MOTOR_CURRENT { 800, 800, 800 }
#endif
//
// Temperature Sensors
@ -180,7 +180,7 @@
#define TFT_DRIVER ILI9341
#define TFT_BUFFER_SIZE 14400
// YV for normal screen mounting
#define ILI9341_ORIENTATION ILI9341_MADCTL_MY | ILI9341_MADCTL_MV
// XV for 180° rotated screen mounting

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
View File

@ -293,7 +293,7 @@
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET 349
#endif
#define TFT_DRIVER ILI9488
#define TFT_BUFFER_SIZE 14400
#define ILI9488_ORIENTATION ILI9488_MADCTL_MX | ILI9488_MADCTL_MV