CCF_100
/
InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add additional transitional color

main
Chloe Fontenot 🏳️‍⚧️ 2024-04-22 23:22:26 +07:00
parent c60251359c
commit 7812867a01
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/displayapp/screens/WatchFaceTerminal.cpp
Unescape Escape View File

@ -173,7 +173,7 @@ WatchFaceTerminal::~WatchFaceTerminal() {
} }
const char* TemperatureColor(int16_t temperature) { const char* TemperatureColor(int16_t temperature) {
const std::vector<int> colors = {0x5555ff, 0xff9b00, 0xff0000}; const std::vector<int> colors = {0x5555ff, 0x00c9ff, 0xff9b00, 0xff0000};
std::vector<std::tuple<float, float, float>> stops; std::vector<std::tuple<float, float, float>> stops;
for (auto colorVal: colors) { for (auto colorVal: colors) {
stops.emplace_back(hexToFloat(colorVal)); stops.emplace_back(hexToFloat(colorVal));
@ -183,7 +183,7 @@ WatchFaceTerminal::~WatchFaceTerminal() {
tempRounded = 1; tempRounded = 1;
} }
// convert temperature to range between newMin and newMax // convert temperature to range between newMin and newMax
float oldMax = 100; float oldMax = 26;
float oldMin = 0; float oldMin = 0;
float newMax = 1; float newMax = 1;
float newMin = 0; float newMin = 0;
@ -191,13 +191,30 @@ WatchFaceTerminal::~WatchFaceTerminal() {
float newRange = (newMax - newMin); float newRange = (newMax - newMin);
float newValue = (((tempRounded - oldMin) * newRange) / oldRange) + newMin; float newValue = (((tempRounded - oldMin) * newRange) / oldRange) + newMin;
newValue = normalize(newValue); newValue = normalize(newValue);
if (newValue <= .5f) { if (newValue <= .50f) {
return floatToRgbHex(lerp(stops[0], stops[1], newValue)); return floatToRgbHex(lerp(stops[0], stops[1], newValue));
} else { } else if (newValue <= .85f) {
return floatToRgbHex(lerp(stops[1], stops[2], newValue)); return floatToRgbHex(lerp(stops[1], stops[2], newValue));
} } else {
return floatToRgbHex(lerp(stops[2], stops[3], newValue));
}
}
int16_t testVal = 0;
bool incDec = true;
void testColor() {
if (incDec) {
testVal++;
} else {
testVal--;
}
if (testVal == 26) {
incDec = false;
}
if (testVal == 0) {
incDec = true;
}
NRF_LOG_INFO("testVal: %i", testVal);
} }
void WatchFaceTerminal::Refresh() { void WatchFaceTerminal::Refresh() {
powerPresent = batteryController.IsPowerPresent(); powerPresent = batteryController.IsPowerPresent();
@ -244,14 +261,14 @@ void WatchFaceTerminal::Refresh() {
uint8_t weatherId = static_cast<int>(optCurrentWeather->iconId); // weather type uint8_t weatherId = static_cast<int>(optCurrentWeather->iconId); // weather type
NRF_LOG_INFO("Raw temp: %d", temp); NRF_LOG_INFO("Raw temp: %d", temp);
NRF_LOG_INFO("Rounded temp: %d", RoundTemperature(temp)); NRF_LOG_INFO("Rounded temp: %d", RoundTemperature(temp));
//testColor(); //testVal * 100
auto color = TemperatureColor(temp); // call temperature color BEFORE unit conversion
// unit conversion // unit conversion
char tempUnit = 'C'; char tempUnit = 'C';
if (settingsController.GetWeatherFormat() == Controllers::Settings::WeatherFormat::Imperial) { if (settingsController.GetWeatherFormat() == Controllers::Settings::WeatherFormat::Imperial) {
temp = Controllers::SimpleWeatherService::CelsiusToFahrenheit(temp); temp = Controllers::SimpleWeatherService::CelsiusToFahrenheit(temp);
tempUnit = 'F'; tempUnit = 'F';
} }
auto color = TemperatureColor(temp);
//TemperatureColor(temp);
NRF_LOG_INFO("Color hex: %s", color); NRF_LOG_INFO("Color hex: %s", color);
lv_label_set_text_fmt(weatherStatus, "[WTHR]#%s %d#°%c %s", color, RoundTemperature(temp), tempUnit, WeatherString(weatherId)); lv_label_set_text_fmt(weatherStatus, "[WTHR]#%s %d#°%c %s", color, RoundTemperature(temp), tempUnit, WeatherString(weatherId));
delete[] color; delete[] color;