Finished color mapping, add new theme

This commit is contained in:
MCelliotG
2024-01-02 05:49:19 +02:00
parent 0409f31232
commit 4a2aacd6da
7 changed files with 260 additions and 181 deletions
+120 -89
View File
@@ -1,7 +1,6 @@
#include "gui.h"
#include "language.h"
#include "constants.h"
#include "ARS_Colors.h"
#include <WiFi.h>
#include <Wire.h>
#include <EEPROM.h>
@@ -64,8 +63,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
StereoColorSmooth = CyanSmooth;
RDSColor = Cyan;
RDSColorSmooth = CyanSmooth;
RDSDropoutColor = Teal;
RDSDropoutColorSmooth = TealSmooth;
RDSDropoutColor = CyanDark;
RDSDropoutColorSmooth = CyanDarkSmooth;
BarSignificantColor = Red;
BarInsignificantColor = Cyan;
ModBarSignificantColor = Red;
@@ -78,8 +77,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
case 2: // Crimson theme
PrimaryColor = Crimson;
PrimaryColorSmooth = CrimsonSmooth;
SecondaryColor = CrimsonDarkBW;
SecondaryColorSmooth = 0x4124;
SecondaryColor = Coral;
SecondaryColorSmooth = CoralSmooth;
FrameColor = CrimsonSmooth;
GreyoutColor = PaleGrey;
BackgroundColor = Black;
@@ -95,23 +94,23 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
StereoColorSmooth = Black;
RDSColor = Crimson;
RDSColorSmooth = Black;
RDSDropoutColor = CrimsonDarkBW;
RDSDropoutColorSmooth = 0x4124;
RDSDropoutColor = CrimsonDark;
RDSDropoutColorSmooth = CrimsonDarkSmooth;
BarSignificantColor = Yellow;
BarInsignificantColor = Crimson;
ModBarSignificantColor = Yellow;
ModBarInsignificantColor = Crimson;
BWAutoColor = CrimsonDarkBW;
BWAutoColorSmooth = 0x4124;
BatteryValueColor = 0xFA8D;
BatteryValueColorSmooth = 0x3083;
BWAutoColor = Coral;
BWAutoColorSmooth = CoralSmooth;
BatteryValueColor = Watermelon;
BatteryValueColorSmooth = WatermelonSmooth;
break;
case 3: // Monochrome theme
PrimaryColor = White;
PrimaryColorSmooth = Black;
SecondaryColor = PureGrey;
SecondaryColorSmooth = 0x1082;
FrameColor = 0x2965;
SecondaryColorSmooth = Black;
FrameColor = GreenGrey;
GreyoutColor = PaleGrey;
BackgroundColor = Black;
FreqColor = White;
@@ -127,26 +126,26 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
RDSColor = White;
RDSColorSmooth = Black;
RDSDropoutColor = PureGrey;
RDSDropoutColorSmooth = 0x1082;
RDSDropoutColorSmooth = Black;
BarSignificantColor = Red;
BarInsignificantColor = Green;
ModBarSignificantColor = Red;
ModBarInsignificantColor = Green;
BWAutoColor = PureGrey;
BWAutoColorSmooth = 0x1082;
BWAutoColorSmooth = Black;
BatteryValueColor = White;
BatteryValueColorSmooth = Black;
break;
case 4: // Volcano theme
PrimaryColor = Orange;
PrimaryColorSmooth = 0x2965;
PrimaryColorSmooth = GreenGrey;
SecondaryColor = Tangerine;
SecondaryColorSmooth = TangerineSmooth;
FrameColor = 0x2965;
GreyoutColor = 0x5140;
BackgroundColor = 0x0806;
FrameColor = GreenGrey;
GreyoutColor = Maroon;
BackgroundColor = Prussian;
FreqColor = Orange;
FreqColorSmooth = 0x2965;
FreqColorSmooth = GreenGrey;
ActiveColor = White;
ActiveColorSmooth = WhiteSmooth;
SignificantColor = Red;
@@ -157,8 +156,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
StereoColorSmooth = CyanSmooth;
RDSColor = Orange;
RDSColorSmooth = White;
RDSDropoutColor = Tangerine;
RDSDropoutColorSmooth = TangerineSmooth;
RDSDropoutColor = Dallas;
RDSDropoutColorSmooth = DallasSmooth;
BarSignificantColor = Red;
BarInsignificantColor = Orange;
ModBarSignificantColor = Red;
@@ -170,42 +169,42 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
break;
case 5: // Dendro theme
PrimaryColor = Green;
PrimaryColorSmooth = 0x0200;
SecondaryColor = 0x07F6;
SecondaryColorSmooth = 0x0184;
FrameColor = 0x0200;
PrimaryColorSmooth = GreenDark;
SecondaryColor = Cabbage;
SecondaryColorSmooth = CabbageSmooth;
FrameColor = GreenDark;
GreyoutColor = PaleGrey;
BackgroundColor = Black;
FreqColor = Green;
FreqColorSmooth = 0x0200;
FreqColorSmooth = GreenDark;
ActiveColor = White;
ActiveColorSmooth = WhiteSmooth;
SignificantColor = Red;
SignificantColorSmooth = RedSmooth;
InsignificantColor = 0xAA1C;
InsignificantColor = Green;
InsignificantColorSmooth = GreenSmooth;
StereoColor = Green;
StereoColorSmooth = 0x0200;
StereoColorSmooth = GreenDark;
RDSColor = Green;
RDSColorSmooth = 0x0200;
RDSDropoutColor = 0x07F6;
RDSDropoutColorSmooth = 0x0184;
RDSColorSmooth = GreenDark;
RDSDropoutColor = Laurel;
RDSDropoutColorSmooth = LaurelSmooth;
BarSignificantColor = Red;
BarInsignificantColor = Green;
ModBarSignificantColor = Red;
ModBarInsignificantColor = Green;
BWAutoColor = 0x07F6;
BWAutoColorSmooth = 0x0184;
BatteryValueColor = 0x07F6;
BatteryValueColorSmooth = 0x0184;
BWAutoColor = Cabbage;
BWAutoColorSmooth = CabbageSmooth;
BatteryValueColor = Cabbage;
BatteryValueColorSmooth = CabbageSmooth;
break;
case 6: // Sakura theme
PrimaryColor = Sakura;
PrimaryColorSmooth = SakuraSmooth;
SecondaryColor = 0xF00A;
SecondaryColorSmooth = 0x2802;
FrameColor = 0x3845;
GreyoutColor = 0x38C5;
SecondaryColor = Cherry;
SecondaryColorSmooth = CherrySmooth;
FrameColor = Tyrian;
GreyoutColor = Blackberry;
BackgroundColor = Black;
FreqColor = Sakura;
FreqColorSmooth = SakuraSmooth;
@@ -219,38 +218,38 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
StereoColorSmooth = SakuraSmooth;
RDSColor = Sakura;
RDSColorSmooth = SakuraSmooth;
RDSDropoutColor = 0xF00A;
RDSDropoutColorSmooth = 0x2802;
RDSDropoutColor = SakuraGrey;
RDSDropoutColorSmooth = SakuraGreySmooth;
BarSignificantColor = Black;
BarSignificantColor = Red;
BarInsignificantColor = Sakura;
ModBarSignificantColor = Red;
ModBarInsignificantColor = Sakura;
BWAutoColor = 0xF00A;
BWAutoColorSmooth = 0x2802;
BatteryValueColor = 0xF00A;
BatteryValueColorSmooth = 0x2802;
BWAutoColor = Cherry;
BWAutoColorSmooth = CherrySmooth;
BatteryValueColor = Cherry;
BatteryValueColorSmooth = CherrySmooth;
break;
case 7: // Whiteout theme
PrimaryColor = Black;
PrimaryColorSmooth = White;
SecondaryColor = 0x9492;
SecondaryColor = Grey;
SecondaryColorSmooth = White;
FrameColor = 0x630C;
GreyoutColor = 0x9492;
BackgroundColor = 0xDFFC;
FrameColor = Darkgrey;
GreyoutColor = PureGrey;
BackgroundColor = Honeydew;
FreqColor = Black;
FreqColorSmooth = White;
ActiveColor = Black;
ActiveColorSmooth = 0xDFFC;
ActiveColorSmooth = Honeydew;
SignificantColor = Red;
SignificantColorSmooth = 0xDFFC;
SignificantColorSmooth = Honeydew;
InsignificantColor = Green;
InsignificantColorSmooth = 0x0140;
InsignificantColorSmooth = GreenSmooth;
StereoColor = Black;
StereoColorSmooth = 0xDFFC;
StereoColorSmooth = Honeydew;
RDSColor = Black;
RDSColorSmooth = 0xDFFC;
RDSColorSmooth = Honeydew;
RDSDropoutColor = PureGrey;
RDSDropoutColorSmooth = White;
BarSignificantColor = Black;
@@ -265,10 +264,10 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
case 8: // Tangerine theme
PrimaryColor = Tangerine;
PrimaryColorSmooth = TangerineSmooth;
SecondaryColor = 0xED20;
SecondaryColorSmooth = 0x3940;
FrameColor = 0x38A1;
GreyoutColor = 0x6247;
SecondaryColor = Yolk;
SecondaryColorSmooth = YolkSmooth;
FrameColor = Chocolate;
GreyoutColor = Spice;
BackgroundColor = Black;
FreqColor = Tangerine;
FreqColorSmooth = IndigoSmooth;
@@ -282,24 +281,24 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
StereoColorSmooth = IndigoSmooth;
RDSColor = Tangerine;
RDSColorSmooth = IndigoSmooth;
RDSDropoutColor = 0xED20;
RDSDropoutColorSmooth = 0x3940;
RDSDropoutColor = Copper;
RDSDropoutColorSmooth = CopperSmooth;
BarSignificantColor = Red;
BarInsignificantColor = Green;
ModBarSignificantColor = Red;
ModBarInsignificantColor = Green;
BWAutoColor = 0xED20;
BWAutoColorSmooth = 0x3940;
BatteryValueColor = 0xED20;
BatteryValueColorSmooth = 0x3940;
BWAutoColor = Yolk;
BWAutoColorSmooth = YolkSmooth;
BatteryValueColor = Yolk;
BatteryValueColorSmooth = YolkSmooth;
break;
case 9: // Ocean theme
PrimaryColor = Ocean;
PrimaryColorSmooth = OceanSmooth;
SecondaryColor = 0x051F;
SecondaryColorSmooth = 0x0106;
FrameColor = 0x0010;
GreyoutColor = 0x420C;
SecondaryColor = Deepsky;
SecondaryColorSmooth = DeepskySmooth;
FrameColor = Navy;
GreyoutColor = Cornblue;
BackgroundColor = Black;
FreqColor = Ocean;
FreqColorSmooth = OceanSmooth;
@@ -313,27 +312,27 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
StereoColorSmooth = OceanSmooth;
RDSColor = Ocean;
RDSColorSmooth = OceanSmooth;
RDSDropoutColor = 0x051F;
RDSDropoutColorSmooth = 0x0106;
RDSDropoutColor = Cove;
RDSDropoutColorSmooth = CoveSmooth;
BarSignificantColor = Red;
BarInsignificantColor = Ocean;
ModBarSignificantColor = Red;
ModBarInsignificantColor = Ocean;
BWAutoColor = 0x051F;
BWAutoColorSmooth = 0x0106;
BatteryValueColor = 0x051F;
BatteryValueColorSmooth = 0x0106;
BWAutoColor = Deepsky;
BWAutoColorSmooth = DeepskySmooth;
BatteryValueColor = Deepsky;
BatteryValueColorSmooth = DeepskySmooth;
break;
case 10: // Indigo theme
PrimaryColor = Indigo;
PrimaryColorSmooth = IndigoSmooth;
SecondaryColor = 0xD01F;
SecondaryColorSmooth = 0x400A;
FrameColor = 0x6016;
GreyoutColor = 0x49AC;
SecondaryColor = Violet;
SecondaryColorSmooth = VioletSmooth;
FrameColor = Electric;
GreyoutColor = Meteorite;
BackgroundColor = Black;
FreqColor = Indigo;
FreqColorSmooth = 0x2007;
FreqColorSmooth = IndigoSmooth;
ActiveColor = White;
ActiveColorSmooth = WhiteSmooth;
SignificantColor = Red;
@@ -341,22 +340,54 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
InsignificantColor = Green;
InsignificantColorSmooth = GreenSmooth;
StereoColor = Indigo;
StereoColorSmooth = 0x2007;
StereoColorSmooth = IndigoSmooth;
RDSColor = Indigo;
RDSColorSmooth = 0x2007;
RDSDropoutColor = 0x9C96;
RDSDropoutColorSmooth = 0x41C8;
RDSColorSmooth = IndigoSmooth;
RDSDropoutColor = Logan;
RDSDropoutColorSmooth = LoganSmooth;
BarSignificantColor = Red;
BarInsignificantColor = Indigo;
ModBarSignificantColor = Red;
ModBarInsignificantColor = Indigo;
BWAutoColor = 0xD01F;
BWAutoColorSmooth = 0x400A;
BatteryValueColor = 0xD01F;
BatteryValueColorSmooth = 0x400A;
BWAutoColor = Violet;
BWAutoColorSmooth = VioletSmooth;
BatteryValueColor = Violet;
BatteryValueColorSmooth = VioletSmooth;
break;
case 11: // GoldBrite
case 11: // Maroon
PrimaryColor = Cherry;
PrimaryColorSmooth = CherrySmooth;
SecondaryColor = Crimson;
SecondaryColorSmooth = CrimsonSmooth;
FrameColor = Electric;
GreyoutColor = CoralSmooth;
BackgroundColor = MaroonSmooth;
ActiveColor = White;
ActiveColorSmooth = WhiteSmooth;
FreqColor = Cherry;
FreqColorSmooth = CherrySmooth;
SignificantColor = Red;
SignificantColorSmooth = RedSmooth;
InsignificantColor = Violet;
InsignificantColorSmooth = VioletSmooth;
StereoColor = Cherry;
StereoColorSmooth = CherrySmooth;
RDSColor = Coral;
RDSColorSmooth = CoralSmooth;
RDSDropoutColor = Logan;
RDSDropoutColorSmooth = LoganSmooth;
BarSignificantColor = Yolk;
BarInsignificantColor = Cherry;
ModBarSignificantColor = Yolk;
ModBarInsignificantColor = Cherry;
BWAutoColor = Violet;
BWAutoColorSmooth = VioletSmooth;
BatteryValueColor = Purple;
BatteryValueColorSmooth = PurpleSmooth;
break;
case 12: // GoldBrite
PrimaryColor = Yellow;
PrimaryColorSmooth = YellowSmooth;
SecondaryColor = Skyblue;