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

still broken, getting there though

Browse Source
This commit is contained in:
Chloe Fontenot 🏳️‍⚧️ 2024-04-24 11:33:04 -05:00
parent d2a6882ffe
commit 6b9f1dcffe
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/displayapp/WeatherHelper.cpp
View File

@ -32,17 +32,17 @@ using namespace Pinetime::Applications;
return temp = temp / 100 + (temp % 100 >= 50 ? 1 : 0); return temp = temp / 100 + (temp % 100 >= 50 ? 1 : 0);
} }
const char* floatToRgbHex(std::tuple<float, float, float> rgb) { const char* WeatherHelper::floatToRgbHex(lv_color_t rgb) {
char *rgbHex = new char[7]; char *rgbHex = new char[7];
snprintf(rgbHex, 7, "%02X%02X%02X", static_cast<int>(std::get<0>(rgb)), static_cast<int>(std::get<1>(rgb)), static_cast<int>(std::get<2>(rgb))); snprintf(rgbHex, 7, "%02X%02X%02X", rgb.red, rgb.green, rgb.blue);
return rgbHex; return rgbHex;
} }
std::tuple<float, float, float> hexToFloat(int rgb) { lv_color_t hexToFloat(int rgb) {
float r = ((rgb >> 16) & 0xFF); uint8_t r = ((rgb >> 16) & 0xFF);
float g = ((rgb >> 8) & 0xFF); uint8_t g = ((rgb >> 8) & 0xFF);
float b = (rgb & 0xFF); uint8_t b = (rgb & 0xFF);
return std::tuple<float, float, float>(r, g, b); return LV_COLOR_MAKE(r, g, b);
} }
float normalize(float value) { float normalize(float value) {
@ -54,28 +54,33 @@ using namespace Pinetime::Applications;
return value; return value;
} }
} }
lv_color_t lerp(lv_color_t pointA, lv_color1_t pointB, float normalValue) { lv_color_t lerp(lv_color_t pointA, lv_color_t pointB, float normalValue) {
// reference: https://dev.to/ndesmic/linear-color-gradients-from-scratch-1a0e // reference: https://dev.to/ndesmic/linear-color-gradients-from-scratch-1a0e
//std::tuple<float, float, float> lerp(std::tuple<float, float, float> pointA, std::tuple<float, float, float> pointB, float normalValue) { //std::tuple<float, float, float> lerp(std::tuple<float, float, float> pointA, std::tuple<float, float, float> pointB, float normalValue) {
NRF_LOG_INFO("Normal value: %f", normalValue); NRF_LOG_INFO("Normal value: %f", normalValue);
uint8_t red = pointA.red + (pointB,red - pointA.red) * normalValue; auto redA = LV_COLOR_GET_R(pointA);
auto redB = LV_COLOR_GET_R(pointA);
auto greenA = LV_COLOR_GET_G(pointA);
auto greenB = LV_COLOR_GET_G(pointA);
auto blueA = LV_COLOR_GET_B(pointA);
auto blueB = LV_COLOR_GET_B(pointA);
auto lerpOutput = LV_COLOR_MAKE( auto lerpOutput = LV_COLOR_MAKE(
redA + (redB - redA) * normalValue,
pointA.blue + (pointB.blue - pointA.blue) * normalValue, greenA + (greenB - greenA) * normalValue,
pointA.green + (pointB.green - pointA.green) * normalValue blueA + (blueB - blueA) * normalValue
//std::lerp(get<0>(pointA), get<0>(pointB), normalValue), //std::lerp(get<0>(pointA), get<0>(pointB), normalValue),
//std::lerp(get<1>(pointA), get<1>(pointB), normalValue), //std::lerp(get<1>(pointA), get<1>(pointB), normalValue),
//std::lerp(get<2>(pointA), get<2>(pointB), normalValue) //std::lerp(get<2>(pointA), get<2>(pointB), normalValue)
); );
NRF_LOG_INFO("pointA: %f, %f, %f", get<0>(pointA), get<1>(pointA), get<2>(pointA)); NRF_LOG_INFO("pointA: %f, %f, %f", redA, greenA, blueA);
NRF_LOG_INFO("pointB: %f, %f, %f", get<0>(pointB), get<1>(pointB), get<2>(pointB)); NRF_LOG_INFO("pointB: %f, %f, %f", redB, greenB, blueB);
NRF_LOG_INFO("lerp: %f, %f, %f", get<0>(lerpOutput), get<1>(lerpOutput), get<2>(lerpOutput)); NRF_LOG_INFO("lerpOutput: %f, %f, %f", LV_COLOR_GET_R(lerpOutput), LV_COLOR_GET_GlerpOutput), LV_COLOR_GET_B(lerpOutput));
return lerpOutput; return lerpOutput;
} }
const char* WeatherHelper::TemperatureColor(int16_t temperature) { lv_color_t WeatherHelper::TemperatureColor(int16_t temperature) {
const std::vector<int> colors = {0x5555ff, 0x00c9ff, 0xff9b00, 0xff0000}; const std::vector<int> colors = {0x5555ff, 0x00c9ff, 0xff9b00, 0xff0000};
std::vector<std::tuple<float, float, float>> stops; std::vector<lv_color_t> stops;
for (auto colorVal: colors) { for (auto colorVal: colors) {
stops.emplace_back(hexToFloat(colorVal)); stops.emplace_back(hexToFloat(colorVal));
} }

3
src/displayapp/WeatherHelper.h
View File

@ -23,7 +23,8 @@ namespace Pinetime {
class WeatherHelper { class WeatherHelper {
public: public:
static int16_t RoundTemperature(int16_t temp); static int16_t RoundTemperature(int16_t temp);
static const char* TemperatureColor(int16_t temperature); static const lv_color_t TemperatureColor(int16_t temperature);
static const char* floatToRgbHex(lv_color_t rgb);
}; };
} }
} }

2
src/displayapp/screens/WatchFaceTerminal.cpp
View File

@ -170,7 +170,7 @@ void WatchFaceTerminal::Refresh() {
NRF_LOG_INFO("Raw temp: %d", temp); NRF_LOG_INFO("Raw temp: %d", temp);
NRF_LOG_INFO("Rounded temp: %d", WeatherHelper::RoundTemperature(temp)); NRF_LOG_INFO("Rounded temp: %d", WeatherHelper::RoundTemperature(temp));
//testColor(); //testVal * 100 //testColor(); //testVal * 100
auto color = WeatherHelper::TemperatureColor(temp); // call temperature color BEFORE unit conversion auto color = WeatherHelper::floatToRgbHex(WeatherHelper::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) {