0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
2712 commits 3 branches 0 tags 230 MiB
Commit graph

36 commits

Author SHA1 Message Date
AnHardt 20f909567a Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 
Conflicts:
	README.md
Solved
 2015-03-26 10:05:00 +01:00
Edward Patel 92a7260fd0 typos 2015-03-25 21:34:55 +01:00
Edward Patel 4a78db29eb Added instructions for Mesh bed leveling 2015-03-25 21:28:05 +01:00
AnHardt 4beffbca69 Make SMALL_INFOFONT configurable. 
Tweak the documentation
 2015-03-24 23:40:04 +01:00
AnHardt 9d589cbb2a Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji 
Conflicts:
	Marlin/example_configurations/delta/generic/Configuration.h
	Marlin/example_configurations/delta/kossel_mini/Configuration.h
	Marlin/language.h

Conflicts solved
 2015-03-24 16:59:15 +01:00
Scott Lahteine c6df5f4d85 small text correction 2015-03-23 21:55:03 -07:00
Scott Lahteine 8dd94ccf58 Initial list from perusing the commit logs 2015-03-23 21:54:06 -07:00
Scott Lahteine b1a7f74ee4 A logo for the Marlin wiki 2015-03-23 18:25:31 -07:00
AnHardt e917477fec Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 
Conflicts:
	Marlin/dogm_lcd_implementation.h
	Marlin/fonts/make_fonts.bat

Claerd conflicts with my own #1621. (His was easy. :-) )

corrected typo in fonts/README.fonts

Applied changes to the new delta-configurations
 and deletet there some extra whitespace at the line-endings.
 2015-03-19 12:35:43 +01:00
alexborro 5ddb8d94e2 Update Documentation related to M204 2015-03-18 11:09:10 -03:00
AnHardt 00b162a993 Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji 
Conflicts:
	Marlin/language.h
Conflict cleaned
 2015-03-16 17:13:49 +01:00
AnHardt ace3c62a1c Argh! Did not hit save 2015-03-13 15:26:01 +01:00
AnHardt bfb8a53156 Documentation reformating 
The last for today - i hope.
 2015-03-13 15:23:30 +01:00
AnHardt 1feb71895b And an other one 2015-03-13 15:16:55 +01:00
AnHardt 9518b1c873 And another update for the documentation. 2015-03-13 14:59:53 +01:00
AnHardt d9b3232e94 Another update for the documentation. 2015-03-13 14:55:15 +01:00
AnHardt 09838dc948 reformat documentation 2015-03-13 14:46:15 +01:00
AnHardt 96f8d20f2f Change selection logic another time 
Automatic selection was to unflexible.

Updated documentation

Updated language files to new logic and documentation.

Updated bdf2u8g.exe
 2015-03-13 14:26:58 +01:00
Bo Herrmannsen c7067edddf initial empty change log 2015-03-11 18:56:46 +01:00
AnHardt 6d575b1bc7 Add some documentation. 2015-03-10 17:55:59 +01:00
Gina Häußge 63b62d8d4e Fixed in-line comments and escaping 
* "G1 X1 ; test" was not executing "G1 X1" due to never leaving comment mode.
  * "M117 Hello \;)" printed "Hello \" to the display due to not replacing serial_char properly.

Tested with the following commands:
    * M117 Hello ; test => displays "Hello" on display, ignores "test"
    * G1 X1 ; foo => moves 1mm in X, ignores "foo"
    * ; test => completely ignored, not even acknowledged
    * M117 Hello \;) => displays "Hello ;)" on display
    * M117 Hello \\;) => displays "Hello \" on display, ignores ")"
 2015-03-05 23:30:34 +01:00
Wurstnase 4546c92f5b X and Y must be Integers not Float! 
https://github.com/Wurstnase/Marlin/blob/Development/Marlin/Configuration.h#L427
 2015-02-10 09:00:48 +01:00
PxT d4c8cfe1f2 Update GCodes.md 
Removed remaining angle brackets which are not displayed properly in Github-flavored Markdown.
 2015-01-13 09:23:13 -08:00
PxT 848475a5b0 Update GCodes.md 
Sort Gcodes numerically, other minor formatting changes
 2015-01-12 13:28:31 -08:00
Bo Herrmannsen 46843bd927 adding back notes on servo power 2015-01-11 14:18:38 +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
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 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 04eafe3d04 splitted huge README.md in several sections and moved them to the 
Documentation directory
 2015-01-08 18:55:32 +01:00
Steffen Vogel 8d7bfd03d8 moved/renamed documentation stuff to top-level directory 2015-01-07 15:33:50 +01:00