瀏覽代碼

Merge pull request #488 from MStohn/fix-typo

fixed typo / added "const" to defines for newer gcc compatibility
ErikZalm 12 年之前
父節點
當前提交
440cf2bc10
共有 2 個檔案被更改,包括 4 行新增4 行删除
  1. 3
    3
      Marlin/DOGMbitmaps.h
  2. 1
    1
      Marlin/dogm_lcd_implementation.h

+ 3
- 3
Marlin/DOGMbitmaps.h 查看文件

1
 #define START_BMPWIDTH 	60	//Width in pixels
1
 #define START_BMPWIDTH 	60	//Width in pixels
2
 #define START_BMPHEIGHT 	64	//Height in pixels
2
 #define START_BMPHEIGHT 	64	//Height in pixels
3
 #define START_BMPBYTEWIDTH 	8	//Width in bytes
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
 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,
5
 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,
6
 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,
6
 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,
7
 0xFF,0xFF,0xFF,0xF9,0xFF,0xFF,0xFF,0xF0,
7
 0xFF,0xFF,0xFF,0xF9,0xFF,0xFF,0xFF,0xF0,
71
 #define STATUS_SCREENWIDTH 		115	//Width in pixels
71
 #define STATUS_SCREENWIDTH 		115	//Width in pixels
72
 #define STATUS_SCREENHEIGHT 	19	//Height in pixels
72
 #define STATUS_SCREENHEIGHT 	19	//Height in pixels
73
 #define STATUS_SCREENBYTEWIDTH 	15	//Width in bytes
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
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0xFF,0xE0,
75
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0xFF,0xE0,
76
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0xE0,
76
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0xE0,
77
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x0C,0x60,
77
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x0C,0x60,
96
 #define STATUS_SCREENWIDTH 		115	//Width in pixels
96
 #define STATUS_SCREENWIDTH 		115	//Width in pixels
97
 #define STATUS_SCREENHEIGHT 	19	//Height in pixels
97
 #define STATUS_SCREENHEIGHT 	19	//Height in pixels
98
 #define STATUS_SCREENBYTEWIDTH 	15	//Width in bytes
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
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0xFF,0xE0,
100
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0xFF,0xE0,
101
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0xE0,
101
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0xE0,
102
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0xF8,0x60,
102
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0xF8,0x60,

+ 1
- 1
Marlin/dogm_lcd_implementation.h 查看文件

19
 * Implementation of the LCD display routines for a DOGM128 graphic display. These are common LCD 128x64 pixel graphic displays.
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
 #define BLEN_A 0
23
 #define BLEN_A 0
24
 #define BLEN_B 1
24
 #define BLEN_B 1
25
 #define BLEN_C 2
25
 #define BLEN_C 2

Loading…
取消
儲存