b9d7ccf1cd
Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration
...
Conflicts:
Marlin/Marlin_main.cpp
12 years ago
01ed99143c
Woops, fix logic
12 years ago
34da3a0a3f
Merge github.com:ErikZalm/Marlin into Marlin_v1
...
Conflicts:
Marlin/language.h
12 years ago
18199ff960
Merge github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
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.
12 years ago
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.
12 years ago
d01ee7e7b5
fix zjerk being the same for delta as xy jerk
...
add more delta defaults
on delta make second home even slower
12 years ago
d7390e13d9
Support dual x-carriage printers
...
Dual x-carriage designs offer some substantial improvements for dual
extruder printing.
12 years ago
59004023fd
Fixed typo
12 years ago
461dad6e05
Added : M32 - Select file and start SD print (Can be used when printing from SD card)
...
Untested
12 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
e509cdbeb0
added contrast control function for gLCDs
12 years ago
fde17d5720
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
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
ac975ed8c2
Merge branch 'deltabot' into Marlin_v1
12 years ago
caa848f943
fix homing for deltas
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
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.
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
5dabc95409
Apply all changes from latest Marlin_V1
...
Diffed and merged, preserving my updates
12 years ago
a733537ddd
Missed some variable declarations
...
Integrated fixes from henrikbrixandersen pull request #504
12 years ago
f4f30c9d64
Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles.
12 years ago
79374f0b93
Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1
12 years ago
971ec35135
Expanded M302 to allow setting the temp
12 years ago
5090c56651
More redundant temp sensor changes. (After testing and debugging by reifsnderb)
12 years ago
16b9239a26
Report temperatures for all extruders
12 years ago
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.
12 years ago
0d4a9444c4
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
dfa549f268
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
dc59f07d24
First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple.
12 years ago
bd2cd4903e
Added #ifdef BARICUDA around the BariCUDA changes
12 years ago
fbd899a37d
Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129.
12 years ago
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
12 years ago
fc4ab05157
Solved minor bug in controllerFan()
...
Extruder 2 was checked where extruder 1 should be checked.
12 years ago
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.
12 years ago
d5ad7a0814
Rework change to incorporate CONTROLLERFAN
...
Also refactor extruder auto fan logic to simplify further and now only
check every 2.5 seconds
12 years ago
c3cdaceab3
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
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.
12 years ago
788d62bcc4
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Marlin.pde
Marlin/ultralcd.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h
12 years ago
5d5909fc25
Fix failure to compile with heated bed: remove call to non-existant scaleBedPID().
12 years ago
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
12 years ago
7f622467fc
Merge pull request #425 from kefir-/m928_logging
...
M928 logging
12 years ago
86867928ac
Merge pull request #434 from DDRBoxman/Marlin_v1
...
Add support for M300: Play beep sound
12 years ago
4e448b700a
Merged fetched files from Marlin_v1 branch
...
Pull requests: #414 #433 #432 #428
12 years ago
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
12 years ago
9a1c90471f
Ignore unused beeper pins
12 years ago
1a0f889803
Add support for M300: Play beep sound
12 years ago
e5a853a3d0
Added automated extruder fan function
12 years ago
f036be7c4e
Clean up tab/whitespace from last commit
12 years ago
07e11c7cf5
Add command M928 to enable logging to file of received gcode commands
12 years ago
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.
12 years ago
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.
12 years ago
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).
12 years ago
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.
12 years ago
4eb81a69e6
Only compile the new extruder offset code if you have multiple extruders.
12 years ago
70871715e4
Added support for extruder offset handling
...
The extruder offset can be specified in the configuration
file or adjusted on the fly using the "M218 T# X# Y#" command.
The EEPROM support is not yet merged in.
The "T#" command can take option "F#" that specifies the feedrate
at which the printing head should be re-positioned. If not
specified the re-positioning move is not preformed immediately,
but the coordinates are adjusted for the printer to properly
position the head when the next movement happens.
12 years ago
49b2ddc8c1
Cleaned up non-standard characters
12 years ago
19ce90fe02
Added comment about M42 usage (clean)
12 years ago
00fed0a703
Revert "Extended comment explaining M42 usage"
...
This reverts commit 01541ee64c
12 years ago
01541ee64c
Extended comment explaining M42 usage
12 years ago
1d06b10962
Added a feature to have filament change by gcode or display trigger.
...
[default off for now]
syntax: M600 X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]
if enabled, after a M600, the printer will retract by E, lift by Z, move to XY, retract even more filament.
Oh, and it will display "remove filament" and beep like crazy.
You are then supposed to insert a new filament (other color, e.g.) and click the display to continue.
After having the nozzle cleaned manually, aided by the disabled e-steppers.
After clicking, the printer will then go back the whole shebang, and continue printing with a fancy new color.
12 years ago
27843388c6
Merge pull request #360 from njprossi/Marlin_v1
...
Power signal control definitions for other power supplies
12 years ago
921273baa0
Added optional feature to stop printing when an endstop is hit. Made the Z display on the LCD in 3.2 format instead of 3.1. Added LCD message when and endstop is hit.
12 years ago
437eb3bafc
Initialize PS_ON at startup
12 years ago
f3c1fc70a9
Power signal control definitions for ATX and others
12 years ago
9e7b5056a0
{X,Y,Z}_{MIN,MAX}_POS are actually in Gcode coordinates.
12 years ago
01aac2a142
Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu.
12 years ago
b69cb9fbd9
Change the end of SD cart print message from minutes/seconds to hours/minutes.
12 years ago
6dfb8a2187
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.
12 years ago
3b2e5027e5
Merged updates from Marlin_v1.
12 years ago
1a8f54cea1
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
12 years ago
6731c094ee
Fix compiling with just an 16x2 LCD and no buttons.
12 years ago
b99a928a80
Fix the M117 (display message on LCD) when used over USB with checksums.
12 years ago
5ff5cee8ce
Fix the sensitive pin definitions, there where analogue numbers in the digital pin list. Also made M42 without a P function on the LED_PIN (which was otherwise a useless pin definition)
12 years ago
46ec4b648c
Added some missing Mxxx comments to M commands. Fixed the unsetting of the timer dividers for the fast PWM fan.
12 years ago
8e2519e88b
Add realtime delta geometry in Marlin_main.cpp.
12 years ago
c421774422
The Partial release message (which does not really tell you anything) overwrites the final print time on the LCD, which is a real shame. So I removed the message.
12 years ago
6a9bee27cc
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
12 years ago
94ea26ff46
Some minor changes on code style. And a bugfix where the counters for positioning in the stepper where wrong depending on compiler settings. (Caused strange values to reported back with M114 and endstop triggers). Also fixed compiling with FWRETRACT enabled.
12 years ago
97fa2a9c30
Few simple fixes that save RAM, as static strings are stored in RAM by default.
12 years ago
dbbf050005
More rambo fixes
12 years ago
f934d0ef5b
Merge remote-tracking branch 'tonokip/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
12 years ago
43018a48c4
Fix for a few -Wextra warnings.
12 years ago
12a4d60e18
Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template.
12 years ago
06b58a9c4f
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.
12 years ago
Jim Morris