Merge branch 'release/v23.3.1' into main

peted-davis · Mar 3, 2023 · bee9fa2 · bee9fa2
2 parents 33a01d9 + d4e974a
commit bee9fa2
Show file tree

Hide file tree

Showing 42 changed files with 46 additions and 46 deletions.
diff --git a/kvlang/astro.kv b/kvlang/astro.kv
@@ -1,6 +1,6 @@
 ## WeatherFlow PiConsole: Raspberry Pi Python console for WeatherFlow Tempest
 ## and Smart Home Weather stations.
-## Copyright (C) 2018-2022 Peter Davis
+## Copyright (C) 2018-2023 Peter Davis
 
 ## This program is free software: you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free Software

diff --git a/kvlang/barometer.kv b/kvlang/barometer.kv
@@ -1,6 +1,6 @@
 ## WeatherFlow PiConsole: Raspberry Pi Python console for WeatherFlow Tempest
 ## and Smart Home Weather stations.
-## Copyright (C) 2018-2022 Peter Davis
+## Copyright (C) 2018-2023 Peter Davis
 
 ## This program is free software: you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free Software

diff --git a/kvlang/forecast.kv b/kvlang/forecast.kv
@@ -1,6 +1,6 @@
 ## WeatherFlow PiConsole: Raspberry Pi Python console for WeatherFlow Tempest
 ## and Smart Home Weather stations.
-## Copyright (C) 2018-2022 Peter Davis
+## Copyright (C) 2018-2023 Peter Davis
 
 ## This program is free software: you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free Software

diff --git a/kvlang/layout.kv b/kvlang/layout.kv
@@ -1,6 +1,6 @@
 ## WeatherFlow PiConsole: Raspberry Pi Python console for WeatherFlow Tempest
 ## and Smart Home Weather stations.
-## Copyright (C) 2018-2022 Peter Davis
+## Copyright (C) 2018-2023 Peter Davis
 
 ## This program is free software: you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free Software

diff --git a/kvlang/lightning.kv b/kvlang/lightning.kv
@@ -1,6 +1,6 @@
 ## WeatherFlow PiConsole: Raspberry Pi Python console for WeatherFlow Tempest
 ## and Smart Home Weather stations.
-## Copyright (C) 2018-2022 Peter Davis
+## Copyright (C) 2018-2023 Peter Davis
 
 ## This program is free software: you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free Software

diff --git a/kvlang/rainfall.kv b/kvlang/rainfall.kv
@@ -1,6 +1,6 @@
 ## WeatherFlow PiConsole: Raspberry Pi Python console for WeatherFlow Tempest
 ## and Smart Home Weather stations.
-## Copyright (C) 2018-2022 Peter Davis
+## Copyright (C) 2018-2023 Peter Davis
 
 ## This program is free software: you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free Software

diff --git a/kvlang/settings.kv b/kvlang/settings.kv
@@ -1,6 +1,6 @@
 ## WeatherFlow PiConsole: Raspberry Pi Python console for WeatherFlow Tempest
 ## and Smart Home Weather stations.
-## Copyright (C) 2018-2022 Peter Davis
+## Copyright (C) 2018-2023 Peter Davis
 
 ## This program is free software: you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free Software

diff --git a/kvlang/temperature.kv b/kvlang/temperature.kv
@@ -1,6 +1,6 @@
 ## WeatherFlow PiConsole: Raspberry Pi Python console for WeatherFlow Tempest
 ## and Smart Home Weather stations.
-## Copyright (C) 2018-2022 Peter Davis
+## Copyright (C) 2018-2023 Peter Davis
 
 ## This program is free software: you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free Software

diff --git a/kvlang/update.kv b/kvlang/update.kv
@@ -1,6 +1,6 @@
 ## WeatherFlow PiConsole: Raspberry Pi Python console for WeatherFlow Tempest
 ## and Smart Home Weather stations.
-## Copyright (C) 2018-2022 Peter Davis
+## Copyright (C) 2018-2023 Peter Davis
 
 ## This program is free software: you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free Software

diff --git a/kvlang/widgets.kv b/kvlang/widgets.kv
@@ -1,6 +1,6 @@
 ## WeatherFlow PiConsole: Raspberry Pi Python console for WeatherFlow Tempest
 ## and Smart Home Weather stations.
-## Copyright (C) 2018-2022 Peter Davis
+## Copyright (C) 2018-2023 Peter Davis
 
 ## This program is free software: you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free Software

diff --git a/kvlang/wind.kv b/kvlang/wind.kv
@@ -1,6 +1,6 @@
 ## WeatherFlow PiConsole: Raspberry Pi Python console for WeatherFlow Tempest
 ## and Smart Home Weather stations.
-## Copyright (C) 2018-2022 Peter Davis
+## Copyright (C) 2018-2023 Peter Davis
 
 ## This program is free software: you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free Software

diff --git a/lib/astronomical.py b/lib/astronomical.py
@@ -1,6 +1,6 @@
 """ Returns the astronomical variables required by the Raspberry Pi Python
 console for WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/lib/config.py b/lib/config.py
@@ -1,6 +1,6 @@
 """ Defines the configuration .ini files required by the Raspberry Pi Python
 console for WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -27,7 +27,7 @@
 import os
 
 # Define wfpiconsole version number
-Version = 'v22.12.3'
+Version = 'v23.3.1'
 
 # Define required variables
 TEMPEST       = False
@@ -185,7 +185,7 @@ def verify_station(config):
     Logger.info('Config: Verifying station details')
     RETRIES = 0
     while True:
-        Template = 'https://swd.weatherflow.com/swd/rest/observations/station/{}?api_key={}'
+        Template = 'https://swd.weatherflow.com/swd/rest/observations/station/{}?token={}'
         URL = Template.format(config['Station']['StationID'], config['Keys']['WeatherFlow'])
         try:
             STATION = requests.get(URL).json()
@@ -398,7 +398,7 @@ def writeConfigKey(Config, Section, Key, keyDetails):
         RETRIES = 0
         if keyDetails['Source'] == 'observation' and OBSERVATION is None:
             while True:
-                Template = 'https://swd.weatherflow.com/swd/rest/observations/station/{}?api_key={}'
+                Template = 'https://swd.weatherflow.com/swd/rest/observations/station/{}?token={}'
                 URL = Template.format(Config['Station']['StationID'], Config['Keys']['WeatherFlow'])
                 OBSERVATION = requests.get(URL).json()
                 if 'status' in STATION:
@@ -554,7 +554,7 @@ def validateAPIKeys(Config):
     if 'Keys' in Config and 'Station' in Config:
         if 'WeatherFlow' in Config['Keys'] and 'StationID' in Config['Station'] and STATION is None:
             while True:
-                Template = 'https://swd.weatherflow.com/swd/rest/stations/{}?api_key={}'
+                Template = 'https://swd.weatherflow.com/swd/rest/stations/{}?token={}'
                 URL = Template.format(Config['Station']['StationID'], Config['Keys']['WeatherFlow'])
                 STATION = requests.get(URL).json()
                 if 'status' in STATION:

diff --git a/lib/derivedVariables.py b/lib/derivedVariables.py
@@ -1,6 +1,6 @@
 """ Returns the derived weather variables required by the Raspberry Pi Python
 console for WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/lib/forecast.py b/lib/forecast.py
@@ -1,6 +1,6 @@
 """ Returns the WeatherFlow forecast variables required by the Raspberry Pi
 Python app for WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/lib/observationFormat.py b/lib/observationFormat.py
@@ -1,6 +1,6 @@
 """ Formats and sets the required units of observations displayed on the
 Raspberry Pi Python console for Weather Flow Smart Home Weather Stations.
-Copyright (C) 2018-2022  Peter Davis
+Copyright (C) 2018-2023  Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/lib/observationParser.py b/lib/observationParser.py
@@ -1,6 +1,6 @@
 """ Handles Websocket messages received by the Raspberry Pi Python console for
 WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/lib/properties.py b/lib/properties.py
@@ -1,6 +1,6 @@
 """ Defines the Kivy property values required by the Raspberry Pi Python
 console for WeatherFlow Tempest and Smart Home Weather stations.
-Copyright C) 2018-2022 Peter Davis
+Copyright C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/lib/request_api/checkwx_api.py b/lib/request_api/checkwx_api.py
@@ -1,6 +1,6 @@
 """ Returns CheckWX API requests required by the Raspberry Pi Python console
 for WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/lib/request_api/github_api.py b/lib/request_api/github_api.py
@@ -1,6 +1,6 @@
 """ Returns Github API requests required by the Raspberry Pi Python console
 for WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/lib/request_api/weatherflow_api.py b/lib/request_api/weatherflow_api.py
@@ -1,6 +1,6 @@
 """ Returns WeatherFlow API requests required by the Raspberry Pi Python console
 for WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/lib/sager.py b/lib/sager.py
@@ -1,6 +1,6 @@
 ''' Returns The Sager Weathercaster forecast required by the Raspberry Pi Python
 console for WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/lib/settings.py b/lib/settings.py
@@ -1,7 +1,7 @@
 """ Defines the settings screen JSON object and custom settings types required
 by the Raspberry Pi Python console for WeatherFlow Tempest and Smart Home
 Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/lib/status.py b/lib/status.py
@@ -1,6 +1,6 @@
 """ Contains station status functions required by the Raspberry Pi Python
 console for WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/lib/system.py b/lib/system.py
@@ -1,6 +1,6 @@
 """ Contains system functions required by the Raspberry Pi Python console for
 WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/main.py b/main.py
@@ -1,6 +1,6 @@
 # WeatherFlow PiConsole: Raspberry Pi Python console for WeatherFlow Tempest
 # and Smart Home Weather stations.
-# Copyright (C) 2018-2022 Peter Davis
+# Copyright (C) 2018-2023 Peter Davis
 
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software

diff --git a/panels/astro.py b/panels/astro.py
@@ -1,6 +1,6 @@
 """ Defines the SunriseSunset and MoonPhase panels required by the Raspberry Pi
 Python console for WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/panels/barometer.py b/panels/barometer.py
@@ -1,6 +1,6 @@
 """ Defines the Barometer panel required by the Raspberry Pi Python console for
 WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/panels/forecast.py b/panels/forecast.py
@@ -1,6 +1,6 @@
 """ Defines the Forecast and Sager panel required by the Raspberry Pi Python
 console for WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/panels/lightning.py b/panels/lightning.py
@@ -1,6 +1,6 @@
 """ Defines the Lightning panel required by the Raspberry Pi Python console for
 WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/panels/menu.py b/panels/menu.py
@@ -1,6 +1,6 @@
 """ Defines the mainMenu Panel required by the Raspberry Pi Python console for
 WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/panels/rainfall.py b/panels/rainfall.py
@@ -1,6 +1,6 @@
 """ Defines the Rainfall panel required by the Raspberry Pi Python console for
 WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/panels/temperature.py b/panels/temperature.py
@@ -1,6 +1,6 @@
 """ Defines the Temperature panel required by the Raspberry Pi Python console
 for WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/panels/template.py b/panels/template.py
@@ -1,6 +1,6 @@
 """ Define the panel template for the Raspberry Pi Python console for
 WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/panels/update.py b/panels/update.py
@@ -1,6 +1,6 @@
 """ Defines the update notification panel required by the Raspberry Pi
 Python console for WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/panels/wind.py b/panels/wind.py
@@ -1,6 +1,6 @@
 """ Defines the WindSpeed panel required by the Raspberry Pi Python console for
 WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/service/websocket.py b/service/websocket.py
@@ -1,6 +1,6 @@
 # WeatherFlow PiConsole: Raspberry Pi Python console for WeatherFlow Tempest and
 # Smart Home Weather stations.
-# Copyright (C) 2018-2022 Peter Davis
+# Copyright (C) 2018-2023 Peter Davis
 
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software

diff --git a/user/customPanels.kv.tmpl b/user/customPanels.kv.tmpl
@@ -1,6 +1,6 @@
 ## Define custom user panels for the Raspberry Pi Python console for WeatherFlow
 ## Tempest and Smart Home Weather stations.
-## Copyright (C) 2018-2022 Peter Davis
+## Copyright (C) 2018-2023 Peter Davis
 
 ## This program is free software: you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free Software

diff --git a/user/customPanels.py.tmpl b/user/customPanels.py.tmpl
@@ -1,6 +1,6 @@
 """ Define custom user panels for the Raspberry Pi Python console for
 WeatherFlow Tempest and Smart Home Weather stations.
-Copyright (C) 2018-2022 Peter Davis
+Copyright (C) 2018-2023 Peter Davis
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/wfpiconsole.kv b/wfpiconsole.kv
@@ -1,7 +1,7 @@
 ##:kivy
 ## WeatherFlow PiConsole: Raspberry Pi Python console for WeatherFlow Tempest
 ## and Smart Home Weather stations.
-## Copyright (C) 2018-2022 Peter Davis
+## Copyright (C) 2018-2023 Peter Davis
 
 ## This program is free software: you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free Software

diff --git a/wfpiconsole.service b/wfpiconsole.service
@@ -1,6 +1,6 @@
 # WeatherFlow PiConsole: Raspberry Pi Python console for WeatherFlow Tempest and
 # Smart Home Weather stations.
-# Copyright (C) 2018-2022 Peter Davis
+# Copyright (C) 2018-2023 Peter Davis
 
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software

diff --git a/wfpiconsole.sh b/wfpiconsole.sh
@@ -2,7 +2,7 @@
 
 # Automated installer and updater for the WeatherFlow PiConsole. Modified
 # heavily from the PiHole and PiVPN installers.
-# Copyright (C) 2018-2022 Peter Davis
+# Copyright (C) 2018-2023 Peter Davis
 
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software