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

1880 Commits (5045d17a39d46de34b155ba45f71370a3d42a992)
 

Author SHA1 Message Date
Tim Hawkins 5045d17a39 fix avrdude upload in makefile 10 years ago
Bo Herrmannsen 46843bd927 adding back notes on servo power 10 years ago
Bo Herrmannsen d9cd8e9e69 starting to add back note on ramps servo power 10 years ago
Bo Herrmannsen 1d4af46496 Merge pull request #1348 from stv0g/LogoLCD 
Adding new Marlin to splash screen
 10 years ago
Steffen Vogel 69dc411ae0 Merge branch 'Development' of github.com:MarlinFirmware/Marlin into LogoLCD 
Conflicts:
	Marlin/dogm_lcd_implementation.h
 10 years ago
Steffen Vogel d74394369b Merge pull request #1343 from thinkyhead/dogm_progress_bar 
DOGLCD and LCD_PROGRESS_BAR to coexist
 10 years ago
Scott Lahteine 326b925557 DOGLCD and LCD_PROGRESS_BAR to coexist 
Small changes (and formatting to confuse the diff’er) which first
allows DOGLCD and LCD_PROGRESS_BAR to be enabled in tandem, then a
#warning (rather than error) that the extra progress bar / message
options don’t apply to graphical displays at this time. This leaves
open perhaps combining the progress bar and message area in some future
(or forked custom) graphical LCD display arrangement (at which time the
relevant variables may be moved into ultralcd.cpp with externs in
ultralcd.h). I also added a conditional error that the progress bar and
the filament display may not work well together.
 10 years ago
Steffen Vogel 6e8e9bb41e added link to IRC web chat, archive and mailing list 10 years ago
Bo Herrmannsen 5b4daf2669 removed hangout... only one asked for it 10 years ago
Erik van der Zalm 1aade4a8e2 Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Development 10 years ago
Erik van der Zalm 8a2e84e3f1 Possible fix for FWRETRACT with 0 zlift. 10 years ago
Steffen Vogel 905aab3b85 added missing #endif 10 years ago
Steffen Vogel b9cf1465a7 updated LCD bouts with new strings and bitmaps 
new version is pretty generic and should work in most scenarios
 10 years ago
Steffen Vogel c7632be5cc added high and low resolutions version of splash screen logo (saving code size) 10 years ago
Steffen Vogel 8f0dba7cbf adding string for bouts splash string to config 10 years ago
Steffen Vogel eafa98e6f4 added two black/white versions of the Marlin Logo for the LCD 
splashscreen
 10 years ago
Bo Herrmannsen d94109e886 updated logo post and ver info 10 years ago
Bo Herrmannsen cd33b5b062 changed logo and ver info 
logo is now 110 pixels wide and starts 9 pixels in from top left corner and also 9 pixels down from same corner... this will give a 9 pixel border all way round

ver info is placed centered and there is a 9 pixel from bottom of display to ver info
 10 years ago
Bo Herrmannsen 9b6c1cfda6 removed unneeded lines in welcome msg 10 years ago
Bo Herrmannsen ffa09f86f4 moved ver info 5 spaces to the right 10 years ago
Alex Borro 2bbb68be8a Fix calculation of BAL grid fitting into the bed 
The previous calc was wrong. Between N points there are only N-1 gaps,
not N.

So changing AUTO_BED_LEVELING_GRID_POINTS to
(AUTO_BED_LEVELING_GRID_POINTS-1)
 10 years ago
Bo Herrmannsen 590caafa2d changed ver info 10 years ago
Bo Herrmannsen 3bb9b31515 changed boot logo a bit to test if fat wall goes away 10 years ago
Bo Herrmannsen 47881574ed Merge pull request #1336 from stv0g/Documentation 
Documentation restructuring
 10 years ago
Steffen Vogel 26337a56cc Merge branch 'Documentation' of github.com:stv0g/Marlin into Documentation 10 years ago
Steffen Vogel eaa462279e Merge branch 'Development' of github.com:MarlinFirmware/Marlin into Documentation 
Conflicts:
	README.md
 10 years ago
Steffen Vogel 6712179502 updated milestone link 10 years ago
Steffen Vogel 6dc9e87b68 added missing bracket 10 years ago
Steffen Vogel 38669a56cb updated credits 10 years ago
Steffen Vogel 49b759b804 added credits 10 years ago
Steffen Vogel 6388be0731 reformatting 10 years ago
Steffen Vogel c98d87935a reformatting 10 years ago
Steffen Vogel 11a42c3215 fixed formatting issue 10 years ago
Steffen Vogel d19ef56199 started hardware list 10 years ago
Steffen Vogel bc91167363 moved licence to Documentation (its linked from the frontpage) to get a cleaner top level dir 10 years ago
Steffen Vogel fd68d0074b added missing gcodes description 10 years ago
Steffen Vogel cf88d61c20 added links to reprap.org and the license 10 years ago
Steffen Vogel 4a1f34c522 added logo to README 10 years ago
Steffen Vogel e351eec169 added logo for GitHub Readme 10 years ago
Steffen Vogel 6f137bbe3e updated compilation/configuring instructions 10 years ago
Steffen Vogel 5db6ffc03e fixed line endings 10 years ago
Steffen Vogel abea094f90 fixed hyperlinks 10 years ago
Steffen Vogel 04eafe3d04 splitted huge README.md in several sections and moved them to the 
Documentation directory
 10 years ago
Erik van der Zalm a06700a14b Revert "issue 968 for dev branch" 10 years ago
andrewsil1 489b4fd3a5 Fix grammar/typos in new Configuration.h option 
(For the SLOW_PWM_HEATERS option)
 10 years ago
Bo Herrmannsen fdf9dbb6fe added link to google hangout 10 years ago
Steffen Vogel da192c521f Merge pull request #1333 from andrewsil1/development 
Fix grammar/typos in new Configuration.h option
 10 years ago
Erik van der Zalm 0f5cccca4f Merge pull request #1334 from MarlinFirmware/revert-1311-Development 
Revert "issue 968 for dev branch"
 10 years ago
Erik van der Zalm 3a30d45c2e Revert "issue 968 for dev branch" 10 years ago
andrewsil1 269ec9f87f Fix grammar/typos in new Configuration.h option 
(For the SLOW_PWM_HEATERS option)
 10 years ago