6ae7f7870d
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into ErikZalm
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
11 years ago
e5d3044801
Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability
11 years ago
e8786bf110
Added support for Cheaptronic v1 electronic
11 years ago
cc2925b705
Implemented a least squares fit of the bed equation for auto bed leveling.
...
The code for the LSQ solver (qr_solve) is copyrighted by John Burkardt and released under LGPL here:
http://people.sc.fsu.edu/~%20jburkardt/c_src/qr_solve/qr_solve.html
(see qr_solve.cpp for further copyright information)
11 years ago
b33375d438
Z Axis Safe Homing when using Z Probe
...
Recommended for those who are using the Z Probe for Z Homing (as
Z-Endstop)
This feature has two changes:
1) Allow user to choose where the Z Probe will touch the bed when homing
all axis together (G28) by setting below defines:
Z_SAFE_HOMING_X_POINT
Z_SAFE_HOMING_Y_POINT
2) Prevents the user to perform Z Axis Homing when the Z Probe is
outsite bed.
11 years ago
48a185d004
Fixed compile errors from bad commits.
11 years ago
59b96e323e
Merge pull request #640 from fmalpartida/SAV-MkI
...
Added support for BT on AT90USB devices, corrected LCD bug, added new board and LCD
11 years ago
7b556d2e96
Added BT support on AT90USB devices
...
Added AT90USB device BT connectivity support using second UART.
11 years ago
a5e8575829
Add UUID support to M115 responses.
11 years ago
b5a964fcc5
Initial SAV MkI (RepRap CloneWars board) integration.
...
Included support for BT dongle on AT90USB boards.
Added LCD Shift Register LCD control
Included support for RepRap Clone Wars project board (SAV MKI).
11 years ago
f941203172
PS_ON configurable boot state
...
Allows the user to select wheter or not the PSU should be turned on or
kept in standby when marlin boots
11 years ago
8a08cca0f2
Added temperature status less.
...
Hopefully fixed viky button handling without braking other boards
11 years ago
6a803ba9c5
Merge pull request #590 from timkoster/Marlin_v1
...
Added BlinkM support over i2c
11 years ago
6f85a8c7aa
Bed auto Leveling change: Raise Z before homing
...
- Added "Z_RAISE_BEFORE_HOMING" for raising Z the defined distance
before homing. This is useful to avoid Z-Probe collision when hotend is
near bed.
- Fixed the issue of Z not going bellow Z_PROBE_OFFSET when
"min_software_endstops" is true.
Now the Z_PROBE_OFFSET is not set in Z_MIN_POS, it is added after
homing.
11 years ago
253dfc4bc1
Bed Auto Leveling feature
...
Check the Readme for instruction how to enable and configure the feature
11 years ago
57173739a1
Update Configuration.h
...
Include CPU Sethi 3D
11 years ago
0dca49a7c0
Added Azteeg X3 board.
11 years ago
d8c2c810b4
Added info to the delta configuration files in the configuration.h file
11 years ago
9bc88f8bab
Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file
11 years ago
61db046b32
Added #ifdef BLINKM around new code. Also refined BlinkM.h.
11 years ago
3626b5ad8b
Removed Delta from the default config file.
...
Changed EEPROM CHITCHAT behavior. M503 is always enabled.
11 years ago
88dfeefca3
Define BlinkM default disabled
11 years ago
5350faf2a2
Merge https://github.com/timkoster/MarlinBlinkM into Marlin_v1
11 years ago
7016cc9511
Added BlinkM support over i2c
11 years ago
3b315b3da0
Added BlinkM support over i2c
11 years ago
a54fe2d73c
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
...
Conflicts:
Marlin/Marlin_main.cpp
11 years ago
2ca983568d
separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)
11 years ago
9bf1cf1b22
Pre-calculate diagonal rod length squared
11 years ago
4623e78ce0
Added Honeywell thermistor 135-104LAF-J01
11 years ago
34da3a0a3f
Merge github.com:ErikZalm/Marlin into Marlin_v1
...
Conflicts:
Marlin/language.h
11 years ago
c4a2077951
M109 and M190 now wait when cooling down if R is used instead of S.
...
M109 S180 waits only when heating.
M109 R180 also waits when cooling.
12 years ago
6397b3339c
restored configuration.h defaults
12 years ago
e509cdbeb0
added contrast control function for gLCDs
12 years ago
99b7e926e7
added MaKr3d Melzi board
12 years ago
ecf3ab5de4
Added thermistor 60 to configuration.h
12 years ago
2daa85918e
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
Marlin/language.h
Marlin/pins.h
Marlin/ultralcd.cpp
12 years ago
2015989f84
Added DISABLE_MIN_ENDSTOPS
12 years ago
648d45cfb2
Fix Pin Description Typo
...
Reverse 'Bed' and 'Fan' at the RAMPS 33 Description.
Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
12 years ago
02dee80fa5
added Azteeg X1 motherboard
12 years ago
e34c9981ab
Delta disabled by default
12 years ago
7ad12be763
Merge branch 'Marlin_v1' of https://github.com/codexmas/Marlin into codexmas-Marlin_v1
...
Conflicts:
Marlin/Configuration.h
README.md
12 years ago
408169aef4
Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1
...
Conflicts:
Marlin/Configuration.h
Marlin/language.h
Marlin/pins.h
12 years ago
bd96d22bfb
Merge branch 'Marlin_v1' into thinkyhead
...
Conflicts:
Marlin/Configuration.h
Marlin/Configuration_adv.h
Marlin/Marlin.h
Marlin/Marlin_main.cpp
Marlin/Servo.cpp
Marlin/language.h
Marlin/pins.h
Marlin/planner.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h
README.md
12 years ago
6f4a6e531c
Merge branch 'deltabot' into Marlin_v1
12 years ago
ff6fa09ecf
Moved corexy implementation from stepper to planner
...
(Thanks iquizzle)
12 years ago
c8dcc7c208
Allow increasing the software PWM frequency.
12 years ago
373f3ecab3
Merge branch 'deltabot' of https://github.com/jcrocholl/Marlin into deltabot
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
Marlin/pins.h
12 years ago
6a81291c57
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
...
This should fix issues with pull request 467, I hope.
Conflicts:
Marlin/Configuration.h
Marlin/Marlin.pde
Marlin/ultralcd_implementation_hitachi_HD44780.h
12 years ago
c1cb5977ee
Update Configuration.h
12 years ago
8a5bd8a808
Update Configuration.h
12 years ago
fsantini