melch
/
Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,880 Commits
2 Branches
0 Tags
2.0 GiB
x301
2.0.x
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '5b2c67f4c3'
${ noResults }
Commit Graph

2880 Commits (5b2c67f4c3767a040060bb801040ed560932d8ef)
 

Author SHA1 Message Date
Steve Kelly 53614e5144 add pins for rambo lcd 11 years ago
Steve Kelly b42d24e31e add additional pins to avr2560 for rambo lcd 11 years ago
ErikZalm 07f029c2d5 Merge pull request #563 from njprossi/Marlin_v1 
Improvment for delta, Honeywell thermistor table and move from panel
 11 years ago
Nicolas Rossi b0c8120fcc Added feedrate setting in exemple config for manual moves from panel 11 years ago
Nicolas Rossi a54fe2d73c Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 
Conflicts:
	Marlin/Marlin_main.cpp
 11 years ago
ErikZalm 7ea63d08df Merge pull request #565 from iXce/avrdudeconfpath 
Detect OS in Makefile to use the correct avrdude.conf path
 11 years ago
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)
 11 years ago
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
 11 years ago
Guillaume Seguin c0c4c97db6 Detect OS in Makefile to use the correct avrdude.conf path 11 years ago
hg42@gmx.net 2ca983568d separate INVERTING for MIN and MAX endstops (6 #defines instead of 3) 11 years ago
hg42@gmx.net 3700f688f5 convert PROTOCOL macros from statements to (multiple, comma separated) expressions 11 years ago
daid a504c88346 Fix a bug where the PID controllers D action kicks in hard as soon as the PID controller starts. 11 years ago
ErikZalm c6cb93d38c Merge pull request #556 from ellensp/Marlin_v1 
renamed ArduinoAddons/Arduino_1.x.x/sanguino to Sanguino. Now make works...
 11 years ago
Nicolas Rossi 394ed08f88 Added feedrate setting for manual moves from panel 11 years ago
Nicolas Rossi 9bf1cf1b22 Pre-calculate diagonal rod length squared 11 years ago
Nicolas Rossi 4623e78ce0 Added Honeywell thermistor 135-104LAF-J01 11 years ago
Brendan-csel d7f384f680 Skip SD menu refresh if nothing has changed 11 years ago
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.
 11 years ago
Guillaume Seguin f4c3135c6d Add Panelolu2 pins for RAMPS1.3 11 years ago
Guillaume Seguin aae42c68f9 Update French translation in language.h 11 years ago
Guillaume Seguin 4d435c38a6 Add support of LiquidTWI2-based panels to Makefile 
Use LIQUID_TWI2=1 as make argument to enable this support
 11 years ago
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
 12 years ago
ellensp e019197b32 renamed ArduinoAddons/Arduino_1.x.x/sanguino to Sanguino. Now make works for Arduino > 1.0 on linux 12 years ago
ErikZalm 1561c6df51 Merge pull request #547 from wolfmanjm/delta-configuration 
Setup Default configuration for Deltas if DELTA is defined
 12 years ago
Guillaume Seguin 374bc99fa3 Add support of LiquidTWI2-based panels to Makefile 
Use LIQUID_TWI2=1 as make argument to enable this support
 12 years ago
Jim Morris ab624eac2a revert COnfiguratiuon to the same as head 12 years ago
Jim Morris 52f79ffeca add an example default configuration for delta style bots 12 years ago
Jim Morris b9d7ccf1cd Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration 
Conflicts:
	Marlin/Marlin_main.cpp
 12 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
 12 years ago
Guillaume Seguin d4d1540727 Use -fno-use-cxa-atexit to override gcc --enable-cxa_atexit 12 years ago
Guillaume Seguin 01ed99143c Woops, fix logic 12 years ago
ErikZalm e578f988d3 Merge pull request #553 from iXce/req413 
Update #413 for merging, fix languages.h
 12 years ago
Guillaume Seguin 76841450c8 Only display poweron/poweroff if PS_ON_PIN > -1 12 years ago
Guillaume Seguin 44f327d738 Uniformly reindent language.h 12 years ago
Guillaume Seguin 326d2db025 Update language.h so that all languages compile 
Some strings still need translation, but at least everything compiles.
 12 years ago
Guillaume Seguin 2cb716f513 Run Marlin/language.h through dos2unix 12 years ago
Guillaume Seguin 34da3a0a3f Merge github.com:ErikZalm/Marlin into Marlin_v1 
Conflicts:
	Marlin/language.h
 12 years ago