diff --git a/app/display/fonts/__init__.py b/app/display/fonts/__init__.py index e69de29..0ecc460 100644 --- a/app/display/fonts/__init__.py +++ b/app/display/fonts/__init__.py @@ -0,0 +1,6 @@ +from .font_3x5 import font_3x5 +from .font_5x7 import font_5x7 +from .font_8x8 import font_8x8 +from .font_16x16 import font_16x16 + +__all__ = ['font_3x5', 'font_5x7', 'font_8x8', 'font_16x16'] diff --git a/app/display/fonts/fonts_utils.py b/app/display/fonts/fonts_utils.py index 4bdb04b..65387fb 100644 --- a/app/display/fonts/fonts_utils.py +++ b/app/display/fonts/fonts_utils.py @@ -1,4 +1,4 @@ -import app.utils.utils as utils +import app.utils as utils def char_width(char_matrix) -> int: diff --git a/app/tryout/__init__.py b/app/tryout/__init__.py index e69de29..ba90708 100644 --- a/app/tryout/__init__.py +++ b/app/tryout/__init__.py @@ -0,0 +1,5 @@ +from .emojis import emojis_check +from .fonts import fonts_check +from .weather import weather_check + +__all__ = ['emojis_check', 'fonts_check', 'weather_check'] diff --git a/app/tryout/fonts.py b/app/tryout/fonts.py index af41602..de465e9 100644 --- a/app/tryout/fonts.py +++ b/app/tryout/fonts.py @@ -1,5 +1,5 @@ from app.display.fonts.fonts_utils import align_font, font_height -import app.utils.colors as colors +import app.utils as utils def font_pretty(font): @@ -7,7 +7,7 @@ def font_pretty(font): print(pretty_font) -def fonts_check(display, font) -> None: +def fonts_check(display, font, pretty=False) -> None: display.clear() display.set_font(font) @@ -23,16 +23,19 @@ def fonts_check(display, font) -> None: incr = height display.write_text(num_line, 0, row) row += incr - display.write_text(char_line_1.upper(), 0, row, colors.YELLOW) + display.write_text(char_line_1.upper(), 0, row, utils.colors.YELLOW) # row += incr # display.write_text(char_line_2.upper(), 0, row, colors.YELLOW) # row += incr # display.write_text(char_line_3.upper(), 0, row, colors.YELLOW) row += incr - display.write_text(char_line_1.lower(), 0, row, colors.YELLOW) + display.write_text(char_line_1.lower(), 0, row, utils.colors.YELLOW) # row += incr # display.write_text(char_line_2.lower(), 0, row, colors.YELLOW) # row += incr # display.write_text(char_line_3.lower(), 0, row, colors.YELLOW) row += incr - display.write_text('!.,:;\'"-_+=*/\\()~°•', 0, row, colors.ORANGE) + display.write_text('!.,:;\'"-_+=*/\\()~°•', 0, row, utils.colors.ORANGE) + + if pretty: + font_pretty(font) diff --git a/app/utils/__init__.py b/app/utils/__init__.py index e69de29..a5ba615 100644 --- a/app/utils/__init__.py +++ b/app/utils/__init__.py @@ -0,0 +1,3 @@ +from .system_load import show_system_load +from .colors import * +from .utils import * diff --git a/main.py b/main.py index e30a0c0..631b887 100644 --- a/main.py +++ b/main.py @@ -1,23 +1,13 @@ # from machine import Pin, ADC # type: ignore -from app.display.fonts.font_3x5 import font_3x5 -from app.display.fonts.font_5x7 import font_5x7 from app.display.neopixel_64x64 import NeoPixel_64x64 -import app.utils.colors as colors -from app.utils.system_load import show_system_load -import app.utils.utils as utils -import app.display.fonts.fonts_utils as fonts_utils -from app.tryout.emojis import emojis_check -from app.tryout.fonts import fonts_check, font_pretty -from app.tryout.weather import weather_check - -from app.display.fonts.font_16x16 import font_16x16 - -display = NeoPixel_64x64() - +import app.display.fonts as fonts +import app.utils as utils +import app.tryout as tryout if __name__ == '__main__': - # emojis_check(display) - # fonts_check(display, font_16x16) - # font_pretty(font_16x16) - weather_check(display, test_mode=True) - show_system_load() + display = NeoPixel_64x64() + + # tryout.emojis_check(display) + tryout.fonts_check(display, fonts.font_16x16, pretty=False) + # tryout.weather_check(display, test_mode=True) + utils.show_system_load()