bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
1,273 Commits 1 Branch 4 Tags 151 MiB
4ddedb3b27
Commit Graph

248 Commits

Author SHA1 Message Date
nothinman
d4ba23bc28 Merge pull request #770 from josefpavlik/Marlin_v1 
Marlin v1
 2014-02-17 11:27:05 +00:00
Josef Pavlik
831fc2a952 Pt100 and Pt1000 temperature sensors handling 2014-02-14 12:26:27 +01:00
daid
71bb3a8133 Add comments for Ultimainboard 2.0 configuration. 2014-02-13 10:53:46 +01:00
Jim Morris
b819fc53ca Add Azteeg X3 Pro as motherboard 68 
Add digipot i2c control for MCP4451
Allow M907 to set i2c digipot currents in amps
Fix Makefile to allow Azteeg motherboards
Fix Makefile to allow Wire libraries only
Add beeper pin for Azteeg X3 Pro
 2014-02-05 01:47:12 -08:00
ErikZalm
e1ae7952eb Merge pull request #743 from Opticalworm/Marlin_v1 
Improved support for panelolu2 encoder and buzzer
 2014-02-03 12:33:10 -08:00
David Forrest
a5f53f0cf3 Heater wattage reporting for M105 using EXTRUDER_WATTS and BED_WATTS 2014-02-03 14:50:28 -05:00
Ronald
8d162e5bd7 Improved support for panelolu2 encoder and buzzer 
I added #define for LCD_FEEDBACK_FREQUENCY_HZ and
LCD_FEEDBACK_FREQUENCY_DURATION_MS  which is used to alter the default
buzzer sound.

When selecting Panelolu2 in configuration.h:
- it automatically sets the correct ENCODER_PULSES_PER_STEP and
ENCODER_STEPS_PER_MENU_ITEM.
- if LCD_USE_I2C_BUZZER is defined it will also set the default
LCD_FEEDBACK_FREQUENCY_HZ and LCD_FEEDBACK_FREQUENCY_DURATION_MS

When selecting the sanguinololu 1284p the following is true:
- its now enables  LARGE_FLASH
- It enables the gcode M300 when the panelolu2 LCD_USE_I2C_BUZZER is
defined
 2014-02-03 07:45:03 +00:00
David Forrest
76cf07c3f7 Configuration.h: Use OVERSAMPLENR in dT_PID definition. 2014-01-21 23:25:51 -05:00
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
-
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 2013-12-08 21:34:56 +01:00
Michal Dyntar
e8786bf110 Added support for Cheaptronic v1 electronic 2013-12-07 13:29:47 +01:00
fsantini
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)
 2013-12-06 21:46:25 +01:00
Alex Borro
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.
 2013-11-27 22:37:35 -02:00
Erik van der Zalm
48a185d004 Fixed compile errors from bad commits. 2013-11-10 16:36:37 +01:00
ErikZalm
59b96e323e Merge pull request #640 from fmalpartida/SAV-MkI 
Added support for BT on AT90USB devices, corrected LCD bug, added new board and LCD
 2013-11-10 07:26:08 -08:00
fmalpartida
7b556d2e96 Added BT support on AT90USB devices 
Added AT90USB device BT connectivity support using second UART.
 2013-11-03 19:57:06 +01:00
Kaz Walker
a5e8575829 Add UUID support to M115 responses. 2013-11-01 14:51:50 -06:00
fmalpartida
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).
 2013-10-30 11:45:32 +01:00
dumle29
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
 2013-10-29 18:44:56 +01:00
Erik van der Zalm
8a08cca0f2 Added temperature status less. 
Hopefully fixed viky button handling without braking other boards
 2013-10-20 12:12:35 +02:00
ErikZalm
6a803ba9c5 Merge pull request #590 from timkoster/Marlin_v1 
Added BlinkM support over i2c
 2013-10-20 00:51:35 -07:00
Alex Borro
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.
 2013-10-12 17:28:11 -03:00
Alex Borro
253dfc4bc1 Bed Auto Leveling feature 
Check the Readme for instruction how to enable and configure the feature
 2013-09-29 13:20:06 -03:00
phq1910
57173739a1 Update Configuration.h 
Include CPU Sethi 3D
 2013-09-26 11:29:44 -03:00
Erik van der Zalm
0dca49a7c0 Added Azteeg X3 board. 2013-09-24 17:31:16 +02:00
Erik van der Zalm
d8c2c810b4 Added info to the delta configuration files in the configuration.h file 2013-09-23 23:29:46 +02:00
Erik van der Zalm
9bc88f8bab Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file 2013-09-23 23:25:11 +02:00
Tim Koster
61db046b32 Added #ifdef BLINKM around new code. Also refined BlinkM.h. 2013-09-20 10:57:42 +03:00
Erik van der Zalm
3626b5ad8b Removed Delta from the default config file. 
Changed EEPROM CHITCHAT behavior. M503 is always enabled.
 2013-09-14 13:50:09 +02:00
Tim Koster
88dfeefca3 Define BlinkM default disabled 2013-09-10 12:32:21 +03:00
Tim Koster
5350faf2a2 Merge https://github.com/timkoster/MarlinBlinkM into Marlin_v1 2013-09-10 12:27:26 +03:00
Tim Koster
7016cc9511 Added BlinkM support over i2c 2013-09-10 12:18:29 +03:00
Tim Koster
3b315b3da0 Added BlinkM support over i2c 2013-09-06 22:25:39 +03:00
Nicolas Rossi
a54fe2d73c Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 
Conflicts:
	Marlin/Marlin_main.cpp
 2013-08-03 13:05:56 +02:00
hg42@gmx.net
2ca983568d separate INVERTING for MIN and MAX endstops (6 #defines instead of 3) 2013-08-01 15:06:39 +02:00
Nicolas Rossi
9bf1cf1b22 Pre-calculate diagonal rod length squared 2013-07-30 14:09:21 +02:00
Nicolas Rossi
4623e78ce0 Added Honeywell thermistor 135-104LAF-J01 2013-07-30 14:02:18 +02:00
Guillaume Seguin
34da3a0a3f Merge github.com:ErikZalm/Marlin into Marlin_v1 
Conflicts:
	Marlin/language.h
 2013-07-23 21:46:41 +02:00
Erik van der Zalm
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.
 2013-07-14 21:10:24 +02:00
Erik van der Zalm
6397b3339c restored configuration.h defaults 2013-07-14 15:49:03 +02:00
Michael Mayer
e509cdbeb0 added contrast control function for gLCDs 2013-07-14 15:28:26 +07:00
Michael Mayer
99b7e926e7 added MaKr3d Melzi board 2013-07-14 15:17:55 +07:00
Erik van der Zalm
ecf3ab5de4 Added thermistor 60 to configuration.h 2013-06-27 23:25:51 +02:00
Nicolas Rossi
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
 2013-06-20 23:59:56 +02:00
Erik van der Zalm
2015989f84 Added DISABLE_MIN_ENDSTOPS 2013-06-18 19:20:26 +02:00
Christian Inci
648d45cfb2 Fix Pin Description Typo 
Reverse 'Bed' and 'Fan' at the RAMPS 33 Description.

Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
 2013-06-16 23:35:33 +02:00
lajos
02dee80fa5 added Azteeg X1 motherboard 2013-06-15 16:58:17 -04:00
Erik van der Zalm
e34c9981ab Delta disabled by default 2013-06-11 22:33:58 +02:00
Erik van der Zalm
7ad12be763 Merge branch 'Marlin_v1' of https://github.com/codexmas/Marlin into codexmas-Marlin_v1 
Conflicts:
	Marlin/Configuration.h
	README.md
 2013-06-09 23:10:41 +02:00
Erik van der Zalm
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
 2013-06-09 22:57:40 +02:00