0c1b863755Ignore ":" in comments.
Erik van der Zalm
2012-03-25 14:41:26 +0200
63aec3c56eReplaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart.
Erik van der Zalm
2012-03-25 14:36:51 +0200
8b785f75a6Merge pull request #123 from buserror-uk/for-upstream
ErikZalm
2012-03-23 11:54:58 -0700
5b8758f42bMerge pull request #126 from tommycheng/patch-1
ErikZalm
2012-03-23 11:54:37 -0700
520f1a54a8Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined.
Tommy Cheng
2012-03-24 02:26:59 +0800
5550e893d5New board variant, Open Motion Controller
Michel Pollet
2012-03-22 13:51:21 +0000
aa6e6e914eMakefile: Redone
Michel Pollet
2012-03-22 13:48:10 +0000
0183e6332amade prepare->autostart independent of current folder.
Bernhard
2012-03-19 20:24:40 +0100
1532200435found error in filenames. One array was too short. This had nothing to do with long filenames, other than if they were 12 characters exactly, which could only happen if the extension and the text before were filled completely
Bernhard
2012-03-19 20:06:58 +0100
b985e4a134Fixed compile errors in ultralcd when no ultra_lcd is selected.
Erik van der Zalm
2012-03-15 22:29:31 +0100
2e749d60c3Added DISABLE_MAX_ENDSTOPS
Erik van der Zalm
2012-03-12 20:32:14 +0100
33f5697888PPID tune exports more constants.
Erik van der Zalm
2012-03-11 22:18:25 +0100
b44055cc51Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
Erik van der Zalm
2012-03-11 18:03:00 +0100
f5eae52098Added more manage_inactivity checks
Erik van der Zalm
2012-03-11 17:59:44 +0100
19a47dae4aMerge pull request #99 from Justblair/master
ErikZalm
2012-03-11 04:34:59 -0700
910f4e77a2Added 20MHz support.
Erik van der Zalm
2012-03-11 12:25:04 +0100
7cefad3744Merge pull request #106 from bgamari/Marlin_v1
ErikZalm
2012-03-11 01:48:30 -0800
87ff2f8867Added CONTROLLERFAN. (Controlling a fan to cool down the steppper drivers)
Erik van der Zalm
2012-03-11 10:44:10 +0100
387fe51a56Do not disable steppers when there are moves in the queue.
Erik van der Zalm
2012-03-09 20:20:01 +0100
421264e58aFixed typo
Erik van der Zalm
2012-03-09 17:49:48 +0100
15ad923310Removed !!!. Stupid arduino bootloader can't handle this.
Erik van der Zalm
2012-03-09 17:42:32 +0100
61e09e6be2Added FAN_PIN -1 checks
Erik van der Zalm
2012-03-08 22:09:49 +0100
87c4e06c24Corrected active_extruder when autotemp is used.
Erik van der Zalm
2012-03-08 22:04:13 +0100
7b1e295f34Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
Erik van der Zalm
2012-03-08 21:48:06 +0100
c077316b2bAdded PID autotune. (experimental) M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed. Put these values in Configuration.h
Erik van der Zalm
2012-03-08 21:43:21 +0100
49b228c4b3Add instructions to regenerate speed_lookuptable when changing F_CPU
Ben Gamari
2012-03-07 18:05:10 -0500
96509494f0stepper: Clarify comment on timer-counter configuration
Ben Gamari
2012-03-07 17:58:35 -0500
6d7e6a11fcAdd create_speed_lookup
Ben Gamari
2012-03-07 17:41:29 -0500
f3095493b0Merge pull request #100 from tommycheng/patch-1
ErikZalm
2012-03-05 09:56:50 -0800
ce07c9186dWhile Waiting for hotbed to warm up via M190, LCD Display and Click Encoder input freeze until target temperature is reached.
Tommy Cheng
2012-03-05 23:12:26 +0800
116dc86b8aFixed type in e-jerk
Erik van der Zalm
2012-03-04 23:09:13 +0100
02ee9e3d30Changed Pin Assignment for the RAMPS motherboard so that LCD and Rotary encoder are all wired to AUX-4
Blair Thompson
2012-03-04 21:34:20 +0000
e056bf8081Added E-Jerk
Erik van der Zalm
2012-03-04 16:34:58 +0100
4deeffbc88Added missing defines to the german section. Translation still needed.
Erik van der Zalm
2012-03-04 14:08:20 +0100
632528aa95merging with SCUBA82
Erik van der Zalm
2012-03-04 13:41:47 +0100
aac7aa3bf0Queued fan control. Issue #90
Erik van der Zalm
2012-03-04 13:05:26 +0100
fde51084f3set SD file delete to M30; switch printime output to M31
Christian Thalhammer
2012-03-03 21:58:12 +0100
21e2bae063Changed (corrected?) SD_card comment handling.
Erik van der Zalm
2012-03-03 21:28:33 +0100
e509bbf636Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
Erik van der Zalm
2012-03-03 20:41:22 +0100
072011a3efAdded current_block = NULL to quickStop()
Erik van der Zalm
2012-03-03 20:40:46 +0100
2422a857a1Merge pull request #96 from haxar/Marlin_v1
ErikZalm
2012-03-03 11:24:58 -0800
f598077af3Removed vc files
Erik van der Zalm
2012-03-03 20:22:42 +0100
cb0c84e075Merge remote-tracking branch 'justblair/master' into Marlin_v1
Erik van der Zalm
2012-03-03 20:20:55 +0100
1d5809d458Merge pull request #88 from daid/Marlin_v1
ErikZalm
2012-03-03 11:18:14 -0800
ed951b1977Fixed RAMPS 1.2 support (Found and fixed by rrhb)
Erik van der Zalm
2012-03-03 20:15:41 +0100
4879de08e8The percent complete for the SD file statistic sits squint. Changed "lcd.Setcursor (7,2);" to "lcd.Setcursor (10,2);".
Blair Thompson
2012-03-03 16:47:27 +0000
f278e1c00fThis is in my opinion a much better way of dealing with SD cards than my previous fix.
Blair Thompson
2012-03-03 16:30:31 +0000
046a8e0039Added more defines to the language.h file so that nowe most of the text strings are now configured via this file. Still got some hunting down to do to complete this task.
Blair Thompson
2012-03-03 15:51:47 +0000
79a466ca26make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, complementing changes to analog2temp in d15f01e
haxar
2012-03-02 17:15:21 -0800
5f3a422e68added M31 - delete file from sd card
Christian Thalhammer
2012-03-02 21:49:05 +0100
fa2e3a40e9fixed LCD manual z axis move Feedrate to 70 (was 1700)
Christian Thalhammer
2012-03-01 14:38:50 +0100
a92b3afe64added german translation;Menue should be in english.. sounds better
Christian Thalhammer
2012-03-01 14:24:20 +0100
9fa586bbedfixed languages; Preheat_PLA and Preheat_ABS was not defined for non english
Christian Thalhammer
2012-03-01 14:05:40 +0100
7d124478faOnly protect the heater pins for the defined extruders. Changed the way the extruder pins are defined so it doesn't create extra -1 entries in the list.
Daid
2012-02-29 15:49:02 +0100
3d83109028Fixed general 16x2 LCD build without SD support.
Daid
2012-02-29 15:33:23 +0100
cb02914687Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Christian Thalhammer
2012-02-29 14:51:35 +0100
10bf2bb8e1-
Christian Thalhammer
2012-02-29 14:51:15 +0100
d47b666630Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1
Daid
2012-02-29 12:19:20 +0100
88d289caa1Made plan_buffer_line arguments const, which optimizes better and fixes the RUNOUT_PREVENTION feature.
Daid
2012-02-29 11:38:12 +0100
b4833d55c2Fixed HOME_POS in combination with G28 X0 or G28 Y0
Erik van der Zalm
2012-02-28 18:20:03 +0100
c6f2ec3c82remove stop_heating_wait
Erik van der Zalm
2012-02-27 18:45:45 +0100
b48d67ce10Fixed homing
Erik van der Zalm
2012-02-27 18:31:40 +0100
071eec7aa7Merge pull request #81 from phord/09469add5560ca8a676c42e4bcd499868c33f0dd
ErikZalm
2012-02-27 08:38:36 -0800
1ebe7d1ab6Merge pull request #83 from phord/tempfix
ErikZalm
2012-02-27 08:36:45 -0800
de37b2264aMerge pull request #82 from phord/fix-gen7-build
ErikZalm
2012-02-27 08:36:06 -0800
b65ef8d66cAdd support for upcoming Gen7 v1.4
Phil Hord
2012-02-26 20:39:49 -0500
740f0c7690Add explicit #define for bogus temp override
Phil Hord
2012-02-26 18:46:34 -0500
ba8500a236pins.h: Define Z_MAX_PIN for Gen7 board
Phil Hord
2012-02-26 20:15:40 -0500
f3101e96d9Add suitable .gitignore to avoid build noise
Phil Hord
2012-02-16 12:06:33 -0500
245dca4beeMakefile: generic pde=>cpp rule
Phil Hord
2012-02-16 12:17:33 -0500
97d42ca2b2SDSUPPORT default disabled
Erik van der Zalm
2012-02-26 22:05:38 +0100
2faa0852b9Merge pull request #79 from changwoo/Marlin_v1
ErikZalm
2012-02-26 13:03:15 -0800
7b14953c99Fix build on Sanguino based boards with ATmega1284P
Changwoo Ryu
2012-02-27 04:05:33 +0900
286d5003faFixed compiler warning for Sanguino compile
Daid
2012-02-26 17:35:01 +0100
66d50562b6Merge pull request #76 from iXce/Marlin_v1
ErikZalm
2012-02-26 07:30:51 -0800
27f595a444Changed version => RC2
Erik van der Zalm
2012-02-26 16:26:40 +0100
018c567abfMoved SLOWDOWN function. (jetty840) Included AD595 calibration options. (daid)
Erik van der Zalm
2012-02-26 16:23:47 +0100
4fbda5c3f5Merge remote-tracking branch 'daid/Marlin_v1' into Test
Erik van der Zalm
2012-02-26 16:10:59 +0100
ce714fe306Fixes in pins.h
Erik van der Zalm
2012-02-25 22:55:17 +0100
35e57bf149Added gen6 deluxe.
Erik van der Zalm
2012-02-25 17:44:45 +0100
84ea2d61e8Moved gen7 boards to motherboard type 10, 11 and 12. Split ramps1.3 in Sprinter like config and multiextruder config.
Erik van der Zalm
2012-02-24 23:34:41 +0100
adc108d79eCorrectly build the produced applet/Marlin.cpp source
Guillaume Seguin
2012-02-24 21:21:19 +0100
5aa9c41ab1Changed comment mode for detection. Added M221 extuder multiply factor.
Erik van der Zalm
2012-02-24 20:42:07 +0100
00690f7ffdFix cast warning in Gen7
Erik van der Zalm
2012-02-23 18:50:05 +0100
01d28c18abFixed casting warning in sanguino
Erik van der Zalm
2012-02-23 18:45:37 +0100
2fd8c248feAdded Fan control to the pre-heat settings.
Blair Thompson
2012-02-22 23:05:52 +0000
d9f2f509d5Added 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
Blair Thompson
2012-02-22 22:51:04 +0000
ae3e7586c6Added HOME_POS. This adds the posibility to make the center 0 Updated the Xsteps ... settings via the LCD menu
Erik van der Zalm
2012-02-22 18:07:56 +0100
df1437bd86Changed display format for some numbers.
Erik van der Zalm
2012-02-21 23:05:43 +0100
8816ef1c64Small fixes after merge
Erik van der Zalm
2012-02-21 20:36:43 +0100
d298dd121fmerged SBUBA82 and Justblair
Erik van der Zalm
2012-02-21 20:26:59 +0100
2cc9a89830Merge remote-tracking branch 'SCUBA82/Marlin_v1' into Marlin_v1
Erik van der Zalm
2012-02-21 20:17:35 +0100
a0a1f81913various changes
Erik van der Zalm
2012-02-21 20:17:28 +0100
8a8ea50f33fixed manual axis movement lcd option
Christian Thalhammer
2012-02-21 09:31:28 +0100
b976692d0fRemoved VS project files for tidyness stakes
Blair Thompson
2012-02-20 22:39:39 +0000
fe940a142dAdded a structure that will allow easy translations/modifications to the LCD menu.
Blair Thompson
2012-02-20 22:22:46 +0000
b3fb09a20cchange preheat to ABS values of nozzle 227 and be 105 °C next try for manual axis movement
Christian Thalhammer
2012-02-20 16:07:27 +0100