Created
December 9, 2012 05:35
-
-
Save kastner/4243469 to your computer and use it in GitHub Desktop.
This file contains hidden or 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
| commit a73bcf381bf9e939383ee891ef6d41a1115ceb9f | |
| Author: Erik Kastner <kastner@gmail.com> | |
| Date: Sun Dec 9 00:34:57 2012 -0500 | |
| my configuration (pbj) | |
| diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h | |
| index 9db8dee..8cb3247 100644 | |
| --- a/Marlin/Configuration.h | |
| +++ b/Marlin/Configuration.h | |
| @@ -9,7 +9,7 @@ | |
| //Implementation of an idea by Prof Braino to inform user that any changes made | |
| //to this build by the user have been successfully uploaded into firmware. | |
| #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time | |
| -#define STRING_CONFIG_H_AUTHOR "(none, default config)" //Who made the changes. | |
| +#define STRING_CONFIG_H_AUTHOR "kastner, testing for jcrochell" //Who made the changes. | |
| // SERIAL_PORT selects which serial port should be used for communication with the host. | |
| // This allows the connection of wireless adapters (for instance) to non-default port pins. | |
| @@ -46,7 +46,7 @@ | |
| // Rambo = 301 | |
| #ifndef MOTHERBOARD | |
| -#define MOTHERBOARD 7 | |
| +#define MOTHERBOARD 81 | |
| #endif | |
| @@ -75,15 +75,15 @@ | |
| // 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup) | |
| // 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan) (1k pullup) | |
| -#define TEMP_SENSOR_0 -1 | |
| +#define TEMP_SENSOR_0 1 | |
| #define TEMP_SENSOR_1 0 | |
| #define TEMP_SENSOR_2 0 | |
| -#define TEMP_SENSOR_BED 0 | |
| +#define TEMP_SENSOR_BED 6 | |
| // Actual temperature must be close to target for this long before M109 returns success | |
| -#define TEMP_RESIDENCY_TIME 10 // (seconds) | |
| -#define TEMP_HYSTERESIS 3 // (degC) range of +/- temperatures considered "close" to the target one | |
| -#define TEMP_WINDOW 1 // (degC) Window around target to start the recidency timer x degC early. | |
| +#define TEMP_RESIDENCY_TIME 1 // (seconds) | |
| +#define TEMP_HYSTERESIS 6 // (degC) range of +/- temperatures considered "close" to the target one | |
| +#define TEMP_WINDOW 2 // (degC) Window around target to start the recidency timer x degC early. | |
| // The minimal temperature defines the temperature below which the heater will not be enabled It is used | |
| // to check that the wiring to the thermistor is not broken. | |
| @@ -119,14 +119,18 @@ | |
| // If you are using a preconfigured hotend then you can use one of the value sets by uncommenting it | |
| // Ultimaker | |
| - #define DEFAULT_Kp 22.2 | |
| - #define DEFAULT_Ki 1.08 | |
| - #define DEFAULT_Kd 114 | |
| +// #define DEFAULT_Kp 22.2 | |
| +// #define DEFAULT_Ki 1.08 | |
| +// #define DEFAULT_Kd 114 | |
| + #define DEFAULT_Kp 22.2 | |
| + #define DEFAULT_Ki (1.08*PID_dT) | |
| + #define DEFAULT_Kd (114/PID_dT) | |
| + | |
| // Makergear | |
| // #define DEFAULT_Kp 7.0 | |
| -// #define DEFAULT_Ki 0.1 | |
| -// #define DEFAULT_Kd 12 | |
| +// #define DEFAULT_Ki 0.1 | |
| +// #define DEFAULT_Kd 12 | |
| // Mendel Parts V9 on 12V | |
| // #define DEFAULT_Kp 63.0 | |
| @@ -211,10 +215,10 @@ | |
| #endif | |
| // The pullups are needed if you directly connect a mechanical endswitch between the signal and ground pins. | |
| -const bool X_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops. | |
| -const bool Y_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops. | |
| -const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops. | |
| -//#define DISABLE_MAX_ENDSTOPS | |
| +const bool X_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops. | |
| +const bool Y_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops. | |
| +const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops. | |
| +#define DISABLE_MAX_ENDSTOPS | |
| // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 | |
| #define X_ENABLE_ON 0 | |
| @@ -241,8 +245,8 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th | |
| #define Y_HOME_DIR -1 | |
| #define Z_HOME_DIR -1 | |
| -#define min_software_endstops true //If true, axis won't move to coordinates less than HOME_POS. | |
| -#define max_software_endstops true //If true, axis won't move to coordinates greater than the defined lengths below. | |
| +#define min_software_endstops false //If true, axis won't move to coordinates less than HOME_POS. | |
| +#define max_software_endstops false //If true, axis won't move to coordinates greater than the defined lengths below. | |
| // Travel limits after homing | |
| #define X_MAX_POS 205 | |
| #define X_MIN_POS 0 | |
| @@ -270,8 +274,8 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th | |
| // default settings | |
| -#define DEFAULT_AXIS_STEPS_PER_UNIT {78.7402,78.7402,200*8/3,760*1.1} // default steps per unit for ultimaker | |
| -#define DEFAULT_MAX_FEEDRATE {500, 500, 5, 45} // (mm/sec) | |
| +#define DEFAULT_AXIS_STEPS_PER_UNIT {80, 80, 2272.72, 590} // default steps for PBjr with gt2 belts | |
| +#define DEFAULT_MAX_FEEDRATE {200, 200, 5, 45} // (mm/sec) | |
| #define DEFAULT_MAX_ACCELERATION {9000,9000,100,10000} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot. | |
| #define DEFAULT_ACCELERATION 3000 // X, Y, Z and E max acceleration in mm/s^2 for printing moves | |
| @@ -292,14 +296,14 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th | |
| // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily). | |
| // M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to. | |
| //define this to enable eeprom support | |
| -//#define EEPROM_SETTINGS | |
| +#define EEPROM_SETTINGS | |
| //to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: | |
| // please keep turned on if you can. | |
| -//#define EEPROM_CHITCHAT | |
| +#define EEPROM_CHITCHAT | |
| //LCD and SD support | |
| //#define ULTRA_LCD //general lcd support, also 16x2 | |
| -//#define SDSUPPORT // Enable SD Card Support in Hardware Console | |
| +#define SDSUPPORT // Enable SD Card Support in Hardware Console | |
| //#define ULTIMAKERCONTROLLER //as available from the ultimaker online store. | |
| //#define ULTIPANEL //the ultipanel as on thingiverse |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment