andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Remove some extraneous spaces

pull/1/head
Scott Lahteine 7 years ago
parent
672e45652e
commit
f02af83d42
23 changed files with 42 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Marlin/Configuration_adv.h
  2. 4
      Marlin/Makefile
  3. 4
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  4. 4
      Marlin/example_configurations/Felix/Configuration_adv.h
  5. 4
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  6. 4
      Marlin/example_configurations/Hephestos_2/Configuration_adv.h
  7. 4
      Marlin/example_configurations/K8200/Configuration_adv.h
  8. 4
      Marlin/example_configurations/K8400/Configuration_adv.h
  9. 4
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  10. 4
      Marlin/example_configurations/SCARA/Configuration_adv.h
  11. 4
      Marlin/example_configurations/TAZ4/Configuration_adv.h
  12. 4
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  13. 4
      Marlin/example_configurations/delta/flsun_kossel_mini/Configuration_adv.h
  14. 4
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  15. 4
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  16. 4
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  17. 4
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  18. 4
      Marlin/example_configurations/makibox/Configuration_adv.h
  19. 4
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
  20. 2
      Marlin/pinsDebug_Teensyduino.h
  21. 2
      Marlin/stepper_dac.cpp
  22. 2
      Marlin/temperature.cpp
  23. 2
      Marlin/ultralcd.cpp

4
Marlin/Configuration_adv.h
View File

@ -848,7 +848,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1063,7 +1063,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

4
Marlin/Makefile
View File

@ -45,7 +45,7 @@
#
# make ARDUINO_VERSION=10609 AVR_TOOLS_PATH=/root/arduino/hardware/tools/avr/bin/ \
# HARDWARE_MOTHERBOARD=33 ARDUINO_INSTALL_DIR=/root/arduino upload
#
#
# If uploading doesn't work try adding the parameter "AVRDUDE_PROGRAMMER=wiring" or
# start upload manually (using stk500) like so:
#
@ -69,7 +69,7 @@ AVR_TOOLS_PATH ?=
#Programmer configuration
UPLOAD_RATE ?= 57600
AVRDUDE_PROGRAMMER ?= arduino
# on most linuxes this will be /dev/ttyACM0 or /dev/ttyACM1
# on most linuxes this will be /dev/ttyACM0 or /dev/ttyACM1
UPLOAD_PORT ?= /dev/ttyUSB0
#Directory used to build files in, contains all the build files, from object files to the final hex file

4
Marlin/example_configurations/Cartesio/Configuration_adv.h
View File

@ -845,7 +845,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1060,7 +1060,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

4
Marlin/example_configurations/Felix/Configuration_adv.h
View File

@ -845,7 +845,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1060,7 +1060,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

4
Marlin/example_configurations/Hephestos/Configuration_adv.h
View File

@ -845,7 +845,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1060,7 +1060,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

4
Marlin/example_configurations/Hephestos_2/Configuration_adv.h
View File

@ -828,7 +828,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1043,7 +1043,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

4
Marlin/example_configurations/K8200/Configuration_adv.h
View File

@ -858,7 +858,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1073,7 +1073,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

4
Marlin/example_configurations/K8400/Configuration_adv.h
View File

@ -845,7 +845,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1060,7 +1060,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

4
Marlin/example_configurations/RigidBot/Configuration_adv.h
View File

@ -845,7 +845,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1060,7 +1060,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

4
Marlin/example_configurations/SCARA/Configuration_adv.h
View File

@ -845,7 +845,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1060,7 +1060,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

4
Marlin/example_configurations/TAZ4/Configuration_adv.h
View File

@ -853,7 +853,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1068,7 +1068,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

4
Marlin/example_configurations/WITBOX/Configuration_adv.h
View File

@ -845,7 +845,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1060,7 +1060,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

4
Marlin/example_configurations/delta/flsun_kossel_mini/Configuration_adv.h
View File

@ -850,7 +850,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1065,7 +1065,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

4
Marlin/example_configurations/delta/generic/Configuration_adv.h
View File

@ -847,7 +847,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1062,7 +1062,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

4
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
View File

@ -847,7 +847,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1062,7 +1062,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

4
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
View File

@ -852,7 +852,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1067,7 +1067,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

4
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
View File

@ -847,7 +847,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1062,7 +1062,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

4
Marlin/example_configurations/makibox/Configuration_adv.h
View File

@ -845,7 +845,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1060,7 +1060,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

4
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
View File

@ -845,7 +845,7 @@
* Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered,
* then decrease current by CURRENT_STEP until temperature prewarn is cleared.
* Adjusting starts from X/Y/Z/E_MAX_CURRENT but will not increase over AUTO_ADJUST_MAX
*/
*/
//#define AUTOMATIC_CURRENT_CONTROL
#define CURRENT_STEP 50 // [mA]
#define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak
@ -1060,7 +1060,7 @@
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
* M200 D0 to disable, M200 Dn to set a new diameter.
*/
*/
//#define VOLUMETRIC_DEFAULT_ON
/**

2
Marlin/pinsDebug_Teensyduino.h
View File

@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
//
// some of the pin mapping functions of the Teensduino extension to the Arduino IDE
// do not function the same as the other Arduino extensions

2
Marlin/stepper_dac.cpp
View File

@ -64,7 +64,7 @@
mcp4728_setVref_all(DAC_STEPPER_VREF);
mcp4728_setGain_all(DAC_STEPPER_GAIN);
if (mcp4728_getDrvPct(0) < 1 || mcp4728_getDrvPct(1) < 1 || mcp4728_getDrvPct(2) < 1 || mcp4728_getDrvPct(3) < 1 ) {
mcp4728_setDrvPct(dac_channel_pct);
mcp4728_eepromWrite();

2
Marlin/temperature.cpp
View File

@ -1491,7 +1491,7 @@ void Temperature::isr() {
// at the end of its run, potentially causing re-entry. This flag prevents it.
if (in_temp_isr) return;
in_temp_isr = true;
// Allow UART and stepper ISRs
CBI(TIMSK0, OCIE0B); //Disable Temperature ISR
sei();

2
Marlin/ultralcd.cpp
View File

@ -428,7 +428,7 @@ uint16_t max_display_update_time = 0;
}
else if (screen == lcd_status_screen && currentScreen == lcd_main_menu && PENDING(millis(), doubleclick_expire_ms))
screen = lcd_babystep_z;
#endif
#endif
currentScreen = screen;
encoderPosition = encoder;

Write Preview
Loading…
Cancel
Save