summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2009-02-09 00:32:59 +0000
committerJens Arnold <amiconn@rockbox.org>2009-02-09 00:32:59 +0000
commit0d935ce75e1408dfd9832ae7dbb7d84df50a645d (patch)
tree9ddcc5d21dcd0e576d0fa824e74c58755fa9d1a0 /firmware
parent94537f954e67d44fdd9703c062c4ee53599e0e74 (diff)
downloadrockbox-0d935ce75e1408dfd9832ae7dbb7d84df50a645d.tar.gz
rockbox-0d935ce75e1408dfd9832ae7dbb7d84df50a645d.zip
Put the display colours for monochrome and greyscale targets into the target config files, and use them both for the simulator UI and screendumps. The Clip now shows the split display properly in screendumps and simulator. A side effect is that screendumps of ordinary monochrome targets are now 4-bit BMP files (saves an alternate code path, and might be more compatible with some gfx programs). * Simplify the simulation of split display, and also simplify greylib simulation. The simulator now always calculates 129 shades (2*128 for a Clip sim), and just uses 2 (or 4) of those for native display simulation. * Centralised the simulator LCD dimension definition.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19950 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/config-clip.h17
-rw-r--r--firmware/export/config-fmrecorder.h6
-rw-r--r--firmware/export/config-h100.h12
-rw-r--r--firmware/export/config-h120.h12
-rw-r--r--firmware/export/config-h300.h6
-rw-r--r--firmware/export/config-iaudiom3.h6
-rw-r--r--firmware/export/config-iaudiom5.h12
-rw-r--r--firmware/export/config-iaudiox5.h6
-rw-r--r--firmware/export/config-ifp7xx.h6
-rw-r--r--firmware/export/config-ipod1g2g.h6
-rw-r--r--firmware/export/config-ipod3g.h6
-rw-r--r--firmware/export/config-ipod4g.h6
-rw-r--r--firmware/export/config-ipodmini.h6
-rw-r--r--firmware/export/config-ipodmini2g.h6
-rw-r--r--firmware/export/config-logikdax.h6
-rw-r--r--firmware/export/config-m200.h6
-rw-r--r--firmware/export/config-m200v4.h6
-rw-r--r--firmware/export/config-mrobe100.h10
-rw-r--r--firmware/export/config-ondiofm.h6
-rw-r--r--firmware/export/config-ondiosp.h6
-rw-r--r--firmware/export/config-player.h6
-rw-r--r--firmware/export/config-recorder.h6
-rw-r--r--firmware/export/config-recorderv2.h6
-rw-r--r--firmware/export/config.h22
24 files changed, 192 insertions, 1 deletions
diff --git a/firmware/export/config-clip.h b/firmware/export/config-clip.h
index da8acf2fdf..95ed715276 100644
--- a/firmware/export/config-clip.h
+++ b/firmware/export/config-clip.h
@@ -45,7 +45,24 @@
45#define LCD_WIDTH 128 45#define LCD_WIDTH 128
46#define LCD_HEIGHT 64 46#define LCD_HEIGHT 64
47#define LCD_DEPTH 1 47#define LCD_DEPTH 1
48
48#define LCD_PIXELFORMAT VERTICAL_PACKING 49#define LCD_PIXELFORMAT VERTICAL_PACKING
50#define HAVE_NEGATIVE_LCD /* bright on dark */
51#define HAVE_LCD_SPLIT /* split display */
52
53/* Display colours, for screenshots and sim (0xRRGGBB) */
54#define LCD_DARKCOLOR 0x000000
55#define LCD_BRIGHTCOLOR 0x000000
56#define LCD_BL_DARKCOLOR 0x000000
57#define LCD_BL_BRIGHTCOLOR 0x0de2e5
58
59#define LCD_DARKCOLOR_2 0x000000
60#define LCD_BRIGHTCOLOR_2 0x000000
61#define LCD_BL_DARKCOLOR_2 0x000000
62#define LCD_BL_BRIGHTCOLOR_2 0xffe60f
63
64#define LCD_SPLIT_POS 16
65#define LCD_SPLIT_LINES 2
49 66
50/* define this if you have LCD enable function */ 67/* define this if you have LCD enable function */
51#define HAVE_LCD_ENABLE 68#define HAVE_LCD_ENABLE
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index da281bd033..bc859df67a 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -39,6 +39,12 @@
39 39
40#define LCD_PIXELFORMAT VERTICAL_PACKING 40#define LCD_PIXELFORMAT VERTICAL_PACKING
41 41
42/* Display colours, for screenshots and sim (0xRRGGBB) */
43#define LCD_DARKCOLOR 0x000000
44#define LCD_BRIGHTCOLOR 0x5a915a
45#define LCD_BL_DARKCOLOR 0x000000
46#define LCD_BL_BRIGHTCOLOR 0x7ee57e
47
42/* define this if you have a Recorder style 10-key keyboard */ 48/* define this if you have a Recorder style 10-key keyboard */
43#define CONFIG_KEYPAD RECORDER_PAD 49#define CONFIG_KEYPAD RECORDER_PAD
44 50
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h
index 6ca2a0701e..34ba3e5ad9 100644
--- a/firmware/export/config-h100.h
+++ b/firmware/export/config-h100.h
@@ -44,6 +44,12 @@
44 44
45#define LCD_PIXELFORMAT VERTICAL_PACKING 45#define LCD_PIXELFORMAT VERTICAL_PACKING
46 46
47/* Display colours, for screenshots and sim (0xRRGGBB) */
48#define LCD_DARKCOLOR 0x000000
49#define LCD_BRIGHTCOLOR 0x7e917e
50#define LCD_BL_DARKCOLOR 0x000000
51#define LCD_BL_BRIGHTCOLOR 0xadd8e6
52
47/* remote LCD */ 53/* remote LCD */
48#define LCD_REMOTE_WIDTH 128 54#define LCD_REMOTE_WIDTH 128
49#define LCD_REMOTE_HEIGHT 64 55#define LCD_REMOTE_HEIGHT 64
@@ -51,6 +57,12 @@
51 57
52#define LCD_REMOTE_PIXELFORMAT VERTICAL_PACKING 58#define LCD_REMOTE_PIXELFORMAT VERTICAL_PACKING
53 59
60/* Remote display colours, for screenshots and sim (0xRRGGBB) */
61#define LCD_REMOTE_DARKCOLOR 0x000000
62#define LCD_REMOTE_BRIGHTCOLOR 0x5a915a
63#define LCD_REMOTE_BL_DARKCOLOR 0x000000
64#define LCD_REMOTE_BL_BRIGHTCOLOR 0x82b4fa
65
54#define CONFIG_KEYPAD IRIVER_H100_PAD 66#define CONFIG_KEYPAD IRIVER_H100_PAD
55 67
56#define CONFIG_REMOTE_KEYPAD H100_REMOTE 68#define CONFIG_REMOTE_KEYPAD H100_REMOTE
diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h
index 74074e83e0..37c1872335 100644
--- a/firmware/export/config-h120.h
+++ b/firmware/export/config-h120.h
@@ -39,6 +39,12 @@
39 39
40#define LCD_PIXELFORMAT VERTICAL_PACKING 40#define LCD_PIXELFORMAT VERTICAL_PACKING
41 41
42/* Display colours, for screenshots and sim (0xRRGGBB) */
43#define LCD_DARKCOLOR 0x000000
44#define LCD_BRIGHTCOLOR 0x7e917e
45#define LCD_BL_DARKCOLOR 0x000000
46#define LCD_BL_BRIGHTCOLOR 0xadd8e6
47
42/* remote LCD */ 48/* remote LCD */
43#define LCD_REMOTE_WIDTH 128 49#define LCD_REMOTE_WIDTH 128
44#define LCD_REMOTE_HEIGHT 64 50#define LCD_REMOTE_HEIGHT 64
@@ -46,6 +52,12 @@
46 52
47#define LCD_REMOTE_PIXELFORMAT VERTICAL_PACKING 53#define LCD_REMOTE_PIXELFORMAT VERTICAL_PACKING
48 54
55/* Remote display colours, for screenshots and sim (0xRRGGBB) */
56#define LCD_REMOTE_DARKCOLOR 0x000000
57#define LCD_REMOTE_BRIGHTCOLOR 0x5a915a
58#define LCD_REMOTE_BL_DARKCOLOR 0x000000
59#define LCD_REMOTE_BL_BRIGHTCOLOR 0x82b4fa
60
49#define CONFIG_KEYPAD IRIVER_H100_PAD 61#define CONFIG_KEYPAD IRIVER_H100_PAD
50 62
51#define CONFIG_REMOTE_KEYPAD H100_REMOTE 63#define CONFIG_REMOTE_KEYPAD H100_REMOTE
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h
index 037bb26b2d..ba09884957 100644
--- a/firmware/export/config-h300.h
+++ b/firmware/export/config-h300.h
@@ -45,6 +45,12 @@
45 45
46#define LCD_REMOTE_PIXELFORMAT VERTICAL_PACKING 46#define LCD_REMOTE_PIXELFORMAT VERTICAL_PACKING
47 47
48/* Remote display colours, for screenshots and sim (0xRRGGBB) */
49#define LCD_REMOTE_DARKCOLOR 0x000000
50#define LCD_REMOTE_BRIGHTCOLOR 0x5a915a
51#define LCD_REMOTE_BL_DARKCOLOR 0x000000
52#define LCD_REMOTE_BL_BRIGHTCOLOR 0x82b4fa
53
48#define CONFIG_KEYPAD IRIVER_H300_PAD 54#define CONFIG_KEYPAD IRIVER_H300_PAD
49 55
50#define CONFIG_REMOTE_KEYPAD H300_REMOTE 56#define CONFIG_REMOTE_KEYPAD H300_REMOTE
diff --git a/firmware/export/config-iaudiom3.h b/firmware/export/config-iaudiom3.h
index a6e1028897..e72813c853 100644
--- a/firmware/export/config-iaudiom3.h
+++ b/firmware/export/config-iaudiom3.h
@@ -52,6 +52,12 @@
52 52
53#define LCD_PIXELFORMAT VERTICAL_INTERLEAVED 53#define LCD_PIXELFORMAT VERTICAL_INTERLEAVED
54 54
55/* Display colours, for screenshots and sim (0xRRGGBB) */
56#define LCD_DARKCOLOR 0x000000
57#define LCD_BRIGHTCOLOR 0x7e917e
58#define LCD_BL_DARKCOLOR 0x000000
59#define LCD_BL_BRIGHTCOLOR 0x82b4fa
60
55/* define this if only the remote has an LCD */ 61/* define this if only the remote has an LCD */
56#define HAVE_REMOTE_LCD_AS_MAIN 62#define HAVE_REMOTE_LCD_AS_MAIN
57 63
diff --git a/firmware/export/config-iaudiom5.h b/firmware/export/config-iaudiom5.h
index 26cc9c5da6..d186895b45 100644
--- a/firmware/export/config-iaudiom5.h
+++ b/firmware/export/config-iaudiom5.h
@@ -52,6 +52,12 @@
52 52
53#define LCD_PIXELFORMAT VERTICAL_PACKING 53#define LCD_PIXELFORMAT VERTICAL_PACKING
54 54
55/* Display colours, for screenshots and sim (0xRRGGBB) */
56#define LCD_DARKCOLOR 0x000000
57#define LCD_BRIGHTCOLOR 0x648764
58#define LCD_BL_DARKCOLOR 0x000000
59#define LCD_BL_BRIGHTCOLOR 0xdfd8ff
60
55/* remote LCD */ 61/* remote LCD */
56#define LCD_REMOTE_WIDTH 128 62#define LCD_REMOTE_WIDTH 128
57#define LCD_REMOTE_HEIGHT 96 63#define LCD_REMOTE_HEIGHT 96
@@ -59,6 +65,12 @@
59 65
60#define LCD_REMOTE_PIXELFORMAT VERTICAL_INTERLEAVED 66#define LCD_REMOTE_PIXELFORMAT VERTICAL_INTERLEAVED
61 67
68/* Remote display colours, for screenshots and sim (0xRRGGBB) */
69#define LCD_REMOTE_DARKCOLOR 0x000000
70#define LCD_REMOTE_BRIGHTCOLOR 0x5a915a
71#define LCD_REMOTE_BL_DARKCOLOR 0x000000
72#define LCD_REMOTE_BL_BRIGHTCOLOR 0x82b4fa
73
62#define CONFIG_KEYPAD IAUDIO_X5M5_PAD 74#define CONFIG_KEYPAD IAUDIO_X5M5_PAD
63 75
64#define AB_REPEAT_ENABLE 1 76#define AB_REPEAT_ENABLE 1
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h
index 27bd2c523b..218e1657dd 100644
--- a/firmware/export/config-iaudiox5.h
+++ b/firmware/export/config-iaudiox5.h
@@ -61,6 +61,12 @@
61 61
62#define LCD_REMOTE_PIXELFORMAT VERTICAL_INTERLEAVED 62#define LCD_REMOTE_PIXELFORMAT VERTICAL_INTERLEAVED
63 63
64/* Remote display colours, for screenshots and sim (0xRRGGBB) */
65#define LCD_REMOTE_DARKCOLOR 0x000000
66#define LCD_REMOTE_BRIGHTCOLOR 0x5a915a
67#define LCD_REMOTE_BL_DARKCOLOR 0x000000
68#define LCD_REMOTE_BL_BRIGHTCOLOR 0x82b4fa
69
64#ifndef BOOTLOADER 70#ifndef BOOTLOADER
65/* Define this if your LCD can be enabled/disabled */ 71/* Define this if your LCD can be enabled/disabled */
66#define HAVE_LCD_ENABLE 72#define HAVE_LCD_ENABLE
diff --git a/firmware/export/config-ifp7xx.h b/firmware/export/config-ifp7xx.h
index 6a26a93da2..96faf46e91 100644
--- a/firmware/export/config-ifp7xx.h
+++ b/firmware/export/config-ifp7xx.h
@@ -29,6 +29,12 @@
29 29
30#define LCD_PIXELFORMAT VERTICAL_PACKING 30#define LCD_PIXELFORMAT VERTICAL_PACKING
31 31
32/* Display colours, for screenshots and sim (0xRRGGBB) */
33#define LCD_DARKCOLOR 0x000000
34#define LCD_BRIGHTCOLOR 0x5e6854
35#define LCD_BL_DARKCOLOR 0x000000
36#define LCD_BL_BRIGHTCOLOR 0x3ca0e6
37
32#define CONFIG_KEYPAD IRIVER_IFP7XX_PAD 38#define CONFIG_KEYPAD IRIVER_IFP7XX_PAD
33 39
34#define CONFIG_STORAGE STORAGE_NAND 40#define CONFIG_STORAGE STORAGE_NAND
diff --git a/firmware/export/config-ipod1g2g.h b/firmware/export/config-ipod1g2g.h
index 4308d9c66c..a06cb65828 100644
--- a/firmware/export/config-ipod1g2g.h
+++ b/firmware/export/config-ipod1g2g.h
@@ -51,6 +51,12 @@
51 51
52#define LCD_PIXELFORMAT HORIZONTAL_PACKING 52#define LCD_PIXELFORMAT HORIZONTAL_PACKING
53 53
54/* Display colours, for screenshots and sim (0xRRGGBB) */
55#define LCD_DARKCOLOR 0x000000
56#define LCD_BRIGHTCOLOR 0x648764
57#define LCD_BL_DARKCOLOR 0x000000
58#define LCD_BL_BRIGHTCOLOR 0xdfd8ff
59
54/* define this if you can flip your LCD */ 60/* define this if you can flip your LCD */
55#define HAVE_LCD_FLIP 61#define HAVE_LCD_FLIP
56 62
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h
index f1550576d2..fad3d3d0fb 100644
--- a/firmware/export/config-ipod3g.h
+++ b/firmware/export/config-ipod3g.h
@@ -52,6 +52,12 @@
52 52
53#define LCD_PIXELFORMAT HORIZONTAL_PACKING 53#define LCD_PIXELFORMAT HORIZONTAL_PACKING
54 54
55/* Display colours, for screenshots and sim (0xRRGGBB) */
56#define LCD_DARKCOLOR 0x000000
57#define LCD_BRIGHTCOLOR 0x5a915a
58#define LCD_BL_DARKCOLOR 0x000000
59#define LCD_BL_BRIGHTCOLOR 0xadd8e6
60
55/* define this if you can flip your LCD */ 61/* define this if you can flip your LCD */
56#define HAVE_LCD_FLIP 62#define HAVE_LCD_FLIP
57 63
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h
index e2aaa96ded..5bc0a18a98 100644
--- a/firmware/export/config-ipod4g.h
+++ b/firmware/export/config-ipod4g.h
@@ -52,6 +52,12 @@
52#define LCD_DEPTH 2 /* 4 colours - 2bpp */ 52#define LCD_DEPTH 2 /* 4 colours - 2bpp */
53#define LCD_PIXELFORMAT HORIZONTAL_PACKING 53#define LCD_PIXELFORMAT HORIZONTAL_PACKING
54 54
55/* Display colours, for screenshots and sim (0xRRGGBB) */
56#define LCD_DARKCOLOR 0x000000
57#define LCD_BRIGHTCOLOR 0x5a915a
58#define LCD_BL_DARKCOLOR 0x000000
59#define LCD_BL_BRIGHTCOLOR 0xadd8e6
60
55#define HAVE_LCD_CONTRAST 61#define HAVE_LCD_CONTRAST
56 62
57/* LCD contrast */ 63/* LCD contrast */
diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h
index bc59ededfe..0e87d02ee8 100644
--- a/firmware/export/config-ipodmini.h
+++ b/firmware/export/config-ipodmini.h
@@ -51,6 +51,12 @@
51 51
52#define LCD_PIXELFORMAT HORIZONTAL_PACKING 52#define LCD_PIXELFORMAT HORIZONTAL_PACKING
53 53
54/* Display colours, for screenshots and sim (0xRRGGBB) */
55#define LCD_DARKCOLOR 0x000000
56#define LCD_BRIGHTCOLOR 0x648764
57#define LCD_BL_DARKCOLOR 0x000000
58#define LCD_BL_BRIGHTCOLOR 0xdfd8ff
59
54#define HAVE_LCD_CONTRAST 60#define HAVE_LCD_CONTRAST
55 61
56/* LCD contrast */ 62/* LCD contrast */
diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h
index 4775350712..a44087f897 100644
--- a/firmware/export/config-ipodmini2g.h
+++ b/firmware/export/config-ipodmini2g.h
@@ -51,6 +51,12 @@
51 51
52#define LCD_PIXELFORMAT HORIZONTAL_PACKING 52#define LCD_PIXELFORMAT HORIZONTAL_PACKING
53 53
54/* Display colours, for screenshots and sim (0xRRGGBB) */
55#define LCD_DARKCOLOR 0x000000
56#define LCD_BRIGHTCOLOR 0x648764
57#define LCD_BL_DARKCOLOR 0x000000
58#define LCD_BL_BRIGHTCOLOR 0xdfd8ff
59
54#define HAVE_LCD_CONTRAST 60#define HAVE_LCD_CONTRAST
55 61
56/* LCD contrast */ 62/* LCD contrast */
diff --git a/firmware/export/config-logikdax.h b/firmware/export/config-logikdax.h
index 78a39d32b7..800688b01d 100644
--- a/firmware/export/config-logikdax.h
+++ b/firmware/export/config-logikdax.h
@@ -55,6 +55,12 @@
55 55
56#define LCD_PIXELFORMAT VERTICAL_PACKING 56#define LCD_PIXELFORMAT VERTICAL_PACKING
57 57
58/* Display colours, for screenshots and sim (0xRRGGBB) */
59#define LCD_DARKCOLOR 0x000000
60#define LCD_BRIGHTCOLOR 0x5a915a
61#define LCD_BL_DARKCOLOR 0x000000
62#define LCD_BL_BRIGHTCOLOR 0x82b4fa
63
58/* define this to indicate your device's keypad */ 64/* define this to indicate your device's keypad */
59#define CONFIG_KEYPAD LOGIK_DAX_PAD 65#define CONFIG_KEYPAD LOGIK_DAX_PAD
60 66
diff --git a/firmware/export/config-m200.h b/firmware/export/config-m200.h
index cab1c9927b..38d59cbcbe 100644
--- a/firmware/export/config-m200.h
+++ b/firmware/export/config-m200.h
@@ -49,6 +49,12 @@
49 49
50#define LCD_PIXELFORMAT VERTICAL_PACKING 50#define LCD_PIXELFORMAT VERTICAL_PACKING
51 51
52/* Display colours, for screenshots and sim (0xRRGGBB) */
53#define LCD_BARKCOLOR 0x000000
54#define LCD_BRIGHTCOLOR 0x5e6854
55#define LCD_BL_DARKCOLOR 0x000000
56#define LCD_BL_BRIGHTCOLOR 0x3ca0e6
57
52/* define this to indicate your device's keypad */ 58/* define this to indicate your device's keypad */
53#define CONFIG_KEYPAD SANSA_M200_PAD 59#define CONFIG_KEYPAD SANSA_M200_PAD
54 60
diff --git a/firmware/export/config-m200v4.h b/firmware/export/config-m200v4.h
index 3c601a77cb..c34f33c306 100644
--- a/firmware/export/config-m200v4.h
+++ b/firmware/export/config-m200v4.h
@@ -58,6 +58,12 @@
58 58
59#define LCD_PIXELFORMAT VERTICAL_PACKING 59#define LCD_PIXELFORMAT VERTICAL_PACKING
60 60
61/* Display colours, for screenshots and sim (0xRRGGBB) */
62#define LCD_BARKCOLOR 0x000000
63#define LCD_BRIGHTCOLOR 0x5e6854
64#define LCD_BL_DARKCOLOR 0x000000
65#define LCD_BL_BRIGHTCOLOR 0x3ca0e6
66
61/* define this to indicate your device's keypad */ 67/* define this to indicate your device's keypad */
62#define CONFIG_KEYPAD SANSA_M200_PAD 68#define CONFIG_KEYPAD SANSA_M200_PAD
63 69
diff --git a/firmware/export/config-mrobe100.h b/firmware/export/config-mrobe100.h
index f2fc5cb37a..817c7640b2 100644
--- a/firmware/export/config-mrobe100.h
+++ b/firmware/export/config-mrobe100.h
@@ -27,7 +27,15 @@
27#define LCD_WIDTH 160 27#define LCD_WIDTH 160
28#define LCD_HEIGHT 128 28#define LCD_HEIGHT 128
29#define LCD_DEPTH 1 29#define LCD_DEPTH 1
30#define LCD_PIXELFORMAT VERTICAL_PACKING 30
31#define LCD_PIXELFORMAT VERTICAL_PACKING
32#define HAVE_NEGATIVE_LCD /* bright on dark */
33
34/* Display colours, for screenshots and sim (0xRRGGBB) */
35#define LCD_DARKCOLOR 0x000000
36#define LCD_BRIGHTCOLOR 0x323232
37#define LCD_BL_DARKCOLOR 0x5e0202
38#define LCD_BL_BRIGHTCOLOR 0xf10603
31 39
32/* define this if you can flip your LCD */ 40/* define this if you can flip your LCD */
33#define HAVE_LCD_FLIP 41#define HAVE_LCD_FLIP
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h
index 1b3b266191..32e67cac09 100644
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config-ondiofm.h
@@ -29,6 +29,12 @@
29 29
30#define LCD_PIXELFORMAT VERTICAL_PACKING 30#define LCD_PIXELFORMAT VERTICAL_PACKING
31 31
32/* Display colours, for screenshots and sim (0xRRGGBB) */
33#define LCD_DARKCOLOR 0x000000
34#define LCD_BRIGHTCOLOR 0x5a915a
35#define LCD_BL_DARKCOLOR 0x000000
36#define LCD_BL_BRIGHTCOLOR 0x82b4fa
37
32/* define this if you have an Ondio style 6-key keyboard */ 38/* define this if you have an Ondio style 6-key keyboard */
33#define CONFIG_KEYPAD ONDIO_PAD 39#define CONFIG_KEYPAD ONDIO_PAD
34 40
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h
index 85065f40bb..baa54011ae 100644
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config-ondiosp.h
@@ -22,6 +22,12 @@
22 22
23#define LCD_PIXELFORMAT VERTICAL_PACKING 23#define LCD_PIXELFORMAT VERTICAL_PACKING
24 24
25/* Display colours, for screenshots and sim (0xRRGGBB) */
26#define LCD_DARKCOLOR 0x000000
27#define LCD_BRIGHTCOLOR 0x5a915a
28#define LCD_BL_DARKCOLOR 0x000000
29#define LCD_BL_BRIGHTCOLOR 0x82b4fa
30
25/* define this if you have an Ondio style 6-key keyboard */ 31/* define this if you have an Ondio style 6-key keyboard */
26#define CONFIG_KEYPAD ONDIO_PAD 32#define CONFIG_KEYPAD ONDIO_PAD
27 33
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h
index 91d97abd97..3071a09be8 100644
--- a/firmware/export/config-player.h
+++ b/firmware/export/config-player.h
@@ -15,6 +15,12 @@
15#define SIM_LCD_WIDTH 132 /* pixels */ 15#define SIM_LCD_WIDTH 132 /* pixels */
16#define SIM_LCD_HEIGHT 64 /* pixels */ 16#define SIM_LCD_HEIGHT 64 /* pixels */
17 17
18/* Display colours, for screenshots and sim (0xRRGGBB) */
19#define LCD_DARKCOLOR 0x000000
20#define LCD_BRIGHTCOLOR 0x5a915a
21#define LCD_BL_DARKCOLOR 0x000000
22#define LCD_BL_BRIGHTCOLOR 0x7ee57e
23
18/* define this if you have the Player's keyboard */ 24/* define this if you have the Player's keyboard */
19#define CONFIG_KEYPAD PLAYER_PAD 25#define CONFIG_KEYPAD PLAYER_PAD
20 26
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h
index f0a513851f..44006b4196 100644
--- a/firmware/export/config-recorder.h
+++ b/firmware/export/config-recorder.h
@@ -39,6 +39,12 @@
39 39
40#define LCD_PIXELFORMAT VERTICAL_PACKING 40#define LCD_PIXELFORMAT VERTICAL_PACKING
41 41
42/* Display colours, for screenshots and sim (0xRRGGBB) */
43#define LCD_DARKCOLOR 0x000000
44#define LCD_BRIGHTCOLOR 0x5a915a
45#define LCD_BL_DARKCOLOR 0x000000
46#define LCD_BL_BRIGHTCOLOR 0x7ee57e
47
42/* define this if you have the Recorder's 10-key keyboard */ 48/* define this if you have the Recorder's 10-key keyboard */
43#define CONFIG_KEYPAD RECORDER_PAD 49#define CONFIG_KEYPAD RECORDER_PAD
44 50
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h
index 4e77e3d4ed..5e404a9873 100644
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config-recorderv2.h
@@ -39,6 +39,12 @@
39 39
40#define LCD_PIXELFORMAT VERTICAL_PACKING 40#define LCD_PIXELFORMAT VERTICAL_PACKING
41 41
42/* Display colours, for screenshots and sim (0xRRGGBB) */
43#define LCD_DARKCOLOR 0x000000
44#define LCD_BRIGHTCOLOR 0x5a915a
45#define LCD_BL_DARKCOLOR 0x000000
46#define LCD_BL_BRIGHTCOLOR 0x7ee57e
47
42/* define this if you have a Recorder style 10-key keyboard */ 48/* define this if you have a Recorder style 10-key keyboard */
43#define CONFIG_KEYPAD RECORDER_PAD 49#define CONFIG_KEYPAD RECORDER_PAD
44 50
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 58ae66d1cd..2c299491f9 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -412,6 +412,28 @@
412#define LCD_PIXEL_ASPECT_WIDTH 1 412#define LCD_PIXEL_ASPECT_WIDTH 1
413#endif 413#endif
414 414
415/* Used for split displays (Sansa Clip). Set to 0 otherwise */
416#ifndef LCD_SPLIT_LINES
417#define LCD_SPLIT_LINES 0
418#endif
419
420/* Simulator LCD dimensions. Set to standard dimensions if undefined */
421#ifndef SIM_LCD_WIDTH
422#define SIM_LCD_WIDTH LCD_WIDTH
423#endif
424#ifndef SIM_LCD_HEIGHT
425#define SIM_LCD_HEIGHT (LCD_HEIGHT + LCD_SPLIT_LINES)
426#endif
427
428#ifdef HAVE_REMOTE_LCD
429#ifndef SIM_REMOTE_WIDTH
430#define SIM_REMOTE_WIDTH LCD_REMOTE_WIDTH
431#endif
432#ifndef SIM_REMOTE_HEIGHT
433#define SIM_REMOTE_HEIGHT LCD_REMOTE_HEIGHT
434#endif
435#endif /* HAVE_REMOTE_LCD */
436
415/* define this in the target config.h to use a different size */ 437/* define this in the target config.h to use a different size */
416#ifndef CONFIG_DEFAULT_ICON_HEIGHT 438#ifndef CONFIG_DEFAULT_ICON_HEIGHT
417#define CONFIG_DEFAULT_ICON_HEIGHT 8 439#define CONFIG_DEFAULT_ICON_HEIGHT 8