diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config/cowond2.h | 1 | ||||
-rw-r--r-- | firmware/export/config/mrobe500.h | 2 | ||||
-rw-r--r-- | firmware/export/config/ondavx747.h | 1 | ||||
-rw-r--r-- | firmware/export/config/ondavx767.h | 7 | ||||
-rw-r--r-- | firmware/export/config/ondavx777.h | 1 | ||||
-rw-r--r-- | firmware/export/config/sim.h | 1 | ||||
-rw-r--r-- | firmware/export/lcd.h | 10 | ||||
-rw-r--r-- | firmware/export/touchscreen.h | 1 |
8 files changed, 22 insertions, 2 deletions
diff --git a/firmware/export/config/cowond2.h b/firmware/export/config/cowond2.h index f9de2768bd..ebaa636ac7 100644 --- a/firmware/export/config/cowond2.h +++ b/firmware/export/config/cowond2.h | |||
@@ -75,6 +75,7 @@ | |||
75 | /* LCD dimensions */ | 75 | /* LCD dimensions */ |
76 | #define LCD_WIDTH 320 | 76 | #define LCD_WIDTH 320 |
77 | #define LCD_HEIGHT 240 | 77 | #define LCD_HEIGHT 240 |
78 | #define LCD_DPI 160 | ||
78 | #define LCD_DEPTH 16 | 79 | #define LCD_DEPTH 16 |
79 | #define LCD_PIXELFORMAT 565 | 80 | #define LCD_PIXELFORMAT 565 |
80 | 81 | ||
diff --git a/firmware/export/config/mrobe500.h b/firmware/export/config/mrobe500.h index 9a201951fc..776b0315f8 100644 --- a/firmware/export/config/mrobe500.h +++ b/firmware/export/config/mrobe500.h | |||
@@ -87,9 +87,11 @@ | |||
87 | #if _RESOLUTION == _LCD_RES_VGA | 87 | #if _RESOLUTION == _LCD_RES_VGA |
88 | #define LCD_NATIVE_WIDTH 480 | 88 | #define LCD_NATIVE_WIDTH 480 |
89 | #define LCD_NATIVE_HEIGHT 640 | 89 | #define LCD_NATIVE_HEIGHT 640 |
90 | #define LCD_DPI 216 | ||
90 | #else | 91 | #else |
91 | #define LCD_NATIVE_WIDTH 240 | 92 | #define LCD_NATIVE_WIDTH 240 |
92 | #define LCD_NATIVE_HEIGHT 320 | 93 | #define LCD_NATIVE_HEIGHT 320 |
94 | #define LCD_DPI 108 | ||
93 | #endif | 95 | #endif |
94 | 96 | ||
95 | /* choose the lcd orientation. CONFIG_ORIENTATION defined in config.h */ | 97 | /* choose the lcd orientation. CONFIG_ORIENTATION defined in config.h */ |
diff --git a/firmware/export/config/ondavx747.h b/firmware/export/config/ondavx747.h index ae80cac562..1cd9143965 100644 --- a/firmware/export/config/ondavx747.h +++ b/firmware/export/config/ondavx747.h | |||
@@ -79,6 +79,7 @@ | |||
79 | #define LCD_WIDTH 240 | 79 | #define LCD_WIDTH 240 |
80 | #define LCD_HEIGHT 400 | 80 | #define LCD_HEIGHT 400 |
81 | #endif | 81 | #endif |
82 | #define LCD_DPI 155 | ||
82 | 83 | ||
83 | #define LCD_DEPTH 16 /* 16bit colours */ | 84 | #define LCD_DEPTH 16 /* 16bit colours */ |
84 | #define LCD_PIXELFORMAT RGB565 /* rgb565 */ | 85 | #define LCD_PIXELFORMAT RGB565 /* rgb565 */ |
diff --git a/firmware/export/config/ondavx767.h b/firmware/export/config/ondavx767.h index 19bb7ed580..bf9aaed7c1 100644 --- a/firmware/export/config/ondavx767.h +++ b/firmware/export/config/ondavx767.h | |||
@@ -65,8 +65,11 @@ | |||
65 | /* LCD dimensions */ | 65 | /* LCD dimensions */ |
66 | #define CONFIG_LCD LCD_ONDAVX767 | 66 | #define CONFIG_LCD LCD_ONDAVX767 |
67 | 67 | ||
68 | #define LCD_WIDTH 320 | 68 | /* this are not actually the correct dimensions (480x272 is correct) |
69 | #define LCD_HEIGHT 240 | 69 | * should be fixed once there's a working LCD driver */ |
70 | #define LCD_WIDTH 480 | ||
71 | #define LCD_HEIGHT 272 | ||
72 | #define LCD_DPI 128 | ||
70 | 73 | ||
71 | #define LCD_DEPTH 16 /* 16bit colours */ | 74 | #define LCD_DEPTH 16 /* 16bit colours */ |
72 | #define LCD_PIXELFORMAT RGB565 /* rgb565 */ | 75 | #define LCD_PIXELFORMAT RGB565 /* rgb565 */ |
diff --git a/firmware/export/config/ondavx777.h b/firmware/export/config/ondavx777.h index a2ad15533a..b6e7546590 100644 --- a/firmware/export/config/ondavx777.h +++ b/firmware/export/config/ondavx777.h | |||
@@ -73,6 +73,7 @@ | |||
73 | #define LCD_WIDTH 240 | 73 | #define LCD_WIDTH 240 |
74 | #define LCD_HEIGHT 400 | 74 | #define LCD_HEIGHT 400 |
75 | #endif | 75 | #endif |
76 | #define LCD_DPI 155 | ||
76 | 77 | ||
77 | #define LCD_DEPTH 16 /* 16bit colours */ | 78 | #define LCD_DEPTH 16 /* 16bit colours */ |
78 | #define LCD_PIXELFORMAT RGB565 /* rgb565 */ | 79 | #define LCD_PIXELFORMAT RGB565 /* rgb565 */ |
diff --git a/firmware/export/config/sim.h b/firmware/export/config/sim.h index 066201ad08..fc7996e813 100644 --- a/firmware/export/config/sim.h +++ b/firmware/export/config/sim.h | |||
@@ -19,6 +19,7 @@ | |||
19 | #undef HAVE_ATA_POWER_OFF | 19 | #undef HAVE_ATA_POWER_OFF |
20 | 20 | ||
21 | #undef CONFIG_LCD | 21 | #undef CONFIG_LCD |
22 | #undef LCD_DPI /* likely to be too different on a PC */ | ||
22 | 23 | ||
23 | #undef CONFIG_LED | 24 | #undef CONFIG_LED |
24 | 25 | ||
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 79231d198e..e6e19b1597 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -549,4 +549,14 @@ extern void lcd_bitmap_transparent(const fb_data *src, int x, int y, | |||
549 | 549 | ||
550 | #endif /* HAVE_LCD_BITMAP */ | 550 | #endif /* HAVE_LCD_BITMAP */ |
551 | 551 | ||
552 | |||
553 | #ifdef HAVE_TOUCHSCREEN | ||
554 | /* only needed for touchscreen for now, feel free to implement it for others | ||
555 | * once needed | ||
556 | */ | ||
557 | |||
558 | /* returns the pixel density of the display */ | ||
559 | extern int lcd_get_dpi(void); | ||
560 | #endif | ||
561 | |||
552 | #endif /* __LCD_H__ */ | 562 | #endif /* __LCD_H__ */ |
diff --git a/firmware/export/touchscreen.h b/firmware/export/touchscreen.h index 7d1eb4ac8a..a27e60c653 100644 --- a/firmware/export/touchscreen.h +++ b/firmware/export/touchscreen.h | |||
@@ -50,5 +50,6 @@ void touchscreen_set_mode(enum touchscreen_mode mode); | |||
50 | enum touchscreen_mode touchscreen_get_mode(void); | 50 | enum touchscreen_mode touchscreen_get_mode(void); |
51 | void touchscreen_disable_mapping(void); | 51 | void touchscreen_disable_mapping(void); |
52 | void touchscreen_reset_mapping(void); | 52 | void touchscreen_reset_mapping(void); |
53 | int touchscreen_get_scroll_threshold(void); | ||
53 | 54 | ||
54 | #endif /* __TOUCHSCREEN_INCLUDE_H_ */ | 55 | #endif /* __TOUCHSCREEN_INCLUDE_H_ */ |