Christian Thalhammer
13 years ago
20 changed files with 921 additions and 1125 deletions
@ -1,397 +0,0 @@ |
|||||
#ifndef __CONFIGURATION_H |
|
||||
#define __CONFIGURATION_H |
|
||||
|
|
||||
|
|
||||
|
|
||||
// This determines the communication speed of the printer |
|
||||
//#define BAUDRATE 250000 |
|
||||
#define BAUDRATE 115200 |
|
||||
//#define BAUDRATE 230400 |
|
||||
|
|
||||
#define EXTRUDERS 1 |
|
||||
|
|
||||
// Frequency limit |
|
||||
// See nophead's blog for more info |
|
||||
// Not working O |
|
||||
//#define XY_FREQUENCY_LIMIT 15 |
|
||||
|
|
||||
// Minimum planner junction speed. Sets the default minimum speed the planner plans for at the end |
|
||||
// of the buffer and all stops. This should not be much greater than zero and should only be changed |
|
||||
// if unwanted behavior is observed on a user's machine when running at very slow speeds. |
|
||||
#define MINIMUM_PLANNER_SPEED 2.0 // (mm/sec) |
|
||||
|
|
||||
// BASIC SETTINGS: select your board type, thermistor type, axis scaling, and endstop configuration |
|
||||
|
|
||||
//// The following define selects which electronics board you have. Please choose the one that matches your setup |
|
||||
// MEGA/RAMPS up to 1.2 = 3, |
|
||||
// RAMPS 1.3 = 33 |
|
||||
// Gen6 = 5, |
|
||||
// Sanguinololu 1.2 and above = 62 |
|
||||
// Gen7 = 77, |
|
||||
// Ultimaker = 7, |
|
||||
// Teensylu = 8 |
|
||||
#define MOTHERBOARD 77 |
|
||||
|
|
||||
//=========================================================================== |
|
||||
//=============================Thermal Settings ============================ |
|
||||
//=========================================================================== |
|
||||
|
|
||||
//// Thermistor settings: |
|
||||
// 1 is 100k thermistor |
|
||||
// 2 is 200k thermistor |
|
||||
// 3 is mendel-parts thermistor |
|
||||
// 4 is 10k thermistor |
|
||||
// 5 is ParCan supplied 104GT-2 100K |
|
||||
// 6 is EPCOS 100k |
|
||||
// 7 is 100k Honeywell thermistor 135-104LAG-J01 |
|
||||
|
|
||||
#define THERMISTORHEATER_0 1 |
|
||||
//#define THERMISTORHEATER_1 1 |
|
||||
//#define THERMISTORHEATER_2 1 |
|
||||
|
|
||||
#define HEATER_0_USES_THERMISTOR |
|
||||
//#define HEATER_1_USES_THERMISTOR |
|
||||
//#define HEATER_2_USES_THERMISTOR |
|
||||
//#define HEATER_0_USES_AD595 |
|
||||
//#define HEATER_1_USES_AD595 |
|
||||
//#define HEATER_2_USES_AD595 |
|
||||
|
|
||||
// Select one of these only to define how the bed temp is read. |
|
||||
#define THERMISTORBED 1 |
|
||||
#define BED_USES_THERMISTOR |
|
||||
//#define BED_LIMIT_SWITCHING |
|
||||
#ifdef BED_LIMIT_SWITCHING |
|
||||
#define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS |
|
||||
#endif |
|
||||
//#define BED_USES_AD595 |
|
||||
|
|
||||
#define BED_CHECK_INTERVAL 5000 //ms |
|
||||
|
|
||||
//// Heating sanity check: |
|
||||
// This waits for the watchperiod in milliseconds whenever an M104 or M109 increases the target temperature |
|
||||
// If the temperature has not increased at the end of that period, the target temperature is set to zero. |
|
||||
// It can be reset with another M104/M109 |
|
||||
//#define WATCHPERIOD 20000 //20 seconds |
|
||||
|
|
||||
// Actual temperature must be close to target for this long before M109 returns success |
|
||||
#define TEMP_RESIDENCY_TIME 30 // (seconds) |
|
||||
#define TEMP_HYSTERESIS 3 // (C°) range of +/- temperatures considered "close" to the target one |
|
||||
|
|
||||
//// The minimal temperature defines the temperature below which the heater will not be enabled |
|
||||
//#define HEATER_0_MINTEMP 5 |
|
||||
//#define HEATER_1_MINTEMP 5 |
|
||||
//#define HEATER_2_MINTEMP 5 |
|
||||
//#define BED_MINTEMP 5 |
|
||||
|
|
||||
|
|
||||
// When temperature exceeds max temp, your heater will be switched off. |
|
||||
// This feature exists to protect your hotend from overheating accidentally, but *NOT* from thermistor short/failure! |
|
||||
// You should use MINTEMP for thermistor short/failure protection. |
|
||||
#define HEATER_0_MAXTEMP 275 |
|
||||
//#define HEATER_1_MAXTEMP 275 |
|
||||
//#define HEATER_2_MAXTEMP 275 |
|
||||
//#define BED_MAXTEMP 150 |
|
||||
|
|
||||
|
|
||||
// Wait for Cooldown |
|
||||
// This defines if the M109 call should not block if it is cooling down. |
|
||||
// example: From a current temp of 220, you set M109 S200. |
|
||||
// if CooldownNoWait is defined M109 will not wait for the cooldown to finish |
|
||||
#define CooldownNoWait true |
|
||||
|
|
||||
// Heating is finished if a temperature close to this degree shift is reached |
|
||||
#define HEATING_EARLY_FINISH_DEG_OFFSET 1 //Degree |
|
||||
|
|
||||
// PID settings: |
|
||||
// Uncomment the following line to enable PID support. |
|
||||
#define PIDTEMP |
|
||||
#define PID_MAX 255 // limits current to nozzle; 255=full current |
|
||||
#ifdef PIDTEMP |
|
||||
//#define PID_DEBUG // Sends debug data to the serial port. |
|
||||
//#define PID_OPENLOOP 1 // Puts PID in open loop. M104 sets the output power in % |
|
||||
#define PID_INTEGRAL_DRIVE_MAX 255 //limit for the integral term |
|
||||
#define K1 0.95 //smoothing factor withing the PID |
|
||||
#define PID_dT 0.128 //sampling period of the PID |
|
||||
|
|
||||
//To develop some PID settings for your machine, you can initiall follow |
|
||||
// the Ziegler-Nichols method. |
|
||||
// set Ki and Kd to zero. |
|
||||
// heat with a defined Kp and see if the temperature stabilizes |
|
||||
// ideally you do this graphically with repg. |
|
||||
// the PID_CRITIAL_GAIN should be the Kp at which temperature oscillatins are not dampned out/decreas in amplitutde |
|
||||
// PID_SWING_AT_CRITIAL is the time for a full period of the oscillations at the critical Gain |
|
||||
// usually further manual tunine is necessary. |
|
||||
|
|
||||
#define PID_CRITIAL_GAIN 50 |
|
||||
#define PID_SWING_AT_CRITIAL 47 //seconds |
|
||||
|
|
||||
//#define PID_PI //no differentail term |
|
||||
#define PID_PID //normal PID |
|
||||
|
|
||||
#ifdef PID_PID |
|
||||
//PID according to Ziegler-Nichols method |
|
||||
// #define DEFAULT_Kp (0.6*PID_CRITIAL_GAIN) |
|
||||
// #define DEFAULT_Ki (2*Kp/PID_SWING_AT_CRITIAL*PID_dT) |
|
||||
// #define DEFAULT_Kd (PID_SWING_AT_CRITIAL/8./PID_dT) |
|
||||
|
|
||||
// Ultitmaker |
|
||||
#define DEFAULT_Kp 22.2 |
|
||||
#define DEFAULT_Ki (1.25*PID_dT) |
|
||||
#define DEFAULT_Kd (99/PID_dT) |
|
||||
|
|
||||
// Makergear |
|
||||
// #define DEFAULT_Kp 7.0 |
|
||||
// #define DEFAULT_Ki 0.1 |
|
||||
// #define DEFAULT_Kd 12 |
|
||||
|
|
||||
// Mendel Parts V9 on 12V |
|
||||
// #define DEFAULT_Kp 63.0 |
|
||||
// #define DEFAULT_Ki (2.25*PID_dT) |
|
||||
// #define DEFAULT_Kd (440/PID_dT) |
|
||||
#endif |
|
||||
|
|
||||
#ifdef PID_PI |
|
||||
//PI according to Ziegler-Nichols method |
|
||||
#define DEFAULT_Kp (PID_CRITIAL_GAIN/2.2) |
|
||||
#define DEFAULT_Ki (1.2*Kp/PID_SWING_AT_CRITIAL*PID_dT) |
|
||||
#define DEFAULT_Kd (0) |
|
||||
#endif |
|
||||
|
|
||||
// this adds an experimental additional term to the heatingpower, proportional to the extrusion speed. |
|
||||
// if Kc is choosen well, the additional required power due to increased melting should be compensated. |
|
||||
#define PID_ADD_EXTRUSION_RATE |
|
||||
#ifdef PID_ADD_EXTRUSION_RATE |
|
||||
#define DEFAULT_Kc (1) //heatingpower=Kc*(e_speed) |
|
||||
#endif |
|
||||
#endif // PIDTEMP |
|
||||
|
|
||||
// extruder run-out prevention. |
|
||||
//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded |
|
||||
//#define EXTRUDER_RUNOUT_PREVENT |
|
||||
#define EXTRUDER_RUNOUT_MINTEMP 190 |
|
||||
#define EXTRUDER_RUNOUT_SECONDS 30. |
|
||||
#define EXTRUDER_RUNOUT_ESTEPS 14. //mm filament |
|
||||
#define EXTRUDER_RUNOUT_SPEED 1500. //extrusion speed |
|
||||
#define EXTRUDER_RUNOUT_EXTRUDE 100 |
|
||||
|
|
||||
|
|
||||
//=========================================================================== |
|
||||
//=============================Mechanical Settings=========================== |
|
||||
//=========================================================================== |
|
||||
|
|
||||
|
|
||||
// Endstop Settings |
|
||||
#define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors |
|
||||
|
|
||||
// The pullups are needed if you directly connect a mechanical endswitch between the signal and ground pins. |
|
||||
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. |
|
||||
// For optos H21LOB set to true, for Mendel-Parts newer optos TCST2103 set to false |
|
||||
|
|
||||
#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing |
|
||||
|
|
||||
// For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 |
|
||||
#define X_ENABLE_ON 0 |
|
||||
#define Y_ENABLE_ON 0 |
|
||||
#define Z_ENABLE_ON 0 |
|
||||
#define E_ENABLE_ON 0 // For all extruders |
|
||||
|
|
||||
// Disables axis when it's not being used. |
|
||||
#define DISABLE_X false |
|
||||
#define DISABLE_Y false |
|
||||
#define DISABLE_Z false |
|
||||
#define DISABLE_E false // For all extruders |
|
||||
|
|
||||
// Inverting axis direction |
|
||||
//#define INVERT_X_DIR false // for Mendel set to false, for Orca set to true |
|
||||
//#define INVERT_Y_DIR true // for Mendel set to true, for Orca set to false |
|
||||
//#define INVERT_Z_DIR false // for Mendel set to false, for Orca set to true |
|
||||
//#define INVERT_E*_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false, used for all extruders |
|
||||
|
|
||||
#define INVERT_X_DIR false // for Mendel set to false, for Orca set to true |
|
||||
#define INVERT_Y_DIR false // for Mendel set to true, for Orca set to false |
|
||||
#define INVERT_Z_DIR false // for Mendel set to false, for Orca set to true |
|
||||
#define INVERT_E0_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false |
|
||||
#define INVERT_E1_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false |
|
||||
#define INVERT_E2_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false |
|
||||
|
|
||||
//// ENDSTOP SETTINGS: |
|
||||
// Sets direction of endstops when homing; 1=MAX, -1=MIN |
|
||||
#define X_HOME_DIR -1 |
|
||||
#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 zero. |
|
||||
#define max_software_endstops true //If true, axis won't move to coordinates greater than the defined lengths below. |
|
||||
#define X_MAX_LENGTH 205 |
|
||||
#define Y_MAX_LENGTH 205 |
|
||||
#define Z_MAX_LENGTH 200 |
|
||||
|
|
||||
//// MOVEMENT SETTINGS |
|
||||
#define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E |
|
||||
#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min) |
|
||||
|
|
||||
//homing hits the endstop, then retracts by this distance, before it tries to slowly bump again: |
|
||||
#define X_HOME_RETRACT_MM 5 |
|
||||
#define Y_HOME_RETRACT_MM 5 |
|
||||
#define Z_HOME_RETRACT_MM 1 |
|
||||
#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. |
|
||||
|
|
||||
#define AXIS_RELATIVE_MODES {false, false, false, false} |
|
||||
|
|
||||
#define MAX_STEP_FREQUENCY 40000 // Max step frequency for Ultimaker (5000 pps / half step) |
|
||||
|
|
||||
// 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_AXIS_STEPS_PER_UNIT {40, 40, 3333.92, 360} //sells mendel with v9 extruder |
|
||||
//#define DEFAULT_AXIS_STEPS_PER_UNIT {80.3232, 80.8900, 2284.7651, 757.2218} // SAE Prusa w/ Wade extruder |
|
||||
#define DEFAULT_MAX_FEEDRATE {500, 500, 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 |
|
||||
#define DEFAULT_RETRACT_ACCELERATION 3000 // X, Y, Z and E max acceleration in mm/s^2 for r retracts |
|
||||
|
|
||||
#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate |
|
||||
#define DEFAULT_MINTRAVELFEEDRATE 0.0 |
|
||||
|
|
||||
// minimum time in microseconds that a movement needs to take if the buffer is emptied. Increase this number if you see blobs while |
|
||||
//printing high speed & high detail. It will slowdown on the detailed stuff. |
|
||||
#define DEFAULT_MINSEGMENTTIME 20000 // Obsolete delete this |
|
||||
#define DEFAULT_XYJERK 20.0 // (mm/sec) |
|
||||
#define DEFAULT_ZJERK 0.4 // (mm/sec) |
|
||||
|
|
||||
// If defined the movements slow down when the look ahead buffer is only half full |
|
||||
#define SLOWDOWN |
|
||||
|
|
||||
//default stepper release if idle |
|
||||
#define DEFAULT_STEPPER_DEACTIVE_TIME 60 |
|
||||
#define DEFAULT_STEPPER_DEACTIVE_COMMAND "M84 X Y E" //z stays powered |
|
||||
|
|
||||
|
|
||||
//=========================================================================== |
|
||||
//=============================Additional Features=========================== |
|
||||
//=========================================================================== |
|
||||
|
|
||||
// EEPROM |
|
||||
// the microcontroller can store settings in the EEPROM, e.g. max velocity... |
|
||||
// M500 - stores paramters in EEPROM |
|
||||
// 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 |
|
||||
//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 |
|
||||
|
|
||||
|
|
||||
// The hardware watchdog should halt the Microcontroller, in case the firmware gets stuck somewhere. However: |
|
||||
// the Watchdog is not working well, so please only enable this for testing |
|
||||
// this enables the watchdog interrupt. |
|
||||
//#define USE_WATCHDOG |
|
||||
//#ifdef USE_WATCHDOG |
|
||||
// you cannot reboot on a mega2560 due to a bug in he bootloader. Hence, you have to reset manually, and this is done hereby: |
|
||||
//#define RESET_MANUAL |
|
||||
//#define WATCHDOG_TIMEOUT 4 //seconds |
|
||||
//#endif |
|
||||
|
|
||||
// extruder advance constant (s2/mm3) |
|
||||
// |
|
||||
// advance (steps) = STEPS_PER_CUBIC_MM_E * EXTUDER_ADVANCE_K * cubic mm per second ^ 2 |
|
||||
// |
|
||||
// hooke's law says: force = k * distance |
|
||||
// bernoulli's priniciple says: v ^ 2 / 2 + g . h + pressure / density = constant |
|
||||
// so: v ^ 2 is proportional to number of steps we advance the extruder |
|
||||
//#define ADVANCE |
|
||||
|
|
||||
#ifdef ADVANCE |
|
||||
#define EXTRUDER_ADVANCE_K .0 |
|
||||
|
|
||||
#define D_FILAMENT 2.85 |
|
||||
#define STEPS_MM_E 836 |
|
||||
#define EXTRUTION_AREA (0.25 * D_FILAMENT * D_FILAMENT * 3.14159) |
|
||||
#define STEPS_PER_CUBIC_MM_E (axis_steps_per_unit[E_AXIS]/ EXTRUTION_AREA) |
|
||||
|
|
||||
#endif // ADVANCE |
|
||||
|
|
||||
|
|
||||
//LCD and SD support |
|
||||
//#define ULTRA_LCD //general lcd support, also 16x2 |
|
||||
//#define SDSUPPORT // Enable SD Card Support in Hardware Console |
|
||||
#define SD_FINISHED_STEPPERRELEASE true //if sd support and the file is finished: disable steppers? |
|
||||
#define SD_FINISHED_RELEASECOMMAND "M84 X Y E" // no z because of layer shift. |
|
||||
|
|
||||
#define ULTIPANEL |
|
||||
#ifdef ULTIPANEL |
|
||||
#define NEWPANEL //enable this if you have a click-encoder panel |
|
||||
#define SDSUPPORT |
|
||||
#define ULTRA_LCD |
|
||||
#define LCD_WIDTH 20 |
|
||||
#define LCD_HEIGHT 4 |
|
||||
#else //no panel but just lcd |
|
||||
#ifdef ULTRA_LCD |
|
||||
#define LCD_WIDTH 16 |
|
||||
#define LCD_HEIGHT 2 |
|
||||
#endif |
|
||||
#endif |
|
||||
|
|
||||
// A debugging feature to compare calculated vs performed steps, to see if steps are lost by the software. |
|
||||
//#define DEBUG_STEPS |
|
||||
|
|
||||
|
|
||||
// Arc interpretation settings: |
|
||||
#define MM_PER_ARC_SEGMENT 1 |
|
||||
#define N_ARC_CORRECTION 25 |
|
||||
|
|
||||
|
|
||||
//automatic temperature: The hot end target temperature is calculated by all the buffered lines of gcode. |
|
||||
//The maximum buffered steps/sec of the extruder motor are called "se". |
|
||||
//You enter the autotemp mode by a M109 S<mintemp> T<maxtemp> F<factor> |
|
||||
// the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp |
|
||||
// you exit the value by any M109 without F* |
|
||||
// Also, if the temperature is set to a value <mintemp, it is not changed by autotemp. |
|
||||
// on an ultimaker, some initial testing worked with M109 S215 T260 F0.1 in the start.gcode |
|
||||
//#define AUTOTEMP |
|
||||
#ifdef AUTOTEMP |
|
||||
#define AUTOTEMP_OLDWEIGHT 0.98 |
|
||||
#endif |
|
||||
|
|
||||
//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit |
|
||||
//can be software-disabled for whatever purposes by |
|
||||
#define PREVENT_DANGEROUS_EXTRUDE |
|
||||
#define EXTRUDE_MINTEMP 0 |
|
||||
#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances. |
|
||||
|
|
||||
const int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement |
|
||||
|
|
||||
|
|
||||
// M240 Triggers a camera by emulating a Canon RC-1 Remote |
|
||||
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/ |
|
||||
// #define PHOTOGRAPH_PIN 23 |
|
||||
|
|
||||
//=========================================================================== |
|
||||
//=============================Buffers ============================ |
|
||||
//=========================================================================== |
|
||||
|
|
||||
|
|
||||
|
|
||||
// The number of linear motions that can be in the plan at any give time. |
|
||||
// THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ringbuffering. |
|
||||
#if defined SDSUPPORT |
|
||||
#define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller |
|
||||
#else |
|
||||
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer |
|
||||
#endif |
|
||||
|
|
||||
|
|
||||
//The ASCII buffer for recieving from the serial: |
|
||||
#define MAX_CMD_SIZE 96 |
|
||||
#define BUFSIZE 4 |
|
||||
|
|
||||
|
|
||||
#include "thermistortables.h" |
|
||||
|
|
||||
#endif //__CONFIGURATION_H |
|
||||
|
|
||||
|
|
||||
@ -0,0 +1,221 @@ |
|||||
|
#ifndef __CONFIGURATION_ADV_H |
||||
|
#define __CONFIGURATION_ADV_H |
||||
|
|
||||
|
//===========================================================================
|
||||
|
//=============================Thermal Settings ============================
|
||||
|
//===========================================================================
|
||||
|
|
||||
|
// Select one of these only to define how the bed temp is read.
|
||||
|
//
|
||||
|
//#define BED_LIMIT_SWITCHING
|
||||
|
#ifdef BED_LIMIT_SWITCHING |
||||
|
#define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS
|
||||
|
#endif |
||||
|
#define BED_CHECK_INTERVAL 5000 //ms
|
||||
|
|
||||
|
//// Heating sanity check:
|
||||
|
// This waits for the watchperiod in milliseconds whenever an M104 or M109 increases the target temperature
|
||||
|
// If the temperature has not increased at the end of that period, the target temperature is set to zero.
|
||||
|
// It can be reset with another M104/M109
|
||||
|
//#define WATCHPERIOD 20000 //20 seconds
|
||||
|
|
||||
|
// Wait for Cooldown
|
||||
|
// This defines if the M109 call should not block if it is cooling down.
|
||||
|
// example: From a current temp of 220, you set M109 S200.
|
||||
|
// if CooldownNoWait is defined M109 will not wait for the cooldown to finish
|
||||
|
#define CooldownNoWait true |
||||
|
|
||||
|
//Do not wait for M109 to finish when printing from SD card
|
||||
|
//#define STOP_HEATING_WAIT_WHEN_SD_PRINTING
|
||||
|
|
||||
|
#ifdef PIDTEMP |
||||
|
// this adds an experimental additional term to the heatingpower, proportional to the extrusion speed.
|
||||
|
// if Kc is choosen well, the additional required power due to increased melting should be compensated.
|
||||
|
#define PID_ADD_EXTRUSION_RATE |
||||
|
#ifdef PID_ADD_EXTRUSION_RATE |
||||
|
#define DEFAULT_Kc (1) //heatingpower=Kc*(e_speed)
|
||||
|
#endif |
||||
|
#endif |
||||
|
|
||||
|
|
||||
|
//automatic temperature: The hot end target temperature is calculated by all the buffered lines of gcode.
|
||||
|
//The maximum buffered steps/sec of the extruder motor are called "se".
|
||||
|
//You enter the autotemp mode by a M109 S<mintemp> T<maxtemp> F<factor>
|
||||
|
// the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp
|
||||
|
// you exit the value by any M109 without F*
|
||||
|
// Also, if the temperature is set to a value <mintemp, it is not changed by autotemp.
|
||||
|
// on an ultimaker, some initial testing worked with M109 S215 T260 F0.1 in the start.gcode
|
||||
|
//#define AUTOTEMP
|
||||
|
#ifdef AUTOTEMP |
||||
|
#define AUTOTEMP_OLDWEIGHT 0.98 |
||||
|
#endif |
||||
|
|
||||
|
// extruder run-out prevention.
|
||||
|
//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
|
||||
|
//#define EXTRUDER_RUNOUT_PREVENT
|
||||
|
#define EXTRUDER_RUNOUT_MINTEMP 190 |
||||
|
#define EXTRUDER_RUNOUT_SECONDS 30. |
||||
|
#define EXTRUDER_RUNOUT_ESTEPS 14. //mm filament
|
||||
|
#define EXTRUDER_RUNOUT_SPEED 1500. //extrusion speed
|
||||
|
#define EXTRUDER_RUNOUT_EXTRUDE 100 |
||||
|
|
||||
|
//===========================================================================
|
||||
|
//=============================Mechanical Settings===========================
|
||||
|
//===========================================================================
|
||||
|
|
||||
|
// This defines the number of extruders
|
||||
|
#define EXTRUDERS 1 |
||||
|
|
||||
|
#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
|
||||
|
|
||||
|
//#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats.
|
||||
|
|
||||
|
//homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
|
||||
|
#define X_HOME_RETRACT_MM 5 |
||||
|
#define Y_HOME_RETRACT_MM 5 |
||||
|
#define Z_HOME_RETRACT_MM 1 |
||||
|
#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
|
||||
|
|
||||
|
#define AXIS_RELATIVE_MODES {false, false, false, false} |
||||
|
|
||||
|
#define MAX_STEP_FREQUENCY 40000 // Max step frequency for Ultimaker (5000 pps / half step)
|
||||
|
|
||||
|
//default stepper release if idle
|
||||
|
#define DEFAULT_STEPPER_DEACTIVE_TIME 60 |
||||
|
|
||||
|
#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate
|
||||
|
#define DEFAULT_MINTRAVELFEEDRATE 0.0 |
||||
|
|
||||
|
// minimum time in microseconds that a movement needs to take if the buffer is emptied. Increase this number if you see blobs while printing high speed & high detail. It will slowdown on the detailed stuff.
|
||||
|
#define DEFAULT_MINSEGMENTTIME 20000 // Obsolete delete this
|
||||
|
|
||||
|
// If defined the movements slow down when the look ahead buffer is only half full
|
||||
|
#define SLOWDOWN |
||||
|
|
||||
|
// Frequency limit
|
||||
|
// See nophead's blog for more info
|
||||
|
// Not working O
|
||||
|
//#define XY_FREQUENCY_LIMIT 15
|
||||
|
|
||||
|
// Minimum planner junction speed. Sets the default minimum speed the planner plans for at the end
|
||||
|
// of the buffer and all stops. This should not be much greater than zero and should only be changed
|
||||
|
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
|
||||
|
#define MINIMUM_PLANNER_SPEED 2.0 // (mm/sec)
|
||||
|
|
||||
|
//===========================================================================
|
||||
|
//=============================Additional Features===========================
|
||||
|
//===========================================================================
|
||||
|
|
||||
|
|
||||
|
#define SD_FINISHED_STEPPERRELEASE true //if sd support and the file is finished: disable steppers?
|
||||
|
#define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // no z because of layer shift.
|
||||
|
|
||||
|
// The hardware watchdog should halt the Microcontroller, in case the firmware gets stuck somewhere. However:
|
||||
|
// the Watchdog is not working well, so please only enable this for testing
|
||||
|
// this enables the watchdog interrupt.
|
||||
|
//#define USE_WATCHDOG
|
||||
|
//#ifdef USE_WATCHDOG
|
||||
|
// you cannot reboot on a mega2560 due to a bug in he bootloader. Hence, you have to reset manually, and this is done hereby:
|
||||
|
//#define RESET_MANUAL
|
||||
|
//#define WATCHDOG_TIMEOUT 4 //seconds
|
||||
|
//#endif
|
||||
|
|
||||
|
// extruder advance constant (s2/mm3)
|
||||
|
//
|
||||
|
// advance (steps) = STEPS_PER_CUBIC_MM_E * EXTUDER_ADVANCE_K * cubic mm per second ^ 2
|
||||
|
//
|
||||
|
// hooke's law says: force = k * distance
|
||||
|
// bernoulli's priniciple says: v ^ 2 / 2 + g . h + pressure / density = constant
|
||||
|
// so: v ^ 2 is proportional to number of steps we advance the extruder
|
||||
|
//#define ADVANCE
|
||||
|
|
||||
|
#ifdef ADVANCE |
||||
|
#define EXTRUDER_ADVANCE_K .0 |
||||
|
|
||||
|
#define D_FILAMENT 2.85 |
||||
|
#define STEPS_MM_E 836 |
||||
|
#define EXTRUTION_AREA (0.25 * D_FILAMENT * D_FILAMENT * 3.14159) |
||||
|
#define STEPS_PER_CUBIC_MM_E (axis_steps_per_unit[E_AXIS]/ EXTRUTION_AREA) |
||||
|
|
||||
|
#endif // ADVANCE
|
||||
|
|
||||
|
// A debugging feature to compare calculated vs performed steps, to see if steps are lost by the software.
|
||||
|
//#define DEBUG_STEPS
|
||||
|
|
||||
|
// Arc interpretation settings:
|
||||
|
#define MM_PER_ARC_SEGMENT 1 |
||||
|
#define N_ARC_CORRECTION 25 |
||||
|
|
||||
|
const int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement
|
||||
|
|
||||
|
//===========================================================================
|
||||
|
//=============================Buffers ============================
|
||||
|
//===========================================================================
|
||||
|
|
||||
|
// The number of linear motions that can be in the plan at any give time.
|
||||
|
// THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ringbuffering.
|
||||
|
#if defined SDSUPPORT |
||||
|
#define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
|
||||
|
#else |
||||
|
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer
|
||||
|
#endif |
||||
|
|
||||
|
|
||||
|
//The ASCII buffer for recieving from the serial:
|
||||
|
#define MAX_CMD_SIZE 96 |
||||
|
#define BUFSIZE 4 |
||||
|
|
||||
|
//===========================================================================
|
||||
|
//============================= Define Defines ============================
|
||||
|
//===========================================================================
|
||||
|
|
||||
|
#if TEMP_SENSOR_0 > 0 |
||||
|
#define THERMISTORHEATER_0 TEMP_SENSOR_0 |
||||
|
#define HEATER_0_USES_THERMISTOR |
||||
|
#endif |
||||
|
#if TEMP_SENSOR_1 > 0 |
||||
|
#define THERMISTORHEATER_1 TEMP_SENSOR_1 |
||||
|
#define HEATER_1_USES_THERMISTOR |
||||
|
#endif |
||||
|
#if TEMP_SENSOR_2 > 0 |
||||
|
#define THERMISTORHEATER_2 TEMP_SENSOR_2 |
||||
|
#define HEATER_2_USES_THERMISTOR |
||||
|
#endif |
||||
|
#if TEMP_SENSOR_BED > 0 |
||||
|
#define THERMISTORBED TEMP_SENSOR_BED |
||||
|
#define BED_USES_THERMISTOR |
||||
|
#endif |
||||
|
#if TEMP_SENSOR_0 == -1 |
||||
|
#define HEATER_0_USES_AD595 |
||||
|
#endif |
||||
|
#if TEMP_SENSOR_1 == -1 |
||||
|
#define HEATER_1_USES_AD595 |
||||
|
#endif |
||||
|
#if TEMP_SENSOR_2 == -1 |
||||
|
#define HEATER_2_USES_AD595 |
||||
|
#endif |
||||
|
#if TEMP_SENSOR_BED == -1 |
||||
|
#define BED_USES_AD595 |
||||
|
#endif |
||||
|
#if TEMP_SENSOR_0 == -2 |
||||
|
#define HEATER_0_USES_MAX6675 |
||||
|
#endif |
||||
|
#if TEMP_SENSOR_0 == 0 |
||||
|
#undef HEATER_0_MINTEMP |
||||
|
#undef HEATER_0_MAXTEMP |
||||
|
#endif |
||||
|
#if TEMP_SENSOR_1 == 0 |
||||
|
#undef HEATER_1_MINTEMP |
||||
|
#undef HEATER_1_MAXTEMP |
||||
|
#endif |
||||
|
#if TEMP_SENSOR_2 == 0 |
||||
|
#undef HEATER_2_MINTEMP |
||||
|
#undef HEATER_2_MAXTEMP |
||||
|
#endif |
||||
|
#if TEMP_SENSOR_BED == 0 |
||||
|
#undef BED_MINTEMP |
||||
|
#undef BED_MAXTEMP |
||||
|
#endif |
||||
|
|
||||
|
|
||||
|
#endif //__CONFIGURATION_ADV_H
|
||||
@ -1,76 +1,76 @@ |
|||||
#ifndef SPEED_LOOKUPTABLE_H |
#ifndef SPEED_LOOKUPTABLE_H |
||||
#define SPEED_LOOKUPTABLE_H |
#define SPEED_LOOKUPTABLE_H |
||||
|
|
||||
#include "Marlin.h" |
#include "Marlin.h" |
||||
|
|
||||
uint16_t speed_lookuptable_fast[256][2] PROGMEM = {\ |
const uint16_t speed_lookuptable_fast[256][2] PROGMEM = {\ |
||||
{ 62500, 55556}, { 6944, 3268}, { 3676, 1176}, { 2500, 607}, { 1893, 369}, { 1524, 249}, { 1275, 179}, { 1096, 135}, |
{ 62500, 55556}, { 6944, 3268}, { 3676, 1176}, { 2500, 607}, { 1893, 369}, { 1524, 249}, { 1275, 179}, { 1096, 135}, |
||||
{ 961, 105}, { 856, 85}, { 771, 69}, { 702, 58}, { 644, 49}, { 595, 42}, { 553, 37}, { 516, 32}, |
{ 961, 105}, { 856, 85}, { 771, 69}, { 702, 58}, { 644, 49}, { 595, 42}, { 553, 37}, { 516, 32}, |
||||
{ 484, 28}, { 456, 25}, { 431, 23}, { 408, 20}, { 388, 19}, { 369, 16}, { 353, 16}, { 337, 14}, |
{ 484, 28}, { 456, 25}, { 431, 23}, { 408, 20}, { 388, 19}, { 369, 16}, { 353, 16}, { 337, 14}, |
||||
{ 323, 13}, { 310, 11}, { 299, 11}, { 288, 11}, { 277, 9}, { 268, 9}, { 259, 8}, { 251, 8}, |
{ 323, 13}, { 310, 11}, { 299, 11}, { 288, 11}, { 277, 9}, { 268, 9}, { 259, 8}, { 251, 8}, |
||||
{ 243, 8}, { 235, 7}, { 228, 6}, { 222, 6}, { 216, 6}, { 210, 6}, { 204, 5}, { 199, 5}, |
{ 243, 8}, { 235, 7}, { 228, 6}, { 222, 6}, { 216, 6}, { 210, 6}, { 204, 5}, { 199, 5}, |
||||
{ 194, 5}, { 189, 4}, { 185, 4}, { 181, 4}, { 177, 4}, { 173, 4}, { 169, 4}, { 165, 3}, |
{ 194, 5}, { 189, 4}, { 185, 4}, { 181, 4}, { 177, 4}, { 173, 4}, { 169, 4}, { 165, 3}, |
||||
{ 162, 3}, { 159, 4}, { 155, 3}, { 152, 3}, { 149, 2}, { 147, 3}, { 144, 3}, { 141, 2}, |
{ 162, 3}, { 159, 4}, { 155, 3}, { 152, 3}, { 149, 2}, { 147, 3}, { 144, 3}, { 141, 2}, |
||||
{ 139, 3}, { 136, 2}, { 134, 2}, { 132, 3}, { 129, 2}, { 127, 2}, { 125, 2}, { 123, 2}, |
{ 139, 3}, { 136, 2}, { 134, 2}, { 132, 3}, { 129, 2}, { 127, 2}, { 125, 2}, { 123, 2}, |
||||
{ 121, 2}, { 119, 1}, { 118, 2}, { 116, 2}, { 114, 1}, { 113, 2}, { 111, 2}, { 109, 1}, |
{ 121, 2}, { 119, 1}, { 118, 2}, { 116, 2}, { 114, 1}, { 113, 2}, { 111, 2}, { 109, 1}, |
||||
{ 108, 2}, { 106, 1}, { 105, 2}, { 103, 1}, { 102, 1}, { 101, 1}, { 100, 2}, { 98, 1}, |
{ 108, 2}, { 106, 1}, { 105, 2}, { 103, 1}, { 102, 1}, { 101, 1}, { 100, 2}, { 98, 1}, |
||||
{ 97, 1}, { 96, 1}, { 95, 2}, { 93, 1}, { 92, 1}, { 91, 1}, { 90, 1}, { 89, 1}, |
{ 97, 1}, { 96, 1}, { 95, 2}, { 93, 1}, { 92, 1}, { 91, 1}, { 90, 1}, { 89, 1}, |
||||
{ 88, 1}, { 87, 1}, { 86, 1}, { 85, 1}, { 84, 1}, { 83, 0}, { 83, 1}, { 82, 1}, |
{ 88, 1}, { 87, 1}, { 86, 1}, { 85, 1}, { 84, 1}, { 83, 0}, { 83, 1}, { 82, 1}, |
||||
{ 81, 1}, { 80, 1}, { 79, 1}, { 78, 0}, { 78, 1}, { 77, 1}, { 76, 1}, { 75, 0}, |
{ 81, 1}, { 80, 1}, { 79, 1}, { 78, 0}, { 78, 1}, { 77, 1}, { 76, 1}, { 75, 0}, |
||||
{ 75, 1}, { 74, 1}, { 73, 1}, { 72, 0}, { 72, 1}, { 71, 1}, { 70, 0}, { 70, 1}, |
{ 75, 1}, { 74, 1}, { 73, 1}, { 72, 0}, { 72, 1}, { 71, 1}, { 70, 0}, { 70, 1}, |
||||
{ 69, 0}, { 69, 1}, { 68, 1}, { 67, 0}, { 67, 1}, { 66, 0}, { 66, 1}, { 65, 0}, |
{ 69, 0}, { 69, 1}, { 68, 1}, { 67, 0}, { 67, 1}, { 66, 0}, { 66, 1}, { 65, 0}, |
||||
{ 65, 1}, { 64, 1}, { 63, 0}, { 63, 1}, { 62, 0}, { 62, 1}, { 61, 0}, { 61, 1}, |
{ 65, 1}, { 64, 1}, { 63, 0}, { 63, 1}, { 62, 0}, { 62, 1}, { 61, 0}, { 61, 1}, |
||||
{ 60, 0}, { 60, 0}, { 60, 1}, { 59, 0}, { 59, 1}, { 58, 0}, { 58, 1}, { 57, 0}, |
{ 60, 0}, { 60, 0}, { 60, 1}, { 59, 0}, { 59, 1}, { 58, 0}, { 58, 1}, { 57, 0}, |
||||
{ 57, 1}, { 56, 0}, { 56, 0}, { 56, 1}, { 55, 0}, { 55, 1}, { 54, 0}, { 54, 0}, |
{ 57, 1}, { 56, 0}, { 56, 0}, { 56, 1}, { 55, 0}, { 55, 1}, { 54, 0}, { 54, 0}, |
||||
{ 54, 1}, { 53, 0}, { 53, 0}, { 53, 1}, { 52, 0}, { 52, 0}, { 52, 1}, { 51, 0}, |
{ 54, 1}, { 53, 0}, { 53, 0}, { 53, 1}, { 52, 0}, { 52, 0}, { 52, 1}, { 51, 0}, |
||||
{ 51, 0}, { 51, 1}, { 50, 0}, { 50, 0}, { 50, 1}, { 49, 0}, { 49, 0}, { 49, 1}, |
{ 51, 0}, { 51, 1}, { 50, 0}, { 50, 0}, { 50, 1}, { 49, 0}, { 49, 0}, { 49, 1}, |
||||
{ 48, 0}, { 48, 0}, { 48, 1}, { 47, 0}, { 47, 0}, { 47, 0}, { 47, 1}, { 46, 0}, |
{ 48, 0}, { 48, 0}, { 48, 1}, { 47, 0}, { 47, 0}, { 47, 0}, { 47, 1}, { 46, 0}, |
||||
{ 46, 0}, { 46, 1}, { 45, 0}, { 45, 0}, { 45, 0}, { 45, 1}, { 44, 0}, { 44, 0}, |
{ 46, 0}, { 46, 1}, { 45, 0}, { 45, 0}, { 45, 0}, { 45, 1}, { 44, 0}, { 44, 0}, |
||||
{ 44, 0}, { 44, 1}, { 43, 0}, { 43, 0}, { 43, 0}, { 43, 1}, { 42, 0}, { 42, 0}, |
{ 44, 0}, { 44, 1}, { 43, 0}, { 43, 0}, { 43, 0}, { 43, 1}, { 42, 0}, { 42, 0}, |
||||
{ 42, 0}, { 42, 1}, { 41, 0}, { 41, 0}, { 41, 0}, { 41, 0}, { 41, 1}, { 40, 0}, |
{ 42, 0}, { 42, 1}, { 41, 0}, { 41, 0}, { 41, 0}, { 41, 0}, { 41, 1}, { 40, 0}, |
||||
{ 40, 0}, { 40, 0}, { 40, 0}, { 40, 1}, { 39, 0}, { 39, 0}, { 39, 0}, { 39, 0}, |
{ 40, 0}, { 40, 0}, { 40, 0}, { 40, 1}, { 39, 0}, { 39, 0}, { 39, 0}, { 39, 0}, |
||||
{ 39, 1}, { 38, 0}, { 38, 0}, { 38, 0}, { 38, 0}, { 38, 1}, { 37, 0}, { 37, 0}, |
{ 39, 1}, { 38, 0}, { 38, 0}, { 38, 0}, { 38, 0}, { 38, 1}, { 37, 0}, { 37, 0}, |
||||
{ 37, 0}, { 37, 0}, { 37, 0}, { 37, 1}, { 36, 0}, { 36, 0}, { 36, 0}, { 36, 0}, |
{ 37, 0}, { 37, 0}, { 37, 0}, { 37, 1}, { 36, 0}, { 36, 0}, { 36, 0}, { 36, 0}, |
||||
{ 36, 1}, { 35, 0}, { 35, 0}, { 35, 0}, { 35, 0}, { 35, 0}, { 35, 0}, { 35, 1}, |
{ 36, 1}, { 35, 0}, { 35, 0}, { 35, 0}, { 35, 0}, { 35, 0}, { 35, 0}, { 35, 1}, |
||||
{ 34, 0}, { 34, 0}, { 34, 0}, { 34, 0}, { 34, 0}, { 34, 1}, { 33, 0}, { 33, 0}, |
{ 34, 0}, { 34, 0}, { 34, 0}, { 34, 0}, { 34, 0}, { 34, 1}, { 33, 0}, { 33, 0}, |
||||
{ 33, 0}, { 33, 0}, { 33, 0}, { 33, 0}, { 33, 1}, { 32, 0}, { 32, 0}, { 32, 0}, |
{ 33, 0}, { 33, 0}, { 33, 0}, { 33, 0}, { 33, 1}, { 32, 0}, { 32, 0}, { 32, 0}, |
||||
{ 32, 0}, { 32, 0}, { 32, 0}, { 32, 0}, { 32, 1}, { 31, 0}, { 31, 0}, { 31, 0}, |
{ 32, 0}, { 32, 0}, { 32, 0}, { 32, 0}, { 32, 1}, { 31, 0}, { 31, 0}, { 31, 0}, |
||||
{ 31, 0}, { 31, 0}, { 31, 0}, { 31, 1}, { 30, 0}, { 30, 0}, { 30, 0}, { 30, 0} |
{ 31, 0}, { 31, 0}, { 31, 0}, { 31, 1}, { 30, 0}, { 30, 0}, { 30, 0}, { 30, 0} |
||||
}; |
}; |
||||
|
|
||||
uint16_t speed_lookuptable_slow[256][2] PROGMEM = {\ |
const uint16_t speed_lookuptable_slow[256][2] PROGMEM = {\ |
||||
{ 62500, 12500}, { 50000, 8334}, { 41666, 5952}, { 35714, 4464}, { 31250, 3473}, { 27777, 2777}, { 25000, 2273}, { 22727, 1894}, |
{ 62500, 12500}, { 50000, 8334}, { 41666, 5952}, { 35714, 4464}, { 31250, 3473}, { 27777, 2777}, { 25000, 2273}, { 22727, 1894}, |
||||
{ 20833, 1603}, { 19230, 1373}, { 17857, 1191}, { 16666, 1041}, { 15625, 920}, { 14705, 817}, { 13888, 731}, { 13157, 657}, |
{ 20833, 1603}, { 19230, 1373}, { 17857, 1191}, { 16666, 1041}, { 15625, 920}, { 14705, 817}, { 13888, 731}, { 13157, 657}, |
||||
{ 12500, 596}, { 11904, 541}, { 11363, 494}, { 10869, 453}, { 10416, 416}, { 10000, 385}, { 9615, 356}, { 9259, 331}, |
{ 12500, 596}, { 11904, 541}, { 11363, 494}, { 10869, 453}, { 10416, 416}, { 10000, 385}, { 9615, 356}, { 9259, 331}, |
||||
{ 8928, 308}, { 8620, 287}, { 8333, 269}, { 8064, 252}, { 7812, 237}, { 7575, 223}, { 7352, 210}, { 7142, 198}, |
{ 8928, 308}, { 8620, 287}, { 8333, 269}, { 8064, 252}, { 7812, 237}, { 7575, 223}, { 7352, 210}, { 7142, 198}, |
||||
{ 6944, 188}, { 6756, 178}, { 6578, 168}, { 6410, 160}, { 6250, 153}, { 6097, 145}, { 5952, 139}, { 5813, 132}, |
{ 6944, 188}, { 6756, 178}, { 6578, 168}, { 6410, 160}, { 6250, 153}, { 6097, 145}, { 5952, 139}, { 5813, 132}, |
||||
{ 5681, 126}, { 5555, 121}, { 5434, 115}, { 5319, 111}, { 5208, 106}, { 5102, 102}, { 5000, 99}, { 4901, 94}, |
{ 5681, 126}, { 5555, 121}, { 5434, 115}, { 5319, 111}, { 5208, 106}, { 5102, 102}, { 5000, 99}, { 4901, 94}, |
||||
{ 4807, 91}, { 4716, 87}, { 4629, 84}, { 4545, 81}, { 4464, 79}, { 4385, 75}, { 4310, 73}, { 4237, 71}, |
{ 4807, 91}, { 4716, 87}, { 4629, 84}, { 4545, 81}, { 4464, 79}, { 4385, 75}, { 4310, 73}, { 4237, 71}, |
||||
{ 4166, 68}, { 4098, 66}, { 4032, 64}, { 3968, 62}, { 3906, 60}, { 3846, 59}, { 3787, 56}, { 3731, 55}, |
{ 4166, 68}, { 4098, 66}, { 4032, 64}, { 3968, 62}, { 3906, 60}, { 3846, 59}, { 3787, 56}, { 3731, 55}, |
||||
{ 3676, 53}, { 3623, 52}, { 3571, 50}, { 3521, 49}, { 3472, 48}, { 3424, 46}, { 3378, 45}, { 3333, 44}, |
{ 3676, 53}, { 3623, 52}, { 3571, 50}, { 3521, 49}, { 3472, 48}, { 3424, 46}, { 3378, 45}, { 3333, 44}, |
||||
{ 3289, 43}, { 3246, 41}, { 3205, 41}, { 3164, 39}, { 3125, 39}, { 3086, 38}, { 3048, 36}, { 3012, 36}, |
{ 3289, 43}, { 3246, 41}, { 3205, 41}, { 3164, 39}, { 3125, 39}, { 3086, 38}, { 3048, 36}, { 3012, 36}, |
||||
{ 2976, 35}, { 2941, 35}, { 2906, 33}, { 2873, 33}, { 2840, 32}, { 2808, 31}, { 2777, 30}, { 2747, 30}, |
{ 2976, 35}, { 2941, 35}, { 2906, 33}, { 2873, 33}, { 2840, 32}, { 2808, 31}, { 2777, 30}, { 2747, 30}, |
||||
{ 2717, 29}, { 2688, 29}, { 2659, 28}, { 2631, 27}, { 2604, 27}, { 2577, 26}, { 2551, 26}, { 2525, 25}, |
{ 2717, 29}, { 2688, 29}, { 2659, 28}, { 2631, 27}, { 2604, 27}, { 2577, 26}, { 2551, 26}, { 2525, 25}, |
||||
{ 2500, 25}, { 2475, 25}, { 2450, 23}, { 2427, 24}, { 2403, 23}, { 2380, 22}, { 2358, 22}, { 2336, 22}, |
{ 2500, 25}, { 2475, 25}, { 2450, 23}, { 2427, 24}, { 2403, 23}, { 2380, 22}, { 2358, 22}, { 2336, 22}, |
||||
{ 2314, 21}, { 2293, 21}, { 2272, 20}, { 2252, 20}, { 2232, 20}, { 2212, 20}, { 2192, 19}, { 2173, 18}, |
{ 2314, 21}, { 2293, 21}, { 2272, 20}, { 2252, 20}, { 2232, 20}, { 2212, 20}, { 2192, 19}, { 2173, 18}, |
||||
{ 2155, 19}, { 2136, 18}, { 2118, 18}, { 2100, 17}, { 2083, 17}, { 2066, 17}, { 2049, 17}, { 2032, 16}, |
{ 2155, 19}, { 2136, 18}, { 2118, 18}, { 2100, 17}, { 2083, 17}, { 2066, 17}, { 2049, 17}, { 2032, 16}, |
||||
{ 2016, 16}, { 2000, 16}, { 1984, 16}, { 1968, 15}, { 1953, 16}, { 1937, 14}, { 1923, 15}, { 1908, 15}, |
{ 2016, 16}, { 2000, 16}, { 1984, 16}, { 1968, 15}, { 1953, 16}, { 1937, 14}, { 1923, 15}, { 1908, 15}, |
||||
{ 1893, 14}, { 1879, 14}, { 1865, 14}, { 1851, 13}, { 1838, 14}, { 1824, 13}, { 1811, 13}, { 1798, 13}, |
{ 1893, 14}, { 1879, 14}, { 1865, 14}, { 1851, 13}, { 1838, 14}, { 1824, 13}, { 1811, 13}, { 1798, 13}, |
||||
{ 1785, 12}, { 1773, 13}, { 1760, 12}, { 1748, 12}, { 1736, 12}, { 1724, 12}, { 1712, 12}, { 1700, 11}, |
{ 1785, 12}, { 1773, 13}, { 1760, 12}, { 1748, 12}, { 1736, 12}, { 1724, 12}, { 1712, 12}, { 1700, 11}, |
||||
{ 1689, 12}, { 1677, 11}, { 1666, 11}, { 1655, 11}, { 1644, 11}, { 1633, 10}, { 1623, 11}, { 1612, 10}, |
{ 1689, 12}, { 1677, 11}, { 1666, 11}, { 1655, 11}, { 1644, 11}, { 1633, 10}, { 1623, 11}, { 1612, 10}, |
||||
{ 1602, 10}, { 1592, 10}, { 1582, 10}, { 1572, 10}, { 1562, 10}, { 1552, 9}, { 1543, 10}, { 1533, 9}, |
{ 1602, 10}, { 1592, 10}, { 1582, 10}, { 1572, 10}, { 1562, 10}, { 1552, 9}, { 1543, 10}, { 1533, 9}, |
||||
{ 1524, 9}, { 1515, 9}, { 1506, 9}, { 1497, 9}, { 1488, 9}, { 1479, 9}, { 1470, 9}, { 1461, 8}, |
{ 1524, 9}, { 1515, 9}, { 1506, 9}, { 1497, 9}, { 1488, 9}, { 1479, 9}, { 1470, 9}, { 1461, 8}, |
||||
{ 1453, 8}, { 1445, 9}, { 1436, 8}, { 1428, 8}, { 1420, 8}, { 1412, 8}, { 1404, 8}, { 1396, 8}, |
{ 1453, 8}, { 1445, 9}, { 1436, 8}, { 1428, 8}, { 1420, 8}, { 1412, 8}, { 1404, 8}, { 1396, 8}, |
||||
{ 1388, 7}, { 1381, 8}, { 1373, 7}, { 1366, 8}, { 1358, 7}, { 1351, 7}, { 1344, 8}, { 1336, 7}, |
{ 1388, 7}, { 1381, 8}, { 1373, 7}, { 1366, 8}, { 1358, 7}, { 1351, 7}, { 1344, 8}, { 1336, 7}, |
||||
{ 1329, 7}, { 1322, 7}, { 1315, 7}, { 1308, 6}, { 1302, 7}, { 1295, 7}, { 1288, 6}, { 1282, 7}, |
{ 1329, 7}, { 1322, 7}, { 1315, 7}, { 1308, 6}, { 1302, 7}, { 1295, 7}, { 1288, 6}, { 1282, 7}, |
||||
{ 1275, 6}, { 1269, 7}, { 1262, 6}, { 1256, 6}, { 1250, 7}, { 1243, 6}, { 1237, 6}, { 1231, 6}, |
{ 1275, 6}, { 1269, 7}, { 1262, 6}, { 1256, 6}, { 1250, 7}, { 1243, 6}, { 1237, 6}, { 1231, 6}, |
||||
{ 1225, 6}, { 1219, 6}, { 1213, 6}, { 1207, 6}, { 1201, 5}, { 1196, 6}, { 1190, 6}, { 1184, 5}, |
{ 1225, 6}, { 1219, 6}, { 1213, 6}, { 1207, 6}, { 1201, 5}, { 1196, 6}, { 1190, 6}, { 1184, 5}, |
||||
{ 1179, 6}, { 1173, 5}, { 1168, 6}, { 1162, 5}, { 1157, 5}, { 1152, 6}, { 1146, 5}, { 1141, 5}, |
{ 1179, 6}, { 1173, 5}, { 1168, 6}, { 1162, 5}, { 1157, 5}, { 1152, 6}, { 1146, 5}, { 1141, 5}, |
||||
{ 1136, 5}, { 1131, 5}, { 1126, 5}, { 1121, 5}, { 1116, 5}, { 1111, 5}, { 1106, 5}, { 1101, 5}, |
{ 1136, 5}, { 1131, 5}, { 1126, 5}, { 1121, 5}, { 1116, 5}, { 1111, 5}, { 1106, 5}, { 1101, 5}, |
||||
{ 1096, 5}, { 1091, 5}, { 1086, 4}, { 1082, 5}, { 1077, 5}, { 1072, 4}, { 1068, 5}, { 1063, 4}, |
{ 1096, 5}, { 1091, 5}, { 1086, 4}, { 1082, 5}, { 1077, 5}, { 1072, 4}, { 1068, 5}, { 1063, 4}, |
||||
{ 1059, 5}, { 1054, 4}, { 1050, 4}, { 1046, 5}, { 1041, 4}, { 1037, 4}, { 1033, 5}, { 1028, 4}, |
{ 1059, 5}, { 1054, 4}, { 1050, 4}, { 1046, 5}, { 1041, 4}, { 1037, 4}, { 1033, 5}, { 1028, 4}, |
||||
{ 1024, 4}, { 1020, 4}, { 1016, 4}, { 1012, 4}, { 1008, 4}, { 1004, 4}, { 1000, 4}, { 996, 4}, |
{ 1024, 4}, { 1020, 4}, { 1016, 4}, { 1012, 4}, { 1008, 4}, { 1004, 4}, { 1000, 4}, { 996, 4}, |
||||
{ 992, 4}, { 988, 4}, { 984, 4}, { 980, 4}, { 976, 4}, { 972, 4}, { 968, 3}, { 965, 3} |
{ 992, 4}, { 988, 4}, { 984, 4}, { 980, 4}, { 976, 4}, { 972, 4}, { 968, 3}, { 965, 3} |
||||
}; |
}; |
||||
|
|
||||
#endif |
#endif |
||||
|
|||||
Loading…
Reference in new issue