MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
77df0d689a
Firmware/Marlin
History
whosawhatsis 77df0d689a autretract fix 
I made these changes previously, but I can’t find the commit now. This
reapplies the changes to get auto retract working again.

Conflicts:
	Marlin/Configuration_adv.h
	Marlin/Marlin_main.cpp
2014-02-24 13:24:38 -08:00
..
example_configurations/delta Correct missing parameter from last upmerge 2013-12-19 00:50:44 -02:00
BlinkM.cpp Corrected LCD only error 2013-10-30 21:52:46 +01:00
BlinkM.h Corrected LCD only error 2013-10-30 21:52:46 +01:00
cardreader.cpp Various typo fixes - only in comments, no code changes. 2014-02-17 10:58:36 +00:00
cardreader.h preparation for hibernation 2013-10-22 10:04:08 +02:00
Configuration_adv.h Merge pull request #776 from whosawhatsis/fwretract 2014-02-18 10:39:28 +01:00
Configuration.h Simplify 3-point probing using new code only 2014-02-19 21:48:05 -08:00
ConfigurationStore.cpp Update ConfigurationStore.cpp 2014-01-17 16:09:58 +01:00
ConfigurationStore.h Removed Delta from the default config file. 2013-09-14 13:50:09 +02:00
COPYING first commit 2011-08-12 22:28:35 +02:00
create_speed_lookuptable.py Added 20MHz support. 2012-03-11 12:25:04 +01:00
createTemperatureLookupMarlin.py createTemperatureLookupMarlin.py: Change comment to refer to actual program name. 2014-01-29 23:34:22 -05:00
digipot_mcp4451.cpp Add Azteeg X3 Pro as motherboard 68 2014-02-05 01:47:12 -08:00
dogm_font_data_marlin.h Removed STB custom font hack from u8glib library and moved to marlin project 2013-04-16 13:54:39 +02:00
dogm_lcd_implementation.h fixed bad lcd commit from makr3d 2013-07-15 17:34:21 +02:00
DOGMbitmaps.h Apply all changes from latest Marlin_V1 2013-06-06 15:49:25 -07:00
fastio.h fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/Printrboard compatibility. 2014-01-16 11:23:29 -05:00
language.h Fixed some messages where the text shown on the screen was more than 17 characters 2014-02-18 09:40:10 +01:00
LCD Menu Tree.pdf Added PDF file containing Menu Tree for documentation purposes. Source xlsx document included. 2012-08-29 21:08:41 +01:00
LiquidCrystalRus.cpp Various typo fixes - only in comments, no code changes. 2014-02-17 10:58:36 +00:00
LiquidCrystalRus.h Enables support the Cyrillic alphabet for LCD 2012-10-12 19:06:43 +04:00
Makefile Makefile works with auto bed leveling 2014-02-16 23:23:29 -08:00
Marlin_main.cpp autretract fix 2014-02-24 13:24:38 -08:00
Marlin.h Merge pull request #770 from josefpavlik/Marlin_v1 2014-02-17 11:27:05 +00:00
Marlin.ino Add Azteeg X3 Pro as motherboard 68 2014-02-05 01:47:12 -08:00
Marlin.pde Add Azteeg X3 Pro as motherboard 68 2014-02-05 01:47:12 -08:00
MarlinSerial.cpp Various typo fixes - only in comments, no code changes. 2014-02-17 10:58:36 +00:00
MarlinSerial.h Initial SAV MkI (RepRap CloneWars board) integration. 2013-10-30 11:45:32 +01:00
Menu Plans.xlsx Tidy up 2012-08-29 22:53:41 +01:00
motion_control.cpp software_endstops: use *_MIN_POS and *_MAX_POS for arcs 2012-08-10 19:36:30 +01:00
motion_control.h Removed interrupt nesting in the stepper ISR. 2011-11-27 21:12:55 +01:00
pins.h Ultimainboard 2.x does not has a PS_ON pin. 2014-02-13 10:57:03 +01:00
planner.cpp Fixed math 2014-01-31 08:43:11 -08:00
planner.h Bed Auto Leveling feature 2013-09-29 13:20:06 -03:00
qr_solve.cpp Remove unnecessary dependency on time.h from qr_solve.cpp 2014-02-20 16:43:37 -08:00
qr_solve.h Simplify 3-point probing using new code only 2014-02-19 21:48:05 -08:00
Sd2Card.cpp Fix for a few -Wextra warnings. 2012-11-12 15:35:28 +01:00
Sd2Card.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
Sd2PinMap.h Initial SAV MkI (RepRap CloneWars board) integration. 2013-10-30 11:45:32 +01:00
SdBaseFile.cpp Few simple fixes that save RAM, as static strings are stored in RAM by default. 2012-11-28 10:30:34 +01:00
SdBaseFile.h Added long filename support. 2012-08-22 14:49:57 +02:00
SdFatConfig.h Added long filename support. 2012-08-22 14:49:57 +02:00
SdFatStructs.h Added long filename support. 2012-08-22 14:49:57 +02:00
SdFatUtil.cpp Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0. 2012-02-11 16:02:47 +01:00
SdFatUtil.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
SdFile.cpp First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions. 2012-11-06 12:06:41 +01:00
SdFile.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
SdInfo.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
SdVolume.cpp made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
SdVolume.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
Servo.cpp Bed Auto Leveling feature 2013-09-29 13:20:06 -03:00
Servo.h Fix servo control for Melzi 2013-10-30 20:59:58 +01:00
speed_lookuptable.h Made the 2nd speed lookup table condition more explicit. 2012-11-11 12:02:48 +01:00
stepper.cpp Add Ultiboard2 electronics. With PWM current settings. For the few people that have this new board as experiment in their UM-Original. 2014-01-06 11:05:02 +01:00
stepper.h Add the socalled "Babystepping" feature. 2013-10-06 21:14:51 +02:00
temperature.cpp Merge pull request #727 from drf5n/oversampling 2014-01-31 07:09:10 -08:00
temperature.h Bed Heater monitoring in Controller Fan 2013-11-27 23:23:06 -02:00
thermistortables.h Pt100 and Pt1000 temperature sensors handling 2014-02-14 12:26:27 +01:00
ultralcd_implementation_hitachi_HD44780.h Add configurable beep for UltiPanel. 2014-02-13 11:17:33 +01:00
ultralcd_st7920_u8glib_rrd.h Various typo fixes - only in comments, no code changes. 2014-02-17 10:58:36 +00:00
ultralcd.cpp Merge pull request #770 from josefpavlik/Marlin_v1 2014-02-17 11:27:05 +00:00
ultralcd.h Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1 2013-07-14 15:45:49 +02:00
vector_3.cpp Merge pull request #689 from cajun-rat/tidy 2014-02-12 16:38:11 +00:00
vector_3.h Fixed the plane vector equation to a simpler one (only dependent on the normal) 2013-12-06 21:32:21 +01:00
watchdog.cpp Fix compiling the watchdog error message when the manual reset watchdog is used. 2012-12-06 10:27:50 +01:00
watchdog.h Various typo fixes - only in comments, no code changes. 2014-02-17 10:58:36 +00:00