diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 475a08138..cd842f502 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -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 /** diff --git a/Marlin/Makefile b/Marlin/Makefile index 81eeceada..dffc21f7f 100644 --- a/Marlin/Makefile +++ b/Marlin/Makefile @@ -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 diff --git a/Marlin/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h index 8d10a0539..5d8b55f49 100644 --- a/Marlin/example_configurations/Cartesio/Configuration_adv.h +++ b/Marlin/example_configurations/Cartesio/Configuration_adv.h @@ -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 /** diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index 6ce93616f..27116092d 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -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 /** diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index dc40f3dee..b5e1d2832 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -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 /** diff --git a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h index c3d271376..a8899ab83 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h @@ -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 /** diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index 97ab4c3dd..f85d1009d 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -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 /** diff --git a/Marlin/example_configurations/K8400/Configuration_adv.h b/Marlin/example_configurations/K8400/Configuration_adv.h index 129a96774..fc293e345 100644 --- a/Marlin/example_configurations/K8400/Configuration_adv.h +++ b/Marlin/example_configurations/K8400/Configuration_adv.h @@ -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 /** diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index 1326b550a..4751b30fd 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -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 /** diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index 0276f1a22..67dc5630a 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -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 /** diff --git a/Marlin/example_configurations/TAZ4/Configuration_adv.h b/Marlin/example_configurations/TAZ4/Configuration_adv.h index 4ebc38302..b347b3d7d 100644 --- a/Marlin/example_configurations/TAZ4/Configuration_adv.h +++ b/Marlin/example_configurations/TAZ4/Configuration_adv.h @@ -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 /** diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index dc40f3dee..b5e1d2832 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -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 /** diff --git a/Marlin/example_configurations/delta/flsun_kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/flsun_kossel_mini/Configuration_adv.h index 461c98d15..f1f703aa3 100644 --- a/Marlin/example_configurations/delta/flsun_kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/flsun_kossel_mini/Configuration_adv.h @@ -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 /** diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index 879338196..4e0982631 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -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 /** diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index 879338196..4e0982631 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -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 /** diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index fbf33bf2c..2b32809a8 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h @@ -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 /** diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h index 1f1ce97ab..3fa66b4cc 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h @@ -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 /** diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index 171e61832..84e65c0ed 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -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 /** diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index b6baf4d4f..ab80eca71 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -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 /** diff --git a/Marlin/pinsDebug_Teensyduino.h b/Marlin/pinsDebug_Teensyduino.h index fc5c03abe..187c190f6 100644 --- a/Marlin/pinsDebug_Teensyduino.h +++ b/Marlin/pinsDebug_Teensyduino.h @@ -19,7 +19,7 @@ * along with this program. If not, see . * */ - + // // some of the pin mapping functions of the Teensduino extension to the Arduino IDE // do not function the same as the other Arduino extensions diff --git a/Marlin/stepper_dac.cpp b/Marlin/stepper_dac.cpp index 798768ebf..7d47602cb 100644 --- a/Marlin/stepper_dac.cpp +++ b/Marlin/stepper_dac.cpp @@ -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(); diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp index 735d608ca..af76edb0f 100644 --- a/Marlin/temperature.cpp +++ b/Marlin/temperature.cpp @@ -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(); diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index f788addde..b6f33cc32 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -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;