ソースを参照

Marlin bugfix-2.0.x Version/README

Scott Lahteine 6年前
コミット
e4fcf460e7
66個のファイルの変更81行の追加114行の削除
  1. 1
    1
      Marlin/Configuration.h
  2. 1
    1
      Marlin/Configuration_adv.h
  3. 1
    1
      Marlin/Marlin_main.cpp
  4. 4
    4
      Marlin/Version.h
  5. 1
    1
      Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h
  6. 1
    1
      Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
  7. 1
    1
      Marlin/example_configurations/AliExpress/CL-260/Configuration.h
  8. 1
    1
      Marlin/example_configurations/Anet/A6/Configuration.h
  9. 1
    1
      Marlin/example_configurations/Anet/A6/Configuration_adv.h
  10. 1
    1
      Marlin/example_configurations/Anet/A8/Configuration.h
  11. 1
    1
      Marlin/example_configurations/Anet/A8/Configuration_adv.h
  12. 1
    1
      Marlin/example_configurations/BQ/Hephestos/Configuration.h
  13. 1
    1
      Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
  14. 1
    1
      Marlin/example_configurations/BQ/Hephestos_2/Configuration.h
  15. 1
    1
      Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
  16. 1
    1
      Marlin/example_configurations/BQ/WITBOX/Configuration.h
  17. 1
    1
      Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
  18. 1
    1
      Marlin/example_configurations/Cartesio/Configuration.h
  19. 1
    1
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  20. 1
    1
      Marlin/example_configurations/Creality/CR-10/Configuration.h
  21. 1
    1
      Marlin/example_configurations/Felix/Configuration.h
  22. 1
    1
      Marlin/example_configurations/Felix/Configuration_adv.h
  23. 1
    1
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  24. 1
    1
      Marlin/example_configurations/Folger Tech/i3-2020/Configuration.h
  25. 1
    1
      Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h
  26. 1
    1
      Marlin/example_configurations/Infitary/i3-M508/Configuration.h
  27. 1
    1
      Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
  28. 1
    1
      Marlin/example_configurations/Malyan/M150/Configuration.h
  29. 1
    1
      Marlin/example_configurations/Malyan/M150/Configuration_adv.h
  30. 1
    1
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  31. 1
    1
      Marlin/example_configurations/RigidBot/Configuration.h
  32. 1
    1
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  33. 1
    1
      Marlin/example_configurations/SCARA/Configuration.h
  34. 1
    1
      Marlin/example_configurations/SCARA/Configuration_adv.h
  35. 1
    1
      Marlin/example_configurations/TinyBoy2/Configuration.h
  36. 1
    1
      Marlin/example_configurations/TinyBoy2/Configuration_adv.h
  37. 1
    1
      Marlin/example_configurations/Velleman/K8200/Configuration.h
  38. 1
    1
      Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
  39. 1
    1
      Marlin/example_configurations/Velleman/K8400/Configuration.h
  40. 1
    1
      Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
  41. 1
    1
      Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h
  42. 1
    1
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  43. 1
    1
      Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
  44. 1
    1
      Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
  45. 1
    1
      Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
  46. 1
    1
      Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
  47. 1
    1
      Marlin/example_configurations/delta/generic/Configuration.h
  48. 1
    1
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  49. 1
    1
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  50. 1
    1
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  51. 1
    1
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  52. 1
    1
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  53. 1
    1
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  54. 1
    1
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  55. 1
    1
      Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h
  56. 1
    1
      Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
  57. 1
    1
      Marlin/example_configurations/makibox/Configuration.h
  58. 1
    1
      Marlin/example_configurations/makibox/Configuration_adv.h
  59. 1
    1
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  60. 1
    1
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
  61. 1
    1
      Marlin/example_configurations/wt150/Configuration.h
  62. 1
    1
      Marlin/example_configurations/wt150/Configuration_adv.h
  63. 11
    44
      README.md
  64. 2
    2
      buildroot/share/git/README.md
  65. 1
    1
      buildroot/share/git/mfclean
  66. 2
    2
      buildroot/share/git/mfinfo

+ 1
- 1
Marlin/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/Marlin_main.cpp ファイルの表示

8496
    *
8496
    *
8497
    * *** @thinkyhead: I recommend deprecating M206 for SCARA in favor of M665.
8497
    * *** @thinkyhead: I recommend deprecating M206 for SCARA in favor of M665.
8498
    * ***              M206 for SCARA will remain enabled in 1.1.x for compatibility.
8498
    * ***              M206 for SCARA will remain enabled in 1.1.x for compatibility.
8499
-   * ***              In the next 1.2 release, it will simply be disabled by default.
8499
+   * ***              In the 2.0 release, it will simply be disabled by default.
8500
    */
8500
    */
8501
   inline void gcode_M206() {
8501
   inline void gcode_M206() {
8502
     LOOP_XYZ(i)
8502
     LOOP_XYZ(i)

+ 4
- 4
Marlin/Version.h ファイルの表示

35
   /**
35
   /**
36
    * Marlin release version identifier
36
    * Marlin release version identifier
37
    */
37
    */
38
-  #define SHORT_BUILD_VERSION "bugfix-1.1.x"
38
+  #define SHORT_BUILD_VERSION "bugfix-2.0.x"
39
 
39
 
40
   /**
40
   /**
41
    * Verbose version identifier which should contain a reference to the location
41
    * Verbose version identifier which should contain a reference to the location
48
    * here we define this default string as the date where the latest release
48
    * here we define this default string as the date where the latest release
49
    * version was tagged.
49
    * version was tagged.
50
    */
50
    */
51
-  #define STRING_DISTRIBUTION_DATE "2017-05-04 12:00"
51
+  #define STRING_DISTRIBUTION_DATE "2017-07-27 12:00"
52
 
52
 
53
   /**
53
   /**
54
    * Required minimum Configuration.h and Configuration_adv.h file versions.
54
    * Required minimum Configuration.h and Configuration_adv.h file versions.
57
    * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option on
57
    * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option on
58
    * the configuration files.
58
    * the configuration files.
59
    */
59
    */
60
-  #define REQUIRED_CONFIGURATION_H_VERSION 010100
61
-  #define REQUIRED_CONFIGURATION_ADV_H_VERSION 010100
60
+  #define REQUIRED_CONFIGURATION_H_VERSION 020000
61
+  #define REQUIRED_CONFIGURATION_ADV_H_VERSION 020000
62
 
62
 
63
   /**
63
   /**
64
    * The protocol for communication to the host. Protocol indicates communication
64
    * The protocol for communication to the host. Protocol indicates communication

+ 1
- 1
Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/AliExpress/CL-260/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/Anet/A6/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/Anet/A6/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/Anet/A8/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/Anet/A8/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/BQ/Hephestos/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/BQ/Hephestos_2/Configuration.h ファイルの表示

22
 
22
 
23
 #ifndef CONFIGURATION_H
23
 #ifndef CONFIGURATION_H
24
 #define CONFIGURATION_H
24
 #define CONFIGURATION_H
25
-#define CONFIGURATION_H_VERSION 010100
25
+#define CONFIGURATION_H_VERSION 020000
26
 
26
 
27
 //===========================================================================
27
 //===========================================================================
28
 //================================= README ==================================
28
 //================================= README ==================================

+ 1
- 1
Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/BQ/WITBOX/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/Cartesio/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/Cartesio/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/Creality/CR-10/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/Felix/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/Felix/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/Felix/DUAL/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/Folger Tech/i3-2020/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/Infitary/i3-M508/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/Malyan/M150/Configuration.h ファイルの表示

42
  */
42
  */
43
 #ifndef CONFIGURATION_H
43
 #ifndef CONFIGURATION_H
44
 #define CONFIGURATION_H
44
 #define CONFIGURATION_H
45
-#define CONFIGURATION_H_VERSION 010100
45
+#define CONFIGURATION_H_VERSION 020000
46
 
46
 
47
 //===========================================================================
47
 //===========================================================================
48
 //============================= Getting Started =============================
48
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/Malyan/M150/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/RigidBot/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/RigidBot/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/SCARA/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/SCARA/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/TinyBoy2/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 /**
42
 /**
43
  * Sample configuration file for TinyBoy2 L10/L16
43
  * Sample configuration file for TinyBoy2 L10/L16

+ 1
- 1
Marlin/example_configurations/TinyBoy2/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/Velleman/K8200/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 /**
42
 /**
43
  * Sample configuration file for Vellemann K8200
43
  * Sample configuration file for Vellemann K8200

+ 1
- 1
Marlin/example_configurations/Velleman/K8200/Configuration_adv.h ファイルの表示

41
 
41
 
42
 #ifndef CONFIGURATION_ADV_H
42
 #ifndef CONFIGURATION_ADV_H
43
 #define CONFIGURATION_ADV_H
43
 #define CONFIGURATION_ADV_H
44
-#define CONFIGURATION_ADV_H_VERSION 010100
44
+#define CONFIGURATION_ADV_H_VERSION 020000
45
 
45
 
46
 // @section temperature
46
 // @section temperature
47
 
47
 

+ 1
- 1
Marlin/example_configurations/Velleman/K8400/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/Velleman/K8400/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/adafruit/ST7565/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/delta/generic/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/delta/generic/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/delta/kossel_mini/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/delta/kossel_pro/Configuration.h ファイルの表示

41
  */
41
  */
42
 #ifndef CONFIGURATION_H
42
 #ifndef CONFIGURATION_H
43
 #define CONFIGURATION_H
43
 #define CONFIGURATION_H
44
-#define CONFIGURATION_H_VERSION 010100
44
+#define CONFIGURATION_H_VERSION 020000
45
 
45
 
46
 //===========================================================================
46
 //===========================================================================
47
 //============================= Getting Started =============================
47
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_ADV_H
38
 #ifndef CONFIGURATION_ADV_H
39
 #define CONFIGURATION_ADV_H
39
 #define CONFIGURATION_ADV_H
40
-#define CONFIGURATION_ADV_H_VERSION 010100
40
+#define CONFIGURATION_ADV_H_VERSION 020000
41
 
41
 
42
 // @section temperature
42
 // @section temperature
43
 
43
 

+ 1
- 1
Marlin/example_configurations/delta/kossel_xl/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/makibox/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/makibox/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/tvrrug/Round2/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 1
- 1
Marlin/example_configurations/wt150/Configuration.h ファイルの表示

37
  */
37
  */
38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
-#define CONFIGURATION_H_VERSION 010100
40
+#define CONFIGURATION_H_VERSION 020000
41
 
41
 
42
 //===========================================================================
42
 //===========================================================================
43
 //============================= Getting Started =============================
43
 //============================= Getting Started =============================

+ 1
- 1
Marlin/example_configurations/wt150/Configuration_adv.h ファイルの表示

32
  */
32
  */
33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
-#define CONFIGURATION_ADV_H_VERSION 010100
35
+#define CONFIGURATION_ADV_H_VERSION 020000
36
 
36
 
37
 // @section temperature
37
 // @section temperature
38
 
38
 

+ 11
- 44
README.md ファイルの表示

8
 Additional documentation can be found at the [Marlin Home Page](http://marlinfw.org/).
8
 Additional documentation can be found at the [Marlin Home Page](http://marlinfw.org/).
9
 Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by!
9
 Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by!
10
 
10
 
11
-## Bugfix Branch
11
+## Marlin 2.0 Bugfix Branch
12
 
12
 
13
 __Not for production use. Use with caution!__
13
 __Not for production use. Use with caution!__
14
 
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.
15
+This branch is used to accumulate patches to the latest 2.0.x release version. Periodically this branch will form the basis for the next minor 2.0.x release.
16
 
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.1.)
17
+Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases).
18
 
18
 
19
 ## Recent Changes
19
 ## Recent Changes
20
-- Further integration of Unified Bed Leveling
21
-- Initial UBL LCD Menu
22
-- New optimized G-code parser singleton
23
-- Initial M3/M4/M5 Spindle and Laser support
24
-- Added M421 Q to offset a mesh point
25
-- Refinements to G26 and G33
26
-- Added M80 S to query the power state
27
-- "Cancel Print" now shuts off heaters
28
-- Added `EXTRAPOLATE_BEYOND_GRID` option for mesh-based leveling
20
+- Add a Hardware Abstraction Layer (HAL) supporting current AVR platforms
21
+- Planning a HAL for Re:Arm
22
+- Planning a HAL for STM32
29
 
23
 
30
 ## Submitting Patches
24
 ## Submitting Patches
31
 
25
 
32
-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)).
26
+Proposed patches should be submitted as a Pull Request against this branch ([bugfix-2.0.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x)).
33
 
27
 
34
-- 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.
35
-- 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.
36
-- 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.
28
+- This branch is for fixing bugs and integrating any new features for the duration of the Marlin 2.0.x life-cycle.
29
+- Follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) to gain points with the maintainers.
30
+- Please submit your questions and concerns to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues).
37
 
31
 
38
 ### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
32
 ### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
39
 
33
 
43
  - Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - English
37
  - Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - English
44
  - Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - English
38
  - Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - English
45
  - Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - English
39
  - Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - English
46
- - Andreas Hardtung [[@AnHardt](https://github.com/AnHardt)] - Deutsch, English
47
- - Nico Tonnhofer [[@Wurstnase](https://github.com/Wurstnase)] - Deutsch, English
48
- - Jochen Groppe [[@CONSULitAS](https://github.com/CONSULitAS)] - Deutsch, English
40
+ - Chris Pepper [[@p3p](https://github.com/p3p)] - English
49
  - João Brazio [[@jbrazio](https://github.com/jbrazio)] - Portuguese, English
41
  - João Brazio [[@jbrazio](https://github.com/jbrazio)] - Portuguese, English
50
- - Bo Hermannsen [[@boelle](https://github.com/boelle)] - Danish, English
51
- - Bob Cousins [[@bobc](https://github.com/bobc)] - English
52
- - [[@maverikou](https://github.com/maverikou)]
53
- - Chris Palmer [[@nophead](https://github.com/nophead)]
54
- - [[@paclema](https://github.com/paclema)]
55
- - Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)]
56
- - David Braam [[@daid](https://github.com/daid)]
57
- - Bernhard Kubicek [[@bkubicek](https://github.com/bkubicek)]
58
-
59
-More features have been added by:
60
- - Alberto Cotronei [[@MagoKimbra](https://github.com/MagoKimbra)] - English, Italian
61
- - Thomas Moore [[@tcm0116](https://github.com/tcm0116)]
62
- - Ernesto Martinez [[@emartinez167](https://github.com/emartinez167)]
63
- - Petr Zahradnik [[@clexpert](https://github.com/clexpert)]
64
- - Kai [[@Kaibob2](https://github.com/Kaibob2)]
65
- - Edward Patel [[@epatel](https://github.com/epatel)]
66
- - F. Malpartida [[@fmalpartida](https://github.com/fmalpartida)] - English, Spanish
67
- - [[@esenapaj](https://github.com/esenapaj)] - English, Japanese
68
- - [[@benlye](https://github.com/benlye)]
69
- - [[@Tannoo](https://github.com/Tannoo)]
70
- - [[@teemuatlut](https://github.com/teemuatlut)]
71
- - [[@bgort](https://github.com/bgort)]
72
- - Luc Van Daele[[@LVD-AC](https://github.com/LVD-AC)] - Dutch, French, English
73
- - [[@paulusjacobus](https://github.com/paulusjacobus)]
74
- - ...and many others
75
 
42
 
76
 ## License
43
 ## License
77
 
44
 

+ 2
- 2
buildroot/share/git/README.md ファイルの表示

18
 
18
 
19
 File|Description
19
 File|Description
20
 ----|-----------
20
 ----|-----------
21
-mfadd [user]|Add Remote - Add another Github user's fork of Marlin as a remote, then fetch it. After this you can check out one of their branches and either make a PR targeted at their fork or targeted at `bugfix-1.1.x`.
21
+mfadd [user]|Add Remote - Add another Github user's fork of Marlin as a remote, then fetch it. After this you can check out one of their branches and either make a PR targeted at their fork or targeted at `bugfix-2.0.x`.
22
 mfinit|Init Working Copy - Creates a remote named '`upstream`' (for use by the other scripts) pointing to the '`MarlinFirmware`' fork. Use once after checking out your fork.
22
 mfinit|Init Working Copy - Creates a remote named '`upstream`' (for use by the other scripts) pointing to the '`MarlinFirmware`' fork. Use once after checking out your fork.
23
 
23
 
24
 
24
 
50
 File|Description
50
 File|Description
51
 ----|-----------
51
 ----|-----------
52
 ghtp -[h/s]|Set the protocol to use for all remotes. -h for HTTPS, -s for SSL.
52
 ghtp -[h/s]|Set the protocol to use for all remotes. -h for HTTPS, -s for SSL.
53
-mfinfo|This utility script is used by the other scripts to get:<br/>- The upstream project ('`MarlinFirmware`')<br/>- the '`origin`' project (i.e., your Github username),<br/>- the repository name ('`Marlin`'),<br/>- the PR target branch ('`bugfix-1.1.x`'), and<br/>- the current branch (or the first command-line argument).<br/><br/>By itself, `mfinfo` simply prints these values to the console.
53
+mfinfo|This utility script is used by the other scripts to get:<br/>- The upstream project ('`MarlinFirmware`')<br/>- the '`origin`' project (i.e., your Github username),<br/>- the repository name ('`Marlin`'),<br/>- the PR target branch ('`bugfix-2.0.x`'), and<br/>- the current branch (or the first command-line argument).<br/><br/>By itself, `mfinfo` simply prints these values to the console.
54
 mfclean&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|Prune your merged and remotely-deleted branches.
54
 mfclean&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|Prune your merged and remotely-deleted branches.
55
 
55
 
56
 ---
56
 ---

+ 1
- 1
buildroot/share/git/mfclean ファイルの表示

6
 # Great way to clean up your branches after messing around a lot
6
 # Great way to clean up your branches after messing around a lot
7
 #
7
 #
8
 
8
 
9
-KEEP="RC|RCBugFix|dev|master|bugfix-1"
9
+KEEP="RC|RCBugFix|dev|master|bugfix-1|bugfix-2"
10
 
10
 
11
 echo "Fetching latest upstream and origin..."
11
 echo "Fetching latest upstream and origin..."
12
 git fetch upstream
12
 git fetch upstream

+ 2
- 2
buildroot/share/git/mfinfo ファイルの表示

7
 #   - Remote (upstream) Org name (MarlinFirmware)
7
 #   - Remote (upstream) Org name (MarlinFirmware)
8
 #   - Remote (origin) Org name (your Github username)
8
 #   - Remote (origin) Org name (your Github username)
9
 #   - Repo Name (Marlin, MarlinDev, MarlinDocumentation)
9
 #   - Repo Name (Marlin, MarlinDev, MarlinDocumentation)
10
-#   - PR Target branch (bugfix-1.1.x, dev, or master)
10
+#   - PR Target branch (bugfix-2.0.x, dev, or master)
11
 #   - Branch Arg (the branch argument or current branch)
11
 #   - Branch Arg (the branch argument or current branch)
12
 #   - Current Branch
12
 #   - Current Branch
13
 #
13
 #
23
 [[ $ORG == MarlinFirmware ]] || { echo "`basename $0`: Not a Marlin repository." 1>&2 ; exit 1; }
23
 [[ $ORG == MarlinFirmware ]] || { echo "`basename $0`: Not a Marlin repository." 1>&2 ; exit 1; }
24
 
24
 
25
 case "$REPO" in
25
 case "$REPO" in
26
-  Marlin              ) TARG=bugfix-1.1.x ;;
26
+  Marlin              ) TARG=bugfix-2.0.x ;;
27
   MarlinDev           ) TARG=dev ;;
27
   MarlinDev           ) TARG=dev ;;
28
   MarlinDocumentation ) TARG=master ;;
28
   MarlinDocumentation ) TARG=master ;;
29
 esac
29
 esac

読み込み中…
キャンセル
保存