Browse Source

Marlin 1.1.0 Release Candidate 2 - 29 September 2015

Richard Wackerbarth 8 years ago
parent
commit
91b5156b3e
2 changed files with 26 additions and 15 deletions
  1. 5
    5
      Marlin/Default_Version.h
  2. 21
    10
      README.md

+ 5
- 5
Marlin/Default_Version.h View File

6
 // #error "You must specify the following parameters related to your distribution"
6
 // #error "You must specify the following parameters related to your distribution"
7
 
7
 
8
 #if true
8
 #if true
9
-  #define SHORT_BUILD_VERSION "1.1.0 dev"
10
-  #define DETAILED_BUILD_VERSION "1.1.0 Development From Archive"
11
-  #define STRING_DISTRIBUTION_DATE "2015-08-00 12:00"
12
-  // It might also be appropriate to define a location where additional information can be found
13
-  #define SOURCE_CODE_URL  "http:// ..."
9
+#define SHORT_BUILD_VERSION "1.1.0-RC2"
10
+#define DETAILED_BUILD_VERSION "1.1.0-RC2 From Archive"
11
+#define STRING_DISTRIBUTION_DATE "2015-09-28 12:00"
12
+// It might also be appropriate to define a location where additional information can be found
13
+#define SOURCE_CODE_URL  "http:// ..."
14
 #endif
14
 #endif

+ 21
- 10
README.md View File

2
 <img align="top" width=175 src="Documentation/Logo/Marlin%20Logo%20GitHub.png" />
2
 <img align="top" width=175 src="Documentation/Logo/Marlin%20Logo%20GitHub.png" />
3
  Documentation has moved to [marlinfirmware.org](http://www.marlinfirmware.org).
3
  Documentation has moved to [marlinfirmware.org](http://www.marlinfirmware.org).
4
 
4
 
5
-## Development Only
5
+## Release Candidate -- Marlin 1.1.0-RC2 - 29 September 2015
6
 
6
 
7
 __Not for production use – use with caution!__
7
 __Not for production use – use with caution!__
8
 
8
 
9
-The [dev branch](https://github.com/MarlinFirmware/MarlinDev/tree/dev) contains the most up-to-date Marlin code. When reporting any issues, please check to see if they are resolved in this branch first. But let us know if issues exist in tagged releases so that we can document and patch them.
9
+For the latest tagged version of Marlin (currently 1.0.2 – January 2015) you should switch to the [Release branch](https://github.com/MarlinFirmware/Marlin/tree/Release).
10
 
10
 
11
-## Testing
12
-The [RC branch](https://github.com/MarlinFirmware/MarlinDev/tree/RC) will contain the latest pre-release candidate.
11
+[This branch, "RC"](https://github.com/MarlinFirmware/Marlin/tree/RC), is our current pre-release candidate.
12
+
13
+Future development takes place in the [MarlinDev repository](https://github.com/MarlinFirmware/MarlinDev/).
14
+
15
+## Recent Changes
16
+RC2 - 29 Sep 2015
17
+      File styling reverted
18
+      LCD update frequency reduced
19
+
20
+RC1 - 19 Sep 2015
21
+      Published for testing
13
 
22
 
14
 ## Submitting Patches
23
 ## Submitting Patches
15
-Development patches should be submitted as a Pull Request against the [master](https://github.com/MarlinFirmware/MarlinDev/tree/master) branch
16
- 
17
-For the latest tagged version of Marlin (currently 1.0.2 – January 2015) you should switch to the [Release Repository](https://github.com/MarlinFirmware/Marlin).
24
+Proposed patches should be submitted as a Pull Request against the [RCBugFix](https://github.com/MarlinFirmware/Marlin/tree/RCBugFix) branch
25
+Note: Do not propose added features. Patches to the Release Candidate are limited to corrections of coding errors for the functions that have been implemented.
26
+Please follow the proper style. Pull requests containing styling errors will have to be reworked.
27
+
28
+
18
 
29
 
19
-## Current Status: Bug Fixing
30
+## Current Status: Testing
20
 
31
 
21
-Marlin development is being accelerated to catch up with a long list of issues. Check the Issues and Pull Requests links on the right to to see what we are currently working on.
32
+Please test this firmware and inform us of any issues where it fails to perform in a manner consistent with the designed functionality.
22
 
33
 
23
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224)
34
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224)
24
 [![Travis Build Status](https://travis-ci.org/MarlinFirmware/MarlinDev.svg)](https://travis-ci.org/MarlinFirmware/MarlinDev)
35
 [![Travis Build Status](https://travis-ci.org/MarlinFirmware/MarlinDev.svg)](https://travis-ci.org/MarlinFirmware/MarlinDev)
41
  - [@maverikou]
52
  - [@maverikou]
42
  - Chris Palmer [@nophead]
53
  - Chris Palmer [@nophead]
43
  - [@paclema]
54
  - [@paclema]
44
- - [@epatel]
55
+ - Edward Patel [@epatel] - Swedish, English
45
  - Erik van der Zalm [@ErikZalm]
56
  - Erik van der Zalm [@ErikZalm]
46
  - David Braam [@daid]
57
  - David Braam [@daid]
47
  - Bernhard Kubicek [@bkubicek]
58
  - Bernhard Kubicek [@bkubicek]

Loading…
Cancel
Save