From 4cb0a10617e682b77995761d2f0b7bc572a189ff Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Sat, 18 May 2024 23:11:00 +0200
Subject: [PATCH] colors

---
 game-ctrl/config.c  | 10 +++++-----
 rgb-driver/colors.S | 14 ++++++++++++++
 rgb-driver/colors.h | 42 ++++++++++++++++++++++++++++--------------
 3 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/game-ctrl/config.c b/game-ctrl/config.c
index 3cb70a4..6eaba30 100644
--- a/game-ctrl/config.c
+++ b/game-ctrl/config.c
@@ -12,7 +12,7 @@ typedef enum { e_Config_Flash, e_Config_ResetHighscore, e_Config_End } t_ConfigS
 static bool configChanged = false;
 
 static void configHandleFlash() {
-  canvasSetPixel(0, 1, eepromReadFlashColor());
+  miniCanvasSetPixel(0, 1, eepromReadFlashColor());
 
   if (buttonsConfig2Pressed()) {
     configChanged = true;
@@ -38,21 +38,21 @@ void configExec(void *handle) {
     if (configState == e_Config_End) {
       configState = e_Config_Flash;
     }
-    canvasClear();
+    miniCanvasClear();
 
-    canvasSetPixel(configState, 0, _red);
+    miniCanvasSetPixel(configState, 0, _medium_red);
   }
 
   configHandler[configState]();
 
   if (configChanged) {
-    canvasSetPixel(0, 2, _red);
+    miniCanvasSetPixel(0, 2, _medium_red);
     if (buttonsConfig4Pressed()) {
       eepromCommit();
       configChanged = false;
     }
   } else {
-    canvasSetPixel(0, 2, _green);
+    miniCanvasSetPixel(0, 2, _medium_green);
   }
 
 
diff --git a/rgb-driver/colors.S b/rgb-driver/colors.S
index d696b06..ad591dc 100644
--- a/rgb-driver/colors.S
+++ b/rgb-driver/colors.S
@@ -1,6 +1,7 @@
 #include "colors.h"
 
 #define DF 5
+#define DF_M 3
   .section ".rodata","a"
 ;; color definitions according to
 ;; https://learn.sparkfun.com/tutorials/lilypad-protosnap-plus-activity-guide/3-custom-color-mixing
@@ -21,6 +22,19 @@ colors:
   .byte   0xff>>DF, 0xff>>DF, 0x00>>DF, 0   ;; yellow
   .byte   0xff>>DF, 0xff>>DF, 0xff>>DF, 0   ;; white
   .byte   0xff>>DF, 0x00>>DF, 0x00>>DF, 0   ;; red
+  .byte   0x00>>DF_M, 0x00>>DF_M, 0xff>>DF_M, 0   ;; blue
+  .byte   0x00>>DF_M, 0xff>>DF_M, 0x00>>DF_M, 0   ;; green
+  .byte   0xff>>DF_M, 0x80>>DF_M, 0x00>>DF_M, 0   ;; orange
+  .byte   0xff>>DF_M, 0x00>>DF_M, 0x80>>DF_M, 0   ;; rose
+  .byte   0xff>>DF_M, 0x00>>DF_M, 0xff>>DF_M, 0   ;; magenta
+  .byte   0x80>>DF_M, 0x00>>DF_M, 0xff>>DF_M, 0   ;; violet
+  .byte   0x00>>DF_M, 0x80>>DF_M, 0xff>>DF_M, 0   ;; azure
+  .byte   0x00>>DF_M, 0xff>>DF_M, 0xff>>DF_M, 0   ;; cyan
+  .byte   0x00>>DF_M, 0xff>>DF_M, 0x80>>DF_M, 0   ;; springgreen
+  .byte   0x80>>DF_M, 0xff>>DF_M, 0x00>>DF_M, 0   ;; chartreuse
+  .byte   0xff>>DF_M, 0xff>>DF_M, 0x00>>DF_M, 0   ;; yellow
+  .byte   0xff>>DF_M, 0xff>>DF_M, 0xff>>DF_M, 0   ;; white
+  .byte   0xff>>DF_M, 0x00>>DF_M, 0x00>>DF_M, 0   ;; red
   .byte   0x00, 0x00, 0xff, 0   ;; blue
   .byte   0x00, 0xff, 0x00, 0   ;; green
   .byte   0xff, 0x80, 0x00, 0   ;; orange
diff --git a/rgb-driver/colors.h b/rgb-driver/colors.h
index c11d501..e516866 100644
--- a/rgb-driver/colors.h
+++ b/rgb-driver/colors.h
@@ -18,21 +18,35 @@
 #define _white 0x0c
 #define _red 0x0d
 
-#define _dazzling_blue 0x0e
-#define _dazzling_green 0x0f
-#define _dazzling_orange 0x10
-#define _dazzling_rose 0x11
-#define _dazzling_magenta 0x12
-#define _dazzling_violet 0x13
-#define _dazzling_azure 0x14
-#define _dazzling_cyan 0x15
-#define _dazzling_springgreen 0x16
-#define _dazzling_chartreuse 0x17
-#define _dazzling_yellow 0x18
-#define _dazzling_white 0x19
-#define _dazzling_red 0x1a
+#define _medium_blue 0x0e
+#define _medium_green 0x0f
+#define _medium_orange 0x10
+#define _medium_rose 0x11
+#define _medium_magenta 0x12
+#define _medium_violet 0x13
+#define _medium_azure 0x14
+#define _medium_cyan 0x15
+#define _medium_springgreen 0x16
+#define _medium_chartreuse 0x17
+#define _medium_yellow 0x18
+#define _medium_white 0x19
+#define _medium_red 0x1a
 
-#define _color_end 0x1b
+#define _dazzling_blue 0x1b
+#define _dazzling_green 0x1c
+#define _dazzling_orange 0x1d
+#define _dazzling_rose 0x1e
+#define _dazzling_magenta 0x1f
+#define _dazzling_violet 0x20
+#define _dazzling_azure 0x21
+#define _dazzling_cyan 0x22
+#define _dazzling_springgreen 0x23
+#define _dazzling_chartreuse 0x24
+#define _dazzling_yellow 0x25
+#define _dazzling_white 0x26
+#define _dazzling_red 0x27
+
+#define _color_end 0x28
 
 
 #endif