Skip to content

Commit

Permalink
Fix line-endings, formatting, whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Dec 30, 2018
1 parent 135c740 commit 371d9a1
Show file tree
Hide file tree
Showing 5 changed files with 180 additions and 208 deletions.
2 changes: 1 addition & 1 deletion Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@
#define STATUS_HOTEND_ANIM // Use a second bitmap to indicate hotend heating
#define STATUS_BED_ANIM // Use a second bitmap to indicate bed heating
//#define STATUS_ALT_BED_BITMAP // Use the alternative bed bitmap
//#define STATUS_ALT_FAN_BITMAP // Use the alternate fan bitmap
//#define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap
//#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames
//#define STATUS_HEAT_PERCENT // Show heating in a progress bar

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/module/configuration_store.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ void MarlinSettings::postprocess() {
EEPROM_WRITE(dummy);
#endif
#else
const float planner_max_jerk[XYZE] = { float(DEFAULT_EJERK) };
const float planner_max_jerk[XYZE] = { float(DEFAULT_EJERK) };
EEPROM_WRITE(planner_max_jerk);
#endif

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/pins.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
#elif MB(MKS_BASE)
#include "pins_MKS_BASE.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
#elif MB(MKS_BASE_14)
#include "pins_MKS_BASE_14.h" // ATmega2560 env:megaatmega2560
#include "pins_MKS_BASE_14.h" // ATmega2560 env:megaatmega2560
#elif MB(MKS_BASE_15)
#include "pins_MKS_BASE_15.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
#elif MB(MKS_BASE_HEROIC)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/pins_DUPLICATOR_I3_PLUS.h
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
* ##################################
*
* @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
*
*
* == Y-endstop == == Z-endstop == == Bed temperature ==
*
* 1 2 1 2 1 2
Expand Down
Loading

0 comments on commit 371d9a1

Please sign in to comment.