MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
Firmware2/Marlin
History
fsantini 6ae7f7870d Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into ErikZalm 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
2013-12-23 12:20:32 +01: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
preparation for hibernation
2013-10-22 10:04:08 +02:00
cardreader.h
preparation for hibernation
2013-10-22 10:04:08 +02:00
Configuration_adv.h
Z and Y dual stepper drivers error
2013-12-11 14:37:43 -06:00
Configuration.h
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into ErikZalm
2013-12-23 12:20:32 +01:00
ConfigurationStore.cpp
Removed Delta from the default config file.
2013-09-14 13:50:09 +02: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
Added new temperature lookup table creation tool. This one uses stein hart-hart equations.
2012-11-16 23:51:05 +01: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
Fixed duplicate define in fastio.h
2013-10-03 19:24:53 +02:00
language.h
Z Axis Safe Homing when using Z Probe
2013-11-27 22:37:35 -02: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
Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h
2013-05-02 09:22:58 -07:00
LiquidCrystalRus.h
Enables support the Cyrillic alphabet for LCD
2012-10-12 19:06:43 +04:00
Makefile
Detect OS in Makefile to use the correct avrdude.conf path
2013-08-01 19:20:27 +02:00
Marlin_main.cpp
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into ErikZalm
2013-12-23 12:20:32 +01:00
Marlin.h
Z Axis Safe Homing when using Z Probe
2013-11-27 22:37:35 -02:00
Marlin.ino
Bed Auto Leveling feature
2013-09-29 13:20:06 -03:00
Marlin.pde
Apply all changes from latest Marlin_V1
2013-06-06 15:49:25 -07:00
MarlinSerial.cpp
Initial SAV MkI (RepRap CloneWars board) integration.
2013-10-30 11:45:32 +01: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
Revert "Made numbering of heat bed thermistor more logical as D8 is bed, D9 is Extruder 2 and D10 is Extruder 1, so T0 should be E1, T1 E1 and T2 bed to be sequential as MOSFET-Outputs"
2013-12-16 12:22:06 +01:00
planner.cpp
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into ErikZalm
2013-12-23 12:20:32 +01:00
planner.h
Bed Auto Leveling feature
2013-09-29 13:20:06 -03:00
qr_solve.cpp
Implemented a least squares fit of the bed equation for auto bed leveling.
2013-12-06 21:46:25 +01:00
qr_solve.h
Implemented a least squares fit of the bed equation for auto bed leveling.
2013-12-06 21:46:25 +01: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
Fixed merge conflicts
2013-10-20 09:50:27 +02:00
stepper.h
Add the socalled "Babystepping" feature.
2013-10-06 21:14:51 +02:00
temperature.cpp
Bed Heater monitoring in Controller Fan
2013-11-27 23:23:06 -02:00
temperature.h
Bed Heater monitoring in Controller Fan
2013-11-27 23:23:06 -02:00
thermistortables.h
Added Honeywell thermistor 135-104LAF-J01
2013-07-30 14:02:18 +02:00
ultralcd_implementation_hitachi_HD44780.h
Initial SAV MkI (RepRap CloneWars board) integration.
2013-10-30 11:45:32 +01:00
ultralcd_st7920_u8glib_rrd.h
Apply all changes from latest Marlin_V1
2013-06-06 15:49:25 -07:00
ultralcd.cpp
Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability
2013-12-08 21:34:56 +01: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
Minor code and comment polishing
2013-12-11 21:27:43 +01: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
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