Browse Source

Remove extraneous whitespace

Scott Lahteine 8 years ago
parent
commit
77491dd924

+ 2
- 2
Marlin/Configuration_adv.h View File

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

+ 2
- 2
Marlin/Makefile View File

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

+ 2
- 2
Marlin/example_configurations/Cartesio/Configuration_adv.h View File

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

+ 2
- 2
Marlin/example_configurations/Felix/Configuration_adv.h View File

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

+ 2
- 2
Marlin/example_configurations/Hephestos/Configuration_adv.h View File

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

+ 2
- 2
Marlin/example_configurations/Hephestos_2/Configuration_adv.h View File

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

+ 2
- 2
Marlin/example_configurations/K8200/Configuration_adv.h View File

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

+ 2
- 2
Marlin/example_configurations/K8400/Configuration_adv.h View File

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

+ 2
- 2
Marlin/example_configurations/RigidBot/Configuration_adv.h View File

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

+ 2
- 2
Marlin/example_configurations/SCARA/Configuration_adv.h View File

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

+ 2
- 2
Marlin/example_configurations/TAZ4/Configuration_adv.h View File

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

+ 2
- 2
Marlin/example_configurations/WITBOX/Configuration_adv.h View File

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

+ 2
- 2
Marlin/example_configurations/delta/flsun_kossel_mini/Configuration_adv.h View File

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

+ 2
- 2
Marlin/example_configurations/delta/generic/Configuration_adv.h View File

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

+ 2
- 2
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h View File

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

+ 2
- 2
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h View File

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

+ 2
- 2
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h View File

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

+ 2
- 2
Marlin/example_configurations/makibox/Configuration_adv.h View File

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

+ 2
- 2
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h View File

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

+ 1
- 1
Marlin/pinsDebug_Teensyduino.h View File

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

+ 1
- 1
Marlin/stepper_dac.cpp View File

64
 
64
 
65
     mcp4728_setVref_all(DAC_STEPPER_VREF);
65
     mcp4728_setVref_all(DAC_STEPPER_VREF);
66
     mcp4728_setGain_all(DAC_STEPPER_GAIN);
66
     mcp4728_setGain_all(DAC_STEPPER_GAIN);
67
-    
67
+
68
     if (mcp4728_getDrvPct(0) < 1 || mcp4728_getDrvPct(1) < 1 || mcp4728_getDrvPct(2) < 1 || mcp4728_getDrvPct(3) < 1 ) {
68
     if (mcp4728_getDrvPct(0) < 1 || mcp4728_getDrvPct(1) < 1 || mcp4728_getDrvPct(2) < 1 || mcp4728_getDrvPct(3) < 1 ) {
69
       mcp4728_setDrvPct(dac_channel_pct);
69
       mcp4728_setDrvPct(dac_channel_pct);
70
       mcp4728_eepromWrite();
70
       mcp4728_eepromWrite();

+ 1
- 1
Marlin/temperature.cpp View File

1491
   // at the end of its run, potentially causing re-entry. This flag prevents it.
1491
   // at the end of its run, potentially causing re-entry. This flag prevents it.
1492
   if (in_temp_isr) return;
1492
   if (in_temp_isr) return;
1493
   in_temp_isr = true;
1493
   in_temp_isr = true;
1494
-  
1494
+
1495
   // Allow UART and stepper ISRs
1495
   // Allow UART and stepper ISRs
1496
   CBI(TIMSK0, OCIE0B); //Disable Temperature ISR
1496
   CBI(TIMSK0, OCIE0B); //Disable Temperature ISR
1497
   sei();
1497
   sei();

Loading…
Cancel
Save