This commit is contained in:
2024-05-18 23:11:00 +02:00
parent a92a3beb96
commit 4cb0a10617
3 changed files with 47 additions and 19 deletions

View File

@ -12,7 +12,7 @@ typedef enum { e_Config_Flash, e_Config_ResetHighscore, e_Config_End } t_ConfigS
static bool configChanged = false; static bool configChanged = false;
static void configHandleFlash() { static void configHandleFlash() {
canvasSetPixel(0, 1, eepromReadFlashColor()); miniCanvasSetPixel(0, 1, eepromReadFlashColor());
if (buttonsConfig2Pressed()) { if (buttonsConfig2Pressed()) {
configChanged = true; configChanged = true;
@ -38,21 +38,21 @@ void configExec(void *handle) {
if (configState == e_Config_End) { if (configState == e_Config_End) {
configState = e_Config_Flash; configState = e_Config_Flash;
} }
canvasClear(); miniCanvasClear();
canvasSetPixel(configState, 0, _red); miniCanvasSetPixel(configState, 0, _medium_red);
} }
configHandler[configState](); configHandler[configState]();
if (configChanged) { if (configChanged) {
canvasSetPixel(0, 2, _red); miniCanvasSetPixel(0, 2, _medium_red);
if (buttonsConfig4Pressed()) { if (buttonsConfig4Pressed()) {
eepromCommit(); eepromCommit();
configChanged = false; configChanged = false;
} }
} else { } else {
canvasSetPixel(0, 2, _green); miniCanvasSetPixel(0, 2, _medium_green);
} }

View File

@ -1,6 +1,7 @@
#include "colors.h" #include "colors.h"
#define DF 5 #define DF 5
#define DF_M 3
.section ".rodata","a" .section ".rodata","a"
;; color definitions according to ;; color definitions according to
;; https://learn.sparkfun.com/tutorials/lilypad-protosnap-plus-activity-guide/3-custom-color-mixing ;; 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, 0x00>>DF, 0 ;; yellow
.byte 0xff>>DF, 0xff>>DF, 0xff>>DF, 0 ;; white .byte 0xff>>DF, 0xff>>DF, 0xff>>DF, 0 ;; white
.byte 0xff>>DF, 0x00>>DF, 0x00>>DF, 0 ;; red .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, 0x00, 0xff, 0 ;; blue
.byte 0x00, 0xff, 0x00, 0 ;; green .byte 0x00, 0xff, 0x00, 0 ;; green
.byte 0xff, 0x80, 0x00, 0 ;; orange .byte 0xff, 0x80, 0x00, 0 ;; orange

View File

@ -18,21 +18,35 @@
#define _white 0x0c #define _white 0x0c
#define _red 0x0d #define _red 0x0d
#define _dazzling_blue 0x0e #define _medium_blue 0x0e
#define _dazzling_green 0x0f #define _medium_green 0x0f
#define _dazzling_orange 0x10 #define _medium_orange 0x10
#define _dazzling_rose 0x11 #define _medium_rose 0x11
#define _dazzling_magenta 0x12 #define _medium_magenta 0x12
#define _dazzling_violet 0x13 #define _medium_violet 0x13
#define _dazzling_azure 0x14 #define _medium_azure 0x14
#define _dazzling_cyan 0x15 #define _medium_cyan 0x15
#define _dazzling_springgreen 0x16 #define _medium_springgreen 0x16
#define _dazzling_chartreuse 0x17 #define _medium_chartreuse 0x17
#define _dazzling_yellow 0x18 #define _medium_yellow 0x18
#define _dazzling_white 0x19 #define _medium_white 0x19
#define _dazzling_red 0x1a #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 #endif