neildarlow
7325d7102e
Activate LiquidTWI2 device detection and space-pad LCD status line.
2014-03-03 21:01:27 +00:00
ErikZalm
7f76a0e064
Merge pull request #813 from drf5n/PID_DEBUG
...
temperature.cpp: Fix PID_DEBUG compile error.
2014-02-26 17:31:48 +01:00
Erik van der Zalm
fcd8524b6e
Only increase EEPROM version for DELTA printers.
2014-02-26 17:29:27 +01:00
Jim Morris
8ea5665ee2
Merge remote-tracking branch 'origin/Marlin_v1' into add/M665-set-delta-configuration
...
Conflicts:
Marlin/Marlin_main.cpp
2014-02-26 00:19:28 -08:00
David Forrest
8c4377dd63
temperature.cpp: Fix PID_DEBUG compile error.
2014-02-26 00:44:22 -05:00
ErikZalm
fde8c2c310
Merge pull request #807 from Cylindric3D/typofixes_upstream5
...
Various typo fixes #5 - only in comments, no code changes.
2014-02-25 18:49:41 +01:00
Cylindric
fdce91192e
Various typo fixes - only in comments, no code changes.
2014-02-25 10:01:15 +00:00
Cylindric
d819c55395
Various typo fixes - only in comments, no code changes.
2014-02-25 09:52:58 +00:00
ErikZalm
fd4542f33a
Merge pull request #805 from whosawhatsis/M200
...
autretract fix
2014-02-24 22:35:08 +01:00
ErikZalm
e8291ed728
Merge pull request #802 from Makers-Tool-Works/Marlin_v1
...
Clarify which PID values to enter
2014-02-24 22:31:13 +01:00
ErikZalm
465b654d24
Merge pull request #797 from Cylindric3D/update_menu_plan
...
Update menu plan
2014-02-24 22:30:19 +01:00
ErikZalm
88506a80c3
Merge pull request #789 from smiler/Marlin_v1
...
Fixed typo.
2014-02-24 22:26:31 +01:00
ErikZalm
b514d3c87f
Merge pull request #781 from Cylindric3D/typofixes_upstream
...
Various typo fixes #3 - only in comments, no code changes.
2014-02-24 22:25:38 +01:00
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
ErikZalm
cc5f1d475c
Merge pull request #772 from ellensp/Marlin_v1
...
Updated gen3+ board pins names to current convention
2014-02-24 22:22:15 +01:00
Cylindric
91759dede6
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
2014-02-24 17:29:37 +00:00
Cylindric
557217fc05
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan
2014-02-24 17:29:24 +00:00
RoyOnWheels
aee63afccd
Clarify which PID values to enter
...
Users can be confused as to which values to enter after a PID tune. Updating the message to help clarity it.
New message: "PID Autotune finished! Put the last Kp, Ki and Kd constants from above into Configuration.h"
Old message: "PID Autotune finished! Put the Kp, Ki and Kd constants into Configuration.h"
2014-02-23 14:36:50 -08:00
Gabe Rosenhouse
99f6326544
Remove unnecessary dependency on time.h from qr_solve.cpp
...
Fixed compiler errors on Ubuntu using arduino-core
2014-02-20 16:43:37 -08:00
Cylindric
ea669cb504
Fix some extra and some missing tabs, to make the file consistent.
2014-02-20 14:28:29 +00:00
Cylindric
b46a1b6360
Update the menu plan document with the current menu as per ultralcd.cpp.
2014-02-20 14:20:27 +00:00
Cylindric
3cc7626d1f
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan
2014-02-20 14:12:10 +00:00
Gabe Rosenhouse
174b8d99d5
Simplify 3-point probing using new code only
2014-02-19 21:48:05 -08:00
Gabe Rosenhouse
3b718b816c
better documentation
2014-02-19 14:04:37 -08:00
Gabe Rosenhouse
34fd59c370
ABL at any points
2014-02-19 13:18:21 -08:00
Cylindric
541155ea87
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
2014-02-19 15:52:18 +00:00
alexborro
9fa328e5c8
Merge pull request #793 from MissionSt/use_axis_enums
...
Use constants instead of numeric literals
2014-02-19 10:15:57 -03:00
Gabe Rosenhouse
f308a8af91
update comment
2014-02-19 01:06:24 -08:00
Gabe Rosenhouse
357e31270a
Prevent G29 without first homing in X and Y
...
If position is unknown, then G29 can be dangerous.
2014-02-19 00:51:43 -08:00
Gabe Rosenhouse
d2d7d186b5
Use descriptive constants, more
2014-02-19 00:10:17 -08:00
Gabe Rosenhouse
2ccdf4f36d
Use descriptive constants instead of numeric literals
2014-02-19 00:02:59 -08:00
Christian Axelsson
c00383f286
Fixed typo.
2014-02-18 18:50:12 +01:00
Cylindric
60f72a78a9
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
2014-02-18 17:31:58 +00:00
nothinman
abba7a0003
Merge pull request #782 from marcovannoord/Marlin_v1
...
Added dutch to language.h
2014-02-18 16:19:50 +00:00
Cylindric
b868d668fa
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
2014-02-18 12:11:01 +00:00
Marco
8212d8d543
Revert "Fixed small typo that would prevent compiling"
...
This reverts commit 51ae4881ab
.
2014-02-18 10:40:25 +01:00
daid
46bae30573
Merge pull request #776 from whosawhatsis/fwretract
...
Fwretract fixes, cleanup
2014-02-18 10:39:28 +01:00
Marco
51ae4881ab
Fixed small typo that would prevent compiling
2014-02-18 09:47:36 +01:00
Marco
498d76fd79
Fixed some messages where the text shown on the screen was more than 17 characters
2014-02-18 09:40:10 +01:00
Jim Morris
af9395ac2e
Add M605 to dynamically set delta configuration
...
Save above configs in eeprom
fix docs in createTemperatureLookupMarlin.py
add missing azteegX3pro digipot settings in delta example config
2014-02-17 20:50:59 -08:00
nothinman
fd42f0d226
Merge pull request #783 from MissionSt/fix/syntax-error
...
Fix compile error
2014-02-17 20:59:43 +00:00
nothinman
96217bf36a
Merge pull request #777 from PxT/M114
...
Add whitespace to M114 output
2014-02-17 18:07:47 +00:00
Marco
cf5c3b6610
Added dutch to language.h
2014-02-17 17:00:50 +01:00
Gabe Rosenhouse
d1c64b9dc4
Fix syntax error introduced in 477b6fa1d
2014-02-17 07:56:19 -08:00
Cylindric
5d50819791
Various typo fixes - only in comments, no code changes.
2014-02-17 13:04:44 +00:00
nothinman
3f455889d0
Merge pull request #769 from Cylindric3D/typofixes_1
...
Various typo fixes - only in comments, no code changes.
2014-02-17 11:30:01 +00:00
nothinman
4ddedb3b27
Merge pull request #780 from Cylindric3D/typofixes_2
...
Various typo fixes #2 - only in comments, no code changes.
2014-02-17 11:29:18 +00:00
nothinman
d4ba23bc28
Merge pull request #770 from josefpavlik/Marlin_v1
...
Marlin v1
2014-02-17 11:27:05 +00:00
nothinman
bbb424bd2f
Merge pull request #779 from MissionSt/makefile-fix-abl
...
Makefile fixes
2014-02-17 11:22:34 +00:00
Cylindric
8f0cee2a14
Various typo fixes - only in comments, no code changes.
2014-02-17 10:58:36 +00:00
Cylindric
08263ae66e
Merge branch 'Marlin_v1' into typofixes_1
2014-02-17 10:28:20 +00:00
Gabe Rosenhouse
5bd09d26e2
Makefile works with auto bed leveling
2014-02-16 23:23:29 -08:00
Gabe Rosenhouse
b45beeffd6
typo fix in Makefile
2014-02-16 23:23:29 -08:00
Paul Telford
306588925d
Add whitespace to M114 output
2014-02-16 21:01:19 -08:00
whosawhatsis
c43838bb1e
disable auto retract by default
...
This should make it safe to enable FWRETRACT by default, with
autoretract (which should now be fixed) only enabled by M209. FWRETRACT
should probably now default to enabled (to make G10/G11 and M207-209
available, without changing functionality when they are not used), but
I’ll save that for another pull request/discussion.
2014-02-16 19:04:54 -08:00
whosawhatsis
99f0e44864
Move FWRETRACT defaults to configuration_adv.h
2014-02-16 19:00:28 -08:00
whosawhatsis
66e3869138
Fix autoretract
...
This takes the (now working) G10/G11 code and moves it to a function,
which is called by G10 and G11, and also called by G1 if autoretract is
enabled and a retract/recover move is detected.
2014-02-16 18:59:04 -08:00
whosawhatsis
2f2459c0db
Fix G10/G11 Z-lift
2014-02-16 18:15:34 -08:00
Gabe Rosenhouse
8c5675c290
Use language.h instead of English literals for "bed"
2014-02-16 17:16:00 -08:00
Gabe Rosenhouse
0f7393a13e
Refactor 'accurate' auto bed leveling to use probe_pt()
2014-02-16 10:44:15 -08:00
Gabe Rosenhouse
c4fbb44d6d
Refactor 3-point auto bed leveling to use probe_pt()
2014-02-16 10:44:08 -08:00
Gabe Rosenhouse
ad2c6488c7
Add probe_pt(), useful for auto bed leveling
2014-02-16 10:38:29 -08:00
Peter
c9c83a4560
Updated gen3+ board pins names to current convention
2014-02-16 00:47:06 +13:00
Mark Hanford
ab0d3c4fb3
Various typo fixes - only in comments, no code changes.
2014-02-14 11:48:24 +00:00
Josef Pavlik
477b6fa1df
move engaged from lcd console refreshes power off timeout
2014-02-14 12:37:21 +01:00
Josef Pavlik
831fc2a952
Pt100 and Pt1000 temperature sensors handling
2014-02-14 12:26:27 +01:00
nothinman
7dcd350941
A few changes to Russian, changed LCD strings to be <=17 characters.
2014-02-13 11:58:14 +00:00
daid
c31bb2b7ad
Only show the ZProbe offset when auto-bed-leveling is enabled.
2014-02-13 11:48:55 +01:00
daid
46f5bea19f
Add configurable beep for UltiPanel.
2014-02-13 11:17:33 +01:00
daid
d16a770855
Ultimainboard 2.x does not has a PS_ON pin.
2014-02-13 10:57:03 +01:00
daid
71bb3a8133
Add comments for Ultimainboard 2.0 configuration.
2014-02-13 10:53:46 +01:00
daid
9b7d87e885
Remove duplicate contrast define.
2014-02-13 10:50:17 +01:00
daid
816f0a678a
Merge pull request #768 from whosawhatsis/Marlin_v1
...
multiple FWretract fixes
2014-02-13 09:14:57 +01:00
whosawhatsis
6e43398509
G10/G11 bugfixes
...
Previous version was broken by using G92 E0 between retract and recover.
2014-02-12 13:03:00 -08:00
whosawhatsis
d6c5c503d4
correct feedrate units in comments for M207/M208
2014-02-12 13:02:47 -08:00
nothinman
15d6116188
Merge pull request #689 from cajun-rat/tidy
...
Use C++ initialization list
2014-02-12 16:38:11 +00:00
Martin Lukasik
0b9ecf3824
Language cleanup, part 1.
2014-02-12 13:21:26 +00:00
whosawhatsis
b5ba5c1465
Merge branch 'Marlin_v1' of https://github.com/whosawhatsis/Marlin into Marlin_v1
2014-02-11 19:06:03 -08:00
whosawhatsis
78e7654601
Keep FWRETRACT values in terms of millimeters when using M200
...
for volumetric E units
2014-02-11 19:05:35 -08:00
whosawhatsis
3f6d44d40b
Keep FWRETRACT values in terms of millimeters when using M200 for volumetric E units
2014-02-11 18:50:11 -08:00
Cylindric
363dc2f0e8
Merge branch 'Marlin_v1' into update_menu_plan
2014-02-12 00:51:16 +00:00
nothinman
5f797ca29f
Updated Polish, changed default firmware URL to Marlin.
2014-02-11 22:38:01 +00:00
Mark Hanford
0778f5f028
Add missing entries to the new Aragonian language.
2014-02-11 14:40:53 +00:00
Mark Hanford
54bab3e0d0
Merge branch 'Marlin_v1' into localisation
...
Conflicts:
Marlin/language.h
2014-02-11 14:35:28 +00:00
Mark Hanford
bdd0211aeb
Move strings in ultralcd.cpp into language.h.
2014-02-11 13:54:43 +00:00
Daniel Martinez
c8e5a82d49
keep English as default lang.
2014-02-09 18:24:24 +01:00
Daniel Martinez
f64592e362
Add Aragonese translation
2014-02-09 18:19:37 +01:00
ErikZalm
ac74f45dc0
Merge pull request #752 from MatixYo/patch-3
...
Update language.h
2014-02-09 17:52:26 +01:00
MatixYo
36086d3ca4
Update language.h
...
Updated Polish translations.
2014-02-07 19:15:51 +01:00
Cylindric
1781031f2d
Update LCD Menu Tree with current options, based on ultralcd.cpp and language.h.
2014-02-07 01:52:44 +00:00
Jim Morris
d485988bec
fix typo
2014-02-05 14:39:45 -08:00
Jim Morris
8a1fd25363
Default is to not define digipot_i2c
2014-02-05 14:28:23 -08:00
Jim Morris
5097c57d3a
Added pins for Azteeg X3 Pro under motherboard 68
2014-02-05 14:25:42 -08: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
whosawhatsis
b2c11ba980
Change diameter code to 'D'
...
For some reason that I can’t figure out, the decimal is dropped when
using ’S’ for the code.
Also some minor code improvements to M200.
2014-02-01 18:49:25 -08:00
ErikZalm
61059385a3
Merge pull request #737 from whosawhatsis/M200
...
M200 implementation
2014-02-01 10:37:49 -08:00
whosawhatsis
856edfcc0d
Fixed math
...
This is why I wanted to sleep on the code I wrote while falling asleep
rather than immediately submitting a pull request.
2014-01-31 08:43:11 -08:00
ErikZalm
0d81ae77bc
Merge pull request #727 from drf5n/oversampling
...
temperature.cpp: Actually use OVERSAMPLENR in the oversampling calculation.
2014-01-31 07:09:10 -08:00
ErikZalm
84df13f7d1
Merge pull request #721 from drf5n/lcdOnly
...
Enable basic ULTRA_LCD screen w/o encoders and menus.
2014-01-31 07:07:12 -08:00
ErikZalm
4c7e9502ad
Merge pull request #718 from drf5n/temptableRes
...
createTemperatureLookupMarlin.py: Add resolution comments and format for...
2014-01-31 07:06:02 -08:00
ErikZalm
652a0f6b5a
Merge pull request #717 from drf5n/tpins2
...
fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/...
2014-01-31 07:05:20 -08:00
ErikZalm
96a0cdc541
Merge pull request #716 from drf5n/maketeensy
...
Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HAR...
2014-01-31 07:04:29 -08:00
whosawhatsis
d24df7af2c
M200 implementation
2014-01-31 00:54:19 -08:00
David Forrest
f0b8d5ba3d
createTemperatureLookupMarlin.py: Change comment to refer to actual program name.
2014-01-29 23:34:22 -05:00
David Forrest
50f44d9249
createTemperatureLookupMarlin.py: Truncate to short after application of OVERSAMPLENR for improved resolution.
2014-01-29 23:24:07 -05:00
David Forrest
f5b5dd8038
createTemperatureLookupMarlin.py: Add output of Steinhart-Hart coefficients.
2014-01-29 22:59:47 -05:00
David Forrest
76cf07c3f7
Configuration.h: Use OVERSAMPLENR in dT_PID definition.
2014-01-21 23:25:51 -05:00
David Forrest
476c7193d8
temperature.cpp: Use OVERSAMPLENR in oversampling calculation.
2014-01-21 16:49:03 -05:00
whosawhatsis
f08bb8bb6a
Previous commit borked.
2014-01-19 22:06:45 -08:00
whosawhatsis
b1f8f492c6
Remove previous_millis_cmd update from extruder runout prevention code
...
This seems to defeat the purpose of previous_millis_cmd, preventing the
time elapsed from previous_millis_cmd from ever reaching
max_inactive_time or stepper_inactive_time while the heat was on.
2014-01-19 19:22:08 -08:00
whosawhatsis
8a5eaa3c9b
Fix crash after home bug
...
Fixes a bug in the Extruder Runout Prevention feature that caused the
extruder to move back to “current_position” after a move if it was
activated while the move was in progress. For long home moves (which
are longer than the dimensions of the machine’s working area), this
would cause the machine to crash into the far end of its travel after
homing. This usually occurred on the Z axis, which could result in
damage to the machine if you don’t hit the reset button in time.
2014-01-19 19:11:51 -08:00
David Forrest
61a7256d42
Enable basic ULTRA_LCD screen w/o encoders and menus.
2014-01-17 17:00:47 -05:00
l.lefebvre
fdac8f6cec
Update ConfigurationStore.cpp
...
Unable to compile if ENABLE_AUTO_BED_LEVELING is not set (not set by default).
2014-01-17 16:09:58 +01:00
Alex Borro
05932e4458
Add Z Probe Offset to EEPROM and Ultra LCD
2014-01-16 18:13:46 -02:00
David Forrest
7216583b8b
createTemperatureLookupMarlin.py: Add resolution comments and format for Marlin.
2014-01-16 12:40:15 -05:00
David Forrest
e8e0697e48
fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/Printrboard compatibility.
2014-01-16 11:23:29 -05:00
David Forrest
75f39fadfc
Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HARDWARE_MOTHERBOARD=={8,81,82,83,84})
2014-01-16 10:58:35 -05:00
daid
df194f75e1
Added PT100 support for Ultiboard2
2014-01-06 11:20:03 +01:00
daid
380144c20f
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
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
Phil Wise
17d6d965dc
Use C++ initialization list
...
This is the recommended approach for object initialization. The change
doesn't affect binary size (although in theory it could make it smaller).
2013-12-19 21:21:46 +00:00
Joseivaldo Benito Junior
ce8b9c4fc5
Correct missing parameter from last upmerge
...
Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>
2013-12-19 00:50:44 -02:00
Joseivaldo Benito Junior
8e48e24c7f
Update Delta example files
...
Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>
2013-12-18 00:04:36 -02:00
ErikZalm
46d2443c7d
Merge pull request #676 from IVI053/Marlin_v1
...
Minor improvements for encoder configuration, LCD entry for PSU controll and thermistor pins on RAMPS
2013-12-17 02:28:28 -08:00
-
eed053dffb
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"
...
This reverts commit b7eadb9f37
.
2013-12-16 12:22:06 +01:00
Erik van der Zalm
8349fc89a4
Fixed planner bug
2013-12-16 11:40:23 +01:00
Francesco Santini
da2a6f9a31
Accurate bed leveling: x loop inside y and zigzag motion
2013-12-13 10:31:19 +01:00
RicardoGA
d29615dc0c
Z and Y dual stepper drivers error
...
if you try to enable Z_DUAL_STEPPER_DRIVERS the error "You cannot have dual drivers for both Y and Z" shows even if you don't have defined Y_DUAL_STEPPER_DRIVERS and don't let you compile the firmware
to solve this problem i change this line:
#ifdef Z_DUAL_STEPPER_DRIVERS && Y_DUAL_STEPPER_DRIVERS
to:
#if defined (Z_DUAL_STEPPER_DRIVERS) && defined (Y_DUAL_STEPPER_DRIVERS)
now the error only show if you define both Z_DUAL_STEPPER_DRIVERS and Y_DUAL_STEPPER_DRIVERS
2013-12-11 14:37:43 -06:00
fsantini
5bde7fcb28
Minor code and comment polishing
2013-12-11 21:27:43 +01:00
-
20faff5935
Incorporate PS_DEFAULT_OFF for starting state on LCD menu entry
2013-12-08 21:35:57 +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
-
b7eadb9f37
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-08 21:30:42 +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
fsantini
b64661070e
Fixed the plane vector equation to a simpler one (only dependent on the normal)
...
Removed the calculation of the inverse matrix since the rotation matrix is orthogonal, therefore inverted == transposed.
Much simpler and mathematically robust.
2013-12-06 21:32:21 +01:00
Alex Borro
5c44f6c434
Bed Heater monitoring in Controller Fan
...
In some cases the Bed Heater FET heats up more then stepper drivers, so
this change add the bed monitoring to the controller fan. As soon as the
bed heater is turned on, the controller fan will run as well.
2013-11-27 23:23:06 -02: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
Alex Borro
35905ea4f9
Allow heaters to stay full On when PWM=127
...
In previous version, even with PWM = 127, the system turns the FET off
and then on in the next cycle. This bevavior may increase the FET heat
dissipation.
It was fixed keeping the FET always On when PWM=127.
2013-11-27 18:13:38 -02:00
Erik van der Zalm
a94e588765
Changed slow buttons behavior.
2013-11-17 17:41:30 +01:00
Erik van der Zalm
69af392554
Added HEATERS_PARALLEL (Request from reifsnyderb)
...
This allows a hot end with two heaters and a FET for each heater. This is useful if the FET is not capable of heating two heaters.
2013-11-17 13:29:02 +01:00
Erik van der Zalm
48a185d004
Fixed compile errors from bad commits.
2013-11-10 16:36:37 +01:00
ErikZalm
24d1f480b6
Merge pull request #647 from shaggythesheep/newfeature-M226
...
Implement M226 - GCode Initiated Pause
2013-11-10 07:27:01 -08:00
ErikZalm
95b41413e6
Merge pull request #641 from hugokernel/master
...
M80 - ATX Power On related modification
2013-11-10 07:26:35 -08: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
ErikZalm
2433ee6fc8
Merge pull request #637 from justuswilhelm/Marlin_v1
...
Fix servo control for Melzi v2.0
2013-11-10 07:22:12 -08:00
ErikZalm
3455a2bac2
Merge pull request #636 from PrintToPeer/Marlin_v1
...
Add UUID support to M115 responses.
2013-11-10 07:21:46 -08:00
Richard Miles
dc887ef99b
Implement M226 - GCode Initiated Pause
...
Implemented M226 as described here:
http://reprap.org/wiki/G-code#M226:_Gcode_Initiated_Pause
Waits for pin to be become either HIGH, LOW or the inverse of what it
was before. Allows printing to pause until user interaction
2013-11-09 15:11:58 +00:00
Charles R
c244eb860c
If you have a switch on suicide pin, this is useful if you want to
...
start another print with suicide feature after a print without
suicide...
2013-11-04 12:04:04 +01: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
Daniel Benamy
cab84e0e5b
Add (correct) missing pin definitions for Y2
...
I tested this and it works.
2013-10-30 22:44:20 -04:00
fmalpartida
5b3f60ea2e
Corrected LCD only error
...
If only an LCD is defined and no menu or keyboard defined, there is a
compilation error.
Added conditional compilation.
2013-10-30 21:52:46 +01:00
Justus Perlwitz
62d0b79023
Fix servo control for Melzi
2013-10-30 20:59:58 +01: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
whosawhatsis
c79e3967b3
Make G11 not horribly broken
2013-10-24 18:58:42 -07:00
bkubicek
d69822ed51
Fix '#'
...
since it can occure in comments.
2013-10-22 10:34:51 +02:00
bkubicek
2fb2a0a119
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2013-10-22 10:08:21 +02:00
bkubicek
39d88bcccb
preparation for hibernation
...
If a print is stopped, it would be nice in the future to write a file with the printer state, the filename of the print, and the position within the print.
this file could be read, to continue a previously stopped print.
not finished yet.
2013-10-22 10:04:08 +02:00
bkubicek
ab965376ff
Sub-file calls.
...
by overloading M32 it is now possible to execute gcode files from other gcode files, with a fixed recursion level.
This can be used e.g. for having a real start.g and end.g somewhere on the sd card, which are then called from the normal print file.
Another usecase would be to have macro-files for nozzle-change and layerchange.
I have not tested the speedwise performance. The testing was done with pronterface.
syntax:
normal call from sd card will open the new file and continue executing there.
M32 !/path/filename#
this however will call the new file and return to the caller file.
M32 P !/path/filename#
with the optional "S<position>" the file starting position can be set.
this is for continuing prints from a previous location.
2013-10-22 10:02:18 +02:00
bkubicek
b2cc27e5ea
Added a magic character for sd buffering.
...
if a '#' is read now the buffer will be emptied before reading ahead.
This is so one can execute files from within gcode files, without messing the buffer with preread characters from the caller file.
# can not occure in sd files imho, because it should only occure within checksums in ther serial communication.
Yes, thats a lame argument. If you have a better idea please tell me. It has to be a character that one can type
on a keyboard manually.
2013-10-22 09:54:13 +02: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
Erik van der Zalm
667d278f54
Revert "Fix for Viki display"
...
This reverts commit 314fd13c39
.
2013-10-20 10:16:46 +02:00
Erik van der Zalm
bf27e79e74
Small BlinkM fix
2013-10-20 10:06:02 +02:00
Erik van der Zalm
87e28c0599
Added ifdefs to blinkm
2013-10-20 09:55:15 +02:00
Erik van der Zalm
24c6b2ab35
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2013-10-20 09:51:58 +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
Erik van der Zalm
457d8a0acb
Fixed merge conflicts
2013-10-20 09:50:27 +02: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
dd3086d3f2
Show Temperature ADC values
...
If "SHOW_TEMP_ADC_VALUES" is defined in Configuration_adv.h, the M105
command will present, after tradicional temperatures, the ADC value read
from temp sensors. This is great for adjusting thermistor tables with
thermocouple.
From Pronterface you can see the ADC value and compare with a
thermocouple reading.. then you just need to create your own thermistor
table.
Since this merge doesnt change the original information, it doesnt mess
with PC software parsing (tested under Pronterface and Repetier-Host).
2013-10-12 10:41:23 -03:00
bkubicek
7fad13a1e2
Reverse SD card file name order.
...
This is _not_ automatically the cronological, since deleting a file will free
the filesystem descriptor for it, which then will be used by the next file copied on it.
Since this makes the auto0.g file very inaccessible, I put the option back, to have it in the prepare menu.
this should satisfy https://github.com/ErikZalm/Marlin/pull/373
as a reminder, auto0.g will be executed every time after a boot with sd card present and file present.
thereafter, if there is a file auto1.g this will be done. Thats IMHO the best place to put settings, and prepare heating.
I also execute again after each (now again via the prepare menu) before starting a new print/ after a failed one.
It for me 100% replaces any start.gcode form the slicers.
2013-10-12 13:24:55 +02:00
bkubicek
b832f5b9f6
added delta tower babystepping. Its untested, but hopefully florian horsch will be able to try.
...
also, removed some trouble for compilation with corexy.
I think that babystepping is only possible in z for a delta tower.
not sure if it would be usefull to step individual motors on a delta, i don't own one
2013-10-07 09:14:04 +02:00
bkubicek
c38b0855c8
I think that filament change is ready for the masses. I have tested very often with my ultimaker.
...
I strongly vote for it being a single gcode, because otherwise the triggering from the menu is terrible.
2013-10-06 21:20:26 +02:00
bkubicek
d147a057ac
Add the socalled "Babystepping" feature.
...
It is a realtime control over the head position via the LCD menu system that works _while_ printing.
Using it, one can e.g. tune the z-position in realtime, while printing the first layer.
Also, lost steps can be manually added/removed, but thats not the prime feature.
Stuff is placed into the Tune->Babystep *
It is not possible to have realtime control via gcode sending due to the buffering, so I did not include a gcode yet. However, it could be added, but it movements will not be realtime then.
Historically, a very similar thing was implemented for the "Kaamermaker" project, while Joris was babysitting his offspring, hence the name.
say goodby to fuddling around with the z-axis.
2013-10-06 21:14:51 +02:00
Erik van der Zalm
bca353cc12
Fixed duplicate define in fastio.h
2013-10-03 19:24:53 +02: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
ErikZalm
1bda6bf862
Merge pull request #609 from phq1910/patch-1
...
Update Configuration.h
2013-09-26 11:47:58 -07:00
ErikZalm
c80aac1518
Merge pull request #610 from phq1910/patch-2
...
Update pins.h
2013-09-26 11:47:47 -07:00
Erik van der Zalm
314fd13c39
Fix for Viki display
2013-09-26 20:32:19 +02:00
phq1910
4f7c6dfe35
Update pins.h
...
Include Pins cpu Sethi 3D
2013-09-26 11:40:54 -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
Erik van der Zalm
3ca1ca6869
Fixed missing ENCODER_PULSES_PER_STEP
2013-09-23 23:18:35 +02:00
Tim Koster
97b0da0c2e
Removed #ifndef BLINKM
2013-09-22 10:43:27 +03:00
Tim Koster
61db046b32
Added #ifdef BLINKM around new code. Also refined BlinkM.h.
2013-09-20 10:57:42 +03:00
Richard Miles
77df2ab0e7
Make Y_DUAL_STEPPER_DRIVERS disabled by default
2013-09-17 21:49:44 +01:00
Richard Miles
ed1ab42186
Added Y_DUAL_STEPPER_DRIVERS
...
Enables two stepper drivers to be used for the Y axis (useful for
Shapeoko style machines)
Each Y driver can be stepped in either the same way or in opposite
directions, accounting for different hardware setups (leadscrew vs. belt
driven)
2013-09-17 19:19:20 +01:00
Richard Miles
f4a59e4ce5
Revert "Added Y_DUAL_STEPPER_DRIVERS"
...
This reverts commit 7ee275b620
.
2013-09-17 19:05:49 +01:00
Richard Miles
7ee275b620
Added Y_DUAL_STEPPER_DRIVERS
...
Enables two stepper drivers to be used for the Y axis (useful for
Shapeoko style machines)
Each Y driver can be stepped either the same way or in opposite
directions, accounting for different hardware setups (leadscrew vs. belt
driven)
2013-09-17 19:02:00 +01:00
ErikZalm
6a1e980c6d
Merge pull request #600 from xoan/Encoder_Pulses_Per_Step
...
add ENCODER_PULSES_PER_STEP
2013-09-14 04:56:45 -07:00
ErikZalm
20076a8bd3
Merge pull request #598 from GDV0/Marlin_v1
...
FIx compilation error when enabling SERVO_ENDSTOPS (#591 )
2013-09-14 04:54:19 -07: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
Xoan Sampaiño
bf7007d02f
add ENCODER_PULSES_PER_STEP
2013-09-13 04:12:51 +02:00
GDV0
f17506c504
FIx compilation error when enabling SERVO_ENDSTOPS ( #591 )
2013-09-11 23:09:37 +02:00
Martin Lukasik
acd8619809
Fan fix for Panelolu2+Sanguinololu.
2013-09-10 22:10:58 +01:00
George Roberts
595580556c
Fixed bug that makes ulticontroller knob backwards introduced Feb 28 2013 by Robert.
...
Bug introduced in version 6beb42cdf6
.
Robert did a good job of simplifying but messed up this chunk of code.
Looking at working version: 839bef6d5d
it seems there is no case where encrot3 should be defined as 2
because if ULTICONTROLLER is defined then NEWPANEL is also defined.
2013-09-10 09:56:19 -04: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
Jim Morris
f26f26b7bd
Fix the example delta configuration as someone forgot to do it.
2013-09-05 16:36:55 -07:00
Peter Hercek
9aa2229077
add command M666 for adjusting delta printer endstop position
2013-08-28 01:15:20 +02:00
Robert F-C
9547fb9dfb
Add duplication and auto-park mode for dual x-carriage support.
2013-08-08 00:10:26 +10:00
Steve Kelly
53614e5144
add pins for rambo lcd
2013-08-03 11:45:53 -05:00
Steve Kelly
b42d24e31e
add additional pins to avr2560 for rambo lcd
2013-08-03 11:37:12 -05:00
Nicolas Rossi
b0c8120fcc
Added feedrate setting in exemple config for manual moves from panel
2013-08-03 13:09:53 +02: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
ErikZalm
7ea63d08df
Merge pull request #565 from iXce/avrdudeconfpath
...
Detect OS in Makefile to use the correct avrdude.conf path
2013-08-02 13:16:07 -07:00
ErikZalm
4187b637a5
Merge pull request #570 from hg42/separate-INVERTING-macros-for-MIN-and-MAX-endstops
...
separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)
2013-08-02 13:15:30 -07:00
ErikZalm
07e7de3600
Merge pull request #569 from hg42/convert-PROTOCOL-macros-from-statements-to-expressions
...
convert PROTOCOL macros from statements to (multiple, comma separated) expressions
2013-08-02 13:13:29 -07:00
Guillaume Seguin
c0c4c97db6
Detect OS in Makefile to use the correct avrdude.conf path
2013-08-01 19:20:27 +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
hg42@gmx.net
3700f688f5
convert PROTOCOL macros from statements to (multiple, comma separated) expressions
2013-08-01 14:56:39 +02:00
daid
a504c88346
Fix a bug where the PID controllers D action kicks in hard as soon as the PID controller starts.
2013-08-01 14:12:30 +02:00
Nicolas Rossi
394ed08f88
Added feedrate setting for manual moves from panel
2013-07-30 14:33:30 +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
Brendan-csel
d7f384f680
Skip SD menu refresh if nothing has changed
2013-07-30 14:02:15 +02:00
Brendan-csel
abc8320a68
Save LCD_CLICKED before it is cleared
...
The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.
2013-07-30 14:02:13 +02:00
Guillaume Seguin
f4c3135c6d
Add Panelolu2 pins for RAMPS1.3
2013-07-30 14:02:11 +02:00
Guillaume Seguin
aae42c68f9
Update French translation in language.h
2013-07-30 14:02:08 +02:00
Guillaume Seguin
4d435c38a6
Add support of LiquidTWI2-based panels to Makefile
...
Use LIQUID_TWI2=1 as make argument to enable this support
2013-07-30 14:02:06 +02:00
Guillaume Seguin
6c42a3a339
Woops, fix logic
2013-07-30 14:02:04 +02:00
Guillaume Seguin
376d8af2c8
Report temperatures for all extruders
2013-07-30 14:02:01 +02:00
ErikZalm
434b6a05c1
Merge pull request #552 from iXce/Marlin_v1
...
Report temperatures for all extruders in reply to M105
2013-07-29 10:39:21 -07:00
ErikZalm
bdc2621119
Merge pull request #561 from Brendan-csel/Marlin_v1
...
Fix for Viki LCD issues printing from SD card
2013-07-29 10:38:17 -07:00
ErikZalm
6965bd4e15
Merge pull request #560 from njprossi/Marlin_v1
...
Fixed move from panel for delta bot #557
2013-07-29 10:37:40 -07:00
ErikZalm
a55b33e613
Merge pull request #559 from iXce/panelolupinsramps13
...
Add Panelolu2 pins for RAMPS1.3
2013-07-29 10:37:03 -07:00
ErikZalm
8b34351537
Merge pull request #558 from iXce/frenchupdate
...
Update French translation in language.h
2013-07-29 10:36:43 -07:00
ErikZalm
735e556724
Merge pull request #555 from iXce/liquidtwi2_makefile
...
Add support of LiquidTWI2-based panels to Makefile
2013-07-29 10:33:54 -07:00
Brendan-csel
d80aecda0a
Skip SD menu refresh if nothing has changed
2013-07-29 21:00:29 +12:00
Brendan-csel
be2dea1dc6
Save LCD_CLICKED before it is cleared
...
The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.
2013-07-29 20:58:09 +12:00
Nicolas Rossi
55c287a69e
Fixed move from panel for delta bot #557
2013-07-28 22:54:37 +02:00
Guillaume Seguin
1902d339b0
Add Panelolu2 pins for RAMPS1.3
2013-07-28 19:19:57 +02:00
Guillaume Seguin
eb23a68e92
Update French translation in language.h
2013-07-28 18:50:47 +02:00
ErikZalm
1561c6df51
Merge pull request #547 from wolfmanjm/delta-configuration
...
Setup Default configuration for Deltas if DELTA is defined
2013-07-24 03:11:36 -07:00
Guillaume Seguin
374bc99fa3
Add support of LiquidTWI2-based panels to Makefile
...
Use LIQUID_TWI2=1 as make argument to enable this support
2013-07-24 12:09:53 +02:00
Jim Morris
ab624eac2a
revert COnfiguratiuon to the same as head
2013-07-24 02:57:46 -07:00
Jim Morris
52f79ffeca
add an example default configuration for delta style bots
2013-07-24 02:55:52 -07:00
Jim Morris
b9d7ccf1cd
Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration
...
Conflicts:
Marlin/Marlin_main.cpp
2013-07-24 02:49:25 -07:00
Guillaume Seguin
d4d1540727
Use -fno-use-cxa-atexit to override gcc --enable-cxa_atexit
2013-07-24 11:19:38 +02:00
Guillaume Seguin
01ed99143c
Woops, fix logic
2013-07-23 23:34:42 +02:00
Guillaume Seguin
76841450c8
Only display poweron/poweroff if PS_ON_PIN > -1
2013-07-23 22:28:30 +02:00
Guillaume Seguin
44f327d738
Uniformly reindent language.h
2013-07-23 22:13:40 +02:00
Guillaume Seguin
326d2db025
Update language.h so that all languages compile
...
Some strings still need translation, but at least everything compiles.
2013-07-23 22:11:54 +02:00
Guillaume Seguin
2cb716f513
Run Marlin/language.h through dos2unix
2013-07-23 21:49:37 +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
Guillaume Seguin
18199ff960
Merge github.com:ErikZalm/Marlin into Marlin_v1
2013-07-23 21:33:52 +02:00
Robert F-C
fb5334f428
Fixed compile error when QUICK_HOME is defined.
...
As well a couple of minor changes to handling of extruder offset for
dual x-carriage mode.
2013-07-22 22:46:14 +10:00
Robert F-C
c3568398b5
Disable DUAL_X_CARRIAGE by default
2013-07-20 23:50:30 +10:00
Robert F-C
39cd3dbdbe
Remove dual x-carriage functionality that could/should be implemented in slicer
...
Also added a couple of missed merge lines in homeaxis() from previous
commit.
2013-07-20 13:07:50 +10:00
Jim Morris
fb20ceabce
enable soft endstops for delta
...
disable delta by default
2013-07-17 16:21:51 -07:00
Jim Morris
d01ee7e7b5
fix zjerk being the same for delta as xy jerk
...
add more delta defaults
on delta make second home even slower
2013-07-17 16:14:07 -07:00
Robert F-C
d7390e13d9
Support dual x-carriage printers
...
Dual x-carriage designs offer some substantial improvements for dual
extruder printing.
2013-07-17 22:44:45 +10:00
Jim Morris
f3aa2a48e7
update max pos
2013-07-17 01:29:51 -07:00
Jim Morris
460751503e
Added default configurations for deltas when DELTA is defined
2013-07-17 01:17:27 -07:00
Maik Stohn
9da94c247a
fixed bad lcd commit from makr3d
...
#elsif does not exist #elif is correct
2013-07-15 17:34:21 +02:00
Erik van der Zalm
59004023fd
Fixed typo
2013-07-15 17:22:56 +02:00
Erik van der Zalm
461dad6e05
Added : M32 - Select file and start SD print (Can be used when printing from SD card)
...
Untested
2013-07-14 22:39:59 +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
ErikZalm
8a2a3ef91d
Merge pull request #531 from iXce/Marlin_v1_lcd
...
Only clamp panel movements if software endstops are enabled
2013-07-14 06:50:23 -07:00
Erik van der Zalm
6397b3339c
restored configuration.h defaults
2013-07-14 15:49:03 +02:00
Erik van der Zalm
cdaaad3df1
Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1
2013-07-14 15:45:49 +02:00
Erik van der Zalm
e3bdefd873
fixed missing #endif
2013-07-14 15:42:53 +02:00
Erik van der Zalm
a5be0c52c6
no message
2013-07-14 15:35:54 +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
Gabino Lopez
68be33b1fc
Update language.h
...
I update the spanish Messages, now this compile for spanish language.
2013-07-04 10:23:00 +02:00
daid
acb3271c9a
Merge pull request #534 from xifle/Marlin_v1
...
Fixes compiler warning for feedrate deadzone
2013-07-01 23:41:51 -07:00
xifle
61fe430d4f
Should fix compiler warning for feedrate deadzone
2013-07-01 11:10:02 +02:00
Gord Christmas
fde17d5720
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
2013-06-28 08:02:04 -07:00
Guillaume Seguin
aa65c20d1f
Only clamp panel movements if software endstops are enabled
2013-06-28 14:18:00 +02: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
ErikZalm
171719f18c
Merge pull request #525 from lajos/ultralcd_pid
...
ultralcd.cpp compile errors when !defined(PIDTEMP)
2013-06-16 00:02:54 -07:00
lajos
b519af4f05
fixed another !defined(PIDTEMP) compile in ultralcd.cpp
2013-06-15 20:49:18 -04:00
lajos
7d03c52511
fixed compile error in ultralcd.cpp when PIDTEMP undefined
2013-06-15 18:09:52 -04:00
lajos
02dee80fa5
added Azteeg X1 motherboard
2013-06-15 16:58:17 -04:00
Henrik Brix Andersen
47dc70e3ec
Fix location of avrdude.conf
2013-06-15 09:50:25 +02:00
Henrik Brix Andersen
1d258903bb
Allow command line compilation when using BEEPER.
2013-06-15 09:36:55 +02:00
Erik van der Zalm
e34c9981ab
Delta disabled by default
2013-06-11 22:33:58 +02:00
Erik van der Zalm
26a441fc7d
More 3Drag controller patches.
2013-06-10 18:26:15 +02:00
Erik van der Zalm
ac975ed8c2
Merge branch 'deltabot' into Marlin_v1
2013-06-10 18:20:29 +02:00
Jim Morris
caa848f943
fix homing for deltas
2013-06-09 21:10:00 -07: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
Erik van der Zalm
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
2013-06-09 22:26:47 +02:00
Erik van der Zalm
73f21cd5d6
Spanish updated so far.
2013-06-09 21:40:35 +02:00
Erik van der Zalm
6f4a6e531c
Merge branch 'deltabot' into Marlin_v1
2013-06-09 13:55:18 +02:00
Erik van der Zalm
01edf22a10
Fix home_all_axis to make QUICK_HOME work with Repetier-Host which sends G28 X0 Y0 Z0 instead of G28. Thanks to Matt Schoenholz for reporting this issue.
2013-06-09 13:54:19 +02:00
Erik van der Zalm
ff6fa09ecf
Moved corexy implementation from stepper to planner
...
(Thanks iquizzle)
2013-06-09 13:10:06 +02:00
Erik van der Zalm
c8dcc7c208
Allow increasing the software PWM frequency.
2013-06-09 12:52:49 +02:00
Erik van der Zalm
8b0d82e9db
Removed "awaiting translation" for french
2013-06-09 12:24:06 +02:00
Erik van der Zalm
1e05d192ab
Make the beep tone less offensive
2013-06-09 12:21:16 +02:00
Erik van der Zalm
373f3ecab3
Merge branch 'deltabot' of https://github.com/jcrocholl/Marlin into deltabot
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
Marlin/pins.h
2013-06-09 00:51:58 +02:00
kiyoshigawa
f295712008
Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h
2013-06-08 09:27:56 -06:00
kiyoshigawa
69b02031ca
Fixed small error in lcd define statements.
2013-06-08 09:09:11 -06:00
kiyoshigawa
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
2013-06-08 08:48:18 -06:00
BorisLandoni
c1cb5977ee
Update Configuration.h
2013-06-08 14:37:39 +02:00
BorisLandoni
8a5bd8a808
Update Configuration.h
2013-06-08 14:37:17 +02:00
BorisLandoni
c1d7cf939e
Update language.h
2013-06-07 17:38:17 +02:00
BorisLandoni
4c7d1436e9
Update pins.h
2013-06-07 18:37:44 +03:00
BorisLandoni
6588933c04
Update Configuration.h
2013-06-07 18:36:16 +03:00
Scott Lahteine
5dabc95409
Apply all changes from latest Marlin_V1
...
Diffed and merged, preserving my updates
2013-06-06 15:49:25 -07:00
Gord Christmas
a733537ddd
Missed some variable declarations
...
Integrated fixes from henrikbrixandersen pull request #504
2013-06-06 09:18:03 -07:00
Gord Christmas
f4f30c9d64
Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles.
2013-06-06 07:36:52 -07:00
Erik van der Zalm
79374f0b93
Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1
2013-06-05 17:44:48 +02:00
Maik Stohn
da05b3ba94
faster GLCD (ST7920 SW-SPI) implementation / fixes
...
- fixed long menu entries (>14 or >18 chars) caused overrun in dogm lcd
implementation
- fixed pin set problem when in interrupt
- much faster ST7920 SW-SPI implementation
- increased ST7920 framebuffer size for more speed
2013-06-05 16:27:44 +02:00
kiyoshigawa
4b19c8552e
Fixing changed Configuration.h settings to be default values per ErikZalm Request.
2013-06-04 12:01:55 -06:00
Erik van der Zalm
971ec35135
Expanded M302 to allow setting the temp
2013-06-02 17:36:23 +02:00
Erik van der Zalm
5090c56651
More redundant temp sensor changes. (After testing and debugging by reifsnderb)
2013-05-29 19:29:30 +02:00
Guillaume Seguin
16b9239a26
Report temperatures for all extruders
2013-05-29 18:06:12 +02:00
ErikZalm
a964b3cf3d
Merge pull request #495 from Gatulibu/Marlin_v1
...
Added support for Megatronics v2.0 and Minitronics v1.0
2013-05-28 07:51:49 -07:00
Maik Stohn
e8572c5239
Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation
2013-05-28 15:53:07 +02:00
Maik Stohn
7ee70c2248
Fix: removed wrong ; at end of define
2013-05-28 15:50:48 +02:00
Gatulibu
b78fa6bb70
Added support for Megatronics v2.0 and Minitronics v1.0
...
merged from code downloaded from reprapworld.com
2013-05-28 14:03:31 +02:00
Erik van der Zalm
9be61cdc02
Added redundant temp sensor
2013-05-26 17:57:49 +02:00
Erik van der Zalm
7231a20dba
Put #ifdef around servo pins in pins.h. This allows the pins to be used for M42.
2013-05-24 21:05:11 +02:00
Alexander Kasimir
e2ff536b03
Fixed typo in Comment
2013-05-22 16:02:03 +03:00
Robert F-C
40eb07bad4
Revert and extend previous change pin check change
...
Reviert previous change of #if BLAH_PIN > 0 to #if defined(BLAH_PIN) &&
BLAH_PIN > -1. Unfortunately some times pin 0 is used. For my sins I've
gone through and replaced all unsafe checks of #if BLAH_PIN > -1 with
the safe version.
2013-05-22 21:33:23 +10:00
Maik Stohn
bd33cf4a9f
fixed typo / added "const" to defines for newer gcc compatibility
2013-05-21 17:58:34 +02:00
ErikZalm
567291e734
Merge pull request #485 from Banjer/Panelolu2_Melzi
...
Add Panelolu2 support for Melzi
2013-05-21 08:46:27 -07:00
Maik Stohn
8d80cbbf4c
fix broken LCD commit #dfa549f268 from buildrob - GLCD/DOGM implementation was ignored
2013-05-21 16:53:38 +02:00
xifle
98d0d48191
fixed merge
2013-05-20 14:52:35 +02:00
xifle
bbe67fca5a
soft tab correction
2013-05-20 14:50:39 +02:00
xifle
9eeb711c96
Merged from Upstream Master
2013-05-20 14:45:37 +02:00
Bas Spaans
424101110c
Add Panelolu2 support for Melzi
2013-05-19 12:09:34 +02:00
Robert F-C
0d4a9444c4
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
2013-05-19 08:50:58 +10:00
Erik van der Zalm
86cce025f4
Added #ifdef NUM_SERVOS to servo.cpp
2013-05-18 23:12:28 +02:00
xifle
03141a5ef4
LCD: Added Deadzone at 100% Feedrate
...
This adds a deadzone at 100% Feedrate when changing it at the status
screen/main menu. Prevents from unwanted feedrate-changing when
navigating back to the main menu and makes it easier to return to 100%.
2013-05-18 19:53:46 +02:00
Gord Christmas
28ada096e2
Adding servo documentation
2013-05-18 06:01:58 -07:00
Robert F-C
4121311b9d
Change to LCD status indicators
...
The I2C LCD status indicators now indicate when the hotends or bed are
turned on at all (rather than just when they are in their heating phase)
2013-05-18 22:30:42 +10:00
Robert F-C
dfa549f268
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
2013-05-18 21:59:39 +10:00
ErikZalm
64360164ad
Merge pull request #482 from codexmas/Marlin_v1
...
servosupport
2013-05-16 10:19:00 -07:00
ErikZalm
86405cdd11
Merge pull request #479 from MStohn/thermocouple
...
BUGFIXES for temperature.cpp / add RUMBA thermocouple support
2013-05-16 10:06:59 -07:00
Erik van der Zalm
6c45c3f4e7
BariCUDA changes
2013-05-16 19:01:12 +02:00
Gord Christmas
96624f0f31
Forgot to include reference to Servo in makefile
2013-05-16 08:25:20 -07:00
Gord Christmas
dc59f07d24
First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple.
2013-05-16 07:03:01 -07:00
Gord Christmas
b668cb0516
Adding in clean copies of Servo library from Arduino 1.0.4
2013-05-16 06:47:42 -07:00
MaikStohn
95dff34b73
fixed wrong compare for min temp check of heater 1 and heater 2
2013-05-16 01:17:38 +02:00
MaikStohn
4cc6f9f6de
fixed wrong pin initialization when using temperature 2 pin input
2013-05-16 01:17:08 +02:00
MaikStohn
61a48cc662
Add support for RUMBA thermocouple add on
2013-05-16 01:16:33 +02:00
MaikStohn
9cc15876be
Add support for RUMBA thermocouple add on
2013-05-16 01:16:08 +02:00
ErikZalm
c9cf2174dd
Merge pull request #474 from xifle/Marlin_v1
...
Fixed "Cooldown" Selection not reseting bed temp
2013-05-14 14:58:53 -07:00
Erik van der Zalm
bd2cd4903e
Added #ifdef BARICUDA around the BariCUDA changes
2013-05-14 23:56:32 +02:00
Jordan Miller
37f3199df3
fixed problems in planner with solenoids for BariCUDA when set to 0
2013-05-14 23:35:01 +02:00
Jordan Miller
fbd899a37d
Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129.
2013-05-14 23:34:45 +02:00
xifle
29bb8d7d4f
Fixed "Cooldown" Selection not reseting bed temp
...
- enquecommand with multiple lines "\n" doesn't work -> M140 S0 didn't
get processed. So I wrote a new func for the cooldown which uses
setTargetHotend. In addition this does return to status page after
selection.
- Added setWatch() to preheat-functions (Temperatur sanity check
would never have worked when preheating from the lcd panel)
2013-05-14 16:56:19 +02:00
Robert F-C
015d0594b0
Optimize menu selection for Viki rotary encoder.
...
The Viki LCD rotary encoder uses a different number of steps per
rotation. This fixes the seeming "missed" steps when selecting a menu.
2013-05-12 07:51:28 +10:00
gregor
2739c26c4f
changes:
...
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
2013-05-10 22:20:02 +02:00
gregor
6fb9573157
added support for the reprapworld keypad
2013-05-10 21:57:17 +02:00
Tim Anderson
594193c908
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
2013-05-06 23:29:38 -06:00
Tim Anderson
1fa61c297e
Turning off Control Panel by Default and Updating the link to the LiquidCrystal_I2C library to avoid confusion.
2013-05-06 23:23:54 -06:00
kiyoshigawa
b27a59f41e
Added support for Elefu RA Board and Elefu Control Panel
2013-05-06 08:44:38 -06:00
midopple
a65a26d6b4
If CORE_XY is in use X and Y Axis had to be activated at the same time
2013-05-05 19:23:59 +02:00
midopple
db2f157a22
Replace the <= to < in the Command M907, M350 and M351.
...
The for loop for Axis count over the Array.
Add a break after M907
2013-05-05 19:19:55 +02:00
Scott Lahteine
a5cd582665
Support for 10 level deep SD folder hierarchy
2013-05-04 04:18:02 -07:00
Arnoud
fc4ab05157
Solved minor bug in controllerFan()
...
Extruder 2 was checked where extruder 1 should be checked.
2013-05-03 21:32:34 +02:00
Scott Lahteine
0ef54f2f85
Make M303 silent when "S0" is sent
...
If S is left out perhaps it should be silent, but check the spec for
this M code.
2013-05-02 09:55:15 -07:00
Scott Lahteine
a200521eab
Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h
...
Also cosmetic comment changes and spelling corrections in printed
messages
2013-05-02 09:22:58 -07:00
Martin Renold
1a397825f9
fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error
2013-05-01 08:30:24 +02:00
Robert F-C
289c02eda4
Remove unnecessary pin initialization in stepper.cpp
...
(duplicates initialization in Marlin_main.cpp)
2013-04-30 01:11:23 +10:00
Robert F-C
d5ad7a0814
Rework change to incorporate CONTROLLERFAN
...
Also refactor extruder auto fan logic to simplify further and now only
check every 2.5 seconds
2013-04-30 01:08:29 +10:00
Robert F-C
c3cdaceab3
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
2013-04-29 22:13:55 +10:00
Robert F-C
1c127217df
Make DOGLCD merge neater.
2013-04-29 22:03:37 +10:00
Robert F-C
7f57f28ccc
Add lcd_buzz function to ultralcd.h so that non-LCD code can make use of lcd's buzzer.
...
Argument order of lcd_buzz was set to mirror that on tone(). Change
default M300 frequency to something audible.
2013-04-29 21:50:52 +10:00
Robert F-C
788d62bcc4
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Marlin.pde
Marlin/ultralcd.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h
2013-04-29 21:13:46 +10:00
Lukasz Stefanowicz
d71f1e9bf6
Add (as an option) slower SD transfer mode
2013-04-24 10:50:57 +02:00
ErikZalm
db5bb8546d
Merge pull request #452 from MStohn/Marlin_v1
...
128x64 RepRapDiscount Full Graphic Smart Controller support
2013-04-23 09:43:37 -07:00
daid
4b2ece159b
Merge pull request #453 from brackendawson/Marlin_v1
...
Make Gen7 1.4+ heater temp sensort pins match silkscreen.
2013-04-16 10:12:25 -07:00
Bracken Dawson
d5ee2a5a62
Make Gen7 1.4 heater pins match silkscreen
2013-04-16 17:37:38 +01:00
MaikStohn
7ac6d7f78e
FIX: Speedup - no explicit display clear needed in u8glib
2013-04-16 14:22:24 +02:00
MaikStohn
13596e8722
Added RepRapDiscount FULL GRAPHIC Smart Controller
2013-04-16 14:21:39 +02:00
MaikStohn
3a6abe1d6e
Removed STB custom font hack from u8glib library and moved to marlin project
2013-04-16 13:54:39 +02:00
MaikStohn
16afbf9bfa
FIX: adopted latest changes from hitachi implementation
2013-04-16 13:51:48 +02:00
daid303
34bca48b98
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
2013-04-15 15:11:38 +02:00
daid303
ac52dcc174
Updated the card menu and watch messages to make it more informative.
2013-04-15 15:11:22 +02:00
Stefanowicz
31bb3fb297
Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined
2013-04-12 18:04:32 +02:00
daid303
c80a78bb70
Lower the default max E feedrate a bit. With the stepper fix this is much to high.
2013-04-12 13:54:38 +02:00
Simon Oliver
5d5909fc25
Fix failure to compile with heated bed: remove call to non-existant scaleBedPID().
2013-04-12 13:32:47 +02:00
Simon Oliver
93f0463b21
Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values
...
Add new 'callback' edit-menu types that call a function after the edit is done. Use this to display and edit Ki and Kd correctly (removing the scaling first and reapplying it after). Also use it to reset maximum stepwise acceleration rates, after updating mm/s^2 rates via menus. (Previously, changes did nothing to affect planner unless saved back to EEPROM, and the machine reset).
Add calls to updatePID() so that PID loop uses updated values whether set by gcode (it already did this), or by restoring defaults, or loading from EEPROM (it didn't do those last two). Similarly, update the maximum step/s^2 accel rates when the mm/s^2 values are changed - whether by menu edits, restore defaults, or EEPROM read.
Refactor the acceleration rate update logic, and the PID scaling logic, into new functions that can be called from wherever, including the callbacks.
Add menu items to allow the z jerk and e jerk to be viewed/edited in the Control->Motion menu, as per xy jerk.
Conflicts:
Marlin/language.h
2013-04-12 13:31:30 +02:00
Bart K
4fa2260a59
Fixed cardreader.h to resolve issue #440 (Pull Request #425 missing file)
2013-03-31 19:59:16 -04:00
Erik van der Zalm
038d405254
Corrected #endif in language.h
2013-03-31 20:28:29 +02:00
Dirk Eichel
443aaa30bf
Removed GIT fragments
...
Seems that there was something wrong while merging
2013-03-30 23:26:42 +01:00
ErikZalm
7f622467fc
Merge pull request #425 from kefir-/m928_logging
...
M928 logging
2013-03-30 08:50:34 -07:00
ErikZalm
86867928ac
Merge pull request #434 from DDRBoxman/Marlin_v1
...
Add support for M300: Play beep sound
2013-03-30 08:49:54 -07:00
ErikZalm
9a38cad6f0
Merge pull request #430 from STB3/GLCD_128x64_dots
...
Final task of the 128x64dots GLCD implementation
2013-03-30 08:49:14 -07:00
ErikZalm
7a5c474d91
Update Configuration.h
2013-03-28 21:27:50 +01:00
Dirk Eichel
4e448b700a
Merged fetched files from Marlin_v1 branch
...
Pull requests: #414 #433 #432 #428
2013-03-26 21:43:04 +01:00
ErikZalm
9f2862ce48
Merge pull request #414 from whosawhatsis/Marlin_v1
...
regenerated thermistor table 7
2013-03-25 13:14:49 -07:00
ErikZalm
9fb8bd5685
Merge pull request #433 from whosawhatsis/bang-mode
...
Separate PID_MAX from BANG_MAX
2013-03-25 13:11:34 -07:00
Colin Edwards
0d075378d5
Add LARGE_FLASH define and enable it for some of the beefier boards
...
The LARGE_FLASH flag allows superfluous features to be excluded
on boards with less memory
2013-03-25 10:42:27 -05:00
Colin Edwards
9a1c90471f
Ignore unused beeper pins
2013-03-25 10:28:15 -05:00
Colin Edwards
1a0f889803
Add support for M300: Play beep sound
2013-03-24 23:35:05 -05:00
Robert F-C
9322c408c6
Updated for LiquidTWI2 library version 1.2.3
...
The new version of the library means that PANELOLU no longer needs to be
defined in LiquidTWI.h (the library file can be used as is) and the new
version of the library also enables the buzzer on the Panucatt VIKI
panel.
2013-03-24 18:19:58 +11:00
whosawhatsis
fd5b7e0cec
Separate PID_MAX from BANG_MAX
...
This allows PID_FUNCTIONAL_RANGE to use a maximum duty cycle higher
than PID_MAX. This is useful for powerful heaters to heat quickly in
bang-bang mode, but use a lower duty cycle that is easier to stabilize
in PID mode.
2013-03-22 18:16:26 -07:00
blddk
e5a853a3d0
Added automated extruder fan function
2013-03-22 18:49:05 +01:00
blddk
72419f69a9
Added rumba
2013-03-22 18:41:54 +01:00
blddk
91bea43332
Added rumba pinout
2013-03-22 18:29:47 +01:00
blddk
d2b00fe486
Removed html and added rumba
...
Found some unwanted html at the bottom of the file which caused it to not be able to compile.
Also added rumba as machine.
2013-03-22 18:28:16 +01:00
Dirk Eichel
6c66cae694
GLCD init screen cosmetics
2013-03-19 21:25:11 +01:00
Dirk Eichel
f3e0e5184d
Add include selector between char. LCD and GLCD
2013-03-19 20:59:21 +01:00
Dirk Eichel
5d3862f9d1
Modified u8glib logo on welcome screen
2013-03-19 20:32:23 +01:00
Dirk Eichel
0b320f75e9
Removed debug code, add some comments
2013-03-19 20:29:25 +01:00
Dirk Eichel
5f1cd70122
Add code to lcd_update() for GLCD
...
This code selects between the routines for the GLCD or the char.
display.
2013-03-19 20:19:16 +01:00
Dirk Eichel
a49c09a776
Add variable for animated fan, add float conversion w/o sign
...
A new variable was introduced to allow fan animation on the GLCD.
Add additional float to string conversion routine without sign
character. This is used for the coordinates visualisation on the GLCD.
2013-03-19 20:13:23 +01:00
Dirk Eichel
26d8863111
Add library selection between GLCD and char. LCD
2013-03-19 20:03:47 +01:00
Dirk Eichel
4a141a694f
Marlin code for GLCD display
...
This contains the menues, status screen etc...
2013-03-19 19:59:56 +01:00
Dirk Eichel
83c790a020
Add bitmap graphics for GLCD
...
1. Marlin welcome screen
2. Status screen symbols 3 Extruders, heated bed, animated fan logo 1
3. Status screen symbols 3 Extruders, heated bed, animated fan logo 2
2013-03-19 19:57:35 +01:00
Dirk Eichel
233df9cca0
Add missing LF at the end of the file
2013-03-19 19:12:33 +01:00
Dirk Eichel
bb0de75a92
Removed umwanted HTML code ath the end of the file
...
Sorry for that. This does not lead to compile errors. I removed the
unwanted code to make it clean.
2013-03-19 06:46:05 +01:00
Ryan Turner
7c47e7162d
Adding Maker's Tool Works heated bed thermistor
2013-03-18 22:53:37 -05:00
daid
af78d0cbfa
Merge pull request #1 from illuminarti/Fix_E_Speed
...
Fix step rate bug (especially for retraction)
2013-03-18 23:36:11 +01:00
Dirk Eichel
9a78f321a4
Add pins for Motherboard variant 64
...
These definition contain also the definition for the graphics LCD.
2013-03-18 23:36:11 +01:00
Dirk Eichel
5de25ccd20
Add Motherboard variant 64 - STB V1.1
...
Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
2013-03-18 23:36:10 +01:00
daid
d6ce63c49c
Merge pull request #411 from STB3/Marlin_w_STB_Board_support
...
Add STB board support to Marlin (next step towards graphic LCD implementation)
2013-03-18 07:57:39 -07:00
Ketil Froyn
f036be7c4e
Clean up tab/whitespace from last commit
2013-03-16 23:11:58 +01:00
Ketil Froyn
07e11c7cf5
Add command M928 to enable logging to file of received gcode commands
2013-03-16 23:02:57 +01:00
daid
92782f9252
Merge pull request #1 from illuminarti/Fix_E_Speed
...
Fix step rate bug (especially for retraction)
2013-03-15 09:07:34 +01:00
whosawhatsis
6a61a3c0b4
missing comma in last commit
2013-03-08 16:15:49 -08:00
whosawhatsis
f0aee4101a
regenerated thermistor table 7
...
Generated with createTemperatureLookup.py. The old table crapped out at
270C, which was a problem for polycarbonate.
2013-03-08 13:41:49 -08:00
Nicolas Rossi
aba67e2449
No bed config for RAMPS
...
The motherboard 35 is a config without bed with this pins setting :
D8 Extruder
D9 Fan
D10 Controller Fan
2013-03-05 15:51:24 +01:00
Nicolas Rossi
6504e96165
Turn off power supply off-load
...
Disable the high current output and wait a little before to turn off,
because the interrupting capacity of the PSU is unknown.
Could be a function if needed by other.
2013-03-05 15:03:48 +01:00
Nicolas Rossi
86bf911139
Toggle menu for PSU from LCD pannel
...
From the prepare menu, accessible when is not printing, you have the
possibility to turn off the PSU when is on et vice versa.
From the host, you can turn off or turn on the PSU then the menu is
updated accordingly.
From the LCD message, the printer status is reported ready or off
respectively when the PSU is on or off.
2013-03-05 14:52:51 +01:00
Robert F-C
7bad72359c
Support encoder click on PANELOLU2 being read through I2C
...
This change also handles the case where the pause/stop/restart button on
the VIKI is not used. Make LCD I2C buzz sound the same as the normal
buzz (300ms is too long for quick feedback).
2013-03-03 18:47:50 +11:00
Robert F-C
1daf2f3256
Number of extruders is not an advanced configuration - it is a basic property.
2013-03-02 16:14:19 +11:00
Robert F-C
f1263d3f88
Further reduce code by using precompiler logic
2013-03-02 16:12:11 +11:00
Dirk Eichel
140e095c6e
Add pins for Motherboard variant 64
...
These definition contain also the definition for the graphics LCD.
2013-03-01 17:47:32 +01:00
Dirk Eichel
b2c1c64fb1
Add Motherboard variant 64 - STB V1.1
...
Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
2013-03-01 17:39:54 +01:00
Dirk Eichel
ceb5ee38af
Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin
2013-03-01 17:27:57 +01:00
Dirk Eichel
8efd4cfd73
fixed merge conflict
2013-03-01 16:27:35 +01:00
Robert F-C
372e12f83f
Implement automatic extruder/cold-end fan control based on temperature
...
This change allows fan outputs to automatically turn on/off when the
associated nozzle temperature of an extruder is above/below a threshold
temperature.
Multiple extruders can be assigned to the same pin in which case the fan
will turn on when any selected extruder is above the threshold.
It also makes the M42 command compatible with the M106/M107 command.
The majority of the logic in this change will be evaluated by the
compiler at build time (i.e, low code space requirements).
2013-03-01 21:57:23 +11:00
Robert F-C
6beb42cdf6
Attempt to address Bernhard's comments
...
Refactor configuration to try to make items clearer (what defines a
panel vs what is user changeable).
2013-03-01 01:17:07 +11:00
Robert F-C
839bef6d5d
Fix Configuration.h file to not define LCDs be default.
...
Also fix compile time check in Marlin.pde
2013-02-28 02:32:20 +11:00
Robert F-C
1292d735ba
Converge all I2C LCD branches (PANELOLU2, VIKI & PCF8575)
...
This includes refactoring the buttons code to remove a large amount of
non-pin dependent duplication from pins.h.
2013-02-28 02:04:51 +11:00
daid303
4eb81a69e6
Only compile the new extruder offset code if you have multiple extruders.
2013-02-27 12:32:07 +01:00
daid
3e9cd334a4
Merge pull request #383 from dob71/jeff
...
Hotend offset handling for multi-extruder machines
2013-02-27 03:10:18 -08:00
MendelMax
67710df9f3
Made i2c mode wok with the hardware I am able to test (ywrobot / sainsmart i2c LCD 2004)
...
Removed incorrect LiquidCrystal_I2C Library
2013-02-26 22:22:12 +00:00
Bob Clough
b6209c86dd
Added import of Wire Library to make I2C LCD support compilable
2013-02-25 15:15:23 +00:00
Bob Clough
2b567d1df5
Added I2C port expander support to HD44780
2013-02-25 14:22:14 +00:00
Bob Clough
06272f463d
Added Config variables for activating I2C LCDs and setting type and address
2013-02-25 14:14:46 +00:00
daid303
de3dec7215
Also show the tune menu when USB printing.
2013-02-20 00:54:44 +01:00
Denis Bakin
73d41c10b9
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into jeff
...
Conflicts:
Marlin/language.h
Marlin/thermistortables.h
2013-02-18 12:10:52 -05:00