thomas
/
marlin
Прати 1
Волим 0
Креирај огранак 0
Код Дискусије 0 Захтеви за спајање 0 Издања 0 Вики Activity
Преглед изворни кода

Support for SAV_3DGLCD OLED LCD controller

Scott Lahteine пре 8 година
родитељ
bd97bbc52a
комит
a0b000d752
21 измењених фајлова са 141 додато и 5 уклоњено
Подељен поглед Покажи статистику Diff
  1. 4
    4
      Marlin/Conditionals.h
  2. 7
    0
      Marlin/Configuration.h
  3. 4
    1
      Marlin/dogm_lcd_implementation.h
  4. 7
    0
      Marlin/example_configurations/Felix/Configuration.h
  5. 7
    0
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  6. 7
    0
      Marlin/example_configurations/Hephestos/Configuration.h
  7. 7
    0
      Marlin/example_configurations/Hephestos_2/Configuration.h
  8. 7
    0
      Marlin/example_configurations/K8200/Configuration.h
  9. 7
    0
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  10. 7
    0
      Marlin/example_configurations/RigidBot/Configuration.h
  11. 7
    0
      Marlin/example_configurations/SCARA/Configuration.h
  12. 7
    0
      Marlin/example_configurations/TAZ4/Configuration.h
  13. 7
    0
      Marlin/example_configurations/WITBOX/Configuration.h
  14. 7
    0
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  15. 7
    0
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  16. 7
    0
      Marlin/example_configurations/delta/generic/Configuration.h
  17. 7
    0
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  18. 7
    0
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  19. 7
    0
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  20. 7
    0
      Marlin/example_configurations/makibox/Configuration.h
  21. 7
    0
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 4
- 4
Marlin/Conditionals.h Прегледај датотеку 

@@ -74,13 +74,13 @@
74 74 
     #define ENCODER_STEPS_PER_MENU_ITEM 1
75 75 
   #endif
76 76
77 
-  // Generic support for SSD1306 OLED based LCDs.
78 
-  #if ENABLED(U8GLIB_SSD1306)
77 
+  // Generic support for SSD1306 / SH1106 OLED based LCDs.
78 
+  #if ENABLED(U8GLIB_SSD1306) || ENABLED(U8GLIB_SH1106)
79 79 
     #define ULTRA_LCD  //general LCD support, also 16x2
80 
-    #define DOGLCD  // Support for I2C LCD 128x64 (Controller SSD1306 graphic Display Family)
80 
+    #define DOGLCD  // Support for I2C LCD 128x64 (Controller SSD1306 / SH1106 graphic Display Family)
81 81 
   #endif
82 82
83 
-  #if ENABLED(PANEL_ONE)
83 
+  #if ENABLED(PANEL_ONE) || ENABLED(U8GLIB_SH1106)
84 84 
     #define ULTIMAKERCONTROLLER
85 85 
   #endif
86 86

+ 7
- 0
Marlin/Configuration.h Прегледај датотеку 

@@ -1063,6 +1063,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
1063 1063 
 //
1064 1064 
 //#define U8GLIB_SSD1306
1065 1065
1066 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1067 
+//#define SAV_3DGLCD
1068 
+#if ENABLED(SAV_3DGLCD)
1069 
+  //#define U8GLIB_SSD1306
1070 
+  #define U8GLIB_SH1106
1071 
+#endif
1072 
+
1066 1073 
 //
1067 1074 
 // CONTROLLER TYPE: Shift register panels
1068 1075 
 //

+ 4
- 1
Marlin/dogm_lcd_implementation.h Прегледај датотеку 

@@ -150,7 +150,10 @@
150 150 
   U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);
151 151 
 #elif ENABLED(U8GLIB_SSD1306)
152 152 
   // Generic support for SSD1306 OLED I2C LCDs
153 
-  U8GLIB_SSD1306_128X64 u8g(U8G_I2C_OPT_NONE);
153 
+  U8GLIB_SSD1306_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST);
154 
+#elif ENABLED(U8GLIB_SH1106)
155 
+  // Generic support for SH1106 OLED I2C LCDs
156 
+  U8GLIB_SH1106_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST);
154 157 
 #elif ENABLED(MINIPANEL)
155 158 
   // The MINIPanel display
156 159 
   U8GLIB_MINI12864 u8g(DOGLCD_CS, DOGLCD_A0);

+ 7
- 0
Marlin/example_configurations/Felix/Configuration.h Прегледај датотеку 

@@ -1046,6 +1046,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
1046 1046 
 //
1047 1047 
 //#define U8GLIB_SSD1306
1048 1048
1049 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1050 
+//#define SAV_3DGLCD
1051 
+#if ENABLED(SAV_3DGLCD)
1052 
+  //#define U8GLIB_SSD1306
1053 
+  #define U8GLIB_SH1106
1054 
+#endif
1055 
+
1049 1056 
 //
1050 1057 
 // CONTROLLER TYPE: Shift register panels
1051 1058 
 //

+ 7
- 0
Marlin/example_configurations/Felix/DUAL/Configuration.h Прегледај датотеку 

@@ -1044,6 +1044,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
1044 1044 
 //
1045 1045 
 //#define U8GLIB_SSD1306
1046 1046
1047 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1048 
+//#define SAV_3DGLCD
1049 
+#if ENABLED(SAV_3DGLCD)
1050 
+  //#define U8GLIB_SSD1306
1051 
+  #define U8GLIB_SH1106
1052 
+#endif
1053 
+
1047 1054 
 //
1048 1055 
 // CONTROLLER TYPE: Shift register panels
1049 1056 
 //

+ 7
- 0
Marlin/example_configurations/Hephestos/Configuration.h Прегледај датотеку 

@@ -1055,6 +1055,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
1055 1055 
 //
1056 1056 
 //#define U8GLIB_SSD1306
1057 1057
1058 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1059 
+//#define SAV_3DGLCD
1060 
+#if ENABLED(SAV_3DGLCD)
1061 
+  //#define U8GLIB_SSD1306
1062 
+  #define U8GLIB_SH1106
1063 
+#endif
1064 
+
1058 1065 
 //
1059 1066 
 // CONTROLLER TYPE: Shift register panels
1060 1067 
 //

+ 7
- 0
Marlin/example_configurations/Hephestos_2/Configuration.h Прегледај датотеку 

@@ -1057,6 +1057,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
1057 1057 
 //
1058 1058 
 //#define U8GLIB_SSD1306
1059 1059
1060 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1061 
+//#define SAV_3DGLCD
1062 
+#if ENABLED(SAV_3DGLCD)
1063 
+  //#define U8GLIB_SSD1306
1064 
+  #define U8GLIB_SH1106
1065 
+#endif
1066 
+
1060 1067 
 //
1061 1068 
 // CONTROLLER TYPE: Shift register panels
1062 1069 
 //

+ 7
- 0
Marlin/example_configurations/K8200/Configuration.h Прегледај датотеку 

@@ -1080,6 +1080,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
1080 1080 
 //
1081 1081 
 //#define U8GLIB_SSD1306
1082 1082
1083 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1084 
+//#define SAV_3DGLCD
1085 
+#if ENABLED(SAV_3DGLCD)
1086 
+  //#define U8GLIB_SSD1306
1087 
+  #define U8GLIB_SH1106
1088 
+#endif
1089 
+
1083 1090 
 //
1084 1091 
 // CONTROLLER TYPE: Shift register panels
1085 1092 
 //

+ 7
- 0
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h Прегледај датотеку 

@@ -1063,6 +1063,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
1063 1063 
 //
1064 1064 
 //#define U8GLIB_SSD1306
1065 1065
1066 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1067 
+//#define SAV_3DGLCD
1068 
+#if ENABLED(SAV_3DGLCD)
1069 
+  //#define U8GLIB_SSD1306
1070 
+  #define U8GLIB_SH1106
1071 
+#endif
1072 
+
1066 1073 
 //
1067 1074 
 // CONTROLLER TYPE: Shift register panels
1068 1075 
 //

+ 7
- 0
Marlin/example_configurations/RigidBot/Configuration.h Прегледај датотеку 

@@ -1060,6 +1060,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
1060 1060 
 //
1061 1061 
 //#define U8GLIB_SSD1306
1062 1062
1063 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1064 
+//#define SAV_3DGLCD
1065 
+#if ENABLED(SAV_3DGLCD)
1066 
+  //#define U8GLIB_SSD1306
1067 
+  #define U8GLIB_SH1106
1068 
+#endif
1069 
+
1063 1070 
 //
1064 1071 
 // CONTROLLER TYPE: Shift register panels
1065 1072 
 //

+ 7
- 0
Marlin/example_configurations/SCARA/Configuration.h Прегледај датотеку 

@@ -1071,6 +1071,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
1071 1071 
 //
1072 1072 
 //#define U8GLIB_SSD1306
1073 1073
1074 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1075 
+//#define SAV_3DGLCD
1076 
+#if ENABLED(SAV_3DGLCD)
1077 
+  //#define U8GLIB_SSD1306
1078 
+  #define U8GLIB_SH1106
1079 
+#endif
1080 
+
1074 1081 
 //
1075 1082 
 // CONTROLLER TYPE: Shift register panels
1076 1083 
 //

+ 7
- 0
Marlin/example_configurations/TAZ4/Configuration.h Прегледај датотеку 

@@ -1084,6 +1084,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
1084 1084 
 //
1085 1085 
 //#define U8GLIB_SSD1306
1086 1086
1087 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1088 
+//#define SAV_3DGLCD
1089 
+#if ENABLED(SAV_3DGLCD)
1090 
+  //#define U8GLIB_SSD1306
1091 
+  #define U8GLIB_SH1106
1092 
+#endif
1093 
+
1087 1094 
 //
1088 1095 
 // CONTROLLER TYPE: Shift register panels
1089 1096 
 //

+ 7
- 0
Marlin/example_configurations/WITBOX/Configuration.h Прегледај датотеку 

@@ -1055,6 +1055,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
1055 1055 
 //
1056 1056 
 //#define U8GLIB_SSD1306
1057 1057
1058 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1059 
+//#define SAV_3DGLCD
1060 
+#if ENABLED(SAV_3DGLCD)
1061 
+  //#define U8GLIB_SSD1306
1062 
+  #define U8GLIB_SH1106
1063 
+#endif
1064 
+
1058 1065 
 //
1059 1066 
 // CONTROLLER TYPE: Shift register panels
1060 1067 
 //

+ 7
- 0
Marlin/example_configurations/adafruit/ST7565/Configuration.h Прегледај датотеку 

@@ -1063,6 +1063,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
1063 1063 
 //
1064 1064 
 //#define U8GLIB_SSD1306
1065 1065
1066 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1067 
+//#define SAV_3DGLCD
1068 
+#if ENABLED(SAV_3DGLCD)
1069 
+  //#define U8GLIB_SSD1306
1070 
+  #define U8GLIB_SH1106
1071 
+#endif
1072 
+
1066 1073 
 //
1067 1074 
 // CONTROLLER TYPE: Shift register panels
1068 1075 
 //

+ 7
- 0
Marlin/example_configurations/delta/biv2.5/Configuration.h Прегледај датотеку 

@@ -1192,6 +1192,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
1192 1192 
 //
1193 1193 
 //#define U8GLIB_SSD1306
1194 1194
1195 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1196 
+//#define SAV_3DGLCD
1197 
+#if ENABLED(SAV_3DGLCD)
1198 
+  //#define U8GLIB_SSD1306
1199 
+  #define U8GLIB_SH1106
1200 
+#endif
1201 
+
1195 1202 
 //
1196 1203 
 // CONTROLLER TYPE: Shift register panels
1197 1204 
 //

+ 7
- 0
Marlin/example_configurations/delta/generic/Configuration.h Прегледај датотеку 

@@ -1192,6 +1192,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
1192 1192 
 //
1193 1193 
 //#define U8GLIB_SSD1306
1194 1194
1195 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1196 
+//#define SAV_3DGLCD
1197 
+#if ENABLED(SAV_3DGLCD)
1198 
+  //#define U8GLIB_SSD1306
1199 
+  #define U8GLIB_SH1106
1200 
+#endif
1201 
+
1195 1202 
 //
1196 1203 
 // CONTROLLER TYPE: Shift register panels
1197 1204 
 //

+ 7
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration.h Прегледај датотеку 

@@ -1196,6 +1196,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
1196 1196 
 //
1197 1197 
 //#define U8GLIB_SSD1306
1198 1198
1199 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1200 
+//#define SAV_3DGLCD
1201 
+#if ENABLED(SAV_3DGLCD)
1202 
+  //#define U8GLIB_SSD1306
1203 
+  #define U8GLIB_SH1106
1204 
+#endif
1205 
+
1199 1206 
 //
1200 1207 
 // CONTROLLER TYPE: Shift register panels
1201 1208 
 //

+ 7
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration.h Прегледај датотеку 

@@ -1189,6 +1189,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
1189 1189 
 //
1190 1190 
 //#define U8GLIB_SSD1306
1191 1191
1192 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1193 
+//#define SAV_3DGLCD
1194 
+#if ENABLED(SAV_3DGLCD)
1195 
+  //#define U8GLIB_SSD1306
1196 
+  #define U8GLIB_SH1106
1197 
+#endif
1198 
+
1192 1199 
 //
1193 1200 
 // CONTROLLER TYPE: Shift register panels
1194 1201 
 //

+ 7
- 0
Marlin/example_configurations/delta/kossel_xl/Configuration.h Прегледај датотеку 

@@ -1197,6 +1197,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
1197 1197 
 //
1198 1198 
 //#define U8GLIB_SSD1306
1199 1199
1200 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1201 
+//#define SAV_3DGLCD
1202 
+#if ENABLED(SAV_3DGLCD)
1203 
+  //#define U8GLIB_SSD1306
1204 
+  #define U8GLIB_SH1106
1205 
+#endif
1206 
+
1200 1207 
 //
1201 1208 
 // CONTROLLER TYPE: Shift register panels
1202 1209 
 //

+ 7
- 0
Marlin/example_configurations/makibox/Configuration.h Прегледај датотеку 

@@ -1066,6 +1066,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
1066 1066 
 //
1067 1067 
 //#define U8GLIB_SSD1306
1068 1068
1069 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1070 
+//#define SAV_3DGLCD
1071 
+#if ENABLED(SAV_3DGLCD)
1072 
+  //#define U8GLIB_SSD1306
1073 
+  #define U8GLIB_SH1106
1074 
+#endif
1075 
+
1069 1076 
 //
1070 1077 
 // CONTROLLER TYPE: Shift register panels
1071 1078 
 //

+ 7
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration.h Прегледај датотеку 

@@ -1057,6 +1057,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
1057 1057 
 //
1058 1058 
 //#define U8GLIB_SSD1306
1059 1059
1060 
+// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1061 
+//#define SAV_3DGLCD
1062 
+#if ENABLED(SAV_3DGLCD)
1063 
+  //#define U8GLIB_SSD1306
1064 
+  #define U8GLIB_SH1106
1065 
+#endif
1066 
+
1060 1067 
 //
1061 1068 
 // CONTROLLER TYPE: Shift register panels
1062 1069 
 //

Write Preview
Loading…
Откажи
Сачувај