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 年之前
Steffen Vogel
6e8e9bb41e
added link to IRC web chat, archive and mailing list
10 年之前
Bo Herrmannsen
5b4daf2669
removed hangout... only one asked for it
10 年之前
Erik van der Zalm
1aade4a8e2
Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Development
10 年之前
Erik van der Zalm
8a2e84e3f1
Possible fix for FWRETRACT with 0 zlift.
10 年之前
Bo Herrmannsen
d94109e886
updated logo post and ver info
10 年之前
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 年之前
Bo Herrmannsen
9b6c1cfda6
removed unneeded lines in welcome msg
10 年之前
Bo Herrmannsen
ffa09f86f4
moved ver info 5 spaces to the right
10 年之前
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 年之前
Bo Herrmannsen
590caafa2d
changed ver info
10 年之前
Bo Herrmannsen
3bb9b31515
changed boot logo a bit to test if fat wall goes away
10 年之前
Bo Herrmannsen
47881574ed
Merge pull request #1336 from stv0g/Documentation
Documentation restructuring
10 年之前
Steffen Vogel
26337a56cc
Merge branch 'Documentation' of github.com:stv0g/Marlin into Documentation
10 年之前
Steffen Vogel
eaa462279e
Merge branch 'Development' of github.com:MarlinFirmware/Marlin into Documentation
Conflicts:
README.md
10 年之前
Steffen Vogel
6712179502
updated milestone link
10 年之前
Steffen Vogel
6dc9e87b68
added missing bracket
10 年之前
Steffen Vogel
38669a56cb
updated credits
10 年之前
Steffen Vogel
49b759b804
added credits
10 年之前
Steffen Vogel
6388be0731
reformatting
10 年之前
Steffen Vogel
c98d87935a
reformatting
10 年之前
Steffen Vogel
11a42c3215
fixed formatting issue
10 年之前
Steffen Vogel
d19ef56199
started hardware list
10 年之前
Steffen Vogel
bc91167363
moved licence to Documentation (its linked from the frontpage) to get a cleaner top level dir
10 年之前
Steffen Vogel
fd68d0074b
added missing gcodes description
10 年之前
Steffen Vogel
cf88d61c20
added links to reprap.org and the license
10 年之前
Steffen Vogel
4a1f34c522
added logo to README
10 年之前
Steffen Vogel
e351eec169
added logo for GitHub Readme
10 年之前
Steffen Vogel
6f137bbe3e
updated compilation/configuring instructions
10 年之前
Steffen Vogel
5db6ffc03e
fixed line endings
10 年之前
Steffen Vogel
abea094f90
fixed hyperlinks
10 年之前
Steffen Vogel
04eafe3d04
splitted huge README.md in several sections and moved them to the
Documentation directory
10 年之前
Erik van der Zalm
a06700a14b
Revert "issue 968 for dev branch"
10 年之前
andrewsil1
489b4fd3a5
Fix grammar/typos in new Configuration.h option
(For the SLOW_PWM_HEATERS option)
10 年之前
Bo Herrmannsen
fdf9dbb6fe
added link to google hangout
10 年之前
Steffen Vogel
da192c521f
Merge pull request #1333 from andrewsil1/development
Fix grammar/typos in new Configuration.h option
10 年之前
Erik van der Zalm
0f5cccca4f
Merge pull request #1334 from MarlinFirmware/revert-1311-Development
Revert "issue 968 for dev branch"
10 年之前
Erik van der Zalm
3a30d45c2e
Revert "issue 968 for dev branch"
10 年之前
andrewsil1
269ec9f87f
Fix grammar/typos in new Configuration.h option
(For the SLOW_PWM_HEATERS option)
10 年之前
Bo Herrmannsen
3d2b471c1a
added link to google hangout
10 年之前
Steffen Vogel
72912851b8
Merge pull request #1331 from stv0g/Development
moved/renamed documentation stuff to top-level directory
10 年之前
Steffen Vogel
8d7bfd03d8
moved/renamed documentation stuff to top-level directory
10 年之前
Bo Herrmannsen
3c9e6b7b62
added link for pic to hex converter
10 年之前
Bo Herrmannsen
0e760274bd
changed reprap logo to marlin logo
10 年之前
Bo Herrmannsen
b291a422e9
added square png version of logo
406*406 pixels
10 年之前
Bo Herrmannsen
8813978766
Merge pull request #1330 from avluis/feature-request
Update Marlin Firmware URL
10 年之前
Luis E Alvarado
7ae548cf34
Update Marlin Firmware URL
10 年之前
Erik van der Zalm
8f9067faa6
Added marlin logos. (Designed by Ahmet Cem TURAN)
10 年之前
Bo Herrmannsen
addf52fd4a
Merge pull request #1328 from DinoMesina/development
Some corrections and new features
10 年之前
Bo Herrmannsen
e9ddd21aef
Update README.md
10 年之前