esphome 2025.3.0b2__py3-none-any.whl → 2025.3.0b3__py3-none-any.whl

esphome/components/font/__init__.py

@@ -146,6 +146,13 @@ def check_missing_glyphs(file, codepoints, warning: bool = False):
             raise cv.Invalid(message)
 
 
+def pt_to_px(pt):
+    """
+    Convert a point size to pixels, rounding up to the nearest pixel
+    """
+    return (pt + 63) // 64
+
+
 def validate_font_config(config):
     """
     Check for duplicate codepoints, then check that all requested codepoints actually
@@ -172,42 +179,43 @@ def validate_font_config(config):
     )
     # Make setpoints and glyphspoints disjoint
     setpoints.difference_update(glyphspoints)
-    if fileconf[CONF_TYPE] == TYPE_LOCAL_BITMAP:
-        if any(x >= 256 for x in setpoints.copy().union(glyphspoints)):
-            raise cv.Invalid("Codepoints in bitmap fonts must be in the range 0-255")
-    else:
-        # for TT fonts, check that glyphs are actually present
-        # Check extras against their own font, exclude from parent font codepoints
-        for extra in config[CONF_EXTRAS]:
-            points = {ord(x) for x in flatten(extra[CONF_GLYPHS])}
-            glyphspoints.difference_update(points)
-            setpoints.difference_update(points)
-            check_missing_glyphs(extra[CONF_FILE], points)
-
-        # A named glyph that can't be provided is an error
-
-        check_missing_glyphs(fileconf, glyphspoints)
-        # A missing glyph from a set is a warning.
-        if not config[CONF_IGNORE_MISSING_GLYPHS]:
-            check_missing_glyphs(fileconf, setpoints, warning=True)
+    # check that glyphs are actually present
+    # Check extras against their own font, exclude from parent font codepoints
+    for extra in config[CONF_EXTRAS]:
+        points = {ord(x) for x in flatten(extra[CONF_GLYPHS])}
+        glyphspoints.difference_update(points)
+        setpoints.difference_update(points)
+        check_missing_glyphs(extra[CONF_FILE], points)
+
+    # A named glyph that can't be provided is an error
+
+    check_missing_glyphs(fileconf, glyphspoints)
+    # A missing glyph from a set is a warning.
+    if not config[CONF_IGNORE_MISSING_GLYPHS]:
+        check_missing_glyphs(fileconf, setpoints, warning=True)
 
     # Populate the default after the above checks so that use of the default doesn't trigger errors
+    font = FONT_CACHE[fileconf]
     if not config[CONF_GLYPHS] and not config[CONF_GLYPHSETS]:
-        if fileconf[CONF_TYPE] == TYPE_LOCAL_BITMAP:
-            config[CONF_GLYPHS] = [DEFAULT_GLYPHS]
-        else:
-            # set a default glyphset, intersected with what the font actually offers
-            font = FONT_CACHE[fileconf]
-            config[CONF_GLYPHS] = [
-                chr(x)
-                for x in glyphsets.unicodes_per_glyphset(DEFAULT_GLYPHSET)
-                if font.get_char_index(x) != 0
-            ]
-
-    if config[CONF_FILE][CONF_TYPE] == TYPE_LOCAL_BITMAP:
-        if CONF_SIZE in config:
+        # set a default glyphset, intersected with what the font actually offers
+        config[CONF_GLYPHS] = [
+            chr(x)
+            for x in glyphsets.unicodes_per_glyphset(DEFAULT_GLYPHSET)
+            if font.get_char_index(x) != 0
+        ]
+
+    if font.has_fixed_sizes:
+        sizes = [pt_to_px(x.size) for x in font.available_sizes]
+        if not sizes:
+            raise cv.Invalid(
+                f"Font {FontCache.get_name(fileconf)} has no available sizes"
+            )
+        if CONF_SIZE not in config:
+            config[CONF_SIZE] = sizes[0]
+        elif config[CONF_SIZE] not in sizes:
+            sizes = ", ".join(str(x) for x in sizes)
             raise cv.Invalid(
-                "Size is not a valid option for bitmap fonts, which are inherently fixed size"
+                f"Font {FontCache.get_name(fileconf)} only has size{'s' if len(sizes) != 1 else ''} {sizes} available"
             )
     elif CONF_SIZE not in config:
         config[CONF_SIZE] = 20
@@ -215,14 +223,7 @@ def validate_font_config(config):
     return config
 
 
-FONT_EXTENSIONS = (".ttf", ".woff", ".otf")
-BITMAP_EXTENSIONS = (".bdf", ".pcf")
-
-
-def validate_bitmap_file(value):
-    if not any(map(value.lower().endswith, BITMAP_EXTENSIONS)):
-        raise cv.Invalid(f"Only {', '.join(BITMAP_EXTENSIONS)} files are supported.")
-    return CORE.relative_config_path(cv.file_(value))
+FONT_EXTENSIONS = (".ttf", ".woff", ".otf", "bdf", ".pcf")
 
 
 def validate_truetype_file(value):
@@ -246,7 +247,6 @@ def add_local_file(value):
 
 
 TYPE_LOCAL = "local"
-TYPE_LOCAL_BITMAP = "local_bitmap"
 TYPE_GFONTS = "gfonts"
 TYPE_WEB = "web"
 LOCAL_SCHEMA = cv.All(
@@ -258,15 +258,6 @@ LOCAL_SCHEMA = cv.All(
     add_local_file,
 )
 
-LOCAL_BITMAP_SCHEMA = cv.All(
-    cv.Schema(
-        {
-            cv.Required(CONF_PATH): validate_bitmap_file,
-        }
-    ),
-    add_local_file,
-)
-
 FULLPATH_SCHEMA = cv.maybe_simple_value(
     {cv.Required(CONF_PATH): cv.string}, key=CONF_PATH
 )
@@ -403,15 +394,6 @@ def validate_file_shorthand(value):
             }
         )
 
-    extension = Path(value).suffix
-    if extension in BITMAP_EXTENSIONS:
-        return font_file_schema(
-            {
-                CONF_TYPE: TYPE_LOCAL_BITMAP,
-                CONF_PATH: value,
-            }
-        )
-
     return font_file_schema(
         {
             CONF_TYPE: TYPE_LOCAL,
@@ -424,7 +406,6 @@ TYPED_FILE_SCHEMA = cv.typed_schema(
     {
         TYPE_LOCAL: LOCAL_SCHEMA,
         TYPE_GFONTS: GFONTS_SCHEMA,
-        TYPE_LOCAL_BITMAP: LOCAL_BITMAP_SCHEMA,
         TYPE_WEB: WEB_FONT_SCHEMA,
     }
 )
@@ -522,11 +503,13 @@ async def to_code(config):
     bpp = config[CONF_BPP]
     mode = ft_pixel_mode_grays
     scale = 256 // (1 << bpp)
+    size = config[CONF_SIZE]
     # create the data array for all glyphs
     for codepoint in codepoints:
         font = point_font_map[codepoint]
-        if not font.has_fixed_sizes:
-            font.set_pixel_sizes(config[CONF_SIZE], 0)
+        format = font.get_format().decode("utf-8")
+        if format != "PCF":
+            font.set_pixel_sizes(size, 0)
         font.load_char(codepoint)
         font.glyph.render(mode)
         width = font.glyph.bitmap.width
@@ -550,17 +533,17 @@ async def to_code(config):
                     if pixel & (1 << (bpp - bit_num - 1)):
                         glyph_data[pos // 8] |= 0x80 >> (pos % 8)
                     pos += 1
-        ascender = font.size.ascender // 64
+        ascender = pt_to_px(font.size.ascender)
         if ascender == 0:
             if font.has_fixed_sizes:
-                ascender = font.available_sizes[0].height
+                ascender = size
             else:
                 _LOGGER.error(
                     "Unable to determine ascender of font %s", config[CONF_FILE]
                 )
         glyph_args[codepoint] = GlyphInfo(
             len(data),
-            font.glyph.metrics.horiAdvance // 64,
+            pt_to_px(font.glyph.metrics.horiAdvance),
             font.glyph.bitmap_left,
             ascender - font.glyph.bitmap_top,
             width,
@@ -599,11 +582,11 @@ async def to_code(config):
 
     glyphs = cg.static_const_array(config[CONF_RAW_GLYPH_ID], glyph_initializer)
 
-    font_height = base_font.size.height // 64
-    ascender = base_font.size.ascender // 64
+    font_height = pt_to_px(base_font.size.height)
+    ascender = pt_to_px(base_font.size.ascender)
     if font_height == 0:
         if base_font.has_fixed_sizes:
-            font_height = base_font.available_sizes[0].height
+            font_height = size
             ascender = font_height
         else:
             _LOGGER.error("Unable to determine height of font %s", config[CONF_FILE])

esphome/components/graph/graph.cpp

@@ -132,6 +132,10 @@ void Graph::draw(Display *buff, uint16_t x_offset, uint16_t y_offset, Color colo
     yrange = ymax - ymin;
   }
 
+  // Store graph limts
+  this->graph_limit_max_ = ymax;
+  this->graph_limit_min_ = ymin;
+
   /// Draw grid
   if (!std::isnan(this->gridspacing_y_)) {
     for (int y = yn; y <= ym; y++) {

esphome/components/graph/graph.h

@@ -161,11 +161,15 @@ class Graph : public Component {
   uint32_t get_duration() { return duration_; }
   uint32_t get_width() { return width_; }
   uint32_t get_height() { return height_; }
+  float get_graph_limit_min() { return graph_limit_min_; }
+  float get_graph_limit_max() { return graph_limit_max_; }
 
  protected:
   uint32_t duration_;  /// in seconds
   uint32_t width_;     /// in pixels
   uint32_t height_;    /// in pixels
+  float graph_limit_min_{NAN};
+  float graph_limit_max_{NAN};
   float min_value_{NAN};
   float max_value_{NAN};
   float min_range_{1.0};

esphome/const.py

@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2025.3.0b2"
+__version__ = "2025.3.0b3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (

{esphome-2025.3.0b2.dist-info → esphome-2025.3.0b3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: esphome
-Version: 2025.3.0b2
+Version: 2025.3.0b3
 Summary: ESPHome is a system to configure your microcontrollers by simple yet powerful configuration files and control them remotely through Home Automation systems.
 Author-email: The ESPHome Authors <esphome@nabucasa.com>
 License: MIT

{esphome-2025.3.0b2.dist-info → esphome-2025.3.0b3.dist-info}/RECORD

@@ -5,7 +5,7 @@ esphome/codegen.py,sha256=GePHUM7xdXb_Pil59SHVsXg2F4VBPgkH-Fz2PDX8Z54,1873
 esphome/config.py,sha256=fFrDYbhWY1xn_onAl_0jwlg9D8NkK_FdKULTlnjZtxs,39832
 esphome/config_helpers.py,sha256=MKf_wzO35nn41FvigXE0iYKDslPgL2ruf8R-EPtTT2I,3256
 esphome/config_validation.py,sha256=9KOhLHQXmDbahg6zHynXfXDfAL2bciu35_SHxHrzZ2M,63705
-esphome/const.py,sha256=IgFxQSkYp7H9q4bhgy1oMHYF1LX43GgQEw1e6VauJvU,40764
+esphome/const.py,sha256=gRnH5u1m9aFv6gSK3arX-BBWulzgNpPYP88e5YWZkRo,40764
 esphome/coroutine.py,sha256=j_14z8dIIzIBeuNO30D4c1RJvMMt1xZFZ58Evd-EvJA,9344
 esphome/cpp_generator.py,sha256=1g-y3fxWSrd5Kpbz6DrJXaQajjuwQiTIaTRIz9n7svI,31237
 esphome/cpp_helpers.py,sha256=6C2vNbOIhZKi43xRVlk5hp9GfshfBn-rc5D_ZFUEYaE,4801
@@ -952,7 +952,7 @@ esphome/components/fingerprint_grow/binary_sensor.py,sha256=NeVcqVCpmjGdnfimIIWS
 esphome/components/fingerprint_grow/fingerprint_grow.cpp,sha256=xtHEpnp1Ei_5s5SS5Vfxt8vG_PoPMmeUjbOQHWrn5G0,18675
 esphome/components/fingerprint_grow/fingerprint_grow.h,sha256=UEkLR4Cqas_XYlTLAwscXCAMRoprWeQZEZ_3vTsI-BM,11206
 esphome/components/fingerprint_grow/sensor.py,sha256=eazvZvdtt1Rl8o3Aw6eYKn-kb2sNDfZKHegxpFFdQeg,2244
-esphome/components/font/__init__.py,sha256=sa2miIdrA8C2brb4mBkgJfxh4ECUqJEotFzEM6ISGQE,19549
+esphome/components/font/__init__.py,sha256=r7IpPuAOAJuPyz9tvnb_q9T9QTLuH2-ti-D3iDGOG9A,18893
 esphome/components/font/font.cpp,sha256=dxZID-p7toxsAe3JZIc6syEdleARl-H3IRWoUIFGUOY,5361
 esphome/components/font/font.h,sha256=lBUD-bX8qK0Us0tVjq9i38EJVG6p9w4npKnW1L_ILx0,2024
 esphome/components/fs3000/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1014,8 +1014,8 @@ esphome/components/gps/time/__init__.py,sha256=iuZWg8qhi8uMoah4B2z4OyAsXndE9z6oH
 esphome/components/gps/time/gps_time.cpp,sha256=XEslYAhMq8ZViWF0QfoO95JiISUj0TLeuRcU4CnJq_8,958
 esphome/components/gps/time/gps_time.h,sha256=LTbCT36s68Sjifw0Qv6yxo5aiv2NK6Zreh1Rmtkxsqk,624
 esphome/components/graph/__init__.py,sha256=cxfJJTEGoaQ_3EAo5_cWUvLWAUjeoNyI4mqoxwkm_cc,7819
-esphome/components/graph/graph.cpp,sha256=1pwQFl5M0L4eJJhlL5x1uAsVNBOHnTXvvKd695WHhos,12241
-esphome/components/graph/graph.h,sha256=hEOwQKaakerdidM9Gw6gibKu0zmdZZ1MCa1qXGga6xo,6021
+esphome/components/graph/graph.cpp,sha256=khFAaKpn7t67RtQFtbp-5GnjxGcTHHQS19hYjj4yJVc,12331
+esphome/components/graph/graph.h,sha256=_QYsue2vhTKTLdKW39b_JVcPMwzhlyx5201fIuYJMrw,6201
 esphome/components/graphical_display_menu/__init__.py,sha256=YGbv_JsuWmW3HumvMZq0EwJszFmaXGbNYrrl9OPhNEc,3557
 esphome/components/graphical_display_menu/graphical_display_menu.cpp,sha256=_1xbdf6a_krZS-xD8D4kRW32QPz68zWs-MrXLOYYThU,9146
 esphome/components/graphical_display_menu/graphical_display_menu.h,sha256=wxHyShfCIFDgvppSatvxAYPSnGNjYF9uuh-sloI53MI,2957
@@ -3474,9 +3474,9 @@ esphome/dashboard/util/itertools.py,sha256=8eLrWEWmICLtXNxkKdYPQV0c_N4GEz8m9Npnb
 esphome/dashboard/util/password.py,sha256=cQz3b9B-ijTe7zS6BeCW0hc3pWv6JjC78jmnycYYAh8,321
 esphome/dashboard/util/subprocess.py,sha256=T8EW6dbU4LPd2DG1dRrdh8li71tt6J1isn411poMhkk,1022
 esphome/dashboard/util/text.py,sha256=ENDnfN4O0NdA3CKVJjQYabFbwbrsIhVKrAMQe53qYu4,534
-esphome-2025.3.0b2.dist-info/LICENSE,sha256=HzEjkBInJe44L4WvAOPfhPJJDNj6YbnqFyvGWRzArGM,36664
-esphome-2025.3.0b2.dist-info/METADATA,sha256=2m1NmojG95uxTvK4EXhFEqgLMKlObZkyQRPAJLL10H8,3691
-esphome-2025.3.0b2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-esphome-2025.3.0b2.dist-info/entry_points.txt,sha256=mIxVNuWtbYzeEcaWCl-AQ-97aBOWbnYBAK8nbF6P4M0,50
-esphome-2025.3.0b2.dist-info/top_level.txt,sha256=0GSXEW3cnITpgG3qnsSMz0qoqJHAFyfw7Y8MVtEf1Yk,8
-esphome-2025.3.0b2.dist-info/RECORD,,
+esphome-2025.3.0b3.dist-info/LICENSE,sha256=HzEjkBInJe44L4WvAOPfhPJJDNj6YbnqFyvGWRzArGM,36664
+esphome-2025.3.0b3.dist-info/METADATA,sha256=EpO47tRzjK6pyJGru626GK2LUW_a_Zd9ybDSWxX3xV0,3691
+esphome-2025.3.0b3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+esphome-2025.3.0b3.dist-info/entry_points.txt,sha256=mIxVNuWtbYzeEcaWCl-AQ-97aBOWbnYBAK8nbF6P4M0,50
+esphome-2025.3.0b3.dist-info/top_level.txt,sha256=0GSXEW3cnITpgG3qnsSMz0qoqJHAFyfw7Y8MVtEf1Yk,8
+esphome-2025.3.0b3.dist-info/RECORD,,