11409 Commits (56a94c2a2689882664274cbf285d6c7f236c6b85)
 

Author SHA1 Message Date
Guillaume Seguin 6c42a3a339 Woops, fix logic 11 years ago
Guillaume Seguin 376d8af2c8 Report temperatures for all extruders 11 years ago
ErikZalm 434b6a05c1 Merge pull request #552 from iXce/Marlin_v1
Report temperatures for all extruders in reply to M105
11 years ago
ErikZalm bdc2621119 Merge pull request #561 from Brendan-csel/Marlin_v1
Fix for Viki LCD issues printing from SD card
11 years ago
ErikZalm 6965bd4e15 Merge pull request #560 from njprossi/Marlin_v1
Fixed move from panel for delta bot #557
11 years ago
ErikZalm a55b33e613 Merge pull request #559 from iXce/panelolupinsramps13
Add Panelolu2 pins for RAMPS1.3
11 years ago
ErikZalm 8b34351537 Merge pull request #558 from iXce/frenchupdate
Update French translation in language.h
11 years ago
ErikZalm 735e556724 Merge pull request #555 from iXce/liquidtwi2_makefile
Add support of LiquidTWI2-based panels to Makefile
11 years ago
Brendan-csel d80aecda0a Skip SD menu refresh if nothing has changed 11 years ago
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.
11 years ago
Nicolas Rossi 55c287a69e Fixed move from panel for delta bot #557 11 years ago
Guillaume Seguin 1902d339b0 Add Panelolu2 pins for RAMPS1.3 11 years ago
Guillaume Seguin eb23a68e92 Update French translation in language.h 11 years ago
midopple 7ced55b97c Merge pull request #1 from ErikZalm/Marlin_v1
merge
11 years ago
ellensp e019197b32 renamed ArduinoAddons/Arduino_1.x.x/sanguino to Sanguino. Now make works for Arduino > 1.0 on linux 11 years ago
ErikZalm 1561c6df51 Merge pull request #547 from wolfmanjm/delta-configuration
Setup Default configuration for Deltas if DELTA is defined
11 years ago
Guillaume Seguin 374bc99fa3 Add support of LiquidTWI2-based panels to Makefile
Use LIQUID_TWI2=1 as make argument to enable this support
11 years ago
Jim Morris ab624eac2a revert COnfiguratiuon to the same as head 11 years ago
Jim Morris 52f79ffeca add an example default configuration for delta style bots 11 years ago
Jim Morris b9d7ccf1cd Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration
Conflicts:
	Marlin/Marlin_main.cpp
11 years ago
ErikZalm c323fced9a Merge pull request #554 from iXce/cxa_atexit
Fix Makefile-based build when avr-gcc has been compiled with --enable-cxa_atexit
11 years ago
Guillaume Seguin d4d1540727 Use -fno-use-cxa-atexit to override gcc --enable-cxa_atexit 11 years ago
Guillaume Seguin 01ed99143c Woops, fix logic 11 years ago
ErikZalm e578f988d3 Merge pull request #553 from iXce/req413
Update #413 for merging, fix languages.h
11 years ago
Guillaume Seguin 76841450c8 Only display poweron/poweroff if PS_ON_PIN > -1 11 years ago
Guillaume Seguin 44f327d738 Uniformly reindent language.h 11 years ago
Guillaume Seguin 326d2db025 Update language.h so that all languages compile
Some strings still need translation, but at least everything compiles.
11 years ago
Guillaume Seguin 2cb716f513 Run Marlin/language.h through dos2unix 11 years ago
Guillaume Seguin 34da3a0a3f Merge github.com:ErikZalm/Marlin into Marlin_v1
Conflicts:
	Marlin/language.h
11 years ago
Guillaume Seguin 18199ff960 Merge github.com:ErikZalm/Marlin into Marlin_v1 11 years ago
ErikZalm a105e10075 Merge pull request #550 from buildrob101/MinimalDualXCarriage
Fixed compile error when QUICK_HOME is defined.
11 years ago
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.
11 years ago
ErikZalm c5bf8298d3 Merge pull request #549 from buildrob101/MinimalDualXCarriage
Disable DUAL_X_CARRIAGE by default
11 years ago
Robert F-C c3568398b5 Disable DUAL_X_CARRIAGE by default 11 years ago
ErikZalm 96a773fa48 Merge pull request #548 from buildrob101/MinimalDualXCarriage
Dual x-carriage support
11 years ago
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.
11 years ago
Jim Morris fb20ceabce enable soft endstops for delta
disable delta by default
11 years ago
Jim Morris d01ee7e7b5 fix zjerk being the same for delta as xy jerk
add more delta defaults
on delta make second home even slower
11 years ago
Robert F-C d7390e13d9 Support dual x-carriage printers
Dual x-carriage designs offer some substantial improvements for dual
extruder printing.
12 years ago
Jim Morris f3aa2a48e7 update max pos 12 years ago
Jim Morris 460751503e Added default configurations for deltas when DELTA is defined 12 years ago
ErikZalm 5ab872de1f Merge pull request #545 from MStohn/fix-bad-lcd-commit-from-makr3d
fixed bad lcd commit from makr3d
12 years ago
Maik Stohn 9da94c247a fixed bad lcd commit from makr3d
#elsif does not exist #elif is correct
12 years ago
Erik van der Zalm 59004023fd Fixed typo 12 years ago
Erik van der Zalm 461dad6e05 Added : M32 - Select file and start SD print (Can be used when printing from SD card)
Untested
12 years ago
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.
12 years ago
ErikZalm 8a2a3ef91d Merge pull request #531 from iXce/Marlin_v1_lcd
Only clamp panel movements if software endstops are enabled
12 years ago
Erik van der Zalm 6397b3339c restored configuration.h defaults 12 years ago
Erik van der Zalm cdaaad3df1 Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1 12 years ago
Erik van der Zalm e3bdefd873 fixed missing #endif 12 years ago