Browse Source

bugfix-1.1.x ReadMe, Version, helper scripts

Scott Lahteine 7 years ago
parent
commit
3cd9af2409
3 changed files with 111 additions and 39 deletions
  1. 2
    2
      Marlin/Version.h
  2. 108
    36
      README.md
  3. 1
    1
      buildroot/share/git/mfinfo

+ 2
- 2
Marlin/Version.h View File

@@ -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 "bugfix-1.1.x"
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-12-06 12:00"
51
+  #define STRING_DISTRIBUTION_DATE "2017-05-04 12:00"
52 52
 
53 53
   /**
54 54
    * Required minimum Configuration.h and Configuration_adv.h file versions.

+ 108
- 36
README.md View File

@@ -1,40 +1,114 @@
1 1
 # Marlin 3D Printer Firmware
2
-<img align="right" src="../../raw/1.1.x/buildroot/share/pixmaps/logo/marlin-250.png" />
3
-
4
-## Marlin 1.1.0
5
-
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
-
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
-
10
-## Stable Release Branch
11
-
12
-This Release branch contains the latest tagged version of Marlin (currently 1.1.0 – May 2017).
13
-
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
-
16
-## Contributing to Marlin
17
-
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
-
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
-
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
-
24
-## Current Status: In Development
25
-
26
-Marlin development has reached an important milestone with its first stable release in over 2 years. During this period we focused on cleaning up the code and making it more modern, consistent, readable, and sensible.
27
-
28
-## Future Development
29
-
30
-Arduino IDE now supports folder hierarchies, so Marlin 1.1 is the last "flat" version of Marlin. Version 1.2 will have a hierarchical file structure, and will form the starting-point for our integration of 32-bit CPU support.
31 2
 
3
+[![Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg?branch=RCBugFix)](https://travis-ci.org/MarlinFirmware/Marlin)
32 4
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224)
33
-[![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin)
34 5
 
35
-##### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
36
-##### [Marlin Home Page](http://marlinfw.org/)
37
-##### [Marlin Discussion Forum](http://forums.reprap.org/list.php?415)
6
+<img align="top" width=175 src="buildroot/share/pixmaps/logo/marlin-250.png" />
7
+
8
+Additional documentation can be found at the [Marlin Home Page](http://marlinfw.org/).
9
+Please test this firmware and inform us if it misbehaves in any way, volunteers are standing by!
10
+
11
+## Bugfix Branch
12
+
13
+__Not for production use. Use with caution!__
14
+
15
+This branch is used to accumulate patches to the latest 1.1.x release version. Periodically this branch will form the basis for the next minor 1.1.x release.
16
+
17
+Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases). (The latest tagged release of Marlin is version 1.1.0.)
18
+
19
+## Recent Changes
20
+- 1.1.0 - 4 May 2017
21
+  - See the [1.1.0 Release Notes](https://github.com/MarlinFirmware/Marlin/releases/tag/1.1.0) for a full list of changes.
22
+
23
+- RC8 - 6 Dec 2016
24
+  - Major performance improvement for Graphical LCDs
25
+  - Simplified probe configuration
26
+  - Enable Auto Bed Leveling by type
27
+  - Reduce serial communication errors
28
+  - Make Bilinear (Mesh) Grid Leveling available for non-delta
29
+  - Support for Trinamic TMC2130 SilentStepStick SPI-based drivers
30
+  - Add `M211` to Enable/Disable Software Endstops
31
+  - Add `M355` to turn the case light on/off and set brightness
32
+  - Improved I2C class with full master/slave support
33
+  - Add `G38.2` `G38.3` command option for CNC style probing
34
+  - Add `MINIMUM_STEPPER_PULSE` option to adjust step pulse duration
35
+  - Add `R` parameter support for `G2`/`G3`
36
+  - Add `M43` optional command (`PINS_DEBUGGING`)
37
+  - Remove SCARA axis scaling
38
+  - Improved sanity checking of configuration
39
+  - Improved support for PlatformIO and command-line build
40
+  - Usable `DELTA_CALIBRATION_MENU`
41
+  - Support for Printrbot Rev.F
42
+  - New and updated languages
43
+
44
+- RC7 - 26 Jul 2016
45
+  - Add Print Job Timer and Print Counter (`PRINTCOUNTER`)
46
+  - New `M600` Filament Change (`FILAMENT_CHANGE_FEATURE`)
47
+  - New `G12` Nozzle Clean (`NOZZLE_CLEAN_FEATURE`)
48
+  - New `G27` Nozzle Park (`NOZZLE_PARK_FEATURE`)
49
+  - Add support for `COREYZ`
50
+  - Add a new Advance Extrusion algorithm (`LIN_ADVANCE`)
51
+  - Add support for inches, Fahrenheit, Kelvin units (`INCH_MODE_SUPPORT`, `TEMPERATURE_UNITS_SUPPORT`)
52
+  - Better handling of `G92` shifting of the coordinate space
53
+  - Add Greek and Croatian languages
54
+  - Improve the Manual (Mesh) Bed Leveling user interface
55
+  - Add support for more boards, controllers, and probes:
56
+    - Vellemann K8400 (`BOARD_K8400`)
57
+    - RigidBot V2 (`BOARD_RIGIDBOARD_V2`)
58
+    - Cartesio UI (`BOARD_CNCONTROLS_12`)
59
+    - BLTouch probe sensor (`BLTOUCH`)
60
+    - Viki 2 with RAMPS and MKS boards
61
+  - Improve support for `DELTA` and other kinematics
62
+  - Improve thermal management, add `WATCH_BED_TEMP_PERIOD`
63
+  - Better handling of toolchange, multiple tools
64
+  - Add support for two X steppers `X_DUAL_STEPPER_DRIVERS`
65
+  - Add support for `SINGLENOZZLE`, `MIXING_EXTRUDER`, and `SWITCHING_EXTRUDER`
66
+  - Simplified probe configuration, allow usage without bed leveling
67
+  - And much more… See the [1.1.0-RC7 Change Log](https://github.com/MarlinFirmware/Marlin/releases/tag/1.1.0-RC7) for the complete list of changes.
68
+
69
+- RC6 - 24 Apr 2016
70
+  - Marlin now requires Arduino version 1.6.0 or later
71
+  - Completed support for CoreXY / CoreXZ
72
+  - See the [1.1.0-RC6 Change Log](https://github.com/MarlinFirmware/Marlin/releases/tag/1.1.0-RC6) for all the changes.
73
+
74
+- RC5 - 01 Apr 2016
75
+  - Warn if compiling with older versions (<1.50) of Arduino
76
+  - Fix various LCD menu issues
77
+  - Add formal support for MKSv1.3 and Sainsmart (RAMPS variants)
78
+  - Fix bugs in M104, M109, and M190
79
+  - Fix broken M404 command
80
+  - Fix issues with M23 and "Start SD Print"
81
+  - More output for M111
82
+  - Rename FILAMENT_SENSOR to FILAMENT_WIDTH_SENSOR
83
+  - Fix SD card bugs
84
+  - and a lot more
85
+  - See the [1.1.0-RC5 Change Log](https://github.com/MarlinFirmware/Marlin/releases/tag/1.1.0-RC5) for more!
86
+
87
+- RC4 - 24 Mar 2016
88
+  - Many lingering bugs and nagging issues addressed
89
+  - Improvements to LCD menus, CoreXY/CoreXZ, Delta, Bed Leveling, and more…
90
+
91
+- RC3 - 01 Dec 2015
92
+  - A number of language sensitive strings have been revised
93
+  - Formatting of the LCD display has been improved to handle negative coordinates better
94
+  - Various compiler-related issues have been corrected
95
+
96
+- RC2 - 29 Sep 2015
97
+  - File styling reverted
98
+  - LCD update frequency reduced
99
+
100
+- RC1 - 19 Sep 2015
101
+  - Published for testing
102
+
103
+## Submitting Patches
104
+
105
+Proposed patches should be submitted as a Pull Request against this branch ([bugfix-1.1.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-1.1.x)).
106
+
107
+- This branch is for fixing bugs and integrating any new features for the duration of the Marlin 1.1.x life-cycle. We've opted for a simplified branch structure while we work on the maintainability and encapsulation of code modules. Version 1.2 and beyond should improve on separation of bug fixes and cutting-edge development.
108
+- Follow the proper coding style to gain points with the maintainers. See our [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) page for more information.
109
+- Please submit your questions and concerns to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues). The "naive" question is often the one we forget to ask.
110
+
111
+### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
38 112
 
39 113
 ## Credits
40 114
 
@@ -74,8 +148,6 @@ More features have been added by:
74 148
 
75 149
 ## License
76 150
 
77
-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.
151
+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.
78 152
 
79 153
 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.
80
-
81
-[![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)

+ 1
- 1
buildroot/share/git/mfinfo View File

@@ -25,7 +25,7 @@ if [[ $ORG != MarlinFirmware ]]; then
25 25
 fi
26 26
 
27 27
 case "$REPO" in
28
-  Marlin              ) TARG=RCBugFix ;;
28
+  Marlin              ) TARG=bugfix-1.1.x ;;
29 29
   MarlinDev           ) TARG=dev ;;
30 30
   MarlinDocumentation ) TARG=master ;;
31 31
 esac

Loading…
Cancel
Save