Replace main.py with working version for release 1.4.1

douginoz · Jul 31, 2024 · 3f37ffd · 3f37ffd
1 parent 74a0cae
commit 3f37ffd
Showing 1 changed file with 0 additions and 6 deletions.
diff --git 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}")