thomas
/
marlin
關註 1
收藏 0
複製 0
程式碼 問題管理 0 合併請求 0 版本發佈 0 Wiki Activity
瀏覽代碼

Merge pull request #3669 from esenapaj/patch-2 

Fix for PR #3526(Configuration.h LCD & SDCard s...
Scott Lahteine 9 年之前
父節點
6bb664c690 212b17d510
當前提交
4e1a91caa1
共有 19 個文件被更改，包括 0 次插入 和 114 次删除
統一視圖 顯示文件統計
  1. 0
    6
      Marlin/Configuration.h
  2. 0
    6
      Marlin/example_configurations/Felix/Configuration.h
  3. 0
    6
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  4. 0
    6
      Marlin/example_configurations/Hephestos/Configuration.h
  5. 0
    6
      Marlin/example_configurations/Hephestos_2/Configuration.h
  6. 0
    6
      Marlin/example_configurations/K8200/Configuration.h
  7. 0
    6
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  8. 0
    6
      Marlin/example_configurations/RigidBot/Configuration.h
  9. 0
    6
      Marlin/example_configurations/SCARA/Configuration.h
  10. 0
    6
      Marlin/example_configurations/TAZ4/Configuration.h
  11. 0
    6
      Marlin/example_configurations/WITBOX/Configuration.h
  12. 0
    6
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  13. 0
    6
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  14. 0
    6
      Marlin/example_configurations/delta/generic/Configuration.h
  15. 0
    6
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  16. 0
    6
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  17. 0
    6
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  18. 0
    6
      Marlin/example_configurations/makibox/Configuration.h
  19. 0
    6
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 0
- 6
Marlin/Configuration.h 查看文件

940 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
 940 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
941
941
942 
 //
 942 
 //
943 
-// BQ LCD Smart Controller shipped by
944 
-// default with the BQ Hephestos 2 and Witbox 2.
945 
-//
946 
-//#define BQ_LCD_SMART_CONTROLLER
947 
-
948 
-//
949 
 // GADGETS3D G3D LCD/SD Controller
 943 
 // GADGETS3D G3D LCD/SD Controller
950 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 944 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
951 
 //
 945 
 //

+ 0
- 6
Marlin/example_configurations/Felix/Configuration.h 查看文件

923 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
 923 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
924
924
925 
 //
 925 
 //
926 
-// BQ LCD Smart Controller shipped by
927 
-// default with the BQ Hephestos 2 and Witbox 2.
928 
-//
929 
-//#define BQ_LCD_SMART_CONTROLLER
930 
-
931 
-//
932 
 // GADGETS3D G3D LCD/SD Controller
 926 
 // GADGETS3D G3D LCD/SD Controller
933 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 927 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
934 
 //
 928 
 //

+ 0
- 6
Marlin/example_configurations/Felix/Configuration_DUAL.h 查看文件

921 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
 921 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
922
922
923 
 //
 923 
 //
924 
-// BQ LCD Smart Controller shipped by
925 
-// default with the BQ Hephestos 2 and Witbox 2.
926 
-//
927 
-//#define BQ_LCD_SMART_CONTROLLER
928 
-
929 
-//
930 
 // GADGETS3D G3D LCD/SD Controller
 924 
 // GADGETS3D G3D LCD/SD Controller
931 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 925 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
932 
 //
 926 
 //

+ 0
- 6
Marlin/example_configurations/Hephestos/Configuration.h 查看文件

932 
 #define REPRAP_DISCOUNT_SMART_CONTROLLER
 932 
 #define REPRAP_DISCOUNT_SMART_CONTROLLER
933
933
934 
 //
 934 
 //
935 
-// BQ LCD Smart Controller shipped by
936 
-// default with the BQ Hephestos 2 and Witbox 2.
937 
-//
938 
-//#define BQ_LCD_SMART_CONTROLLER
939 
-
940 
-//
941 
 // GADGETS3D G3D LCD/SD Controller
 935 
 // GADGETS3D G3D LCD/SD Controller
942 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 936 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
943 
 //
 937 
 //

+ 0
- 6
Marlin/example_configurations/Hephestos_2/Configuration.h 查看文件

934 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
 934 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
935
935
936 
 //
 936 
 //
937 
-// BQ LCD Smart Controller shipped by
938 
-// default with the BQ Hephestos 2 and Witbox 2.
939 
-//
940 
-//#define BQ_LCD_SMART_CONTROLLER
941 
-
942 
-//
943 
 // GADGETS3D G3D LCD/SD Controller
 937 
 // GADGETS3D G3D LCD/SD Controller
944 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 938 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
945 
 //
 939 
 //

+ 0
- 6
Marlin/example_configurations/K8200/Configuration.h 查看文件

957 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
 957 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
958
958
959 
 //
 959 
 //
960 
-// BQ LCD Smart Controller shipped by
961 
-// default with the BQ Hephestos 2 and Witbox 2.
962 
-//
963 
-//#define BQ_LCD_SMART_CONTROLLER
964 
-
965 
-//
966 
 // GADGETS3D G3D LCD/SD Controller
 960 
 // GADGETS3D G3D LCD/SD Controller
967 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 961 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
968 
 //
 962 
 //

+ 0
- 6
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h 查看文件

940 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
 940 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
941
941
942 
 //
 942 
 //
943 
-// BQ LCD Smart Controller shipped by
944 
-// default with the BQ Hephestos 2 and Witbox 2.
945 
-//
946 
-//#define BQ_LCD_SMART_CONTROLLER
947 
-
948 
-//
949 
 // GADGETS3D G3D LCD/SD Controller
 943 
 // GADGETS3D G3D LCD/SD Controller
950 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 944 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
951 
 //
 945 
 //

+ 0
- 6
Marlin/example_configurations/RigidBot/Configuration.h 查看文件

935 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
 935 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
936
936
937 
 //
 937 
 //
938 
-// BQ LCD Smart Controller shipped by
939 
-// default with the BQ Hephestos 2 and Witbox 2.
940 
-//
941 
-//#define BQ_LCD_SMART_CONTROLLER
942 
-
943 
-//
944 
 // GADGETS3D G3D LCD/SD Controller
 938 
 // GADGETS3D G3D LCD/SD Controller
945 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 939 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
946 
 //
 940 
 //

+ 0
- 6
Marlin/example_configurations/SCARA/Configuration.h 查看文件

948 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
 948 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
949
949
950 
 //
 950 
 //
951 
-// BQ LCD Smart Controller shipped by
952 
-// default with the BQ Hephestos 2 and Witbox 2.
953 
-//
954 
-//#define BQ_LCD_SMART_CONTROLLER
955 
-
956 
-//
957 
 // GADGETS3D G3D LCD/SD Controller
 951 
 // GADGETS3D G3D LCD/SD Controller
958 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 952 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
959 
 //
 953 
 //

+ 0
- 6
Marlin/example_configurations/TAZ4/Configuration.h 查看文件

961 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
 961 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
962
962
963 
 //
 963 
 //
964 
-// BQ LCD Smart Controller shipped by
965 
-// default with the BQ Hephestos 2 and Witbox 2.
966 
-//
967 
-//#define BQ_LCD_SMART_CONTROLLER
968 
-
969 
-//
970 
 // GADGETS3D G3D LCD/SD Controller
 964 
 // GADGETS3D G3D LCD/SD Controller
971 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 965 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
972 
 //
 966 
 //

+ 0
- 6
Marlin/example_configurations/WITBOX/Configuration.h 查看文件

932 
 #define REPRAP_DISCOUNT_SMART_CONTROLLER
 932 
 #define REPRAP_DISCOUNT_SMART_CONTROLLER
933
933
934 
 //
 934 
 //
935 
-// BQ LCD Smart Controller shipped by
936 
-// default with the BQ Hephestos 2 and Witbox 2.
937 
-//
938 
-//#define BQ_LCD_SMART_CONTROLLER
939 
-
940 
-//
941 
 // GADGETS3D G3D LCD/SD Controller
 935 
 // GADGETS3D G3D LCD/SD Controller
942 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 936 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
943 
 //
 937 
 //

+ 0
- 6
Marlin/example_configurations/adafruit/ST7565/Configuration.h 查看文件

940 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
 940 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
941
941
942 
 //
 942 
 //
943 
-// BQ LCD Smart Controller shipped by
944 
-// default with the BQ Hephestos 2 and Witbox 2.
945 
-//
946 
-//#define BQ_LCD_SMART_CONTROLLER
947 
-
948 
-//
949 
 // GADGETS3D G3D LCD/SD Controller
 943 
 // GADGETS3D G3D LCD/SD Controller
950 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 944 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
951 
 //
 945 
 //

+ 0
- 6
Marlin/example_configurations/delta/biv2.5/Configuration.h 查看文件

1069 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
 1069 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
1070
1070
1071 
 //
 1071 
 //
1072 
-// BQ LCD Smart Controller shipped by
1073 
-// default with the BQ Hephestos 2 and Witbox 2.
1074 
-//
1075 
-//#define BQ_LCD_SMART_CONTROLLER
1076 
-
1077 
-//
1078 
 // GADGETS3D G3D LCD/SD Controller
 1072 
 // GADGETS3D G3D LCD/SD Controller
1079 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 1073 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
1080 
 //
 1074 
 //

+ 0
- 6
Marlin/example_configurations/delta/generic/Configuration.h 查看文件

1069 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
 1069 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
1070
1070
1071 
 //
 1071 
 //
1072 
-// BQ LCD Smart Controller shipped by
1073 
-// default with the BQ Hephestos 2 and Witbox 2.
1074 
-//
1075 
-//#define BQ_LCD_SMART_CONTROLLER
1076 
-
1077 
-//
1078 
 // GADGETS3D G3D LCD/SD Controller
 1072 
 // GADGETS3D G3D LCD/SD Controller
1079 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 1073 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
1080 
 //
 1074 
 //

+ 0
- 6
Marlin/example_configurations/delta/kossel_mini/Configuration.h 查看文件

1073 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
 1073 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
1074
1074
1075 
 //
 1075 
 //
1076 
-// BQ LCD Smart Controller shipped by
1077 
-// default with the BQ Hephestos 2 and Witbox 2.
1078 
-//
1079 
-//#define BQ_LCD_SMART_CONTROLLER
1080 
-
1081 
-//
1082 
 // GADGETS3D G3D LCD/SD Controller
 1076 
 // GADGETS3D G3D LCD/SD Controller
1083 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 1077 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
1084 
 //
 1078 
 //

+ 0
- 6
Marlin/example_configurations/delta/kossel_pro/Configuration.h 查看文件

1066 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
 1066 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
1067
1067
1068 
 //
 1068 
 //
1069 
-// BQ LCD Smart Controller shipped by
1070 
-// default with the BQ Hephestos 2 and Witbox 2.
1071 
-//
1072 
-//#define BQ_LCD_SMART_CONTROLLER
1073 
-
1074 
-//
1075 
 // GADGETS3D G3D LCD/SD Controller
 1069 
 // GADGETS3D G3D LCD/SD Controller
1076 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 1070 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
1077 
 //
 1071 
 //

+ 0
- 6
Marlin/example_configurations/delta/kossel_xl/Configuration.h 查看文件

1074 
 #define REPRAP_DISCOUNT_SMART_CONTROLLER
 1074 
 #define REPRAP_DISCOUNT_SMART_CONTROLLER
1075
1075
1076 
 //
 1076 
 //
1077 
-// BQ LCD Smart Controller shipped by
1078 
-// default with the BQ Hephestos 2 and Witbox 2.
1079 
-//
1080 
-//#define BQ_LCD_SMART_CONTROLLER
1081 
-
1082 
-//
1083 
 // GADGETS3D G3D LCD/SD Controller
 1077 
 // GADGETS3D G3D LCD/SD Controller
1084 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 1078 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
1085 
 //
 1079 
 //

+ 0
- 6
Marlin/example_configurations/makibox/Configuration.h 查看文件

943 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
 943 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
944
944
945 
 //
 945 
 //
946 
-// BQ LCD Smart Controller shipped by
947 
-// default with the BQ Hephestos 2 and Witbox 2.
948 
-//
949 
-//#define BQ_LCD_SMART_CONTROLLER
950 
-
951 
-//
952 
 // GADGETS3D G3D LCD/SD Controller
 946 
 // GADGETS3D G3D LCD/SD Controller
953 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 947 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
954 
 //
 948 
 //

+ 0
- 6
Marlin/example_configurations/tvrrug/Round2/Configuration.h 查看文件

934 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
 934 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
935
935
936 
 //
 936 
 //
937 
-// BQ LCD Smart Controller shipped by
938 
-// default with the BQ Hephestos 2 and Witbox 2.
939 
-//
940 
-//#define BQ_LCD_SMART_CONTROLLER
941 
-
942 
-//
943 
 // GADGETS3D G3D LCD/SD Controller
 937 
 // GADGETS3D G3D LCD/SD Controller
944 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
 938 
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
945 
 //
 939 
 //

Write Preview
Loading…
取消
儲存