Created
August 19, 2018 14:30
-
-
Save meihong/efb07b44723ad7a51fcbc491805c8648 to your computer and use it in GitHub Desktop.
diff between the original Marlin and M508
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
*** Marlin-1.1.1/Marlin/Configuration.h 2017-05-12 19:37:35.000000000 +0900 | |
--- Marlin-M508/Marlin/Configuration.h 2017-06-13 15:18:20.000000000 +0900 | |
*************** | |
*** 1,4 **** | |
! /** | |
* Marlin 3D Printer Firmware | |
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] | |
* | |
--- 1,7 ---- | |
! | |
! | |
! | |
! /** | |
* Marlin 3D Printer Firmware | |
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] | |
* | |
*************** | |
*** 118,124 **** | |
// The following define selects which electronics board you have. | |
// Please choose the name from boards.h that matches your setup | |
#ifndef MOTHERBOARD | |
! #define MOTHERBOARD BOARD_RAMPS_14_EFB | |
#endif | |
// Optional custom name for your RepStrap or other custom machine | |
--- 121,127 ---- | |
// The following define selects which electronics board you have. | |
// Please choose the name from boards.h that matches your setup | |
#ifndef MOTHERBOARD | |
! #define MOTHERBOARD BOARD_MKS_BASE | |
#endif | |
// Optional custom name for your RepStrap or other custom machine | |
*************** | |
*** 240,246 **** | |
#define TEMP_SENSOR_2 0 | |
#define TEMP_SENSOR_3 0 | |
#define TEMP_SENSOR_4 0 | |
! #define TEMP_SENSOR_BED 0 | |
// Dummy thermistor constant temperature readings, for use with 998 and 999 | |
#define DUMMY_THERMISTOR_998_VALUE 25 | |
--- 243,249 ---- | |
#define TEMP_SENSOR_2 0 | |
#define TEMP_SENSOR_3 0 | |
#define TEMP_SENSOR_4 0 | |
! #define TEMP_SENSOR_BED 1 | |
// Dummy thermistor constant temperature readings, for use with 998 and 999 | |
#define DUMMY_THERMISTOR_998_VALUE 25 | |
*************** | |
*** 305,311 **** | |
// Ultimaker | |
#define DEFAULT_Kp 22.2 | |
#define DEFAULT_Ki 1.08 | |
! #define DEFAULT_Kd 114 | |
// MakerGear | |
//#define DEFAULT_Kp 7.0 | |
--- 308,314 ---- | |
// Ultimaker | |
#define DEFAULT_Kp 22.2 | |
#define DEFAULT_Ki 1.08 | |
! #define DEFAULT_Kd 144 | |
// MakerGear | |
//#define DEFAULT_Kp 7.0 | |
*************** | |
*** 439,447 **** | |
#endif | |
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). | |
! #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. | |
! #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. | |
--- 442,450 ---- | |
#endif | |
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). | |
! #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 Z_MIN_ENDSTOP_INVERTING true // 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. | |
*************** | |
*** 476,482 **** | |
* Override with M92 | |
* X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]] | |
*/ | |
! #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 4000, 500 } | |
/** | |
* Default Max Feed Rate (mm/s) | |
--- 479,485 ---- | |
* Override with M92 | |
* X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]] | |
*/ | |
! #define DEFAULT_AXIS_STEPS_PER_UNIT { 100, 100 , 400, 96 } | |
/** | |
* Default Max Feed Rate (mm/s) | |
*************** | |
*** 491,497 **** | |
* Override with M201 | |
* X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]] | |
*/ | |
! #define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 } | |
/** | |
* Default Acceleration (change/s) change = mm/s | |
--- 494,500 ---- | |
* Override with M201 | |
* X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]] | |
*/ | |
! #define DEFAULT_MAX_ACCELERATION {3000, 3000, 100, 10000 } | |
/** | |
* Default Acceleration (change/s) change = mm/s | |
*************** | |
*** 694,700 **** | |
// @section machine | |
// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. | |
! #define INVERT_X_DIR false | |
#define INVERT_Y_DIR true | |
#define INVERT_Z_DIR false | |
--- 697,703 ---- | |
// @section machine | |
// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. | |
! #define INVERT_X_DIR true | |
#define INVERT_Y_DIR true | |
#define INVERT_Z_DIR false | |
*************** | |
*** 704,710 **** | |
// @section extruder | |
// For direct drive extruder v9 set to true, for geared extruder set to false. | |
! #define INVERT_E0_DIR false | |
#define INVERT_E1_DIR false | |
#define INVERT_E2_DIR false | |
#define INVERT_E3_DIR false | |
--- 707,713 ---- | |
// @section extruder | |
// For direct drive extruder v9 set to true, for geared extruder set to false. | |
! #define INVERT_E0_DIR true | |
#define INVERT_E1_DIR false | |
#define INVERT_E2_DIR false | |
#define INVERT_E3_DIR false | |
*************** | |
*** 724,731 **** | |
// @section machine | |
// Travel limits after homing (units are in mm) | |
! #define X_MIN_POS 0 | |
! #define Y_MIN_POS 0 | |
#define Z_MIN_POS 0 | |
#define X_MAX_POS 200 | |
#define Y_MAX_POS 200 | |
--- 727,734 ---- | |
// @section machine | |
// Travel limits after homing (units are in mm) | |
! #define X_MIN_POS -10 | |
! #define Y_MIN_POS -15 | |
#define Z_MIN_POS 0 | |
#define X_MAX_POS 200 | |
#define Y_MAX_POS 200 | |
*************** | |
*** 988,998 **** | |
// @section temperature | |
// Preheat Constants | |
! #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_TEMP_HOTEND 240 | |
#define PREHEAT_2_TEMP_BED 110 | |
#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255 | |
--- 991,1001 ---- | |
// @section temperature | |
// Preheat Constants | |
! #define PREHEAT_1_TEMP_HOTEND 200 | |
! #define PREHEAT_1_TEMP_BED 50 | |
#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255 | |
! #define PREHEAT_2_TEMP_HOTEND 250 | |
#define PREHEAT_2_TEMP_BED 110 | |
#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255 | |
*************** | |
*** 1169,1175 **** | |
* you must uncomment the following option or it won't work. | |
* | |
*/ | |
! //#define SDSUPPORT | |
/** | |
* SD CARD: SPI SPEED | |
--- 1172,1178 ---- | |
* you must uncomment the following option or it won't work. | |
* | |
*/ | |
! #define SDSUPPORT | |
/** | |
* SD CARD: SPI SPEED | |
*************** | |
*** 1313,1319 **** | |
// | |
// Note: Usually sold with a white PCB. | |
// | |
! //#define REPRAP_DISCOUNT_SMART_CONTROLLER | |
// | |
// GADGETS3D G3D LCD/SD Controller | |
--- 1316,1322 ---- | |
// | |
// Note: Usually sold with a white PCB. | |
// | |
! #define REPRAP_DISCOUNT_SMART_CONTROLLER | |
// | |
// GADGETS3D G3D LCD/SD Controller | |
diff -rbc Marlin-1.1.1/Marlin/Configuration_adv.h Marlin-M508/Marlin/Configuration_adv.h | |
*** Marlin-1.1.1/Marlin/Configuration_adv.h 2017-05-12 19:37:35.000000000 +0900 | |
--- Marlin-M508/Marlin/Configuration_adv.h 2017-06-13 15:18:20.000000000 +0900 | |
*************** | |
*** 1,4 **** | |
! /** | |
* Marlin 3D Printer Firmware | |
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] | |
* | |
--- 1,4 ---- | |
! /** | |
* Marlin 3D Printer Firmware | |
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] | |
* | |
*************** | |
*** 82,89 **** | |
* Thermal Protection parameters for the bed are just as above for hotends. | |
*/ | |
#if ENABLED(THERMAL_PROTECTION_BED) | |
! #define THERMAL_PROTECTION_BED_PERIOD 20 // Seconds | |
! #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius | |
/** | |
* Whenever an M140 or M190 increases the target temperature the firmware will wait for the | |
--- 82,89 ---- | |
* Thermal Protection parameters for the bed are just as above for hotends. | |
*/ | |
#if ENABLED(THERMAL_PROTECTION_BED) | |
! #define THERMAL_PROTECTION_BED_PERIOD 180 // Seconds | |
! #define THERMAL_PROTECTION_BED_HYSTERESIS 5 // Degrees Celsius | |
/** | |
* Whenever an M140 or M190 increases the target temperature the firmware will wait for the | |
*************** | |
*** 768,774 **** | |
* Requires an LCD display. | |
* This feature is required for the default FILAMENT_RUNOUT_SCRIPT. | |
*/ | |
! //#define FILAMENT_CHANGE_FEATURE | |
#if ENABLED(FILAMENT_CHANGE_FEATURE) | |
#define FILAMENT_CHANGE_X_POS 3 // X position of hotend | |
#define FILAMENT_CHANGE_Y_POS 3 // Y position of hotend | |
--- 768,774 ---- | |
* Requires an LCD display. | |
* This feature is required for the default FILAMENT_RUNOUT_SCRIPT. | |
*/ | |
! #define FILAMENT_CHANGE_FEATURE | |
#if ENABLED(FILAMENT_CHANGE_FEATURE) | |
#define FILAMENT_CHANGE_X_POS 3 // X position of hotend | |
#define FILAMENT_CHANGE_Y_POS 3 // Y position of hotend | |
Only in Marlin-M508/Marlin: Marlin.ino.mega.hex | |
Only in Marlin-M508/Marlin: Marlin.ino.with_bootloader.mega.hex | |
diff -rbc Marlin-1.1.1/Marlin/Version.h Marlin-M508/Marlin/Version.h | |
*** Marlin-1.1.1/Marlin/Version.h 2017-05-12 19:37:35.000000000 +0900 | |
--- Marlin-M508/Marlin/Version.h 2017-06-13 15:18:20.000000000 +0900 | |
*************** | |
*** 89,94 **** | |
* The WEBSITE_URL is the location where users can get more information such as | |
* documentation about a specific Marlin release. | |
*/ | |
! #define WEBSITE_URL "http://marlinfw.org" | |
#endif // USE_AUTOMATIC_VERSIONING | |
--- 89,94 ---- | |
* The WEBSITE_URL is the location where users can get more information such as | |
* documentation about a specific Marlin release. | |
*/ | |
! #define WEBSITE_URL "" | |
#endif // USE_AUTOMATIC_VERSIONING | |
diff -rbc Marlin-1.1.1/Marlin/ultralcd_impl_HD44780.h Marlin-M508/Marlin/ultralcd_impl_HD44780.h | |
*** Marlin-1.1.1/Marlin/ultralcd_impl_HD44780.h 2017-05-12 19:37:35.000000000 +0900 | |
--- Marlin-M508/Marlin/ultralcd_impl_HD44780.h 2017-06-13 15:18:20.000000000 +0900 | |
*************** | |
*** 413,421 **** | |
static void logo_lines(const char* const extra) { | |
int indent = (LCD_WIDTH - 8 - lcd_strlen_P(extra)) / 2; | |
! lcd.setCursor(indent, 0); lcd.print('\x00'); lcd_printPGM(PSTR( "------" )); lcd.print('\x01'); | |
! lcd.setCursor(indent, 1); lcd_printPGM(PSTR("|Marlin|")); lcd_printPGM(extra); | |
! lcd.setCursor(indent, 2); lcd.print('\x02'); lcd_printPGM(PSTR( "------" )); lcd.print('\x03'); | |
} | |
void bootscreen() { | |
--- 413,421 ---- | |
static void logo_lines(const char* const extra) { | |
int indent = (LCD_WIDTH - 8 - lcd_strlen_P(extra)) / 2; | |
! lcd.setCursor(indent, 0); lcd_printPGM(PSTR( " welcome" )); | |
! // lcd.setCursor(indent, 1); lcd_printPGM(PSTR("|Marlin|")); lcd_printPGM(extra); | |
! // lcd.setCursor(indent, 2); lcd.print('\x02'); lcd_printPGM(PSTR( "------" )); lcd.print('\x03'); | |
} | |
void bootscreen() { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment