zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
1471 commits 1 branch 0 tags 156 MiB
Commit graph

1471 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ErikZalm c6cb93d38c Merge pull request #556 from ellensp/Marlin_v1 
renamed ArduinoAddons/Arduino_1.x.x/sanguino to Sanguino. Now make works...
 2013-07-31 13:34:40 -07: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
midopple 7ced55b97c Merge pull request #1 from ErikZalm/Marlin_v1 
merge
 2013-07-27 08:06:44 -07:00
ellensp e019197b32 renamed ArduinoAddons/Arduino_1.x.x/sanguino to Sanguino. Now make works for Arduino > 1.0 on linux 2013-07-27 00:13:49 +12: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
ErikZalm c323fced9a Merge pull request #554 from iXce/cxa_atexit 
Fix Makefile-based build when avr-gcc has been compiled with --enable-cxa_atexit
 2013-07-24 02:49:08 -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
ErikZalm e578f988d3 Merge pull request #553 from iXce/req413 
Update #413 for merging, fix languages.h
 2013-07-23 14:19:30 -07: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
ErikZalm a105e10075 Merge pull request #550 from buildrob101/MinimalDualXCarriage 
Fixed compile error when QUICK_HOME is defined.
 2013-07-22 06:08:44 -07: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
ErikZalm c5bf8298d3 Merge pull request #549 from buildrob101/MinimalDualXCarriage 
Disable DUAL_X_CARRIAGE by default
 2013-07-20 09:43:47 -07:00
Robert F-C c3568398b5 Disable DUAL_X_CARRIAGE by default 2013-07-20 23:50:30 +10:00
ErikZalm 96a773fa48 Merge pull request #548 from buildrob101/MinimalDualXCarriage 
Dual x-carriage support
 2013-07-20 02:59:32 -07: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