Diff: lpc_swim/lpc_colors.h

Revision:

11:265884fa7fdd

Parent:

0:4977187e90c7

--- a/lpc_swim/lpc_colors.h	Mon Jan 26 10:06:58 2015 +0100
+++ b/lpc_swim/lpc_colors.h	Tue Feb 17 10:34:13 2015 +0100
@@ -41,18 +41,18 @@
 
 /** @defgroup GUI_SWIM_COLORS SWIM color definitions
  * @ingroup GUI_SWIM
- * The Simple Windows Interface manager (SWIM) supports 8-bit RGB323,
+ * The Simple Windows Interface manager (SWIM) supports 8-bit RGB332,
  * 12-bit RGB 444 (in a 16-bit field), 15-bit RGB555, 16-bit RGB565,
  * and 24-bit RGB888 (in a 32-bit field) color.
  *
  * SWIM is configured for the color type at build-time based on the
  * the COLORS_DEF definitions. Select one of the following values to
  * configure SWIM.
- *  8-bit RGB323 : COLORS_DEF = 8
- *  12-bit RGB323: COLORS_DEF = 12
- *  15-bit RGB323: COLORS_DEF = 15
- *  16-bit RGB323: COLORS_DEF = 16
- *  24-bit RGB323: COLORS_DEF = 24
+ *  8-bit RGB332 : COLORS_DEF = 8
+ *  12-bit RGB444: COLORS_DEF = 12
+ *  15-bit RGB555: COLORS_DEF = 15
+ *  16-bit RGB565: COLORS_DEF = 16
+ *  24-bit RGB888: COLORS_DEF = 24
  * @{
  */
 
@@ -148,6 +148,13 @@
 /* Blue color, 565 mode */
 #define BLUE          0x001F
 
+/* Magenta color, 565 mode */
+#define MAGENTA       (RED | BLUE)
+/* Cyan color, 565 mode */
+#define CYAN          (GREEN | BLUE)
+/* Yellow color, 565 mode */
+#define YELLOW        (RED | GREEN)
+
 /* Light red color, 565 mode */
 #define LIGHTRED      0x7800
 /* Light green color, 565 mode */
@@ -309,50 +316,50 @@
 #endif
 
 #if COLORS_DEF == 8
-/* Black color, 323 mode */
+/* Black color, 332 mode */
 #define BLACK         0x00
-/* Light gray color, 323 mode */
+/* Light gray color, 332 mode */
 #define LIGHTGRAY     0x6E
-/* Dark gray color, 323 mode */
+/* Dark gray color, 332 mode */
 #define DARKGRAY      0x25
-/* White color, 323 mode */
+/* White color, 332 mode */
 #define WHITE         0xFF
-/* Red color, 323 mode */
+/* Red color, 332 mode */
 #define RED           0xE0
-/* Green color, 323 mode */
+/* Green color, 332 mode */
 #define GREEN         0x1C
-/* Blue color, 323 mode */
+/* Blue color, 332 mode */
 #define BLUE          0x03
-/* Magenta color, 323 mode */
+/* Magenta color, 332 mode */
 #define MAGENTA       (RED | BLUE)
-/* Cyan color, 323 mode */
+/* Cyan color, 332 mode */
 #define CYAN          (GREEN | BLUE)
-/* Yellow color, 323 mode */
+/* Yellow color, 332 mode */
 #define YELLOW        (RED | GREEN)
-/* Light red color, 323 mode */
+/* Light red color, 332 mode */
 #define LIGHTRED      0x60
-/* Light green color, 323 mode */
+/* Light green color, 332 mode */
 #define LIGHTGREEN    0x0C
-/* Light blue color, 323 mode */
+/* Light blue color, 332 mode */
 #define LIGHTBLUE     0x01
-/* Light magenta color, 323 mode */
+/* Light magenta color, 332 mode */
 #define LIGHTMAGENTA  (LIGHTRED | LIGHTBLUE)
-/* Light cyan color, 323 mode */
+/* Light cyan color, 332 mode */
 #define LIGHTCYAN     (LIGHTGREEN | LIGHTBLUE)
-/* Light yellow color, 323 mode */
+/* Light yellow color, 332 mode */
 #define LIGHTYELLOW   (LIGHTRED | LIGHTGREEN)
 
-/* Red color mask, 323 mode */
+/* Red color mask, 332 mode */
 #define REDMASK       0xE0
-/* Red shift value, 323 mode */
+/* Red shift value, 332 mode */
 #define REDSHIFT      5
-/* Green color mask, 323 mode */
+/* Green color mask, 332 mode */
 #define GREENMASK     0x1C
-/* Green shift value, 323 mode */
+/* Green shift value, 332 mode */
 #define GREENSHIFT    2
-/* Blue color mask, 323 mode */
+/* Blue color mask, 332 mode */
 #define BLUEMASK      0x3
-/* Blue shift value, 323 mode */
+/* Blue shift value, 332 mode */
 #define BLUESHIFT     0
 
 /* Number of colors in 332 mode */
@@ -360,9 +367,9 @@
 /* Number of red colors in 332 mode */
 #define RED_COLORS    0x08
 /* Number of green colors in 332 mode */
-#define GREEN_COLORS  0x08
+#define GREEN_COLORS  0x06
 /* Number of blue colors in 332 mode */
-#define BLUE_COLORS   0x08
+#define BLUE_COLORS   0x04
 
 /* Color type is a 8-bit value */
 typedef uint8_t COLOR_T;