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

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

diff --git a/src/displayapp/.WeatherHelper.cpp.kate-swp b/src/displayapp/.WeatherHelper.cpp.kate-swp
deleted file mode 100644
index d1e70f8ae3cf1cd03a6df1398333872c11544437..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/src/displayapp/WeatherHelper.cpp b/src/displayapp/WeatherHelper.cpp
index 093c6e3e..6a395f54 100644
--- a/src/displayapp/WeatherHelper.cpp
+++ b/src/displayapp/WeatherHelper.cpp
@@ -54,12 +54,13 @@ using namespace Pinetime::Applications;
         return value;
     }
 }
-    lv_color_t lerp(lv_color_t pointA, lv_color_t pointB float normalValue) {
+    lv_color_t lerp(lv_color_t pointA, lv_color1_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) {
       NRF_LOG_INFO("Normal value: %f", normalValue);
-      auto lerpOutput = lv_color_make(
-        pointA.red + (pointB,red - pointA.red) * normalValue,
+      uint8_t red = pointA.red + (pointB,red - pointA.red) * normalValue;
+      auto lerpOutput = LV_COLOR_MAKE(
+
         pointA.blue + (pointB.blue - pointA.blue) * normalValue,
         pointA.green + (pointB.green - pointA.green) * normalValue
         //std::lerp(get<0>(pointA), get<0>(pointB), normalValue),