906 Commits (dbe4126e07db6cf4e96d984c5c8b961b3c776fdf)

Author SHA1 Message Date
Erik van der Zalm ecf3ab5de4 Added thermistor 60 to configuration.h 12 years ago
Nicolas Rossi 2daa85918e Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
	Marlin/language.h
	Marlin/pins.h
	Marlin/ultralcd.cpp
12 years ago
Erik van der Zalm 2015989f84 Added DISABLE_MIN_ENDSTOPS 12 years ago
Christian Inci 648d45cfb2 Fix Pin Description Typo
Reverse 'Bed' and 'Fan' at the RAMPS 33 Description.

Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
12 years ago
lajos 02dee80fa5 added Azteeg X1 motherboard 12 years ago
Erik van der Zalm e34c9981ab Delta disabled by default 12 years ago
Erik van der Zalm 7ad12be763 Merge branch 'Marlin_v1' of https://github.com/codexmas/Marlin into codexmas-Marlin_v1
Conflicts:
	Marlin/Configuration.h
	README.md
12 years ago
Erik van der Zalm 408169aef4 Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1
Conflicts:
	Marlin/Configuration.h
	Marlin/language.h
	Marlin/pins.h
12 years ago
Erik van der Zalm bd96d22bfb Merge branch 'Marlin_v1' into thinkyhead
Conflicts:
	Marlin/Configuration.h
	Marlin/Configuration_adv.h
	Marlin/Marlin.h
	Marlin/Marlin_main.cpp
	Marlin/Servo.cpp
	Marlin/language.h
	Marlin/pins.h
	Marlin/planner.cpp
	Marlin/ultralcd_implementation_hitachi_HD44780.h
	README.md
12 years ago
Erik van der Zalm 6f4a6e531c Merge branch 'deltabot' into Marlin_v1 12 years ago
Erik van der Zalm ff6fa09ecf Moved corexy implementation from stepper to planner
(Thanks iquizzle)
12 years ago
Erik van der Zalm c8dcc7c208 Allow increasing the software PWM frequency. 12 years ago
Erik van der Zalm 373f3ecab3 Merge branch 'deltabot' of https://github.com/jcrocholl/Marlin into deltabot
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
	Marlin/pins.h
12 years ago
kiyoshigawa 6a81291c57 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
This should fix issues with pull request 467, I hope.

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
	Marlin/ultralcd_implementation_hitachi_HD44780.h
12 years ago
BorisLandoni c1cb5977ee Update Configuration.h 12 years ago
BorisLandoni 8a5bd8a808 Update Configuration.h 12 years ago
BorisLandoni 6588933c04 Update Configuration.h 12 years ago
Scott Lahteine 5dabc95409 Apply all changes from latest Marlin_V1
Diffed and merged, preserving my updates
12 years ago
Gord Christmas f4f30c9d64 Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles. 12 years ago
Erik van der Zalm 79374f0b93 Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1 12 years ago
kiyoshigawa 4b19c8552e Fixing changed Configuration.h settings to be default values per ErikZalm Request. 12 years ago
Erik van der Zalm 5090c56651 More redundant temp sensor changes. (After testing and debugging by reifsnderb) 12 years ago
Gatulibu b78fa6bb70 Added support for Megatronics v2.0 and Minitronics v1.0
merged from code downloaded from reprapworld.com
12 years ago
Erik van der Zalm 9be61cdc02 Added redundant temp sensor 12 years ago
Alexander Kasimir e2ff536b03 Fixed typo in Comment 12 years ago
Robert F-C 0d4a9444c4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
Gord Christmas 28ada096e2 Adding servo documentation 12 years ago
Robert F-C dfa549f268 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
Gord Christmas dc59f07d24 First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple. 12 years ago
Erik van der Zalm bd2cd4903e Added #ifdef BARICUDA around the BariCUDA changes 12 years ago
gregor 2739c26c4f changes:
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
12 years ago
gregor 6fb9573157 added support for the reprapworld keypad 12 years ago
Tim Anderson 1fa61c297e Turning off Control Panel by Default and Updating the link to the LiquidCrystal_I2C library to avoid confusion. 12 years ago
kiyoshigawa b27a59f41e Added support for Elefu RA Board and Elefu Control Panel 12 years ago
Scott Lahteine 0ef54f2f85 Make M303 silent when "S0" is sent
If S is left out perhaps it should be silent, but check the spec for
this M code.
12 years ago
Scott Lahteine a200521eab Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h
Also cosmetic comment changes and spelling corrections in printed
messages
12 years ago
Martin Renold 1a397825f9 fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error 12 years ago
Robert F-C c3cdaceab3 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
Robert F-C 788d62bcc4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Marlin.pde
	Marlin/ultralcd.cpp
	Marlin/ultralcd_implementation_hitachi_HD44780.h
12 years ago
Lukasz Stefanowicz d71f1e9bf6 Add (as an option) slower SD transfer mode 12 years ago
MaikStohn 13596e8722 Added RepRapDiscount FULL GRAPHIC Smart Controller 12 years ago
daid303 c80a78bb70 Lower the default max E feedrate a bit. With the stepper fix this is much to high. 12 years ago
ErikZalm 7a5c474d91 Update Configuration.h 12 years ago
ErikZalm 9fb8bd5685 Merge pull request #433 from whosawhatsis/bang-mode
Separate PID_MAX from BANG_MAX
12 years ago
Robert F-C 9322c408c6 Updated for LiquidTWI2 library version 1.2.3
The new version of the library means that PANELOLU no longer needs to be
defined in LiquidTWI.h (the library file can be used as is) and the new
version of the library also enables the buzzer on the Panucatt VIKI
panel.
12 years ago
whosawhatsis fd5b7e0cec Separate PID_MAX from BANG_MAX
This allows PID_FUNCTIONAL_RANGE to use a maximum duty cycle higher
than PID_MAX. This is useful for powerful heaters to heat quickly in
bang-bang mode, but use a lower duty cycle that is easier to stabilize
in PID mode.
12 years ago
blddk 72419f69a9 Added rumba 12 years ago
Nicolas Rossi aba67e2449 No bed config for RAMPS
The motherboard 35 is a config without bed with this pins setting :
D8 Extruder
D9 Fan
D10 Controller Fan
12 years ago
Robert F-C 7bad72359c Support encoder click on PANELOLU2 being read through I2C
This change also handles the case where the pause/stop/restart button on
the VIKI is not used. Make LCD I2C buzz sound the same as the normal
buzz (300ms is too long for quick feedback).
12 years ago
Robert F-C 1daf2f3256 Number of extruders is not an advanced configuration - it is a basic property. 12 years ago
Dirk Eichel b2c1c64fb1 Add Motherboard variant 64 - STB V1.1
Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
12 years ago
Robert F-C 6beb42cdf6 Attempt to address Bernhard's comments
Refactor configuration to try to make items clearer (what defines a
panel vs what is user changeable).
12 years ago
Robert F-C 839bef6d5d Fix Configuration.h file to not define LCDs be default.
Also fix compile time check in Marlin.pde
12 years ago
Robert F-C 1292d735ba Converge all I2C LCD branches (PANELOLU2, VIKI & PCF8575)
This includes refactoring the buttons code to remove a large amount of
non-pin dependent duplication from pins.h.
12 years ago
MendelMax 67710df9f3 Made i2c mode wok with the hardware I am able to test (ywrobot / sainsmart i2c LCD 2004)
Removed incorrect LiquidCrystal_I2C Library
12 years ago
Bob Clough 2b567d1df5 Added I2C port expander support to HD44780 12 years ago
Bob Clough 06272f463d Added Config variables for activating I2C LCDs and setting type and address 12 years ago
Denis B 70871715e4 Added support for extruder offset handling
The extruder offset can be specified in the configuration
file or adjusted on the fly using the "M218 T# X# Y#" command.
The EEPROM support is not yet merged in.
The "T#" command can take option "F#" that specifies the feedrate
at which the printing head should be re-positioned. If not
specified the re-positioning move is not preformed immediately,
but the coordinates are adjusted for the printer to properly
position the head when the next movement happens.
12 years ago
Daniele Sdei 9ecb267b63 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
Daniele Sdei 3cf59f6f9a add RepRapPro Huxley thermistor tables 12 years ago
daid303 bbe7d3d0fe Fixed #312 12 years ago
daid303 8b88e3b386 Fixed #345, Fixed #267. 12 years ago
Nicolas Rossi f3c1fc70a9 Power signal control definitions for ATX and others 12 years ago
Erik vd Zalm 6752cb2d9c PID now per extruder. Fixed typo 12 years ago
Erik vd Zalm 0ac452e252 Disable is now multi extruder compatible. M84 got a T option. 12 years ago
Johann Rocholl 9e7b5056a0 {X,Y,Z}_{MIN,MAX}_POS are actually in Gcode coordinates. 12 years ago
Johann Rocholl 1c2ecddae4 Fix typo (# missing before define). 12 years ago
Johann Rocholl 3b2e5027e5 Merged updates from Marlin_v1. 12 years ago
daid303 55ba90ac19 Add PID functional range setting. With high powered heaters the current functional range of 10 degrees causes high overshoots as the PID needs to kick in before the temperature hits 10 degrees below target. 12 years ago
daid303 5ff5cee8ce Fix the sensitive pin definitions, there where analogue numbers in the digital pin list. Also made M42 without a P function on the LED_PIN (which was otherwise a useless pin definition) 12 years ago
Johann Rocholl 1f45cb0a51 Fix typo in MANUAL_HOME_POSITION (plural S missing) and improve comments. 12 years ago
Johann Rocholl c430906d3b Deltabot settings and configuration adjustments. 12 years ago
Johann Rocholl 42e21bb06e Add support for Printrboard (from https://github.com/lincomatic/Marlin) and Brainwave (from https://github.com/metrix/Sprinter). 12 years ago
Erik vd Zalm f934d0ef5b Merge remote-tracking branch 'tonokip/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Configuration.h
12 years ago
Martin Lukasik 2f771b3979 Added automatic build numbering. 12 years ago
daid303 a27fef8750 Store the pre-heat constants outside of the ULTIPANEL define, so we can use them when storing EEPROM in a build without the ULTIPANEL. 12 years ago
daid303 ffc69537aa Update on some comments, make the MOTHERBOARD list complete again. 12 years ago
Jonathan Bastien-Filiatrault 46b9988e26 Search and replace failure. 12 years ago
Jonathan Bastien-Filiatrault 36b452c7ac Remove abbrs. 12 years ago
Jonathan Bastien-Filiatrault 3cbaad9288 RepRapDiscount Smart Controller pin definitions. 12 years ago
Robert F-C 65c9a0728f Set default serial port back to 0. 12 years ago
Robert F-C ab9d183024 Make serial port configurable.
This change makes the choice of serial port configurable so that
wireless capability can be easily added by connecting Bluetooth modules
(such as BlueSmirf or JY-MCU) to the expansion port pins.
12 years ago
brupje 326423719f Add support for Megatronics 12 years ago
ErikZalm 36a746d7d5 Merge pull request #244 from markfinn/pidbed
PID for heated bed
12 years ago
Mark Finn 04631d2250 cleanup for pull 12 years ago
ZetaPhoenix c6caa45ae2 Limit Switch locations based on MIN/MAX limits and homing direction
fixes #246
Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined.
Relocated code based on feedback.
12 years ago
ZetaPhoenix dc566d654f fixes #246
Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined.
12 years ago
Mark Finn 9698f4ea64 bed pid
Conflicts:

	Marlin/Configuration.h
12 years ago
Erik vd Zalm e358a2d7af Added fix for SF Arc Point fillet procedure 12 years ago
tonokip 1c1fddc7ac Added support for the Rambo reprap electronics board. Added Mcodes to set
motor current and microstepping pins.
12 years ago
Erik vd Zalm 5406c533db Disable FAST_PWM by default. On some systems it does not work ok. 12 years ago
Dabble63 6b45e9f167 Add Duty Cycling to the Heater Bed 12 years ago
Chris Palmer 538189cc19 Fixed soft limits when the origin is in the middle.
HOME_POS is now always where the endstop is and can be outside the limits.
The limits are now defined by MIN_POS and MAX_POS rather than HOME_POS and MAX_LENGTH.
The Z is axis now homed first if direction is away from the bed.

Saguinololu limit pins change from MIN to MAX according to the homing direction.
13 years ago
Erik van der Zalm ea2c19f978 Added CoreXY support (Thanks Ilan Moyer) 13 years ago
Erik van der Zalm aa65fe22ed decoupled axes sucessfully at least on pure x or y jog 13 years ago
Bernhard 0c123950e9 __ header file replace 13 years ago
Bernhard 0e5e249ab5 added individual pullup setting option to have finer control in case there is a special z-min sensor, for example 13 years ago
Bernhard Kubicek 6b14f95b3e Merge pull request #170 from linagee/Marlin_v1
Marlin v1
13 years ago
linagee fbd282b3ba Update Marlin/Configuration.h 13 years ago
linagee c4490f5f3d Update Marlin/Configuration.h 13 years ago
Daid 7244aa7eb7 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
linagee de2ca3b2e8 Grammar correction. 13 years ago
linagee c2fc466e1b Update Marlin/Configuration.h 13 years ago
linagee 9f9f498491 Update Marlin/Configuration.h 13 years ago
Guan Yang 602c8ee02b Melzi support 13 years ago
Erik de Bruijn e3fe1f0d00 Made a more granular configuration possible PREVENT_LENGTHY_EXTRUDE. You can now decide to allow/disallow large length of extrusions to be executed.
Turning off the protection might be beneficial to those who want to do fast and long reversals.
13 years ago
Erik van der Zalm 1874cb71a6 Added option to increase the FAN PWM frequency. 13 years ago
Erik van der Zalm e3821bd86f Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 13 years ago
Erik van der Zalm 02af69911e Added temperature window to M109. This is needed for systems with no overshoot PID. 13 years ago
Bernhard 464b755918 added support for the UltiController 13 years ago
Erik van der Zalm 67cf105bc6 Fixed AUTOTEMP (M109 S215 B260 F1 starts autotemp)
Changed SLOWDOWN. IF this does not work ok OLD_SLOWDOWN is the old algo.
13 years ago
Erik van der Zalm 63aec3c56e Replaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart.
Moved the PID_dT in the Ki and Kd calculation from the configuration.h to temperature.cpp
13 years ago
Michel Pollet aa6e6e914e Makefile: Redone
+ Removed most explicit pathnames, use the standard make "VPATH" to let
make find the files for itself.

+ Added a "hardware variant" variable that allows compiging Sanguino and
Gen7 as well as "generic" arduino.

+ Allows overriding the MOTHERBOARD define from the Makefile

+ Removed the 'preprocessor' bit that wasn't needed, now just "include" the
files that are needed, since it allows gcc to show the right file/line
when displaying error/warnings.

+ Uses gcc's own dependency generator to generate the .d files, and
and include these instead of self-patching the makefile

Signed-off-by: Michel Pollet <buserror@gmail.com>
13 years ago
Erik van der Zalm 2e749d60c3 Added DISABLE_MAX_ENDSTOPS 13 years ago
Erik van der Zalm 910f4e77a2 Added 20MHz support. 13 years ago
Erik van der Zalm e056bf8081 Added E-Jerk 13 years ago
Phil Hord b65ef8d66c Add support for upcoming Gen7 v1.4
V1.4 moves thermistor power to the always-on 5v line.
The BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE is no longer
needed on this board.  Add a new motherboard type to
support this feature.
13 years ago
Erik van der Zalm 97d42ca2b2 SDSUPPORT default disabled 13 years ago
Erik van der Zalm 018c567abf Moved SLOWDOWN function. (jetty840)
Included AD595 calibration options. (daid)
13 years ago
Erik van der Zalm 4fbda5c3f5 Merge remote-tracking branch 'daid/Marlin_v1' into Test 13 years ago
Erik van der Zalm 35e57bf149 Added gen6 deluxe. 13 years ago
Erik van der Zalm 84ea2d61e8 Moved gen7 boards to motherboard type 10, 11 and 12.
Split ramps1.3 in Sprinter like config and multiextruder config.
13 years ago
Erik van der Zalm 01d28c18ab Fixed casting warning in sanguino 13 years ago
Blair Thompson 2fd8c248fe Added Fan control to the pre-heat settings.
I find that the PID routine works better when the cooling fan is switched on
at the beginning of a warm up routine.  Otherwise when you enable the fan
just before a print, you have a delay as the PIDre-adjusts.

This should also be safer as most cooling fans are directed at the hot -ends
thermal barrier!
13 years ago
Blair Thompson d9f2f509d5 Added new menu items under the prepare submenu.
Instead of a single pre-heat, now there is pre-heat ABS and PLA options
Added defines to the configuration file to adjust preheat temperatures for both
13 years ago
Erik van der Zalm ae3e7586c6 Added HOME_POS. This adds the posibility to make the center 0
Updated the Xsteps ... settings via the LCD menu
13 years ago
Erik van der Zalm 8816ef1c64 Small fixes after merge 13 years ago
Erik van der Zalm d298dd121f merged SBUBA82 and Justblair 13 years ago
Blair Thompson a05a261b72 Added a workaround. Ramps SD card does not have sdcarddetect. My temporary solution is to add a momentary swtich
that pulls down the SDCARDDETECT pin and mimicking the pull and reinsert ofa a SD card
13 years ago
Blair Thompson 1b6765ed12 Updated the pin config for RAMPS 1.3 to include ultimaker new style LCD/Rotary Encoder interface 13 years ago
Christian Thalhammer e661578c84 support for GEN7 1.1,1.2 and 1.3 13 years ago
Daid 73344e69c1 Added temperature offset/gain settings for AD595. 13 years ago
Christian Thalhammer d309565b56 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Configuration.h
13 years ago
Christian Thalhammer 0e3631ff4b smaller changes 13 years ago
Erik van der Zalm fa2e1be0ca changed default EXTRUDE_MINTEMP to 170. 13 years ago
Erik van der Zalm 154de69c02 Print configuration.h version during startup (thanks hairykiwi) 13 years ago
Erik van der Zalm 9173a5713b Teensylu support. 13 years ago
Erik van der Zalm bdb70c0509 Warning for 10k thermistor 13 years ago
Erik van der Zalm d8a0c6450f Split the configuration file in two parts.
One for common settings.
One for advanced settings.
13 years ago
Erik van der Zalm f9c5333f97 Made "stop heating wait" optional.
Default off.
13 years ago
Christian Thalhammer 13e2ad2831 - added info for using GEN7 configuration 13 years ago
Erik van der Zalm 9f139d6e0e Added MAX6675 support. (Thanks to gregfrost)
Needs some work to remove the blocking in read max6675.
13 years ago
Erik van der Zalm e45e5c68bb Added support for Gen3+ (Pins file only)
Added late z enable. (blddk request)
Only calculate look ahead if >2 moves in buffer.
Removed some FORCE_INLINE to save memory.

Signed-off-by: Erik van der Zalm <erik@vdzalm.eu>
13 years ago
Bernhard 212515148e added m240 photography support. default off 13 years ago
Bernhard 415aadf704 lcd panel bed support
advance and ultipanel not any more in default config
13 years ago
Erik van der Zalm 84d9cf7339 merging 13 years ago
Erik van der Zalm e017228569 Merged multiple extruder support.
Soft PWM. (Sanguinololu can also have PID temperature control)
Interrupt save WRITE for addresses > 0x0FF
13 years ago
Bernhard 01001b89d2 repaired nozzle runout prevention to not collide with automatic stepper disabeling. 13 years ago
Bernhard 88ee053af0 heating up santity, formarly knows as "watchdog", but renamed due to the existance of the real watchdog, works now. 13 years ago
Bernhard 2bc5e7ec9e prevent too long extrudes, or too cold extrudes 13 years ago
Bernhard aa4f9a6474 better values. 13 years ago
Bernhard 87fd249c43 made runout prevention independent of tempeorarily set esteps 13 years ago
Bernhard 1ec0c3b68a extruder runout prevention. 13 years ago
Bernhard 5b4625f79c added a partial release option to "m84" aka "stepper release". If you do tiny layers, you might want to keep the z-axis powered to not loose height positioning after homeing. 13 years ago
Denis B 4fd75dc813 Working version of multiple extruders (up to 3)
- The temperature control is pretty much complete
  (not sure what to do w/ autotemp though)
  Changed the pins assignment to clearly separate bed and extruder heaters
  and temp sensors, changed a bit how termistor tables are handled.
- The steppers control is rudimentary
  (only chanages what pins it uses depending on the active_extruder var,
   but that's enough for switching extruder in the start.gcode in the
   the profiles)
- Tested only w/ RAMPS 1.4
13 years ago
Erik van der Zalm b99c49ec3b Add option to only check endstop when homing 13 years ago
Erik van der Zalm 95a0b28acb Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 13 years ago
Erik van der Zalm af22e9cd38 Some advance modifications 13 years ago
Bernhard 4f909963e4 make QUICKHOME configureable 13 years ago
Erik van der Zalm 6b86f15686 More 2nd extruder implementation. (Not usable)
Advance (not tested)
13 years ago
Bernhard 59205ac5fc preliminiary implementation for the early heating finish.
Might be replaced by something more clever, e.g. by erik, and does not yet support the second extruder or the bed.
its kind of not so cool, because you need 6 more ints.
Maybe isheating() should use the degrees directly, as it is not used in time-critical anyways.
Then it would be much easier. to have the offsets without additional variables.
13 years ago
Erik van der Zalm f75f426dfa Removed interrupt nesting in the stepper ISR.
Add serial checkRx in stepper ISR.
Copied HardwareSerial to MarlinSerial (Needed for checkRx).
13 years ago
Erik van der Zalm aad4b75b94 First parts 2nd extruder 13 years ago
Bernhard a0dc66f7bf Home retract distance configureable per axis. 13 years ago
Bernhard 6d6f323535 make an option if sd-card stop should release the steppers. 13 years ago
Bernhard 74d0032e25 cooldown blocking selectable by #define. 13 years ago
Erik van der Zalm c0f8c9fd72 Seperate ENDSTOP_INVERTING for X Y and Z
Added simple endstop filter.
Corrected M114 count display.
13 years ago
Erik van der Zalm 2e43f9c809 Changed min max temperature code. 13 years ago
Bernhard Kubicek 8a1e719a3f overworked config file 13 years ago
Bernhard Kubicek f52e1a9571 autotemp working, default=disabled. 13 years ago
Bernhard Kubicek 70650c331d corrected the ultimaker default values, the previous had a calculation error: see: http://groups.google.com/group/ultimaker/browse_thread/thread/91906788639703cf 13 years ago
Erik van der Zalm b15902d3b5 Fixed bug in configuration.h 13 years ago
Erik van der Zalm e63e224a33 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
13 years ago
Erik van der Zalm e7dca8614b Advance experiments. Not working yet. 13 years ago
Bernhard Kubicek 46f80e82d9 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Conflicts:
	Marlin/ultralcd.h
13 years ago
Bernhard Kubicek a9c7da06e3 and changed ultipanel to have the mm/sec and not mm/min
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

Conflicts:
	Marlin/Marlin.pde
	Marlin/ultralcd.h
13 years ago
Bernhard Kubicek 7919a40d06 watchdog,percent done, 13 years ago
Erik van der Zalm 805d37f77b Fixed some small planner bugs 13 years ago
Erik van der Zalm 5fd41ae872 Some fixes in planner 13 years ago
Erik van der Zalm 95126c09c0 Added slowdown 13 years ago
Erik van der Zalm 331e82dcd3 Buffer size > 16 13 years ago
Erik van der Zalm c00eefb824 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 13 years ago
Erik van der Zalm 1d0452f10c 250000 baud 13 years ago
Bernhard Kubicek c57906b627 fixed bug with adjusting ki in realtime. 13 years ago
Erik van der Zalm ac82411c73 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 13 years ago
Erik van der Zalm 65934eee9c A lot of changes in the planner code 13 years ago
Bernhard Kubicek 36958ee305 minor changes and first not-well working version of autotemp 13 years ago
Bernhard Kubicek 27361e7cd0 beautified the config. ordered it into thematic sections. 13 years ago
Erik van der Zalm d3bfffcb6e Corrected thermistor naming 13 years ago
Bernhard Kubicek 163efdf1c7 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Bernhard Kubicek 87aaf0f70a static'ified Marlin.pde. 13 years ago
Erik van der Zalm 76b3f805c0 Added teensylu pins 13 years ago
Bernhard Kubicek 1d171e9e52 reformating and some minor bugs/things found on the way. 13 years ago
Bernhard Kubicek 2afb7bd4cf refactured temperature.cpp so that there are now abstract functions to access temperatures. 13 years ago
Erik van der Zalm 0b82465168 First arcs version. (Arcs not working ok) 13 years ago
Erik van der Zalm 2e8e8878e5 Corrected temp variables. 13 years ago
Erik van der Zalm 04d3b5537f Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Configuration.h
	Marlin/EEPROMwrite.h
	Marlin/Marlin.h
	Marlin/Marlin.pde
	Marlin/temperature.cpp
	Marlin/temperature.h
	Marlin/thermistortables.h
13 years ago
Erik van der Zalm d15f01e1b4 Temperature changes 13 years ago
Bernhard Kubicek 00674af3a8 merge from the branch bkubicek/Marlin/zalmmerge 13 years ago
Erik van der Zalm 95d3d9847c M109 now equal to sprinter 13 years ago
Erik van der Zalm bf879ceaa9 Added thermistor tables 13 years ago
Erik van der Zalm 094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes 13 years ago
Erik van der Zalm 8e017b81ab Sync with non-gen6 version 13 years ago
Erik van der Zalm b5f6482dce Fixed small feedrate bug.
Copied Camiels comments in the Configuration.h file
13 years ago
Erik van der Zalm 26bf57e22c first-commit 13 years ago
Erik van der Zalm 750f6c33e3 first commit 13 years ago