Bladeren bron

Some LCD code cleanup

Scott Lahteine 5 jaren geleden
bovenliggende
commit
aa1d587128

+ 0
- 2
Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp Bestand weergeven

@@ -26,8 +26,6 @@
26 26
  * COM interface for Arduino (AND ATmega) and the SSDxxxx chip (SOLOMON) variant
27 27
  * I2C protocol
28 28
  *
29
- * ToDo: Rename this to u8g_com_avr_ssd_i2c.c
30
- *
31 29
  * Universal 8bit Graphics Library
32 30
  *
33 31
  * Copyright (c) 2011, olikraus@gmail.com

+ 3
- 3
Marlin/src/inc/Conditionals_LCD.h Bestand weergeven

@@ -66,9 +66,9 @@
66 66
 
67 67
 #elif ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) || ENABLED(AZSMZ_12864)
68 68
 
69
-  #define ULTRA_LCD  //general LCD support, also 16x2
70
-  #define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
71
-  #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
69
+  #define ULTRA_LCD
70
+  #define DOGLCD
71
+  #define ULTIMAKERCONTROLLER
72 72
 
73 73
   #if ENABLED(miniVIKI)
74 74
     #define LCD_CONTRAST_MIN      75

+ 2
- 2
Marlin/src/inc/Conditionals_post.h Bestand weergeven

@@ -1544,9 +1544,9 @@
1544 1544
 #endif
1545 1545
 
1546 1546
 /**
1547
- * VIKI2, miniVIKI, AZSMZ_12864, and MKS_12864OLED_SSD1306 require DOGLCD_SCK and DOGLCD_MOSI to be defined.
1547
+ * Make sure DOGLCD_SCK and DOGLCD_MOSI are defined.
1548 1548
  */
1549
-#if ENABLED(VIKI2) || ENABLED(miniVIKI) || ENABLED(AZSMZ_12864) || ENABLED(MKS_12864OLED_SSD1306)
1549
+#if ENABLED(DOGLCD)
1550 1550
   #ifndef DOGLCD_SCK
1551 1551
     #define DOGLCD_SCK  SCK_PIN
1552 1552
   #endif

+ 1
- 1
Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp Bestand weergeven

@@ -21,7 +21,7 @@
21 21
  */
22 22
 
23 23
 /**
24
- * u8g_dev_st7565_64128n_HAL.c (Displaytech)
24
+ * Based on u8g_dev_st7565_64128n_HAL.c (Displaytech)
25 25
  *
26 26
  * Universal 8bit Graphics Library
27 27
  *

+ 1
- 1
Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp Bestand weergeven

@@ -21,7 +21,7 @@
21 21
  */
22 22
 
23 23
 /**
24
- * u8g_dev_st7920_128x64_HAL.c
24
+ * Based on u8g_dev_st7920_128x64.c
25 25
  *
26 26
  * Universal 8bit Graphics Library
27 27
  *

+ 32
- 36
Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp Bestand weergeven

@@ -20,42 +20,38 @@
20 20
  *
21 21
  */
22 22
 
23
-
24
-/*
25
-
26
-  based on u8g_dev_uc1701_mini12864_HAL.c (dealextreme)
27
-
28
-  Universal 8bit Graphics Library
29
-
30
-  Copyright (c) 2011, olikraus@gmail.com
31
-  All rights reserved.
32
-
33
-  Redistribution and use in source and binary forms, with or without modification,
34
-  are permitted provided that the following conditions are met:
35
-
36
-  * Redistributions of source code must retain the above copyright notice, this list
37
-    of conditions and the following disclaimer.
38
-
39
-  * Redistributions in binary form must reproduce the above copyright notice, this
40
-    list of conditions and the following disclaimer in the documentation and/or other
41
-    materials provided with the distribution.
42
-
43
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
44
-  CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
45
-  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
46
-  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
47
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
48
-  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
49
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
50
-  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
51
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
52
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
53
-  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
54
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
55
-  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
56
-
57
-
58
-*/
23
+/**
24
+ * Based on u8g_dev_uc1701_mini12864.c (dealextreme)
25
+ *
26
+ * Universal 8bit Graphics Library
27
+ *
28
+ * Copyright (c) 2011, olikraus@gmail.com
29
+ * All rights reserved.
30
+ *
31
+ * Redistribution and use in source and binary forms, with or without modification,
32
+ * are permitted provided that the following conditions are met:
33
+ *
34
+ *  * Redistributions of source code must retain the above copyright notice, this list
35
+ *    of conditions and the following disclaimer.
36
+ *
37
+ *  * Redistributions in binary form must reproduce the above copyright notice, this
38
+ *    list of conditions and the following disclaimer in the documentation and/or other
39
+ *    materials provided with the distribution.
40
+ *
41
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
42
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
43
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
44
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
45
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
46
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
47
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
48
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
49
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
50
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
51
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
52
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
53
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
+ */
59 55
 
60 56
 #include "../../inc/MarlinConfigPre.h"
61 57
 

+ 0
- 7
config/examples/Mks/Sbase/Configuration_adv.h Bestand weergeven

@@ -918,13 +918,6 @@
918 918
   // Swap the CW/CCW indicators in the graphics overlay
919 919
   //#define OVERLAY_GFX_REVERSE
920 920
 
921
-
922
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
923
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
924
-    #define DOGLCD_SCK SCK_PIN
925
-    #define DOGLCD_MOSI MOSI_PIN
926
-  #endif
927
-
928 921
   /**
929 922
    * ST7920-based LCDs can emulate a 16 x 4 character display using
930 923
    * the ST7920 character-generator for very fast screen updates.

Laden…
Annuleren
Opslaan