UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-19 05:40:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher] Function colors

Browse Source 
Change-Id: I97c9ee9be8bf234944c7df4fc6756f19c98baf54
This commit is contained in:
Émilie Feral
2017-02-17 16:14:33 +01:00
parent e65b07286d
commit 42149265d4
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/graph/cartesian_function_store.h
View File

@@ -4,6 +4,7 @@
#include "cartesian_function.h"
#include "../shared/function_store.h"
#include <stdint.h>
#include <escher.h>
namespace Graph {
@@ -23,8 +24,8 @@ private:
const KDColor firstAvailableColor() override;
static constexpr int k_numberOfDefaultColors = 8;
static constexpr KDColor k_defaultColors[k_numberOfDefaultColors] = {
KDColor::RGB24(0xbe2727), KDColor::RGB24(0x3e6f3c), KDColor::RGB24(0x656975), KDColor::RGB24(0x9ec580),
KDColor::RGB24(0xffb734), KDColor::RGB24(0x4a94ab), KDColor::RGB24(0xf98577), KDColor::RGB24(0xd4ac46)
Palette::Red, Palette::Blue, Palette::YellowDark, Palette::Magenta,
Palette::Pink, Palette::Turquoise, Palette::Orange, Palette::Green
};
static constexpr const char * k_functionNames[k_maxNumberOfFunctions] = {
"f", "g", "h", "p", "q", "r", "s", "t"

3
apps/sequence/sequence_store.h
View File

@@ -4,6 +4,7 @@
#include "sequence.h"
#include "../shared/function_store.h"
#include <stdint.h>
#include <escher.h>
namespace Sequence {
@@ -22,7 +23,7 @@ public:
private:
const KDColor firstAvailableColor() override;
static constexpr KDColor k_defaultColors[k_maxNumberOfSequences] = {
KDColor::RGB24(0xbe2727), KDColor::RGB24(0x3e6f3c), KDColor::RGB24(0x656975)
Palette::Red, Palette::Blue, Palette::YellowDark
};
static constexpr const char * k_sequenceNames[k_maxNumberOfSequences] = {
"u", "v", "w"

7
escher/include/escher/palette.h
View File

@@ -18,6 +18,13 @@ public:
constexpr static KDColor WallScreenDark = KDColor::RGB24(0xe0e6ed);
constexpr static KDColor SubTab = KDColor::RGB24(0xb8bbc5);
constexpr static KDColor LowBattery = KDColor::RGB24(0xf30211);
constexpr static KDColor Red = KDColor::RGB24(0xff000c);
constexpr static KDColor Magenta = KDColor::RGB24(0xff0588);
constexpr static KDColor Turquoise = KDColor::RGB24(0x60c1ec);
constexpr static KDColor Pink = KDColor::RGB24(0xffabb6);
constexpr static KDColor Blue = KDColor::RGB24(0x5075f2);
constexpr static KDColor Orange = KDColor::RGB24(0xfe871f);
constexpr static KDColor Green = KDColor::RGB24(0x76d435);
};
#endif

7
escher/src/palette.cpp
View File

@@ -13,3 +13,10 @@ constexpr KDColor Palette::WallScreen;
constexpr KDColor Palette::WallScreenDark;
constexpr KDColor Palette::SubTab;
constexpr KDColor Palette::LowBattery;
constexpr KDColor Palette::Red;
constexpr KDColor Palette::Magenta;
constexpr KDColor Palette::Turquoise;
constexpr KDColor Palette::Pink;
constexpr KDColor Palette::Blue;
constexpr KDColor Palette::Orange;
constexpr KDColor Palette::Green;