Scott Lahteine 7 lat temu
rodzic
commit
d97dc10216
2 zmienionych plików z 14 dodań i 10 usunięć
  1. 2
    2
      Marlin/Version.h
  2. 12
    8
      README.md

+ 2
- 2
Marlin/Version.h Wyświetl plik

@@ -35,7 +35,7 @@
35 35
   /**
36 36
    * Marlin release version identifier
37 37
    */
38
-  #define SHORT_BUILD_VERSION "1.1.0-RCBugFix"
38
+  #define SHORT_BUILD_VERSION "1.1.0-RC7"
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 "2016-07-26 12:00"
51
+  #define STRING_DISTRIBUTION_DATE "2016-07-31 12:00"
52 52
 
53 53
   /**
54 54
    * Required minimum Configuration.h and Configuration_adv.h file versions.

+ 12
- 8
README.md Wyświetl plik

@@ -1,14 +1,11 @@
1 1
 # Marlin 3D Printer Firmware
2 2
 
3
-[![Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg?branch=RCBugFix)](https://travis-ci.org/MarlinFirmware/Marlin)
4
-[![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224)
5
-
6 3
 <img align="top" width=175 src="buildroot/share/pixmaps/logo/marlin-250.png" />
7 4
 
8 5
 Additional documentation can be found at [The Marlin Documentation Project](https://www.marlinfw.org/).
9 6
 Please test this firmware and inform us if it misbehaves in any way, volunteers are standing by!
10 7
 
11
-## Release Candidate -- Marlin 1.1.0-RCBugFix - 26 July 2016
8
+## Release Candidate -- Marlin 1.1.0-RC7 - 31 July 2016
12 9
 
13 10
 __Not for production use – use with caution!__
14 11
 
@@ -17,9 +14,7 @@ You can download earlier versions of Marlin on the [Releases page](https://githu
17 14
 The latest Release Candidate lives in the ["RC" branch](https://github.com/MarlinFirmware/Marlin/tree/RC). Bugs that we find in the current Release Candidate are patched in the ["RCBugFix" branch](https://github.com/MarlinFirmware/Marlin/tree/RCBugFix), so during beta testing this is where you can always find the latest code on its way towards release.
18 15
 
19 16
 ## Recent Changes
20
-- RCBugFix
21
-
22
-- RC7 - 26 Jul 2016
17
+- RC7 - 31 Jul 2016
23 18
   - Add Print Job Timer and Print Counter (`PRINTCOUNTER`)
24 19
   - New `M600` Filament Change (`FILAMENT_CHANGE_FEATURE`)
25 20
   - New `G12` Nozzle Clean (`NOZZLE_CLEAN_FEATURE`)
@@ -85,7 +80,14 @@ Proposed patches should be submitted as a Pull Request against the [RCBugFix](ht
85 80
 - Do submit questions and concerns. The "naive" question is often the one we forget to ask.
86 81
 - Follow the proper coding style. Pull requests with styling errors will be delayed. See our [Coding Standards](https://github.com/MarlinFirmware/Marlin/wiki/DNE-Coding-Standards) page for more information.
87 82
 
88
-### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
83
+## Current Status: Testing
84
+
85
+Please test this firmware and inform us if it misbehaves in any way. Volunteers are standing by!
86
+
87
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224)
88
+[![Travis Build Status](https://travis-ci.org/MarlinFirmware/MarlinDev.svg)](https://travis-ci.org/MarlinFirmware/MarlinDev)
89
+
90
+##### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
89 91
 
90 92
 ## Credits
91 93
 
@@ -115,3 +117,5 @@ More features have been added by:
115 117
 Marlin is published under the [GPL license](/LICENSE) 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.
116 118
 
117 119
 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.
120
+
121
+[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)

Ładowanie…
Anuluj
Zapisz