Commit Graph

1880 Commits

Author SHA1 Message Date
Tim Hawkins
5045d17a39 fix avrdude upload in makefile 2015-01-13 13:01:43 +08:00
Bo Herrmannsen
46843bd927 adding back notes on servo power 2015-01-11 14:18:38 +01:00
Bo Herrmannsen
d9cd8e9e69 starting to add back note on ramps servo power 2015-01-11 14:16:33 +01:00
Bo Herrmannsen
1d4af46496 Merge pull request #1348 from stv0g/LogoLCD
Adding new Marlin to splash screen
2015-01-10 16:08:03 +01:00
Steffen Vogel
69dc411ae0 Merge branch 'Development' of github.com:MarlinFirmware/Marlin into LogoLCD
Conflicts:
	Marlin/dogm_lcd_implementation.h
2015-01-10 14:57:11 +01:00
Steffen Vogel
d74394369b Merge pull request #1343 from thinkyhead/dogm_progress_bar
DOGLCD and LCD_PROGRESS_BAR to coexist
2015-01-10 11:37:15 +01:00
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.
2015-01-09 18:16:56 -08:00
Steffen Vogel
6e8e9bb41e added link to IRC web chat, archive and mailing list 2015-01-09 22:28:47 +01:00
Bo Herrmannsen
5b4daf2669 removed hangout... only one asked for it 2015-01-09 22:08:36 +01:00
Erik van der Zalm
1aade4a8e2 Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Development 2015-01-09 21:33:29 +01:00
Erik van der Zalm
8a2e84e3f1 Possible fix for FWRETRACT with 0 zlift. 2015-01-09 21:33:02 +01:00
Steffen Vogel
905aab3b85 added missing #endif 2015-01-09 20:23:38 +01:00
Steffen Vogel
b9cf1465a7 updated LCD bouts with new strings and bitmaps
new version is pretty generic and should work in most scenarios
2015-01-09 18:49:59 +01:00
Steffen Vogel
c7632be5cc added high and low resolutions version of splash screen logo (saving code size) 2015-01-09 18:49:24 +01:00
Steffen Vogel
8f0dba7cbf adding string for bouts splash string to config 2015-01-09 18:48:30 +01:00
Steffen Vogel
eafa98e6f4 added two black/white versions of the Marlin Logo for the LCD
splashscreen
2015-01-09 17:52:23 +01:00
Bo Herrmannsen
d94109e886 updated logo post and ver info 2015-01-09 15:51:15 +01:00
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
2015-01-09 15:44:47 +01:00
Bo Herrmannsen
9b6c1cfda6 removed unneeded lines in welcome msg 2015-01-09 15:20:41 +01:00
Bo Herrmannsen
ffa09f86f4 moved ver info 5 spaces to the right 2015-01-09 13:31:23 +01:00
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)
2015-01-09 10:17:33 -02:00
Bo Herrmannsen
590caafa2d changed ver info 2015-01-09 13:17:08 +01:00
Bo Herrmannsen
3bb9b31515 changed boot logo a bit to test if fat wall goes away 2015-01-09 12:51:21 +01:00
Bo Herrmannsen
47881574ed Merge pull request #1336 from stv0g/Documentation
Documentation restructuring
2015-01-08 20:35:45 +01:00
Steffen Vogel
26337a56cc Merge branch 'Documentation' of github.com:stv0g/Marlin into Documentation 2015-01-08 20:02:56 +01:00
Steffen Vogel
eaa462279e Merge branch 'Development' of github.com:MarlinFirmware/Marlin into Documentation
Conflicts:
	README.md
2015-01-08 20:02:40 +01:00
Steffen Vogel
6712179502 updated milestone link 2015-01-08 19:57:09 +01:00
Steffen Vogel
6dc9e87b68 added missing bracket 2015-01-08 19:55:33 +01:00
Steffen Vogel
38669a56cb updated credits 2015-01-08 19:54:46 +01:00
Steffen Vogel
49b759b804 added credits 2015-01-08 19:48:56 +01:00
Steffen Vogel
6388be0731 reformatting 2015-01-08 19:38:52 +01:00
Steffen Vogel
c98d87935a reformatting 2015-01-08 19:37:36 +01:00
Steffen Vogel
11a42c3215 fixed formatting issue 2015-01-08 19:26:23 +01:00
Steffen Vogel
d19ef56199 started hardware list 2015-01-08 19:21:57 +01:00
Steffen Vogel
bc91167363 moved licence to Documentation (its linked from the frontpage) to get a cleaner top level dir 2015-01-08 18:59:40 +01:00
Steffen Vogel
fd68d0074b added missing gcodes description 2015-01-08 18:59:40 +01:00
Steffen Vogel
cf88d61c20 added links to reprap.org and the license 2015-01-08 18:59:40 +01:00
Steffen Vogel
4a1f34c522 added logo to README 2015-01-08 18:58:57 +01:00
Steffen Vogel
e351eec169 added logo for GitHub Readme 2015-01-08 18:58:08 +01:00
Steffen Vogel
6f137bbe3e updated compilation/configuring instructions 2015-01-08 18:58:08 +01:00
Steffen Vogel
5db6ffc03e fixed line endings 2015-01-08 18:58:08 +01:00
Steffen Vogel
abea094f90 fixed hyperlinks 2015-01-08 18:57:33 +01:00
Steffen Vogel
04eafe3d04 splitted huge README.md in several sections and moved them to the
Documentation directory
2015-01-08 18:55:32 +01:00
Erik van der Zalm
a06700a14b Revert "issue 968 for dev branch" 2015-01-08 18:54:06 +01:00
andrewsil1
489b4fd3a5 Fix grammar/typos in new Configuration.h option
(For the SLOW_PWM_HEATERS option)
2015-01-08 18:54:06 +01:00
Bo Herrmannsen
fdf9dbb6fe added link to google hangout 2015-01-08 18:54:06 +01:00
Steffen Vogel
da192c521f Merge pull request #1333 from andrewsil1/development
Fix grammar/typos in new Configuration.h option
2015-01-08 00:34:01 +01:00
Erik van der Zalm
0f5cccca4f Merge pull request #1334 from MarlinFirmware/revert-1311-Development
Revert "issue 968 for dev branch"
2015-01-07 23:41:10 +01:00
Erik van der Zalm
3a30d45c2e Revert "issue 968 for dev branch" 2015-01-07 23:40:17 +01:00
andrewsil1
269ec9f87f Fix grammar/typos in new Configuration.h option
(For the SLOW_PWM_HEATERS option)
2015-01-07 12:41:09 -08:00