From 8f78887d0cdf818939036fd6a8def144dcd53445 Mon Sep 17 00:00:00 2001
From: Caleb Fontenot <foley2431@gmail.com>
Date: Wed, 24 Apr 2024 10:26:25 -0500
Subject: [PATCH] More breakage

---
 src/displayapp/.WeatherHelper.cpp.kate-swp | Bin 0 -> 2806 bytes
 src/displayapp/WeatherHelper.cpp           |  13 +++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 src/displayapp/.WeatherHelper.cpp.kate-swp

diff --git a/src/displayapp/.WeatherHelper.cpp.kate-swp b/src/displayapp/.WeatherHelper.cpp.kate-swp
new file mode 100644
index 0000000000000000000000000000000000000000..d1e70f8ae3cf1cd03a6df1398333872c11544437
GIT binary patch
literal 2806
zcmcJR%}!Hc5QckP098;Z<;Nf32$Cq4Mu;XPKn<D_2^ta_acP=RlP0yT4d|7)ap4Vk
zC2qX|S1$D$ocBF5&g7&<7fSLaJe~RGoBy^@D3lJHXRWmHuGvrb+nrXrS-n>%6w1Y&
zZtX&?{{HjV?@Ql4e0jL`<I~5+fk?LWB$ayOSpMIYb45<c@iIQDQyWrXQgw!Q^2&J<
zeC|92?l_lnJPj6m_Byznsl&N(h&P-UluaGaPy6k^adzO&(AkzVojvu}Ht^b;%sjjS
zZ|20}Ty*BonS-{4HsQuBQZqIzly!HNd9OJ$6ba3)gQpy!KIu5jc)qA&?1kLgmUADy
zvLgq7BPsu~r}5#4oTQx@Hy+K2`_7|K?>Ud@b$g=-?z;RU_{{kdxarS<$8+L6XXaI7
zgLf0St_=%jLu<o=nOJRDFcTY?J+fVI_zR3bXfVLHE@yx*-C=Oi5$a=(u$Ir>e>E<t
zwA9n{kPCVqQqR(a(y=tD-)Ct;shRtr&)iF=*n7-<C^d5*-ec}VEt&gJ%aY_O){@Ia
z{KpWWcDhUqp{~mUQdpC5HD_pC%4GaI<0dc5b=zz(H<RO8a7fM^c-QUEs~q0d<b)9g
zh7mPP)H~C*(7{ZVmJZBlv~R$SCa~>YL<2dak&!oMG`bogXEd@J&D*f2A*Q+D9?eOm
zOdUMq`0sD)YWx+7tVVkqiJx~wBy)}kbk=dWqh<;NAsu8%;(Tbo<K?0pTWw&@hxR*|
z^P&9?=6q<sgE=4C?_kb{_B)vK5sJj3ha$1)S|qe2cFAfM8@{{IajWp%AbFa_0=_CI
zIdQ%Q)`~)Y9sJnkH^4{E3*caHF(+RFAG>}E4)$+?C3d75?}3+Ho#K7xWvD-Qb?}Pg
zu-ngaw>8mtYz5X1U49E(&&(n5D0CQIZu~IXBDJqYxNoV~Z+AocSp?>$4V#diq@4jd
zJ1J~JcG6bnAmr>M%^o;*5}2J7JY*+n=RnR*(#`?1lk}Gln4J{vm*lg!yg2Vcj<I>r
z@3p&Ud(}bfG`*YNCOxWv)>9YVN!QYDZ}7U=IcavzTa_%yc=L&z0}m0H@QW5X#V;nb
L*kY#dKcIdByp<gY

literal 0
HcmV?d00001

diff --git a/src/displayapp/WeatherHelper.cpp b/src/displayapp/WeatherHelper.cpp
index 7502db05..093c6e3e 100644
--- a/src/displayapp/WeatherHelper.cpp
+++ b/src/displayapp/WeatherHelper.cpp
@@ -18,6 +18,7 @@
 
 #include "WeatherHelper.h"
 #include <FreeRTOS.h>
+#include <lvgl/src/lv_misc/lv_color.h>
 #include <tuple>
 #include <vector>
 #include <cmath>
@@ -53,14 +54,14 @@ using namespace Pinetime::Applications;
         return value;
     }
 }
-    
+    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
-    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);
-      auto lerpOutput = std::tuple<float, float, float>(
-        get<0>(pointA) + (get<0>(pointB) - get<0>(pointA)) * normalValue,
-        get<1>(pointA) + (get<1>(pointB) - get<1>(pointA)) * normalValue,
-        get<2>(pointA) + (get<2>(pointB) - get<2>(pointA)) * normalValue
+      auto lerpOutput = lv_color_make(
+        pointA.red + (pointB,red - pointA.red) * normalValue,
+        pointA.blue + (pointB.blue - pointA.blue) * normalValue,
+        pointA.green + (pointB.green - pointA.green) * normalValue
         //std::lerp(get<0>(pointA), get<0>(pointB), normalValue),
         //std::lerp(get<1>(pointA), get<1>(pointB), normalValue),
         //std::lerp(get<2>(pointA), get<2>(pointB), normalValue)