diff --git a/app/display/__init__.py b/app/display/__init__.py index e69de29..66a49b4 100644 --- a/app/display/__init__.py +++ b/app/display/__init__.py @@ -0,0 +1,4 @@ +from .neopixel_64x64 import NeoPixel_64x64 + +__all__ = ["NeoPixel_64x64"] + \ No newline at end of file diff --git a/app/tryout/emoji_checker.py b/app/tryout/emoji_checker.py index 073c379..7ba6ecf 100644 --- a/app/tryout/emoji_checker.py +++ b/app/tryout/emoji_checker.py @@ -1,6 +1,6 @@ -from app.display.neopixel_64x64 import NeoPixel_64x64 +from app.display import NeoPixel_64x64 from app.display.emoji import emoji_8x8, emoji_16x16 -import app.utils.colors as colors +from app.utils import colors class Emoji_Checker(): diff --git a/app/tryout/font_checker.py b/app/tryout/font_checker.py index 729ab49..38d9f7b 100644 --- a/app/tryout/font_checker.py +++ b/app/tryout/font_checker.py @@ -1,4 +1,4 @@ -from app.display.neopixel_64x64 import NeoPixel_64x64 +from app.display import NeoPixel_64x64 from app.utils import align_font, colors import app.display.fonts as fonts diff --git a/app/tryout/weather_checker.py b/app/tryout/weather_checker.py index ca73ed0..3d94848 100644 --- a/app/tryout/weather_checker.py +++ b/app/tryout/weather_checker.py @@ -2,9 +2,8 @@ import urequests # type: ignore import json from app.classes import Weather, Location, CurrentCondition -from app.display.neopixel_64x64 import NeoPixel_64x64 +from app.display import NeoPixel_64x64 import app.utils.colors as colors -import app.display.fonts as fonts from app.utils import URLEncoder @@ -15,7 +14,6 @@ class Weather_Checker(): def __init__(self, display: NeoPixel_64x64): self.display = display - self.display.set_font( font=fonts.font_16x16) def mock_weather_data(self): filepath = 'restapi/mock-weather.json' diff --git a/app/web/__init__.py b/app/web/__init__.py new file mode 100644 index 0000000..d36ce34 --- /dev/null +++ b/app/web/__init__.py @@ -0,0 +1,3 @@ +from .wlan import Wlan + +__all__=["Wlan"] \ No newline at end of file diff --git a/main.py b/main.py index d1785e7..e20b00a 100644 --- a/main.py +++ b/main.py @@ -1,7 +1,8 @@ -from app.display.neopixel_64x64 import NeoPixel_64x64 +from app.display import NeoPixel_64x64 +from app.display.fonts import font_5x7 from app.tryout import Font_Checker, Weather_Checker, Emoji_Checker from app.utils import show_system_load -from app.web.wlan import Wlan +from app.web import Wlan # Programm Startpunkt if __name__ == '__main__': @@ -12,12 +13,12 @@ if __name__ == '__main__': # font_checker : Font_Checker = Font_Checker( display) # font_checker.fonts_check(pretty=False) - # tryout.emojis_check(display) # emoji_checker : Emoji_Checker = Emoji_Checker(display) # emoji_checker.check() - + # tryout.weather_check(display, test_mode=False) + display.set_font(font_5x7) weather_checker: Weather_Checker = Weather_Checker( display=display) - weather_checker.check(city="esbjerg", lang="de", test_mode=False) - + weather_checker.check(city="ahrensburg", lang="de", test_mode=False) + # show_system_load()