This repository has been archived on 2025-12-23. You can view files and clone it. You cannot open issues or pull requests or push a commit.

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

…

create_speed_lookuptable.py

…

createTemperatureLookupMarlin.py

…

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

…

LiquidCrystalRus.cpp

Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h

2013-05-02 09:22:58 -07:00

LiquidCrystalRus.h

…

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

…

motion_control.cpp

…

motion_control.h

…

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

…

Sd2Card.h

…

Sd2PinMap.h

Initial SAV MkI (RepRap CloneWars board) integration.

2013-10-30 11:45:32 +01:00

SdBaseFile.cpp

…

SdBaseFile.h

…

SdFatConfig.h

…

SdFatStructs.h

…

SdFatUtil.cpp

…

SdFatUtil.h

…

SdFile.cpp

…

SdFile.h

…

SdInfo.h

…

SdVolume.cpp

…

SdVolume.h

…

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

…

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

…

watchdog.h

…