Skip to content

Commit 4fb37f7

Browse files
32teeth32teeth
committed
Wed 18 Mar 2020 07:57:29 EDT - starting new themes
1 parent 22fdda1 commit 4fb37f7

File tree

14 files changed

+452
-418
lines changed

14 files changed

+452
-418
lines changed

‎Components/go-play/odroid-go-common/components/odroid/odroid_hud.c

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -95,36 +95,38 @@
9595
};
9696
STATES STATE;
9797

98-
typedef struct{
99-
int bg;
100-
int fg;
101-
char name[10];
102-
} THEME;
103-
THEME THEMES[22] = {
104-
{32768,54580,"maroon"},
105-
{57545,62839,"red"},
106-
{64143,65049,"pink"},
107-
{39684,56918,"brown"},
108-
{62470,65174,"orange"},
109-
{50604,61240,"apricot"},
110-
{33792,54932,"olive"},
111-
{65283,65461,"yellow"},
112-
{60845,63289,"beige"},
113-
{49000,59351,"lime"},
114-
{15753,48951,"green"},
115-
{45048,57340,"mint"},
116-
{17617,48858,"teal"},
117-
{18078,49023,"cyan"},
118-
{14,42297,"navy"},
119-
{17178,48733,"blue"},
120-
{37110,54652,"purple"},
121-
{52318,61119,"lavender"},
122-
{59804,62910,"magenta"},
123-
{0,42292,"black"},
124-
{16936,48631,"dark"},
125-
{29614,52857,"light"}
126-
};
127-
THEME GUI;
98+
// THEME
99+
typedef struct{
100+
int bg;
101+
int fg;
102+
int hl;
103+
char name[10];
104+
} THEME;
105+
THEME THEMES[22] = {
106+
{63877,51492,20610,"grapefruit"},
107+
{64452,51971,20770,"caramel"},
108+
{64963,52386,20961,"beer"},
109+
{65504,52832,21121,"mustard"},
110+
{49120,38497,14977,"slime"},
111+
{30689,24161,8833,"algae"},
112+
{8162,7778,4737,"jade"},
113+
{8174,7787,4740,"frog"},
114+
{8183,5746,2695,"seafoam"},
115+
{8191,5721,2698,"celeste"},
116+
{9727,9433,4586,"denim"},
117+
{11231,8985,4394,"sky"},
118+
{12511,8344,4202,"cobalt"},
119+
{28959,22777,8298,"indigo"},
120+
{47359,37081,14442,"plum"},
121+
{63743,51417,20586,"orchid"},
122+
{63799,51443,20583,"cupcake"},
123+
{63855,51500,20613,"lemonade"},
124+
{0,25388,48631,"night"},
125+
{25388,38066,55002,"carbon"},
126+
{44373,55002,65535,"smoke"},
127+
{65535,52825,16904,"cloud"},
128+
};
129+
THEME GUI;
128130
//}#pragma endregion Structs
129131

130132
//{#pragma region Sprites
@@ -313,7 +315,7 @@ const uint16_t FONT_5x7[7][250] = {
313315
if(string[n] != ' ') {
314316
for(int c = dx; c < (dx+cols); c++) {
315317
//buffer[i] = FONT_5x5[r][c] == 0 ? GUI.bg : current ? WHITE : GUI.fg;
316-
buffer[i] = FONT_5x7[r][c] == 0 ? GUI.bg : current ? WHITE : GUI.fg;
318+
buffer[i] = FONT_5x7[r][c] == 0 ? GUI.bg : current ? GUI.hl : GUI.fg;
317319
i++;
318320
}
319321
}
@@ -374,7 +376,7 @@ const uint16_t FONT_5x7[7][250] = {
374376
i = 0;
375377
for(int r = 0; r < h; r++) {
376378
for(int c = 0; c < w; c++) {
377-
buffer[i] = logo[r][c] == 0 ? GUI.bg : GUI.fg;
379+
buffer[i] = logo[r][c] == 0 ? GUI.bg : GUI.hl;
378380
i++;
379381
}
380382
}
@@ -413,7 +415,7 @@ const uint16_t FONT_5x7[7][250] = {
413415
STATE = WITHSAVE[n];
414416
y+=20;
415417
for(int r = 0; r < 5; r++){for(int c = 0; c < 5; c++) {
416-
buffer[i] = icons[r+STATE.offset][c] == WHITE ? OPTION == n ? WHITE : GUI.fg : GUI.bg;i++;
418+
buffer[i] = icons[r+STATE.offset][c] == WHITE ? OPTION == n ? GUI.hl : GUI.fg : GUI.bg;i++;
417419
}}
418420
if(n == OPTIONS-1) {y = 216;}
419421
ili9341_write_frame_rectangleLE(x, y, w, h, buffer);
@@ -426,7 +428,7 @@ const uint16_t FONT_5x7[7][250] = {
426428
STATE = WITHOUTSAVE[n];
427429
y+=20;
428430
for(int r = 0; r < 5; r++){for(int c = 0; c < 5; c++) {
429-
buffer[i] = icons[r+STATE.offset][c] == WHITE ? OPTION == n ? WHITE : GUI.fg : GUI.bg;i++;
431+
buffer[i] = icons[r+STATE.offset][c] == WHITE ? OPTION == n ? GUI.hl : GUI.fg : GUI.bg;i++;
430432
}}
431433
if(n == OPTIONS-1) {y = 216;}
432434
ili9341_write_frame_rectangleLE(x, y, w, h, buffer);

‎Components/handy-go/components/odroid/odroid_hud.c

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -95,36 +95,38 @@
9595
};
9696
STATES STATE;
9797

98-
typedef struct{
99-
int bg;
100-
int fg;
101-
char name[10];
102-
} THEME;
103-
THEME THEMES[22] = {
104-
{32768,54580,"maroon"},
105-
{57545,62839,"red"},
106-
{64143,65049,"pink"},
107-
{39684,56918,"brown"},
108-
{62470,65174,"orange"},
109-
{50604,61240,"apricot"},
110-
{33792,54932,"olive"},
111-
{65283,65461,"yellow"},
112-
{60845,63289,"beige"},
113-
{49000,59351,"lime"},
114-
{15753,48951,"green"},
115-
{45048,57340,"mint"},
116-
{17617,48858,"teal"},
117-
{18078,49023,"cyan"},
118-
{14,42297,"navy"},
119-
{17178,48733,"blue"},
120-
{37110,54652,"purple"},
121-
{52318,61119,"lavender"},
122-
{59804,62910,"magenta"},
123-
{0,42292,"black"},
124-
{16936,48631,"dark"},
125-
{29614,52857,"light"}
126-
};
127-
THEME GUI;
98+
// THEME
99+
typedef struct{
100+
int bg;
101+
int fg;
102+
int hl;
103+
char name[10];
104+
} THEME;
105+
THEME THEMES[22] = {
106+
{63877,51492,20610,"grapefruit"},
107+
{64452,51971,20770,"caramel"},
108+
{64963,52386,20961,"beer"},
109+
{65504,52832,21121,"mustard"},
110+
{49120,38497,14977,"slime"},
111+
{30689,24161,8833,"algae"},
112+
{8162,7778,4737,"jade"},
113+
{8174,7787,4740,"frog"},
114+
{8183,5746,2695,"seafoam"},
115+
{8191,5721,2698,"celeste"},
116+
{9727,9433,4586,"denim"},
117+
{11231,8985,4394,"sky"},
118+
{12511,8344,4202,"cobalt"},
119+
{28959,22777,8298,"indigo"},
120+
{47359,37081,14442,"plum"},
121+
{63743,51417,20586,"orchid"},
122+
{63799,51443,20583,"cupcake"},
123+
{63855,51500,20613,"lemonade"},
124+
{0,25388,48631,"night"},
125+
{25388,38066,55002,"carbon"},
126+
{44373,55002,65535,"smoke"},
127+
{65535,52825,16904,"cloud"},
128+
};
129+
THEME GUI;
128130
//}#pragma endregion Structs
129131

130132
//{#pragma region Sprites
@@ -316,7 +318,7 @@ const uint16_t FONT_5x7[7][250] = {
316318
if(string[n] != ' ') {
317319
for(int c = dx; c < (dx+cols); c++) {
318320
//buffer[i] = FONT_5x5[r][c] == 0 ? GUI.bg : current ? WHITE : GUI.fg;
319-
buffer[i] = FONT_5x7[r][c] == 0 ? GUI.bg : current ? WHITE : GUI.fg;
321+
buffer[i] = FONT_5x7[r][c] == 0 ? GUI.bg : current ? GUI.hl : GUI.fg;
320322
i++;
321323
}
322324
}
@@ -377,7 +379,7 @@ const uint16_t FONT_5x7[7][250] = {
377379
i = 0;
378380
for(int r = 0; r < h; r++) {
379381
for(int c = 0; c < w; c++) {
380-
buffer[i] = logo[r][c] == 0 ? GUI.bg : GUI.fg;
382+
buffer[i] = logo[r][c] == 0 ? GUI.bg : GUI.hl;
381383
i++;
382384
}
383385
}
@@ -416,7 +418,7 @@ const uint16_t FONT_5x7[7][250] = {
416418
STATE = WITHSAVE[n];
417419
y+=20;
418420
for(int r = 0; r < 5; r++){for(int c = 0; c < 5; c++) {
419-
buffer[i] = icons[r+STATE.offset][c] == WHITE ? OPTION == n ? WHITE : GUI.fg : GUI.bg;i++;
421+
buffer[i] = icons[r+STATE.offset][c] == WHITE ? OPTION == n ? GUI.hl : GUI.fg : GUI.bg;i++;
420422
}}
421423
if(n == OPTIONS-1) {y = 216;}
422424
ili9341_write_frame_rectangleLE(x, y, w, h, buffer);
@@ -429,7 +431,7 @@ const uint16_t FONT_5x7[7][250] = {
429431
STATE = WITHOUTSAVE[n];
430432
y+=20;
431433
for(int r = 0; r < 5; r++){for(int c = 0; c < 5; c++) {
432-
buffer[i] = icons[r+STATE.offset][c] == WHITE ? OPTION == n ? WHITE : GUI.fg : GUI.bg;i++;
434+
buffer[i] = icons[r+STATE.offset][c] == WHITE ? OPTION == n ? GUI.hl : GUI.fg : GUI.bg;i++;
433435
}}
434436
if(n == OPTIONS-1) {y = 216;}
435437
ili9341_write_frame_rectangleLE(x, y, w, h, buffer);

‎Components/odroid-go-handy/odroid-go-common/components/odroid/odroid_hud.c

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -95,36 +95,38 @@
9595
};
9696
STATES STATE;
9797

98-
typedef struct{
99-
int bg;
100-
int fg;
101-
char name[10];
102-
} THEME;
103-
THEME THEMES[22] = {
104-
{32768,54580,"maroon"},
105-
{57545,62839,"red"},
106-
{64143,65049,"pink"},
107-
{39684,56918,"brown"},
108-
{62470,65174,"orange"},
109-
{50604,61240,"apricot"},
110-
{33792,54932,"olive"},
111-
{65283,65461,"yellow"},
112-
{60845,63289,"beige"},
113-
{49000,59351,"lime"},
114-
{15753,48951,"green"},
115-
{45048,57340,"mint"},
116-
{17617,48858,"teal"},
117-
{18078,49023,"cyan"},
118-
{14,42297,"navy"},
119-
{17178,48733,"blue"},
120-
{37110,54652,"purple"},
121-
{52318,61119,"lavender"},
122-
{59804,62910,"magenta"},
123-
{0,42292,"black"},
124-
{16936,48631,"dark"},
125-
{29614,52857,"light"}
126-
};
127-
THEME GUI;
98+
// THEME
99+
typedef struct{
100+
int bg;
101+
int fg;
102+
int hl;
103+
char name[10];
104+
} THEME;
105+
THEME THEMES[22] = {
106+
{63877,51492,20610,"grapefruit"},
107+
{64452,51971,20770,"caramel"},
108+
{64963,52386,20961,"beer"},
109+
{65504,52832,21121,"mustard"},
110+
{49120,38497,14977,"slime"},
111+
{30689,24161,8833,"algae"},
112+
{8162,7778,4737,"jade"},
113+
{8174,7787,4740,"frog"},
114+
{8183,5746,2695,"seafoam"},
115+
{8191,5721,2698,"celeste"},
116+
{9727,9433,4586,"denim"},
117+
{11231,8985,4394,"sky"},
118+
{12511,8344,4202,"cobalt"},
119+
{28959,22777,8298,"indigo"},
120+
{47359,37081,14442,"plum"},
121+
{63743,51417,20586,"orchid"},
122+
{63799,51443,20583,"cupcake"},
123+
{63855,51500,20613,"lemonade"},
124+
{0,25388,48631,"night"},
125+
{25388,38066,55002,"carbon"},
126+
{44373,55002,65535,"smoke"},
127+
{65535,52825,16904,"cloud"},
128+
};
129+
THEME GUI;
128130
//}#pragma endregion Structs
129131

130132
//{#pragma region Sprites
@@ -316,7 +318,7 @@ const uint16_t FONT_5x7[7][250] = {
316318
if(string[n] != ' ') {
317319
for(int c = dx; c < (dx+cols); c++) {
318320
//buffer[i] = FONT_5x5[r][c] == 0 ? GUI.bg : current ? WHITE : GUI.fg;
319-
buffer[i] = FONT_5x7[r][c] == 0 ? GUI.bg : current ? WHITE : GUI.fg;
321+
buffer[i] = FONT_5x7[r][c] == 0 ? GUI.bg : current ? GUI.hl : GUI.fg;
320322
i++;
321323
}
322324
}
@@ -377,7 +379,7 @@ const uint16_t FONT_5x7[7][250] = {
377379
i = 0;
378380
for(int r = 0; r < h; r++) {
379381
for(int c = 0; c < w; c++) {
380-
buffer[i] = logo[r][c] == 0 ? GUI.bg : GUI.fg;
382+
buffer[i] = logo[r][c] == 0 ? GUI.bg : GUI.hl;
381383
i++;
382384
}
383385
}
@@ -416,7 +418,7 @@ const uint16_t FONT_5x7[7][250] = {
416418
STATE = WITHSAVE[n];
417419
y+=20;
418420
for(int r = 0; r < 5; r++){for(int c = 0; c < 5; c++) {
419-
buffer[i] = icons[r+STATE.offset][c] == WHITE ? OPTION == n ? WHITE : GUI.fg : GUI.bg;i++;
421+
buffer[i] = icons[r+STATE.offset][c] == WHITE ? OPTION == n ? GUI.hl : GUI.fg : GUI.bg;i++;
420422
}}
421423
if(n == OPTIONS-1) {y = 216;}
422424
ili9341_write_frame_rectangleLE(x, y, w, h, buffer);
@@ -429,7 +431,7 @@ const uint16_t FONT_5x7[7][250] = {
429431
STATE = WITHOUTSAVE[n];
430432
y+=20;
431433
for(int r = 0; r < 5; r++){for(int c = 0; c < 5; c++) {
432-
buffer[i] = icons[r+STATE.offset][c] == WHITE ? OPTION == n ? WHITE : GUI.fg : GUI.bg;i++;
434+
buffer[i] = icons[r+STATE.offset][c] == WHITE ? OPTION == n ? GUI.hl : GUI.fg : GUI.bg;i++;
433435
}}
434436
if(n == OPTIONS-1) {y = 216;}
435437
ili9341_write_frame_rectangleLE(x, y, w, h, buffer);

0 commit comments

Comments
 (0)