From 3f37ffd4fa890d19dbc90a8daedc1cee3a3d2cc1 Mon Sep 17 00:00:00 2001 From: douginoz Date: Wed, 31 Jul 2024 16:00:39 -0700 Subject: [PATCH] Replace main.py with working version for release 1.4.1 --- iceicedata/main.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/iceicedata/main.py b/iceicedata/main.py index 3fb22e336..10df07f72 100644 --- a/iceicedata/main.py +++ b/iceicedata/main.py @@ -189,11 +189,6 @@ def main(): if not config.get('mqtt_windrose_root'): print("Windrose root topic is not set in the configuration file. Please add it to the configuration file and try again.") else: -<<<<<<< HEAD - windrose_data = { - "wind_speed": data['wind_speed']['value'], - "wind_direction": data['wind_direction']['value'] -======= wind_direction = data['wind_direction']['value'] if not wind_direction.isdigit(): wind_direction = convert_compass_to_degrees(wind_direction) @@ -212,7 +207,6 @@ def main(): windrose_data = { "wind_speed": wind_speed, "wind_direction": wind_direction ->>>>>>> v1.4.1 } send_mqtt_data(windrose_data, config, f"{config['mqtt_windrose_root']}{station_identifier}")