diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 7e6168a142..045002e4ba 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -71,7 +71,11 @@ // @section info // Author info of this build printed to the host during boot and M115 +<<<<<<< HEAD #define STRING_CONFIG_H_AUTHOR "(Matthew Piercey, Bot-In-a-Box Educational Robotics)" // Who made the changes. +======= +#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. +>>>>>>> 2.0.5.3 //#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) /** @@ -89,7 +93,11 @@ #define SHOW_BOOTSCREEN // Show the bitmap in Marlin/_Bootscreen.h on startup. +<<<<<<< HEAD #define SHOW_CUSTOM_BOOTSCREEN +======= +//#define SHOW_CUSTOM_BOOTSCREEN +>>>>>>> 2.0.5.3 // Show the bitmap in Marlin/_Statusscreen.h on the status screen. //#define CUSTOM_STATUS_SCREEN_IMAGE @@ -104,8 +112,12 @@ * * :[-1, 0, 1, 2, 3, 4, 5, 6, 7] */ +<<<<<<< HEAD #define SERIAL_PORT -1 #define SERIAL_PORT_2 0 +======= +#define SERIAL_PORT 0 +>>>>>>> 2.0.5.3 /** * Select a secondary serial port on the board to use for communication with the host. @@ -129,11 +141,19 @@ // Choose the name from boards.h that matches your setup #ifndef MOTHERBOARD +<<<<<<< HEAD #define MOTHERBOARD BOARD_BTT_SKR_V1_3 #endif // Name displayed in the LCD "Ready" message and Info menu #define CUSTOM_MACHINE_NAME "SKR i3" +======= + #define MOTHERBOARD BOARD_RAMPS_14_EFB +#endif + +// Name displayed in the LCD "Ready" message and Info menu +//#define CUSTOM_MACHINE_NAME "3D Printer" +>>>>>>> 2.0.5.3 // Printer's unique ID, used by some programs to differentiate between machines. // Choose your own or use a service like http://www.uuidgenerator.net/version4 @@ -146,7 +166,11 @@ #define EXTRUDERS 1 // Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc. +<<<<<<< HEAD #define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 +======= +#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0 +>>>>>>> 2.0.5.3 // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE @@ -415,7 +439,11 @@ #define TEMP_SENSOR_5 0 #define TEMP_SENSOR_6 0 #define TEMP_SENSOR_7 0 +<<<<<<< HEAD #define TEMP_SENSOR_BED 1 +======= +#define TEMP_SENSOR_BED 0 +>>>>>>> 2.0.5.3 #define TEMP_SENSOR_PROBE 0 #define TEMP_SENSOR_CHAMBER 0 @@ -451,6 +479,7 @@ // Above this temperature the heater will be switched off. // This can protect components from overheating, but NOT from shorts and failures. // (Use MINTEMP for thermistor short/failure protection.) +<<<<<<< HEAD #define HEATER_0_MAXTEMP 260 #define HEATER_1_MAXTEMP 260 #define HEATER_2_MAXTEMP 260 @@ -460,6 +489,17 @@ #define HEATER_6_MAXTEMP 260 #define HEATER_7_MAXTEMP 260 #define BED_MAXTEMP 115 +======= +#define HEATER_0_MAXTEMP 275 +#define HEATER_1_MAXTEMP 275 +#define HEATER_2_MAXTEMP 275 +#define HEATER_3_MAXTEMP 275 +#define HEATER_4_MAXTEMP 275 +#define HEATER_5_MAXTEMP 275 +#define HEATER_6_MAXTEMP 275 +#define HEATER_7_MAXTEMP 275 +#define BED_MAXTEMP 150 +>>>>>>> 2.0.5.3 //=========================================================================== //============================= PID Settings ================================ @@ -485,6 +525,7 @@ // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it // Ultimaker +<<<<<<< HEAD //#define DEFAULT_Kp 22.2 //#define DEFAULT_Ki 1.08 //#define DEFAULT_Kd 114 @@ -498,6 +539,11 @@ //#define DEFAULT_Kp 17.45 //#define DEFAULT_Ki 0.84 //#define DEFAULT_Kd 90.41 +======= + #define DEFAULT_Kp 22.2 + #define DEFAULT_Ki 1.08 + #define DEFAULT_Kd 114 +>>>>>>> 2.0.5.3 // MakerGear //#define DEFAULT_Kp 7.0 @@ -509,11 +555,14 @@ //#define DEFAULT_Ki 2.25 //#define DEFAULT_Kd 440 +<<<<<<< HEAD // Defaults from PID Tuning #define DEFAULT_Kp 23.66 #define DEFAULT_Ki 1.42 #define DEFAULT_Kd 98.72 +======= +>>>>>>> 2.0.5.3 #endif // PIDTEMP //=========================================================================== @@ -533,7 +582,11 @@ * heater. If your configuration is significantly different than this and you don't understand * the issues involved, don't use bed PID until someone else verifies that your hardware works. */ +<<<<<<< HEAD #define PIDTEMPBED +======= +//#define PIDTEMPBED +>>>>>>> 2.0.5.3 //#define BED_LIMIT_SWITCHING @@ -551,6 +604,7 @@ //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10) +<<<<<<< HEAD //#define DEFAULT_bedKp 10.00 //#define DEFAULT_bedKi .023 //#define DEFAULT_bedKd 305.4 @@ -564,6 +618,11 @@ //#define DEFAULT_bedKp 602.82 //#define DEFAULT_bedKi 114.98 //#define DEFAULT_bedKd 790.15 +======= + #define DEFAULT_bedKp 10.00 + #define DEFAULT_bedKi .023 + #define DEFAULT_bedKd 305.4 +>>>>>>> 2.0.5.3 //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) //from pidautotune @@ -571,11 +630,14 @@ //#define DEFAULT_bedKi 1.41 //#define DEFAULT_bedKd 1675.16 +<<<<<<< HEAD // Defaults from PID Tuning #define DEFAULT_bedKp 148.74 #define DEFAULT_bedKi 29.72 #define DEFAULT_bedKd 496.30 +======= +>>>>>>> 2.0.5.3 // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. #endif // PIDTEMPBED @@ -589,7 +651,11 @@ * *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! *** */ #define PREVENT_COLD_EXTRUSION +<<<<<<< HEAD #define EXTRUDE_MINTEMP 180 +======= +#define EXTRUDE_MINTEMP 170 +>>>>>>> 2.0.5.3 /** * Prevent a single extrusion longer than EXTRUDE_MAXLENGTH. @@ -677,13 +743,22 @@ #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). +<<<<<<< HEAD #define X_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. #define Y_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. +======= +#define X_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. +#define Y_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. +>>>>>>> 2.0.5.3 #define Z_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define Y_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define Z_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. +<<<<<<< HEAD #define Z_MIN_PROBE_ENDSTOP_INVERTING true // Set to true to invert the logic of the probe. +======= +#define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe. +>>>>>>> 2.0.5.3 /** * Stepper Drivers @@ -701,6 +776,7 @@ * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] */ +<<<<<<< HEAD #define X_DRIVER_TYPE TMC2130 #define Y_DRIVER_TYPE TMC2130 #define Z_DRIVER_TYPE TMC2130 @@ -710,6 +786,17 @@ //#define Z3_DRIVER_TYPE A4988 //#define Z4_DRIVER_TYPE A4988 #define E0_DRIVER_TYPE TMC2130 +======= +//#define X_DRIVER_TYPE A4988 +//#define Y_DRIVER_TYPE A4988 +//#define Z_DRIVER_TYPE A4988 +//#define X2_DRIVER_TYPE A4988 +//#define Y2_DRIVER_TYPE A4988 +//#define Z2_DRIVER_TYPE A4988 +//#define Z3_DRIVER_TYPE A4988 +//#define Z4_DRIVER_TYPE A4988 +//#define E0_DRIVER_TYPE A4988 +>>>>>>> 2.0.5.3 //#define E1_DRIVER_TYPE A4988 //#define E2_DRIVER_TYPE A4988 //#define E3_DRIVER_TYPE A4988 @@ -761,14 +848,22 @@ * Override with M92 * X, Y, Z, E0 [, E1[, E2...]] */ +<<<<<<< HEAD #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 100 } +======= +#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 4000, 500 } +>>>>>>> 2.0.5.3 /** * Default Max Feed Rate (mm/s) * Override with M203 * X, Y, Z, E0 [, E1[, E2...]] */ +<<<<<<< HEAD #define DEFAULT_MAX_FEEDRATE { 200, 200, 8, 25 } +======= +#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 } +>>>>>>> 2.0.5.3 //#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2 #if ENABLED(LIMITED_MAX_FR_EDITING) @@ -781,7 +876,11 @@ * Override with M201 * X, Y, Z, E0 [, E1[, E2...]] */ +<<<<<<< HEAD #define DEFAULT_MAX_ACCELERATION { 800, 800, 100, 10000 } +======= +#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 } +>>>>>>> 2.0.5.3 //#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2 #if ENABLED(LIMITED_MAX_ACCEL_EDITING) @@ -796,9 +895,15 @@ * M204 R Retract Acceleration * M204 T Travel Acceleration */ +<<<<<<< HEAD #define DEFAULT_ACCELERATION 600 // X, Y, Z and E acceleration for printing moves #define DEFAULT_RETRACT_ACCELERATION 2500 // E acceleration for retracts #define DEFAULT_TRAVEL_ACCELERATION 800 // X, Y, Z acceleration for travel (non printing) moves +======= +#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves +#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts +#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves +>>>>>>> 2.0.5.3 /** * Default Jerk limits (mm/s) @@ -808,10 +913,17 @@ * When changing speed and direction, if the difference is less than the * value set here, it may happen instantaneously. */ +<<<<<<< HEAD #define CLASSIC_JERK #if ENABLED(CLASSIC_JERK) #define DEFAULT_XJERK 7.0 #define DEFAULT_YJERK 7.0 +======= +//#define CLASSIC_JERK +#if ENABLED(CLASSIC_JERK) + #define DEFAULT_XJERK 10.0 + #define DEFAULT_YJERK 10.0 +>>>>>>> 2.0.5.3 #define DEFAULT_ZJERK 0.3 //#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves @@ -822,7 +934,11 @@ #endif #endif +<<<<<<< HEAD #define DEFAULT_EJERK 2.0 // May be used by Linear Advance +======= +#define DEFAULT_EJERK 5.0 // May be used by Linear Advance +>>>>>>> 2.0.5.3 /** * Junction Deviation Factor @@ -832,7 +948,11 @@ * http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html */ #if DISABLED(CLASSIC_JERK) +<<<<<<< HEAD #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge +======= + #define JUNCTION_DEVIATION_MM 0.013 // (mm) Distance from real junction edge +>>>>>>> 2.0.5.3 #endif /** @@ -915,7 +1035,11 @@ /** * The BLTouch probe uses a Hall effect sensor and emulates a servo. */ +<<<<<<< HEAD #define BLTOUCH +======= +//#define BLTOUCH +>>>>>>> 2.0.5.3 /** * Touch-MI Probe by hotends.fr @@ -987,7 +1111,11 @@ * * Specify a Probe position as { X, Y, Z } */ +<<<<<<< HEAD #define NOZZLE_TO_PROBE_OFFSET { -33, -37, -1 } +======= +#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 } +>>>>>>> 2.0.5.3 // Most probes should stay away from the edges of the bed, but // with NOZZLE_AS_PROBE this can be negative for a wider probing area. @@ -1087,14 +1215,22 @@ // @section machine // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. +<<<<<<< HEAD #define INVERT_X_DIR true +======= +#define INVERT_X_DIR false +>>>>>>> 2.0.5.3 #define INVERT_Y_DIR true #define INVERT_Z_DIR false // @section extruder // For direct drive extruder v9 set to true, for geared extruder set to false. +<<<<<<< HEAD #define INVERT_E0_DIR true +======= +#define INVERT_E0_DIR false +>>>>>>> 2.0.5.3 #define INVERT_E1_DIR false #define INVERT_E2_DIR false #define INVERT_E3_DIR false @@ -1132,7 +1268,11 @@ #define Z_MIN_POS 0 #define X_MAX_POS X_BED_SIZE #define Y_MAX_POS Y_BED_SIZE +<<<<<<< HEAD #define Z_MAX_POS 165 +======= +#define Z_MAX_POS 200 +>>>>>>> 2.0.5.3 /** * Software Endstops @@ -1236,14 +1376,22 @@ //#define AUTO_BED_LEVELING_3POINT //#define AUTO_BED_LEVELING_LINEAR //#define AUTO_BED_LEVELING_BILINEAR +<<<<<<< HEAD #define AUTO_BED_LEVELING_UBL +======= +//#define AUTO_BED_LEVELING_UBL +>>>>>>> 2.0.5.3 //#define MESH_BED_LEVELING /** * Normally G28 leaves leveling disabled on completion. Enable * this option to have G28 restore the prior leveling state. */ +<<<<<<< HEAD #define RESTORE_LEVELING_AFTER_G28 +======= +//#define RESTORE_LEVELING_AFTER_G28 +>>>>>>> 2.0.5.3 /** * Enable detailed logging of G28, G29, M48, etc. @@ -1267,12 +1415,21 @@ /** * Enable the G26 Mesh Validation Pattern tool. */ +<<<<<<< HEAD #define G26_MESH_VALIDATION #if ENABLED(G26_MESH_VALIDATION) #define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle. #define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool. #define MESH_TEST_HOTEND_TEMP 235 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool. #define MESH_TEST_BED_TEMP 80 // (°C) Default bed temperature for the G26 Mesh Validation Tool. +======= + //#define G26_MESH_VALIDATION + #if ENABLED(G26_MESH_VALIDATION) + #define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle. + #define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool. + #define MESH_TEST_HOTEND_TEMP 205 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool. + #define MESH_TEST_BED_TEMP 60 // (°C) Default bed temperature for the G26 Mesh Validation Tool. +>>>>>>> 2.0.5.3 #define G26_XY_FEEDRATE 20 // (mm/s) Feedrate for XY Moves for the G26 Mesh Validation Tool. #define G26_RETRACT_MULTIPLIER 1.0 // G26 Q (retraction) used by default between mesh test elements. #endif @@ -1312,9 +1469,15 @@ //========================= Unified Bed Leveling ============================ //=========================================================================== +<<<<<<< HEAD #define MESH_EDIT_GFX_OVERLAY // Display a graphics overlay while editing the mesh #define MESH_INSET 5 // Set Mesh bounds as an inset region of the bed +======= + //#define MESH_EDIT_GFX_OVERLAY // Display a graphics overlay while editing the mesh + + #define MESH_INSET 1 // Set Mesh bounds as an inset region of the bed +>>>>>>> 2.0.5.3 #define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited. #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X @@ -1342,7 +1505,11 @@ * Add a bed leveling sub-menu for ABL or MBL. * Include a guided procedure if manual probing is enabled. */ +<<<<<<< HEAD #define LCD_BED_LEVELING +======= +//#define LCD_BED_LEVELING +>>>>>>> 2.0.5.3 #if ENABLED(LCD_BED_LEVELING) #define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis. @@ -1387,7 +1554,11 @@ // - Move the Z probe (or nozzle) to a defined XY point before Z Homing when homing all axes (G28). // - Prevent Z homing when the Z probe is outside bed area. // +<<<<<<< HEAD #define Z_SAFE_HOMING +======= +//#define Z_SAFE_HOMING +>>>>>>> 2.0.5.3 #if ENABLED(Z_SAFE_HOMING) #define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28). @@ -1473,9 +1644,16 @@ * M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes) * M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.) */ +<<<<<<< HEAD #define EEPROM_SETTINGS // Persistent storage with M500 and M501 //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! #define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM. +======= +//#define EEPROM_SETTINGS // Persistent storage with M500 and M501 +//#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! +#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM. +#define EEPROM_BOOT_SILENT // Keep M503 quiet and only give errors during first load +>>>>>>> 2.0.5.3 #if ENABLED(EEPROM_SETTINGS) //#define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors. #endif @@ -1504,6 +1682,7 @@ // Preheat Constants #define PREHEAT_1_LABEL "PLA" +<<<<<<< HEAD #define PREHEAT_1_TEMP_HOTEND 205 #define PREHEAT_1_TEMP_BED 60 #define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255 @@ -1511,6 +1690,15 @@ #define PREHEAT_2_LABEL "PETG" #define PREHEAT_2_TEMP_HOTEND 230 #define PREHEAT_2_TEMP_BED 78 +======= +#define PREHEAT_1_TEMP_HOTEND 180 +#define PREHEAT_1_TEMP_BED 70 +#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255 + +#define PREHEAT_2_LABEL "ABS" +#define PREHEAT_2_TEMP_HOTEND 240 +#define PREHEAT_2_TEMP_BED 110 +>>>>>>> 2.0.5.3 #define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255 /** @@ -1524,12 +1712,20 @@ * P1 Raise the nozzle always to Z-park height. * P2 Raise the nozzle by Z-park amount, limited to Z_MAX_POS. */ +<<<<<<< HEAD #define NOZZLE_PARK_FEATURE +======= +//#define NOZZLE_PARK_FEATURE +>>>>>>> 2.0.5.3 #if ENABLED(NOZZLE_PARK_FEATURE) // Specify a park position as { X, Y, Z_raise } #define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 } +<<<<<<< HEAD #define NOZZLE_PARK_XY_FEEDRATE 80 // (mm/s) X and Y axes feedrate (also used for delta Z axis) +======= + #define NOZZLE_PARK_XY_FEEDRATE 100 // (mm/s) X and Y axes feedrate (also used for delta Z axis) +>>>>>>> 2.0.5.3 #define NOZZLE_PARK_Z_FEEDRATE 5 // (mm/s) Z axis feedrate (not used for delta printers) #endif @@ -1628,7 +1824,11 @@ * * View the current statistics with M78. */ +<<<<<<< HEAD #define PRINTCOUNTER +======= +//#define PRINTCOUNTER +>>>>>>> 2.0.5.3 //============================================================================= //============================= LCD and SD support ============================ @@ -1686,7 +1886,11 @@ * you must uncomment the following option or it won't work. * */ +<<<<<<< HEAD #define SDSUPPORT +======= +//#define SDSUPPORT +>>>>>>> 2.0.5.3 /** * SD CARD: SPI SPEED @@ -1703,7 +1907,11 @@ * * Use CRC checks and retries on the SD communication. */ +<<<<<<< HEAD #define SD_CHECK_AND_RETRY +======= +//#define SD_CHECK_AND_RETRY +>>>>>>> 2.0.5.3 /** * LCD Menu Items @@ -1720,13 +1928,21 @@ // This option overrides the default number of encoder pulses needed to // produce one step. Should be increased for high-resolution encoders. // +<<<<<<< HEAD #define ENCODER_PULSES_PER_STEP 4 +======= +//#define ENCODER_PULSES_PER_STEP 4 +>>>>>>> 2.0.5.3 // // Use this option to override the number of step signals required to // move between next/prev menu items. // +<<<<<<< HEAD #define ENCODER_STEPS_PER_MENU_ITEM 1 +======= +//#define ENCODER_STEPS_PER_MENU_ITEM 1 +>>>>>>> 2.0.5.3 /** * Encoder Direction Options @@ -1743,7 +1959,11 @@ // // Set this option if CLOCKWISE causes values to DECREASE // +<<<<<<< HEAD #define REVERSE_ENCODER_DIRECTION +======= +//#define REVERSE_ENCODER_DIRECTION +>>>>>>> 2.0.5.3 // // This option reverses the encoder direction for navigating LCD menus. @@ -1766,7 +1986,11 @@ // // Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu. // +<<<<<<< HEAD #define INDIVIDUAL_AXIS_HOMING_MENU +======= +//#define INDIVIDUAL_AXIS_HOMING_MENU +>>>>>>> 2.0.5.3 // // SPEAKER/BUZZER @@ -1937,7 +2161,11 @@ // RepRapDiscount FULL GRAPHIC Smart Controller // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // +<<<<<<< HEAD #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER +======= +//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER +>>>>>>> 2.0.5.3 // // ReprapWorld Graphical LCD @@ -1988,10 +2216,13 @@ // //#define LCD_FOR_MELZI +<<<<<<< HEAD //#define ST7920_DELAY_1 DELAY_NS(0) //#define ST7920_DELAY_2 DELAY_NS(200) //#define ST7920_DELAY_3 DELAY_NS(200) +======= +>>>>>>> 2.0.5.3 // // Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder // https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index be236b200b..47e6edd857 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -340,6 +340,7 @@ * * The fan turns on automatically whenever any driver is enabled and turns * off (or reduces to idle speed) shortly after drivers are turned off. + * */ //#define USE_CONTROLLER_FAN #if ENABLED(USE_CONTROLLER_FAN) @@ -1060,6 +1061,9 @@ * during SD printing. If the recovery file is found at boot time, present * an option on the LCD screen to continue the print from the last-known * point in the file. + * + * If the machine reboots when resuming a print you may need to replace or + * reformat the SD card. (Bad sectors delay startup triggering the watchdog.) */ //#define POWER_LOSS_RECOVERY #if ENABLED(POWER_LOSS_RECOVERY) diff --git a/Marlin/lib/readme.txt b/Marlin/lib/readme.txt new file mode 100644 index 0000000000..dbadc3d630 --- /dev/null +++ b/Marlin/lib/readme.txt @@ -0,0 +1,36 @@ + +This directory is intended for the project specific (private) libraries. +PlatformIO will compile them to static libraries and link to executable file. + +The source code of each library should be placed in separate directory, like +"lib/private_lib/[here are source files]". + +For example, see how can be organized `Foo` and `Bar` libraries: + +|--lib +| |--Bar +| | |--docs +| | |--examples +| | |--src +| | |- Bar.c +| | |- Bar.h +| |--Foo +| | |- Foo.c +| | |- Foo.h +| |- readme.txt --> THIS FILE +|- platformio.ini +|--src + |- main.c + +Then in `src/main.c` you should use: + +#include +#include + +// rest H/C/CPP code + +PlatformIO will find your libraries automatically, configure preprocessor's +include paths and build them. + +More information about PlatformIO Library Dependency Finder +- http://docs.platformio.org/page/librarymanager/ldf.html diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs2/README.txt b/Marlin/src/sd/usb_flashdrive/lib-uhs2/README.txt new file mode 100644 index 0000000000..5abcc8f2ad --- /dev/null +++ b/Marlin/src/sd/usb_flashdrive/lib-uhs2/README.txt @@ -0,0 +1,46 @@ + +==== USB HOST SHIELD 2.0 LIBRARY ==== + +The lib/ folder contains a subset of the files from the USB Host Shield 2.0 +library: + + https://github.com/felis/USB_Host_Shield_2.0 + +While the original library was released under the GPLv2 and could not be +commingled with Marlin, the developers have graciously re-licenced the +files needed for Marlin as "GPLv2 or later", as documented in this thread. + + https://github.com/felis/USB_Host_Shield_2.0/issues/364 + +Small modifications have been made to the source. Please search for +USB_FLASH_DRIVE_SUPPORT or look at the patch file to see what was changed. + +==== LICENSE SUMMARY ==== + +Source Path: Repository: License: +------------ ----------- -------- +lib-uhs3/ github.com/felis/USB_Host_Shield_2.0 GPLv2 or later +lib-uhs3/lib/masstorage.cpp github.com/greiman/UsbFat [1] MIT +lib-uhs3/lib/settings.h github.com/greiman/UsbFat [1] MIT + +[1] Changes related to SKIP_WRITE_PROTECT and DELAY only + +==== PERFORMANCE ENHANCEMENTS FOR USB DRIVES ==== + +There are also some small performance enhancements from Bill Greiman, regarding +SKIP_WRITE_PROTECT and DELAY. These changes came from the following repo: + + https://github.com/greiman/UsbFat + +While the original library was released under the GPLv2 and could not be +commingled with Marlin, the developer has graciously re-licenced his changes +under the "MIT" license, as documented here: + + https://github.com/greiman/UsbFat/issues/8 + +==== MARLIN INTEGRATION WORK ==== + +All additional work done to integrate USB into Marlin was performed by AlephObjects, Inc. +and is licensed under the GPLv3. + +-- marcio@alephobjects.com diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs3/README.txt b/Marlin/src/sd/usb_flashdrive/lib-uhs3/README.txt new file mode 100644 index 0000000000..710b3f20b5 --- /dev/null +++ b/Marlin/src/sd/usb_flashdrive/lib-uhs3/README.txt @@ -0,0 +1,31 @@ +==== USB HOST SHIELD 3.0 LIBRARY ==== + +The lib-uhs3/ folder contains a subset of the files from the USB Host Shield +3.0 library: + + https://github.com/felis/UHS30 + + +==== LICENSE SUMMARY ==== + +Source Path: Repository: License: +------------ ----------- -------- +usb_flashdrive/lib github.com/felis/UHS30 GPLv2 or later + + +==== MARLIN INTEGRATION WORK ==== + +All additional work done to integrate USB into Marlin was performed by +AlephObjects, Inc. and is licensed under the GPLv3. + +This version of UHS3 has been modified for better compatibility with Marlin. +The upstream version of UHS 3.0 runs a frame timer interrupt every 1 ms to +handle device polling. This timer interrupt interferes with Marlin's stepper +IRQ, so the flag USB_HOST_MANUAL_POLL has been added to move the polling to +the idle task. Additional logic was added to disable and enable the frame +IRQ. + +SKIP_PAGE3F and USB_NO_TEST_UNIT_READY were added to work around bugs with +certain devices. + +-- marcio@alephobjects.com diff --git a/buildroot/share/cmake/CMakeLists.txt b/buildroot/share/cmake/CMakeLists.txt new file mode 100644 index 0000000000..1308f8bf97 --- /dev/null +++ b/buildroot/share/cmake/CMakeLists.txt @@ -0,0 +1,123 @@ +cmake_minimum_required(VERSION 2.8) +#====================================================================# +# Usage under Linux: # +# # +# From Marlin/buildroot/share/cmake folder: # +# mkdir -p build && cd build # +# cmake .. # +# make # +# # +# Usage under Windows: # +# # +# From Marlin/buildroot/share/cmake folder: # +# mkdir build && cd build # +# cmake -G"Unix Makefiles" .. # +# make # +#====================================================================# + +#====================================================================# +# Download marlin-cmake scriptfiles if not already installed # +# and add the path to the module path # +#====================================================================# + +set(SCRIPT_BRANCH 1.0.2) #Set to wanted marlin-cmake release tag or branch + +if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake) + + file(DOWNLOAD https://github.com/tohara/marlin-cmake/archive/${SCRIPT_BRANCH}.tar.gz + ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake-src.tar.gz SHOW_PROGRESS) + + execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xvf ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake-src.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) + + file(RENAME ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake-${SCRIPT_BRANCH} ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake) + file(REMOVE ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake-src.tar.gz) + + +endif() + +if(WIN32 AND NOT EXISTS ${CMAKE_BINARY_DIR}/make.exe) + file(COPY ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake/resources/make.exe DESTINATION ${CMAKE_BINARY_DIR}/) +endif() + +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake/modules) + +#====================================================================# +# Custom path to Arduino SDK can be set here. # +# It can also be set from command line. eg.: # +# cmake .. -DARDUINO_SDK_PATH="/path/to/arduino-1.x.x" # +#====================================================================# +#set(ARDUINO_SDK_PATH ${CMAKE_CURRENT_LIST_DIR}/arduino-1.6.8) +#set(ARDUINO_SDK_PATH /home/tom/git/BigBox-Dual-Marlin/ArduinoAddons/Arduino_1.6.x) +#set(ARDUINO_SDK_PATH /home/tom/test/arduino-1.6.11) +#====================================================================# +# Set included cmake files # +#====================================================================# +include(Arduino_SDK) # Find the intallpath of Arduino SDK +include(marlin_cmake_functions) + +#====================================================================# +# Set toolchain file for arduino # +#====================================================================# +set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake/toolchain/ArduinoToolchain.cmake) # Arduino Toolchain + +#====================================================================# +# Setup Project # +#====================================================================# +project(Marlin C CXX) + +#====================================================================# +# Register non standard hardware # +#====================================================================# +#register_hardware_platform(/home/tom/test/Sanguino) + +#====================================================================# +# Print any info # +# print_board_list() # +# print_programmer_list() # +# print_board_settings(mega) # +#====================================================================# +print_board_list() +print_programmer_list() + + +#====================================================================# +# Get motherboard settings from Configuration.h # +# setup_motherboard(TARGET Marlin_src_folder) # +# Returns ${TARGET}_BOARD and ${TARGET}_CPU # +# # +# To set it manually: # +# set(${PROJECT_NAME}_BOARD mega) # +# set(${PROJECT_NAME}_CPU atmega2560) # +#====================================================================# +setup_motherboard(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/../../../Marlin) + +#====================================================================# +# Setup all source files # +# Include Marlin.ino to compile libs not included in *.cpp files # +#====================================================================# + +file(GLOB SOURCES "../../../src/*.cpp") +set(${PROJECT_NAME}_SRCS "${SOURCES};../../../src/Marlin.ino") + +#====================================================================# +# Define the port for uploading code to the Arduino # +# Can be set from commandline with: # +# cmake .. -DUPLOAD_PORT=/dev/ttyACM0 # +#====================================================================# +if(UPLOAD_PORT) + set(${PROJECT_NAME}_PORT ${UPLOAD_PORT}) +else() + set(${PROJECT_NAME}_PORT /dev/ttyACM0) +endif() + +#====================================================================# +# Register arduino libraries not included in SDK # +#====================================================================# +#link_directories(/home/tom/test/ArduinoAddons) #U8glib +#set(${PROJECT_NAME}_ARDLIBS U8glib) +#set(U8glib_RECURSE True) + +#====================================================================# +# Command to generate code arduino firmware (.hex file) # +#====================================================================# +generate_arduino_firmware(${PROJECT_NAME}) diff --git a/config/README.md b/config/README.md index f4dfd9aedf..284a856215 100644 --- a/config/README.md +++ b/config/README.md @@ -1,3 +1,3 @@ # Where have all the configurations gone? -## https://github.com/MarlinFirmware/Configurations/archive/release-2.0.5.zip +## https://github.com/MarlinFirmware/Configurations/archive/release-2.0.5.2.zip