瀏覽代碼

1.1.1 Readme / Version

Scott Lahteine 8 年之前
父節點
當前提交
5996c3a907
共有 2 個文件被更改,包括 40 次插入40 次删除
  1. 2
    2
      Marlin/Version.h
  2. 38
    38
      README.md

+ 2
- 2
Marlin/Version.h 查看文件

@@ -35,7 +35,7 @@
35 35
   /**
36 36
    * Marlin release version identifier
37 37
    */
38
-  #define SHORT_BUILD_VERSION "1.1.0"
38
+  #define SHORT_BUILD_VERSION "1.1.1"
39 39
 
40 40
   /**
41 41
    * Verbose version identifier which should contain a reference to the location
@@ -48,7 +48,7 @@
48 48
    * here we define this default string as the date where the latest release
49 49
    * version was tagged.
50 50
    */
51
-  #define STRING_DISTRIBUTION_DATE "2017-05-04 12:00"
51
+  #define STRING_DISTRIBUTION_DATE "2017-05-12 12:00"
52 52
 
53 53
   /**
54 54
    * Required minimum Configuration.h and Configuration_adv.h file versions.

+ 38
- 38
README.md 查看文件

@@ -1,23 +1,23 @@
1 1
 # Marlin 3D Printer Firmware
2 2
 <img align="right" src="../../raw/1.1.x/buildroot/share/pixmaps/logo/marlin-250.png" />
3 3
 
4
-## Marlin 1.1.0
4
+## Marlin 1.1
5 5
 
6 6
 Marlin 1.1 represents an evolutionary leap over Marlin 1.0.2. It is the result of over two years of effort by several volunteers around the world who have paid meticulous and sometimes obsessive attention to every detail. For this release we focused on code quality, performance, stability, and overall user experience. Several new features have also been added, many of which require no extra hardware.
7 7
 
8
-For complete Marlin documentation click over to the [Marlin Homepage <marlinfw.org>](http://marlinfw.org/), where you will find in-depth articles, how-to videos, and tutorials on every aspect of Marlin, as the site develops. For release notes, see the [Releases](/MarlinFirmware/Marlin/releases) page.
8
+For complete Marlin documentation click over to the [Marlin Homepage <marlinfw.org>](http://marlinfw.org/), where you will find in-depth articles, how-to videos, and tutorials on every aspect of Marlin, as the site develops. For release notes, see the [Releases](https://github.com/MarlinFirmware/Marlin/releases) page.
9 9
 
10 10
 ## Stable Release Branch
11 11
 
12
-This Release branch contains the latest tagged version of Marlin (currently 1.1.0 – May 2017).
12
+This Release branch contains the latest tagged version of Marlin (currently 1.1.1 – May 2017).
13 13
 
14
-Previous releases of Marlin include [1.0.2-2](/MarlinFirmware/Marlin/tree/1.0.2-2) (December 2016) and [1.0.1](/MarlinFirmware/Marlin/tree/1.0.1) (December 2014). Any version of Marlin prior to 1.0.1 (when we started tagging versions) can be collectively referred to as Marlin 1.0.0.
14
+Previous releases of Marlin include [1.0.2-2](https://github.com/MarlinFirmware/Marlin/tree/1.0.2-2) (December 2016) and [1.0.1](https://github.com/MarlinFirmware/Marlin/tree/1.0.1) (December 2014). Any version of Marlin prior to 1.0.1 (when we started tagging versions) can be collectively referred to as Marlin 1.0.0.
15 15
 
16 16
 ## Contributing to Marlin
17 17
 
18
-Click on the [Issue Queue](/MarlinFirmware/Marlin/issues) and [Pull Requests](/MarlinFirmware/Marlin/pulls) links above at any time to see what we're currently working on.
18
+Click on the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues) and [Pull Requests](https://github.com/MarlinFirmware/Marlin/pulls) links above at any time to see what we're currently working on.
19 19
 
20
-To submit patches and new features for Marlin 1.1 check out the [bugfix-1.1.x](/MarlinFirmware/Marlin/tree/bugfix-1.1.x) branch, add your commits, and submit a Pull Request back to the `bugfix-1.1.x` branch. Periodically that branch will form the basis for the next minor release.
20
+To submit patches and new features for Marlin 1.1 check out the [bugfix-1.1.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-1.1.x) branch, add your commits, and submit a Pull Request back to the `bugfix-1.1.x` branch. Periodically that branch will form the basis for the next minor release.
21 21
 
22 22
 Note that our "bugfix" branch will always contain the latest patches to the current release version. These patches may not be widely tested. As always, when using "nightly" builds of Marlin, proceed with full caution.
23 23
 
@@ -29,7 +29,7 @@ Marlin development has reached an important milestone with its first stable rele
29 29
 
30 30
 Marlin 1.1 is the last "flat" version of Marlin!
31 31
 
32
-Arduino IDE now has support for folder hierarchies, so Marlin 1.2 will have a [hierarchical file structure](/MarlinFirmware/Marlin/tree/breakup-marlin-idea). Marlin's newly reorganized code will be easier to work with and form a stronger starting-point as we get into [32-bit CPU support](/MarlinFirmware/Marlin/tree/32-Bit-RCBugFix-new) and the Hardware Access Layer (HAL).
32
+Arduino IDE now has support for folder hierarchies, so Marlin 1.2 will have a [hierarchical file structure](https://github.com/MarlinFirmware/Marlin/tree/breakup-marlin-idea). Marlin's newly reorganized code will be easier to work with and form a stronger starting-point as we get into [32-bit CPU support](https://github.com/MarlinFirmware/Marlin/tree/32-Bit-RCBugFix-new) and the Hardware Access Layer (HAL).
33 33
 
34 34
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224)
35 35
 [![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin)
@@ -39,47 +39,47 @@ Arduino IDE now has support for folder hierarchies, so Marlin 1.2 will have a [h
39 39
 - [Marlin Home Page](http://marlinfw.org/) - The Marlin Documentation Project. Join us!
40 40
 - [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin) - An overview of Marlin and its role in RepRap.
41 41
 - [Marlin Firmware Forum](http://forums.reprap.org/list.php?415) - Find help with configuration, get up and running.
42
-- [@MarlinFirmware](https://twitter.com/MarlinFirmware) on Twitter - Follow for news, release alerts, and tips & tricks. (Maintained by [@thinkyhead](/thinkyhead).)
42
+- [@MarlinFirmware](https://twitter.com/MarlinFirmware) on Twitter - Follow for news, release alerts, and tips & tricks. (Maintained by [@thinkyhead](https://github.com/thinkyhead).)
43 43
 
44 44
 ## Credits
45 45
 
46 46
 The current Marlin dev team consists of:
47
- - Roxanne Neufeld [@Roxy-3D] - English
48
- - Scott Lahteine [@thinkyhead] - English
49
- - Bob Kuhn [@Bob-the-Kuhn] - English
50
- - Andreas Hardtung [@AnHardt] - Deutsch, English
51
- - Nico Tonnhofer [@Wurstnase] - Deutsch, English
52
- - Jochen Groppe [@CONSULitAS] - Deutsch, English
53
- - João Brazio [@jbrazio] - Portuguese, English
54
- - Bo Hermannsen [@boelle] - Danish, English
55
- - Bob Cousins [@bobc] - English
56
- - [@maverikou]
57
- - Chris Palmer [@nophead]
58
- - [@paclema]
59
- - Erik van der Zalm [@ErikZalm]
60
- - David Braam [@daid]
61
- - Bernhard Kubicek [@bkubicek]
47
+ - Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - English
48
+ - Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - English
49
+ - Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - English
50
+ - Andreas Hardtung [[@AnHardt](https://github.com/AnHardt)] - Deutsch, English
51
+ - Nico Tonnhofer [[@Wurstnase](https://github.com/Wurstnase)] - Deutsch, English
52
+ - Jochen Groppe [[@CONSULitAS](https://github.com/CONSULitAS)] - Deutsch, English
53
+ - João Brazio [[@jbrazio](https://github.com/jbrazio)] - Portuguese, English
54
+ - Bo Hermannsen [[@boelle](https://github.com/boelle)] - Danish, English
55
+ - Bob Cousins [[@bobc](https://github.com/bobc)] - English
56
+ - [[@maverikou](https://github.com/maverikou)]
57
+ - Chris Palmer [[@nophead](https://github.com/nophead)]
58
+ - [[@paclema](https://github.com/paclema)]
59
+ - Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)]
60
+ - David Braam [[@daid](https://github.com/daid)]
61
+ - Bernhard Kubicek [[@bkubicek](https://github.com/bkubicek)]
62 62
 
63 63
 More features have been added by:
64
- - Alberto Cotronei [@MagoKimbra] - English, Italian
65
- - Thomas Moore [@tcm0116]
66
- - Ernesto Martinez [@emartinez167]
67
- - Petr Zahradnik [@clexpert]
68
- - Kai [@Kaibob2]
69
- - Edward Patel [@epatel]
70
- - F. Malpartida [@fmalpartida] - English, Spanish
71
- - [@esenapaj] - English, Japanese
72
- - [@benlye]
73
- - [@Tannoo]
74
- - [@teemuatlut]
75
- - [@bgort]
76
- - [@LVD-AC]
77
- - [@paulusjacobus]
64
+ - Alberto Cotronei [[@MagoKimbra](https://github.com/MagoKimbra)] - English, Italian
65
+ - Thomas Moore [[@tcm0116](https://github.com/tcm0116)]
66
+ - Ernesto Martinez [[@emartinez167](https://github.com/emartinez167)]
67
+ - Petr Zahradnik [[@clexpert](https://github.com/clexpert)]
68
+ - Kai [[@Kaibob2](https://github.com/Kaibob2)]
69
+ - Edward Patel [[@epatel](https://github.com/epatel)]
70
+ - F. Malpartida [[@fmalpartida](https://github.com/fmalpartida)] - English, Spanish
71
+ - [[@esenapaj](https://github.com/esenapaj)] - English, Japanese
72
+ - [[@benlye](https://github.com/benlye)]
73
+ - [[@Tannoo](https://github.com/Tannoo)]
74
+ - [[@teemuatlut](https://github.com/teemuatlut)]
75
+ - [[@bgort](https://github.com/bgort)]
76
+ - [[@LVD-AC](https://github.com/LVD-AC)]
77
+ - [[@paulusjacobus](https://github.com/paulusjacobus)]
78 78
  - ...and many others
79 79
 
80 80
 ## License
81 81
 
82
-Marlin is published under the [GPL license](/COPYING.md) because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork.
82
+Marlin is published under the [GPL license](https://github.com/COPYING.md) because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork.
83 83
 
84 84
 While we can't prevent the use of this code in products (3D printers, CNC, etc.) that are closed source or crippled by a patent, we would prefer that you choose another firmware or, better yet, make your own.
85 85
 

Loading…
取消
儲存