Browse Source

Merge pull request #488 from MStohn/fix-typo

fixed typo / added "const" to defines for newer gcc compatibility
ErikZalm 11 years ago
parent
commit
440cf2bc10
2 changed files with 4 additions and 4 deletions
  1. 3
    3
      Marlin/DOGMbitmaps.h
  2. 1
    1
      Marlin/dogm_lcd_implementation.h

+ 3
- 3
Marlin/DOGMbitmaps.h View File

@@ -1,7 +1,7 @@
1 1
 #define START_BMPWIDTH 	60	//Width in pixels
2 2
 #define START_BMPHEIGHT 	64	//Height in pixels
3 3
 #define START_BMPBYTEWIDTH 	8	//Width in bytes
4
-unsigned char start_bmp[574] PROGMEM = { //AVR-GCC, WinAVR
4
+const unsigned char start_bmp[574] PROGMEM = { //AVR-GCC, WinAVR
5 5
 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,
6 6
 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,
7 7
 0xFF,0xFF,0xFF,0xF9,0xFF,0xFF,0xFF,0xF0,
@@ -71,7 +71,7 @@ unsigned char start_bmp[574] PROGMEM = { //AVR-GCC, WinAVR
71 71
 #define STATUS_SCREENWIDTH 		115	//Width in pixels
72 72
 #define STATUS_SCREENHEIGHT 	19	//Height in pixels
73 73
 #define STATUS_SCREENBYTEWIDTH 	15	//Width in bytes
74
-unsigned char status_screen0_bmp[] PROGMEM = { //AVR-GCC, WinAVR
74
+const unsigned char status_screen0_bmp[] PROGMEM = { //AVR-GCC, WinAVR
75 75
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0xFF,0xE0,
76 76
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0xE0,
77 77
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x0C,0x60,
@@ -96,7 +96,7 @@ unsigned char status_screen0_bmp[] PROGMEM = { //AVR-GCC, WinAVR
96 96
 #define STATUS_SCREENWIDTH 		115	//Width in pixels
97 97
 #define STATUS_SCREENHEIGHT 	19	//Height in pixels
98 98
 #define STATUS_SCREENBYTEWIDTH 	15	//Width in bytes
99
-unsigned char status_screen1_bmp[] PROGMEM = { //AVR-GCC, WinAVR
99
+const unsigned char status_screen1_bmp[] PROGMEM = { //AVR-GCC, WinAVR
100 100
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0xFF,0xE0,
101 101
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0xE0,
102 102
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0xF8,0x60,

+ 1
- 1
Marlin/dogm_lcd_implementation.h View File

@@ -19,7 +19,7 @@
19 19
 * Implementation of the LCD display routines for a DOGM128 graphic display. These are common LCD 128x64 pixel graphic displays.
20 20
 **/
21 21
 
22
-ifdef ULTIPANEL
22
+#ifdef ULTIPANEL
23 23
 #define BLEN_A 0
24 24
 #define BLEN_B 1
25 25
 #define BLEN_C 2

Loading…
Cancel
Save