Merge branch 'dev' into separate-ota-backend

2025-10-31 07:03:55 +00:00 · 2024-04-21 20:56:36 -05:00
parent 5d890be113 45ae78de03
commit 19fdef7bca
21 changed files with 87 additions and 128 deletions
--- a/script/ci-custom.py
+++ b/script/ci-custom.py
@@ -58,7 +58,7 @@ file_types = (
 )
 cpp_include = ("*.h", "*.c", "*.cpp", "*.tcc")
 py_include = ("*.py",)
-ignore_types = (".ico", ".png", ".woff", ".woff2", "")
+ignore_types = (".ico", ".png", ".woff", ".woff2", "", ".ttf", ".otf")

 LINT_FILE_CHECKS = []
 LINT_CONTENT_CHECKS = []
--- a/tests/components/font/Monocraft.ttf
+++ b/tests/components/font/Monocraft.ttf
--- a/tests/components/font/common.yaml
+++ b/tests/components/font/common.yaml
@@ -0,0 +1,38 @@
+font:
+  - file: "gfonts://Roboto"
+    id: roboto
+    size: 20
+    glyphs: "0123456789."
+    extras:
+      - file: "gfonts://Roboto"
+        glyphs: ["\u00C4", "\u00C5", "\U000000C7"]
+  - file: "gfonts://Roboto"
+    id: roboto_web
+    size: 20
+  - file: "https://github.com/IdreesInc/Monocraft/releases/download/v3.0/Monocraft.ttf"
+    id: monocraft
+    size: 20
+  - file:
+      type: web
+      url: "https://github.com/IdreesInc/Monocraft/releases/download/v3.0/Monocraft.ttf"
+    id: monocraft2
+    size: 24
+  - file: $component_dir/Monocraft.ttf
+    id: monocraft3
+    size: 28
+
+i2c:
+  scl: ${i2c_scl}
+  sda: ${i2c_sda}
+
+display:
+  - platform: ssd1306_i2c
+    id: ssd1306_display
+    model: SSD1306_128X64
+    reset_pin: ${display_reset_pin}
+    lambda: |-
+      it.print(0, 0, id(roboto), "Hello, World!");
+      it.print(0, 20, id(roboto_web), "Hello, World!");
+      it.print(0, 40, id(monocraft), "Hello, World!");
+      it.print(0, 60, id(monocraft2), "Hello, World!");
+      it.print(0, 80, id(monocraft3), "Hello, World!");
--- a/tests/components/font/test.esp32-c3-idf.yaml
+++ b/tests/components/font/test.esp32-c3-idf.yaml
@@ -1,19 +1,7 @@
-i2c:
-  - id: i2c_font
-    scl: 5
-    sda: 4
+substitutions:
+  i2c_scl: GPIO5
+  i2c_sda: GPIO4
+  display_reset_pin: GPIO3

-display:
-  - platform: ssd1306_i2c
-    id: ssd1306_display
-    model: SSD1306_128X64
-    reset_pin: 3
-    pages:
-      - id: page1
-        lambda: |-
-          it.rectangle(0, 0, it.get_width(), it.get_height());
-
-font:
-  - file: "gfonts://Roboto"
-    id: roboto
-    size: 20
+packages:
+  common: !include common.yaml
--- a/tests/components/font/test.esp32-c3.yaml
+++ b/tests/components/font/test.esp32-c3.yaml
@@ -1,19 +1,7 @@
-i2c:
-  - id: i2c_font
-    scl: 5
-    sda: 4
+substitutions:
+  i2c_scl: GPIO5
+  i2c_sda: GPIO4
+  display_reset_pin: GPIO3

-display:
-  - platform: ssd1306_i2c
-    id: ssd1306_display
-    model: SSD1306_128X64
-    reset_pin: 3
-    pages:
-      - id: page1
-        lambda: |-
-          it.rectangle(0, 0, it.get_width(), it.get_height());
-
-font:
-  - file: "gfonts://Roboto"
-    id: roboto
-    size: 20
+packages:
+  common: !include common.yaml
--- a/tests/components/font/test.esp32-idf.yaml
+++ b/tests/components/font/test.esp32-idf.yaml
@@ -1,19 +1,7 @@
-i2c:
-  - id: i2c_font
-    scl: 16
-    sda: 17
+substitutions:
+  i2c_scl: GPIO16
+  i2c_sda: GPIO17
+  display_reset_pin: GPIO13

-display:
-  - platform: ssd1306_i2c
-    id: ssd1306_display
-    model: SSD1306_128X64
-    reset_pin: 13
-    pages:
-      - id: page1
-        lambda: |-
-          it.rectangle(0, 0, it.get_width(), it.get_height());
-
-font:
-  - file: "gfonts://Roboto"
-    id: roboto
-    size: 20
+packages:
+  common: !include common.yaml
--- a/tests/components/font/test.esp32.yaml
+++ b/tests/components/font/test.esp32.yaml
@@ -1,38 +1,7 @@
-font:
-  - file: "gfonts://Roboto"
-    id: roboto
-    size: 20
-    glyphs: "0123456789."
-    extras:
-      - file: "gfonts://Roboto"
-        glyphs: ["\u00C4", "\u00C5", "\U000000C7"]
-  - file: "gfonts://Roboto"
-    id: roboto_web
-    size: 20
-  - file: "https://github.com/IdreesInc/Monocraft/releases/download/v3.0/Monocraft.ttf"
-    id: monocraft
-    size: 20
-  - file:
-      type: web
-      url: "https://github.com/IdreesInc/Monocraft/releases/download/v3.0/Monocraft.ttf"
-    id: monocraft2
-    size: 24
-
-spi:
-  clk_pin: 14
-  mosi_pin: 13
-
-display:
-  - id: my_display
-    platform: ili9xxx
-    dimensions: 480x320
-    model: ST7796
-    cs_pin: 15
-    dc_pin: 21
-    reset_pin: 22
-    transform:
-      swap_xy: true
-      mirror_x: true
-      mirror_y: true
-    auto_clear_enabled: false
+substitutions:
+  i2c_scl: GPIO16
+  i2c_sda: GPIO17
+  display_reset_pin: GPIO13

+packages:
+  common: !include common.yaml
--- a/tests/components/font/test.esp8266.yaml
+++ b/tests/components/font/test.esp8266.yaml
@@ -1,19 +1,7 @@
-i2c:
-  - id: i2c_font
-    scl: 5
-    sda: 4
+substitutions:
+  i2c_scl: GPIO5
+  i2c_sda: GPIO4
+  display_reset_pin: GPIO3

-display:
-  - platform: ssd1306_i2c
-    id: ssd1306_display
-    model: SSD1306_128X64
-    reset_pin: 3
-    pages:
-      - id: page1
-        lambda: |-
-          it.rectangle(0, 0, it.get_width(), it.get_height());
-
-font:
-  - file: "gfonts://Roboto"
-    id: roboto
-    size: 20
+packages:
+  common: !include common.yaml
--- a/tests/components/font/test.rp2040.yaml
+++ b/tests/components/font/test.rp2040.yaml
@@ -1,19 +1,7 @@
-i2c:
-  - id: i2c_font
-    scl: 5
-    sda: 4
+substitutions:
+  i2c_scl: GPIO5
+  i2c_sda: GPIO4
+  display_reset_pin: GPIO3

-display:
-  - platform: ssd1306_i2c
-    id: ssd1306_display
-    model: SSD1306_128X64
-    reset_pin: 3
-    pages:
-      - id: page1
-        lambda: |-
-          it.rectangle(0, 0, it.get_width(), it.get_height());
-
-font:
-  - file: "gfonts://Roboto"
-    id: roboto
-    size: 20
+packages:
+  common: !include common.yaml
--- a/tests/test_build_components/build_components_base.bk72xx.yaml
+++ b/tests/test_build_components/build_components_base.bk72xx.yaml
@@ -16,3 +16,4 @@ packages:
      test_name: $test_name
      target_platform: $target_platform
      component_test_file: $component_test_file
+      component_dir: "../../components/$component_name"
--- a/tests/test_build_components/build_components_base.esp32-ard.yaml
+++ b/tests/test_build_components/build_components_base.esp32-ard.yaml
@@ -18,3 +18,4 @@ packages:
      test_name: $test_name
      target_platform: $target_platform
      component_test_file: $component_test_file
+      component_dir: "../../components/$component_name"
--- a/tests/test_build_components/build_components_base.esp32-c3-ard.yaml
+++ b/tests/test_build_components/build_components_base.esp32-c3-ard.yaml
@@ -18,3 +18,4 @@ packages:
      test_name: $test_name
      target_platform: $target_platform
      component_test_file: $component_test_file
+      component_dir: "../../components/$component_name"
--- a/tests/test_build_components/build_components_base.esp32-c3-idf.yaml
+++ b/tests/test_build_components/build_components_base.esp32-c3-idf.yaml
@@ -18,3 +18,4 @@ packages:
      test_name: $test_name
      target_platform: $target_platform
      component_test_file: $component_test_file
+      component_dir: "../../components/$component_name"
--- a/tests/test_build_components/build_components_base.esp32-idf.yaml
+++ b/tests/test_build_components/build_components_base.esp32-idf.yaml
@@ -18,3 +18,4 @@ packages:
      test_name: $test_name
      target_platform: $target_platform
      component_test_file: $component_test_file
+      component_dir: "../../components/$component_name"
--- a/tests/test_build_components/build_components_base.esp32-s2-ard.yaml
+++ b/tests/test_build_components/build_components_base.esp32-s2-ard.yaml
@@ -19,3 +19,4 @@ packages:
      test_name: $test_name
      target_platform: $target_platform
      component_test_file: $component_test_file
+      component_dir: "../../components/$component_name"
--- a/tests/test_build_components/build_components_base.esp32-s2-idf.yaml
+++ b/tests/test_build_components/build_components_base.esp32-s2-idf.yaml
@@ -19,3 +19,4 @@ packages:
      test_name: $test_name
      target_platform: $target_platform
      component_test_file: $component_test_file
+      component_dir: "../../components/$component_name"
--- a/tests/test_build_components/build_components_base.esp32-s3-ard.yaml
+++ b/tests/test_build_components/build_components_base.esp32-s3-ard.yaml
@@ -19,3 +19,4 @@ packages:
      test_name: $test_name
      target_platform: $target_platform
      component_test_file: $component_test_file
+      component_dir: "../../components/$component_name"
--- a/tests/test_build_components/build_components_base.esp32-s3-idf.yaml
+++ b/tests/test_build_components/build_components_base.esp32-s3-idf.yaml
@@ -19,3 +19,4 @@ packages:
      test_name: $test_name
      target_platform: $target_platform
      component_test_file: $component_test_file
+      component_dir: "../../components/$component_name"
--- a/tests/test_build_components/build_components_base.esp8266.yaml
+++ b/tests/test_build_components/build_components_base.esp8266.yaml
@@ -16,3 +16,4 @@ packages:
      test_name: $test_name
      target_platform: $target_platform
      component_test_file: $component_test_file
+      component_dir: "../../components/$component_name"
--- a/tests/test_build_components/build_components_base.host.yaml
+++ b/tests/test_build_components/build_components_base.host.yaml
@@ -16,3 +16,4 @@ packages:
      test_name: $test_name
      target_platform: $target_platform
      component_test_file: $component_test_file
+      component_dir: "../../components/$component_name"
--- a/tests/test_build_components/build_components_base.rp2040.yaml
+++ b/tests/test_build_components/build_components_base.rp2040.yaml
@@ -19,3 +19,4 @@ packages:
      test_name: $test_name
      target_platform: $target_platform
      component_test_file: $component_test_file
+      component_dir: "../../components/$component_name"