8446c9dc92Merge pull request #152 from loganb/Marlin_v1
Bernhard Kubicek
2012-04-25 22:23:31 -07:00
3eacb4c16dWrap the call to turn off the bed heater in a #if to prevent a compile error on boards that do not have a bed heater
Logan Bowers
2012-04-25 19:22:38 -07:00
e4d2138dbdreinitialize the lcd, if the SD card is inserted or removed. It seems that LCDs can confused by electrical discharges from time to time. Since a removal or insert of the sd card takes a long time in firmware, just reinitializing the lcd does not hurt. actually, it solves a problem with the UltiControlle
Bernhard
2012-04-22 21:12:17 +02:00
464b755918added support for the UltiController
Bernhard
2012-04-22 20:55:56 +02:00
44fd8d46d2fixed quickhome
Bernhard
2012-04-22 20:44:27 +02:00
ffea8008caUpdate readme file
Erik van der Zalm
2012-04-15 22:44:03 +02:00
c2557abc03Merge pull request #138 from triffid/fix-makefile
ErikZalm
2012-04-15 10:21:46 -07:00
67cf105bc6Fixed AUTOTEMP (M109 S215 B260 F1 starts autotemp) Changed SLOWDOWN. IF this does not work ok OLD_SLOWDOWN is the old algo.
Erik van der Zalm
2012-04-15 19:17:33 +02:00
8aee9d51b6Disabled disable_heater in PID_autotune.
Erik van der Zalm
2012-04-12 21:12:31 +02:00
939f1fab46Merge pull request #140 from daid/Marlin_v1
ErikZalm
2012-04-12 05:29:24 -07:00
414408b2d0Fix for wrong systax in #ifdef.
Daid
2012-04-12 14:01:30 +02:00
77d503fa13Fix Makefile
Michael Moon
2012-04-11 11:37:55 +10:00
cf7c8c458fFixed MAX6675
Erik van der Zalm
2012-04-10 21:57:57 +02:00
325f0651acMerge pull request #136 from grrf/patch-1
ErikZalm
2012-04-10 09:48:45 -07:00
03b0850e63This breaks temperature readout for pronterface!
grrf
2012-04-09 23:37:34 +03:00
2a019a53d2Merge pull request #134 from tgiphil/Marlin_v1
ErikZalm
2012-04-08 05:16:29 -07:00
ad8bc71d3e- Fixed a typo
tgiphil
2012-04-07 20:01:31 -07:00
46feae79c6Fixed typo in arc
Erik van der Zalm
2012-04-02 17:19:20 +02:00
4ca2f336f0Changed default MINIMUM_PLANNER_SPEED -> 0.05 Fixed small bug in arcs M105 prints now actual_temp/target_temp
Erik van der Zalm
2012-04-01 16:23:40 +02:00
ae0bf8068bFixed arc offset.
Erik van der Zalm
2012-03-27 19:03:33 +02:00
0c1b863755Ignore ":" in comments.
Erik van der Zalm
2012-03-25 14:41:26 +02:00
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 +02:00
8b785f75a6Merge pull request #123 from buserror-uk/for-upstream
ErikZalm
2012-03-23 11:54:58 -07:00
5b8758f42bMerge pull request #126 from tommycheng/patch-1
ErikZalm
2012-03-23 11:54:37 -07:00
520f1a54a8Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined.
Tommy Cheng
2012-03-24 02:26:59 +08:00
5550e893d5New board variant, Open Motion Controller
Michel Pollet
2012-03-22 13:51:21 +00:00
aa6e6e914eMakefile: Redone
Michel Pollet
2012-03-22 13:48:10 +00:00
0183e6332amade prepare->autostart independent of current folder.
Bernhard
2012-03-19 20:24:40 +01:00
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 +01:00
b985e4a134Fixed compile errors in ultralcd when no ultra_lcd is selected.
Erik van der Zalm
2012-03-15 22:29:31 +01:00
2e749d60c3Added DISABLE_MAX_ENDSTOPS
Erik van der Zalm
2012-03-12 20:32:14 +01:00
33f5697888PPID tune exports more constants.
Erik van der Zalm
2012-03-11 22:18:25 +01:00
b44055cc51Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
Erik van der Zalm
2012-03-11 18:03:00 +01:00
f5eae52098Added more manage_inactivity checks
Erik van der Zalm
2012-03-11 17:59:44 +01:00
19a47dae4aMerge pull request #99 from Justblair/master
ErikZalm
2012-03-11 04:34:59 -07:00
910f4e77a2Added 20MHz support.
Erik van der Zalm
2012-03-11 12:25:04 +01:00
7cefad3744Merge pull request #106 from bgamari/Marlin_v1
ErikZalm
2012-03-11 01:48:30 -08:00
87ff2f8867Added CONTROLLERFAN. (Controlling a fan to cool down the steppper drivers)
Erik van der Zalm
2012-03-11 10:44:10 +01:00
387fe51a56Do not disable steppers when there are moves in the queue.
Erik van der Zalm
2012-03-09 20:20:01 +01:00
421264e58aFixed typo
Erik van der Zalm
2012-03-09 17:49:48 +01:00
15ad923310Removed !!!. Stupid arduino bootloader can't handle this.
Erik van der Zalm
2012-03-09 17:42:32 +01:00
61e09e6be2Added FAN_PIN -1 checks
Erik van der Zalm
2012-03-08 22:09:49 +01:00
87c4e06c24Corrected active_extruder when autotemp is used.
Erik van der Zalm
2012-03-08 22:04:13 +01:00
7b1e295f34Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
Erik van der Zalm
2012-03-08 21:48:06 +01:00
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 +01:00
49b228c4b3Add instructions to regenerate speed_lookuptable when changing F_CPU
Ben Gamari
2012-03-07 18:05:10 -05:00
96509494f0stepper: Clarify comment on timer-counter configuration
Ben Gamari
2012-03-07 17:58:35 -05:00
6d7e6a11fcAdd create_speed_lookup
Ben Gamari
2012-03-07 17:41:29 -05:00
f3095493b0Merge pull request #100 from tommycheng/patch-1
ErikZalm
2012-03-05 09:56:50 -08:00
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 +08:00
116dc86b8aFixed type in e-jerk
Erik van der Zalm
2012-03-04 23:09:13 +01:00
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 +00:00
e056bf8081Added E-Jerk
Erik van der Zalm
2012-03-04 16:34:58 +01:00
4deeffbc88Added missing defines to the german section. Translation still needed.
Erik van der Zalm
2012-03-04 14:08:20 +01:00
632528aa95merging with SCUBA82
Erik van der Zalm
2012-03-04 13:41:47 +01:00
aac7aa3bf0Queued fan control. Issue #90
Erik van der Zalm
2012-03-04 13:05:26 +01:00
fde51084f3set SD file delete to M30; switch printime output to M31
Christian Thalhammer
2012-03-03 21:58:12 +01:00
21e2bae063Changed (corrected?) SD_card comment handling.
Erik van der Zalm
2012-03-03 21:28:33 +01:00
e509bbf636Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
Erik van der Zalm
2012-03-03 20:41:22 +01:00
072011a3efAdded current_block = NULL to quickStop()
Erik van der Zalm
2012-03-03 20:40:46 +01:00
2422a857a1Merge pull request #96 from haxar/Marlin_v1
ErikZalm
2012-03-03 11:24:58 -08:00
f598077af3Removed vc files
Erik van der Zalm
2012-03-03 20:22:42 +01:00
cb0c84e075Merge remote-tracking branch 'justblair/master' into Marlin_v1
Erik van der Zalm
2012-03-03 20:20:55 +01:00
1d5809d458Merge pull request #88 from daid/Marlin_v1
ErikZalm
2012-03-03 11:18:14 -08:00
ed951b1977Fixed RAMPS 1.2 support (Found and fixed by rrhb)
Erik van der Zalm
2012-03-03 20:15:41 +01:00
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 +00:00
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 +00:00
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 +00:00
79a466ca26make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, complementing changes to analog2temp in d15f01e
haxar
2012-03-02 17:15:21 -08:00
5f3a422e68added M31 - delete file from sd card
Christian Thalhammer
2012-03-02 21:49:05 +01:00
fa2e3a40e9fixed LCD manual z axis move Feedrate to 70 (was 1700)
Christian Thalhammer
2012-03-01 14:38:50 +01:00
a92b3afe64added german translation;Menue should be in english.. sounds better
Christian Thalhammer
2012-03-01 14:24:20 +01:00
9fa586bbedfixed languages; Preheat_PLA and Preheat_ABS was not defined for non english
Christian Thalhammer
2012-03-01 14:05:40 +01:00
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 +01:00
3d83109028Fixed general 16x2 LCD build without SD support.
Daid
2012-02-29 15:33:23 +01:00
cb02914687Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Christian Thalhammer
2012-02-29 14:51:35 +01:00
10bf2bb8e1-
Christian Thalhammer
2012-02-29 14:51:15 +01:00
d47b666630Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1
Daid
2012-02-29 12:19:20 +01:00
88d289caa1Made plan_buffer_line arguments const, which optimizes better and fixes the RUNOUT_PREVENTION feature.
Daid
2012-02-29 11:38:12 +01:00
b4833d55c2Fixed HOME_POS in combination with G28 X0 or G28 Y0
Erik van der Zalm
2012-02-28 18:20:03 +01:00
c6f2ec3c82remove stop_heating_wait
Erik van der Zalm
2012-02-27 18:45:45 +01:00
b48d67ce10Fixed homing
Erik van der Zalm
2012-02-27 18:31:40 +01:00
071eec7aa7Merge pull request #81 from phord/09469add5560ca8a676c42e4bcd499868c33f0dd
ErikZalm
2012-02-27 08:38:36 -08:00
1ebe7d1ab6Merge pull request #83 from phord/tempfix
ErikZalm
2012-02-27 08:36:45 -08:00
de37b2264aMerge pull request #82 from phord/fix-gen7-build
ErikZalm
2012-02-27 08:36:06 -08:00
b65ef8d66cAdd support for upcoming Gen7 v1.4
Phil Hord
2012-02-26 20:39:49 -05:00
740f0c7690Add explicit #define for bogus temp override
Phil Hord
2012-02-26 18:46:34 -05:00
ba8500a236pins.h: Define Z_MAX_PIN for Gen7 board
Phil Hord
2012-02-26 20:15:40 -05:00