281 Commits (448e5252c352efdf17f9a2e0577fc27a99b67d8f)

Author SHA1 Message Date
Scott Lahteine 4fbb80567e Get upstream commits
10 years ago
Scott Lahteine 691e753cc3 Don't add home offsets in G29
10 years ago
Scott Lahteine 13fbf42d95 Cleanup of planner code
10 years ago
Scott Lahteine b6d381f863 Divide up Conditionals to get LCD items early
10 years ago
maverikou 8a739b6fba Merge branch 'Development' into delta_auto_bed_level
10 years ago
AnHardt f0dcea7e14 Fix #1611
10 years ago
Scott Lahteine bb4cb1b15a Merge pull request #1606 from thinkyhead/cleanup_stepper
10 years ago
alexborro d3259d0dba Merge pull request #1581 from msutas/Development
10 years ago
Scott Lahteine c37f7d15c9 - Rename WRITE_E_STEP for consistency
10 years ago
domonoky d813090d90 Merge remote-tracking branch 'remotes/upstream/Development' into Development
10 years ago
Mehmet Sutas cfc6a3a87a Filament Runout Sensor Feature
10 years ago
maverikou 7c24b97958 Ported over Johann Rocholl's improvements for delta printers:
10 years ago
Scott Lahteine d085725c86 More sanity-checking for ABL
10 years ago
domonoky 4a7aca2736 Merge remote-tracking branch 'remotes/upstream/Development' into Development
10 years ago
alexborro 715104e477 Fix Endstop check for CoreXY bots.
10 years ago
domonoky b55995aae8 Introduce a layer of macro indirection to all stepper pins. This allows other stepper drivers to redefine them, so they can use SPI/I2C instead of direct pin manipulation.
10 years ago
Jérémie FRANCOIS 9d75a56b56 Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
Jérémie FRANCOIS 85e5aa4011 Generalized enqueue_commands_P, and moved them to Marlin_main as they should
10 years ago
Scott Lahteine 9bc9051405 Flag EEPROM write errors on serial output
10 years ago
Scott Lahteine ae4b348d77 Make sure _Ex_PINS is defined
10 years ago
Jérémie FRANCOIS dd301be52d Added suport for multiline G-code commands in the LCD menus
10 years ago
MagoKimbra 986e723eeb Add 4th extruder
10 years ago
daid 53f971095d Revert "Reduce PROGMEM warnings"
10 years ago
Bo Herrmannsen d4a665694a Merge pull request #1350 from odewdney/Development
10 years ago
odewdney cd55a93a13 re-add blank line
10 years ago
odewdney 538859669d Removing compiler warnings for progmem
10 years ago
Alex Borro 422a958a34 Fix CoreXY speed calculation
10 years ago
odewdney 652895d656 try different proproc for CI failure
10 years ago
odewdney 39fae9e3a3 Fix progmem warning
10 years ago
Alexander Hirzel eed451e034 rework analogInputToDigitalPin definition
10 years ago
wgm4321 edac64e7d2 Add Filament menu and add Filament/Retract settings to config store.
10 years ago
Bo Herrmannsen a18b625534 Merge pull request #1261 from wgm4321/Development
10 years ago
Bernhard Kubicek 3d1da45f3e Update Marlin.h
10 years ago
bkubicek d02daec08f fixed compilation
10 years ago
wgm4321 cb12161191 Add Filament menu and add Filament/Retract settings to config store.
10 years ago
Denis Chertykov 050ca9ca13 Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
10 years ago
Erik van der Zalm 058e446531 Merge pull request #1037 from filipmu/Filament-Sensor
10 years ago
Scott Lahteine f989bd5435 Simple code cleanup. Rename "homeing" to homing.
10 years ago
Filip Mulier 62db9848d3 Improvements and bug fixes in sensor delay buffer for filament sensor code
10 years ago
Filip Mulier 85649a4549 Real-time filament diameter measurement and control
10 years ago
cocktailyogi 2f4a20257c imported last Marlin changes
11 years ago
cocktailyogi 512f2a3136 restore Branch from Backup
11 years ago
Dim3nsioneer 3c927901a4 Implementation of FW extruder change retract
11 years ago
Dim3nsioneer 3906f27c46 Individual extruder flow rate
11 years ago
Jim Morris 8ea5665ee2 Merge remote-tracking branch 'origin/Marlin_v1' into add/M665-set-delta-configuration
11 years ago
Cylindric fdce91192e Various typo fixes - only in comments, no code changes.
11 years ago
Jim Morris af9395ac2e Add M605 to dynamically set delta configuration
11 years ago
nothinman d4ba23bc28 Merge pull request #770 from josefpavlik/Marlin_v1
11 years ago
Josef Pavlik 477b6fa1df move engaged from lcd console refreshes power off timeout
11 years ago
Jim Morris b819fc53ca Add Azteeg X3 Pro as motherboard 68
11 years ago
whosawhatsis 856edfcc0d Fixed math
11 years ago
whosawhatsis d24df7af2c M200 implementation
11 years ago
Alex Borro 05932e4458 Add Z Probe Offset to EEPROM and Ultra LCD
11 years ago
Alex Borro b33375d438 Z Axis Safe Homing when using Z Probe
11 years ago
Erik van der Zalm 48a185d004 Fixed compile errors from bad commits.
11 years ago
fmalpartida 7b556d2e96 Added BT support on AT90USB devices
11 years ago
fmalpartida b5a964fcc5 Initial SAV MkI (RepRap CloneWars board) integration.
11 years ago
Erik van der Zalm 457d8a0acb Fixed merge conflicts
11 years ago
Richard Miles ed1ab42186 Added Y_DUAL_STEPPER_DRIVERS
11 years ago
Richard Miles f4a59e4ce5 Revert "Added Y_DUAL_STEPPER_DRIVERS"
11 years ago
Richard Miles 7ee275b620 Added Y_DUAL_STEPPER_DRIVERS
11 years ago
Peter Hercek 9aa2229077 add command M666 for adjusting delta printer endstop position
11 years ago
hg42@gmx.net 3700f688f5 convert PROTOCOL macros from statements to (multiple, comma separated) expressions
11 years ago
Nicolas Rossi 55c287a69e Fixed move from panel for delta bot #557
12 years ago
Robert F-C d7390e13d9 Support dual x-carriage printers
12 years ago
Erik van der Zalm 6f4a6e531c Merge branch 'deltabot' into Marlin_v1
12 years ago
Erik van der Zalm c8dcc7c208 Allow increasing the software PWM frequency.
12 years ago
Erik van der Zalm 373f3ecab3 Merge branch 'deltabot' of https://github.com/jcrocholl/Marlin into deltabot
12 years ago
Robert F-C 40eb07bad4 Revert and extend previous change pin check change
12 years ago
Erik van der Zalm bd2cd4903e Added #ifdef BARICUDA around the BariCUDA changes
12 years ago
Jordan Miller fbd899a37d Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129.
12 years ago
Yuri Valentini 7d20ec706e Added libraries from Arduino 1.0.3 for sanguino build
12 years ago
Johann Rocholl 3b2e5027e5 Merged updates from Marlin_v1.
12 years ago
daid303 596a7e1904 Fix compiling for Arduin < 1.0.0
12 years ago
daid303 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
Johann Rocholl 8e2519e88b Add realtime delta geometry in Marlin_main.cpp.
12 years ago
Johann Rocholl 621c24a10f AT90USB is only defined after pins.h is included.
12 years ago
Johann Rocholl 6cba11f087 Stop redefining MOTHERBOARD and #define AT90USB instead. Also put #ifndef AT90USB around the HardwareSerial_h trick, so now Printrboard / Brainwave support compiles on Arduino 1.0.2 as well.
12 years ago
daid303 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
daid303 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
daid303 97fa2a9c30 Few simple fixes that save RAM, as static strings are stored in RAM by default.
12 years ago
daid303 b6ff45254e Better explain the watchdog "problem" and rename the config define so it explains that the feature belongs to the watchdog.
12 years ago
daid303 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
stohn de0448343f added KILL_PIN support / cleaned up manage_inactivity function definition
12 years ago
ErikZalm f062794a0d Merge pull request #208 from Enchiridion/Marlin_v1
12 years ago
Ian Jackson 7bb326d389 eeprom: provide smaller code for SERIAL_ECHOPAIR
12 years ago
Ian Jackson 957e966d2d M206: always use homing ("homeing") offsets
12 years ago
Ian Jackson faccb35850 software_endstops: use *_MIN_POS and *_MAX_POS for arcs
12 years ago
Enchiridion 50cde90324 Added support for dual Z axis stepper drivers
13 years ago
Bernhard 0c123950e9 __ header file replace
13 years ago
Erik van der Zalm 1874cb71a6 Added option to increase the FAN PWM frequency.
13 years ago
Erik van der Zalm 67cf105bc6 Fixed AUTOTEMP (M109 S215 B260 F1 starts autotemp)
13 years ago
Erik van der Zalm 63aec3c56e Replaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart.
13 years ago
Erik van der Zalm aac7aa3bf0 Queued fan control. Issue #90
13 years ago
Erik van der Zalm c6f2ec3c82 remove stop_heating_wait
13 years ago
daid 2a77c84c8f Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0.
13 years ago
Erik van der Zalm 598eb1d4f1 Fixed compilation for gcc-4.6.2 with avr-lib-1.8.0 (thanks daid)
13 years ago
Erik van der Zalm 9173a5713b Teensylu support.
13 years ago
Bernhard 8463e39a4a starting with sanguino arduino 1.0 compatibility
13 years ago
Bernhard 57f9359a41 simplified the includes, makefile now works with arduino23
13 years ago
Bernhard 3c1a4aac2b header file simplification
13 years ago
Erik van der Zalm 84d9cf7339 merging
13 years ago
Erik van der Zalm e017228569 Merged multiple extruder support.
13 years ago
Bernhard 06411d5c9e ultralcd can now also stop the wait loop for the hot-end m109 heating when stopping sd prints.
13 years ago
Bernhard 986f0ba76c moved <stdio.h> to more dominant location.
13 years ago
Denis B 4fd75dc813 Working version of multiple extruders (up to 3)
13 years ago
Bernhard 7714b98da7 solved some compiler warnings that are now visible in arduino 1.0.
13 years ago
Bernhard 0bc9daa4f7 make it compile with arduino 1.0 ; function is still untested.
13 years ago
Bernhard b0c3871750 more fixing of the sanguino math round problem
13 years ago
Bernhard 311627141b Merge branch 'smallopt' into Marlin_v1
13 years ago
Erik van der Zalm f75f426dfa Removed interrupt nesting in the stepper ISR.
13 years ago
Bernhard 2d9a715655 first naive attempt to have a offset in the homeing procedure. Does not enable to move into regions not allowed by endstops.
13 years ago
Bernhard 26a1de1e44 force inline
13 years ago
Bernhard Kubicek 7919a40d06 watchdog,percent done,
13 years ago
Bernhard Kubicek 9980ceb4a3 added a m400, that finished all moves,
13 years ago
Bernhard Kubicek 36958ee305 minor changes and first not-well working version of autotemp
13 years ago
Bernhard Kubicek ba8a53a40f Streaming.h is gone. It conflicted with PROGMEM. And saving memory is more important than nicer code, imho
13 years ago
Bernhard Kubicek ab154d5592 project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.
13 years ago
Bernhard Kubicek 7b70caab7c made progmem mainly, found one bug in cardreader, added a empty class for cardreader in case no sd support.
13 years ago
Bernhard Kubicek 1d171e9e52 reformating and some minor bugs/things found on the way.
13 years ago
Bernhard Kubicek 900e0c9bf2 overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.
13 years ago
Bernhard Kubicek 1740a83e11 correcting commit errors.
13 years ago
Bernhard Kubicek e8092898b1 watchdog into dedicated file
13 years ago
Erik van der Zalm 04d3b5537f Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
Erik van der Zalm d15f01e1b4 Temperature changes
13 years ago
Bernhard Kubicek b9ea0651ec Revert "this is not working. Do you maybe know why?"
13 years ago
Bernhard Kubicek 8bcdb9f5f0 this is not working. Do you maybe know why?
13 years ago
Bernhard Kubicek 00674af3a8 merge from the branch bkubicek/Marlin/zalmmerge
13 years ago
Erik van der Zalm 094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes
13 years ago
Erik van der Zalm 8e017b81ab Sync with non-gen6 version
13 years ago
Erik van der Zalm 750f6c33e3 first commit
13 years ago