From d919c8c71040e820b4cea1c8926947cfda328c1b Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Mon, 15 Jul 2024 13:16:27 +0200
Subject: [PATCH] weewx: updates for solar

---
 packages/weewx-proxy.nix | 6 +++---
 packages/weewx.nix       | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/weewx-proxy.nix b/packages/weewx-proxy.nix
index db00138..4c49748 100644
--- a/packages/weewx-proxy.nix
+++ b/packages/weewx-proxy.nix
@@ -12,9 +12,9 @@ beamPackages.mixRelease rec {
     domain = "git.kempkens.io";
     owner = "daniel";
     repo = pname;
-    rev = "2ad93b457ccda286185e8e64a284589111f48768";
-    sha256 = "sha256-cMsz+72xSnJhPRGbrVrJWF4dJlyuFImc6JLBZw3lDIM=";
+    rev = "1e839fd76690564b197668b86c28c485c9543f68";
+    sha256 = "sha256-UtAf0oxD99FTxyheHYl7Qi/TgNJ9zi4fM7o1pJohGeQ=";
   };
 
-  mixNixDeps = import "${src}/mix.nix" { inherit lib beamPackages; };
+  mixNixDeps = import "${src}/deps.nix" { inherit lib beamPackages; };
 }
diff --git a/packages/weewx.nix b/packages/weewx.nix
index b1d9819..97868e6 100644
--- a/packages/weewx.nix
+++ b/packages/weewx.nix
@@ -63,6 +63,9 @@ let
 
     weewx.units.obs_group_dict['soilMoistBatteryVoltage1'] = 'group_volt'
     weewx.units.obs_group_dict['soilTempBatteryVoltage1'] = 'group_volt'
+
+    weewx.units.obs_group_dict['solarEnergyDay'] = 'group_energy'
+    weewx.units.obs_group_dict['solarEnergyActive'] = 'group_power'
   '';
 in
 poetry2nix.mkPoetryApplication {