chore: Modify the compilation method of .mpy file

lbuque · lbuque · commit ea6d1a33e85f · 2023-09-26T15:20:25.000+08:00
Removing some unnecessary files from the firmware
reduced the size of micropython.bin by 3%.

Signed-off-by: lbuque &lt;1102390310@qq.com&gt;
diff --git a/m5stack/boards/M5STACK_AtomS3/manifest.py b/m5stack/boards/M5STACK_AtomS3/manifest.py
@@ -0,0 +1 @@
+include("$(MPY_DIR)/../m5stack/modules/startup/manifest_atoms3.py")
diff --git a/m5stack/boards/M5STACK_AtomS3U/manifest.py b/m5stack/boards/M5STACK_AtomS3U/manifest.py
@@ -0,0 +1 @@
+include("$(MPY_DIR)/../m5stack/modules/startup/manifest_atoms3u.py")
diff --git a/m5stack/boards/M5STACK_AtomS3_Lite/manifest.py b/m5stack/boards/M5STACK_AtomS3_Lite/manifest.py
@@ -0,0 +1 @@
+include("$(MPY_DIR)/../m5stack/modules/startup/manifest_atoms3lite.py")
diff --git a/m5stack/boards/M5STACK_Basic/manifest.py b/m5stack/boards/M5STACK_Basic/manifest.py
@@ -0,0 +1 @@
+include("$(MPY_DIR)/../m5stack/modules/startup/manifest_basic.py")
diff --git a/m5stack/boards/M5STACK_Core2/manifest.py b/m5stack/boards/M5STACK_Core2/manifest.py
@@ -0,0 +1 @@
+include("$(MPY_DIR)/../m5stack/modules/startup/manifest_core2.py")
diff --git a/m5stack/boards/M5STACK_CoreS3/manifest.py b/m5stack/boards/M5STACK_CoreS3/manifest.py
@@ -0,0 +1 @@
+include("$(MPY_DIR)/../m5stack/modules/startup/manifest_cores3.py")
diff --git a/m5stack/boards/M5STACK_Fire/manifest.py b/m5stack/boards/M5STACK_Fire/manifest.py
@@ -0,0 +1 @@
+include("$(MPY_DIR)/../m5stack/modules/startup/manifest_fire.py")
diff --git a/m5stack/boards/M5STACK_StickC_PLUS/manifest.py b/m5stack/boards/M5STACK_StickC_PLUS/manifest.py
@@ -0,0 +1 @@
+include("$(MPY_DIR)/../m5stack/modules/startup/manifest_stickcplus.py")
diff --git a/m5stack/boards/M5STACK_StickC_PLUS2/manifest.py b/m5stack/boards/M5STACK_StickC_PLUS2/manifest.py
@@ -0,0 +1 @@
+include("$(MPY_DIR)/../m5stack/modules/startup/manifest_stickcplus.py")
diff --git a/m5stack/boards/manifest.py b/m5stack/boards/manifest.py
@@ -1,5 +1,4 @@
-freeze("$(MPY_DIR)/../m5stack/modules")
-freeze("$(MPY_DIR)/../m5stack/libs")
+include("manifest_m5stack.py")
 require("mip")
 require("ntptime")
 require("dht")
diff --git a/m5stack/boards/manifest_m5stack.py b/m5stack/boards/manifest_m5stack.py
@@ -0,0 +1,3 @@
+include("$(BOARD_DIR)/manifest.py")
+include("$(MPY_DIR)/../m5stack/modules/manifest.py")
+include("$(MPY_DIR)/../m5stack/libs/manifest.py")
diff --git a/m5stack/libs/bleuart/manifest.py b/m5stack/libs/bleuart/manifest.py
@@ -0,0 +1,11 @@
+package(
+    "bleuart",
+    (
+        "__init__.py",
+        "ble_advertising.py",
+        "bleuart_client.py",
+        "bleuart_server.py",
+    ),
+    base_path="..",
+    opt=0,
+)
diff --git a/m5stack/libs/driver/manifest.py b/m5stack/libs/driver/manifest.py
@@ -0,0 +1,39 @@
+package(
+    "driver",
+    (
+        "__init__.py",
+        "fpc1020a/fpc1020a/__init__.py",
+        "fpc1020a/fpc1020a/api.py",
+        "fpc1020a/fpc1020a/types.py",
+        "ir/__init__.py",
+        "ir/nec.py",
+        "ir/receiver.py",
+        "ir/transmitter.py",
+        "neopixel/__init__.py",
+        "neopixel/sk6812.py",
+        "neopixel/ws2812.py",
+        "ads1100.py",
+        "asr650x.py",
+        "bh1750.py",
+        "bh1750fvi.py",
+        "bmp280.py",
+        "button.py",
+        "checksum.py",
+        "dht12.py",
+        "mcp4725.py",
+        "mlx90614.py",
+        "pca9554.py",
+        "pcf8563.py",
+        "qmp6988.py",
+        "scd40.py",
+        "sgp30.py",
+        "sh1107.py",
+        "sht4x.py",
+        "sht30.py",
+        "tcs3472.py",
+        "timer_thread.py",
+        "vl53l0x.py",
+    ),
+    base_path="..",
+    opt=0,
+)
diff --git a/m5stack/libs/ezdata/manifest.py b/m5stack/libs/ezdata/manifest.py
@@ -0,0 +1,9 @@
+package(
+    "ezdata",
+    (
+        "__init__.py",
+        "multi.py",
+    ),
+    base_path="..",
+    opt=0,
+)
diff --git a/m5stack/libs/hardware/manifest.py b/m5stack/libs/hardware/manifest.py
@@ -0,0 +1,12 @@
+package(
+    "hardware",
+    (
+        "__init__.py",
+        "button.py",
+        "ir.py",
+        "rgb.py",
+        "sdcard.py",
+    ),
+    base_path="..",
+    opt=0,
+)
diff --git a/m5stack/libs/hat/manifest.py b/m5stack/libs/hat/manifest.py
@@ -0,0 +1,6 @@
+package(
+    "hat",
+    ("__init__.py",),
+    base_path="..",
+    opt=0,
+)
diff --git a/m5stack/libs/image_plus/manifest.py b/m5stack/libs/image_plus/manifest.py
@@ -0,0 +1,6 @@
+package(
+    "image_plus",
+    ("__init__.py",),
+    base_path="..",
+    opt=0,
+)
diff --git a/m5stack/libs/image_plus/queue.py b/m5stack/libs/image_plus/queue.py
@@ -0,0 +1,36 @@
+from collections import namedtuple
+import _thread
+import time
+
+# Queue = namedtuple("Queue", ["task", "period", "enable"])
+
+thread_id = 0
+thread_status = False
+
+
+class Task:
+    def __init__(self, fn, period, enable) -> None:
+        self.fn = fn
+        self.period = period
+        self.enable = enable
+        self.last_time = time.ticks_ms()
+
+
+tasks = []
+
+
+def register_queue(task: Task):
+    if len(tasks) < 3:
+        tasks.append(task)
+
+
+def loop():
+    while True:
+        for task in tasks:
+            if task.enable is not True:
+                continue
+            if time.ticks_ms() - task.last_time >= task.period:
+                task.fn and task.fn()
+                task.last_time = time.ticks_ms()
+        time.sleep_ms(100)
+    _thread.exit()
diff --git a/m5stack/libs/manifest.py b/m5stack/libs/manifest.py
@@ -0,0 +1,13 @@
+include("bleuart/manifest.py")
+include("driver/manifest.py")
+include("ezdata/manifest.py")
+include("hardware/manifest.py")
+include("hat/manifest.py")
+include("image_plus/manifest.py")
+include("module/manifest.py")
+include("umqtt/manifest.py")
+include("unit/manifest.py")
+# freeze("$(MPY_DIR)/../m5stack/libs/unit")
+include("utility/manifest.py")
+module("label_plus.py")
+module("m5camera.py")
diff --git a/m5stack/libs/module/manifest.py b/m5stack/libs/module/manifest.py
@@ -0,0 +1,10 @@
+package(
+    "module",
+    (
+        "__init__.py",
+        "dual_kmeter.py",
+        "mbus.py",
+    ),
+    base_path="..",
+    opt=0,
+)
diff --git a/m5stack/libs/umqtt/manifest.py b/m5stack/libs/umqtt/manifest.py
@@ -0,0 +1,10 @@
+package(
+    "umqtt",
+    (
+        "__init__.py",
+        "robust.py",
+        "simple.py",
+    ),
+    base_path="..",
+    opt=0,
+)
diff --git a/m5stack/libs/unit/manifest.py b/m5stack/libs/unit/manifest.py
@@ -0,0 +1,36 @@
+package(
+    "unit",
+    (
+        "__init__.py",
+        "ac_measure.py",
+        "adc.py",
+        "angle.py",
+        "cardkb.py",
+        "color.py",
+        "dac.py",
+        "dlight.py",
+        "dual_button.py",
+        "earth.py",
+        "encoder8.py",
+        "env.py",
+        "extio.py",
+        "extio2.py",
+        "finger.py",
+        "gps.py",
+        "hbridge.py",
+        "ir.py",
+        "light.py",
+        "lorawan.py",
+        "ncir.py",
+        "pahub.py",
+        "pbhub.py",
+        "pir.py",
+        "relay.py",
+        "rgb.py",
+        "tof.py",
+        "unit_helper.py",
+        "uwb.py",
+    ),
+    base_path="..",
+    opt=0,
+)
diff --git a/m5stack/libs/utility/manifest.py b/m5stack/libs/utility/manifest.py
@@ -0,0 +1,9 @@
+package(
+    "utility",
+    (
+        "__init__.py",
+        "exception_helper.py",
+    ),
+    base_path="..",
+    opt=0,
+)
diff --git a/m5stack/modules/manifest.py b/m5stack/modules/manifest.py
@@ -0,0 +1,4 @@
+module("_boot.py")
+module("flashbdev.py")
+module("inisetup.py")
+include("widgets/manifest.py")
diff --git a/m5stack/modules/startup/manifest_atoms3.py b/m5stack/modules/startup/manifest_atoms3.py
@@ -0,0 +1,9 @@
+package(
+    "startup",
+    (
+        "__init__.py",
+        "atoms3.py",
+    ),
+    base_path="..",
+    opt=3,
+)
diff --git a/m5stack/modules/startup/manifest_atoms3lite.py.py b/m5stack/modules/startup/manifest_atoms3lite.py.py
@@ -0,0 +1,10 @@
+package(
+    "startup",
+    (
+        "__init__.py",
+        "atoms3lite.py",
+        "stamps3.py",
+    ),
+    base_path="..",
+    opt=3,
+)
diff --git a/m5stack/modules/startup/manifest_atoms3u.py b/m5stack/modules/startup/manifest_atoms3u.py
@@ -0,0 +1,10 @@
+package(
+    "startup",
+    (
+        "__init__.py",
+        "atoms3u.py",
+        "stamps3.py",
+    ),
+    base_path="..",
+    opt=3,
+)
diff --git a/m5stack/modules/startup/manifest_basic.py b/m5stack/modules/startup/manifest_basic.py
@@ -0,0 +1,17 @@
+package(
+    "startup",
+    (
+        "__init__.py",
+        "basic/__init__.py",
+        "basic/app.py",
+        "basic/framework.py",
+        "basic/res.py",
+        "basic/apps/app_list.py",
+        "basic/apps/app_run.py",
+        "basic/apps/dev.py",
+        "basic/apps/ezdata.py",
+        "basic/apps/settings.py",
+    ),
+    base_path="..",
+    opt=3,
+)
diff --git a/m5stack/modules/startup/manifest_core2.py b/m5stack/modules/startup/manifest_core2.py
@@ -0,0 +1,17 @@
+package(
+    "startup",
+    (
+        "__init__.py",
+        "core2/__init__.py",
+        "core2/app.py",
+        "core2/framework.py",
+        "core2/apps/app_list.py",
+        "core2/apps/app_run.py",
+        "core2/apps/dev.py",
+        "core2/apps/ezdata.py",
+        "core2/apps/settings.py",
+        "core2/apps/status_bar.py",
+    ),
+    base_path="..",
+    opt=3,
+)
diff --git a/m5stack/modules/startup/manifest_cores3.py b/m5stack/modules/startup/manifest_cores3.py
@@ -0,0 +1,17 @@
+package(
+    "startup",
+    (
+        "__init__.py",
+        "cores3/__init__.py",
+        "cores3/app.py",
+        "cores3/framework.py",
+        "cores3/apps/app_list.py",
+        "cores3/apps/app_run.py",
+        "cores3/apps/dev.py",
+        "cores3/apps/ezdata.py",
+        "cores3/apps/settings.py",
+        "cores3/apps/status_bar.py",
+    ),
+    base_path="..",
+    opt=3,
+)
diff --git a/m5stack/modules/startup/manifest_fire.py b/m5stack/modules/startup/manifest_fire.py
@@ -0,0 +1,17 @@
+package(
+    "startup",
+    (
+        "__init__.py",
+        "fire/__init__.py",
+        "fire/app.py",
+        "fire/framework.py",
+        "fire/res.py",
+        "fire/apps/app_list.py",
+        "fire/apps/app_run.py",
+        "fire/apps/dev.py",
+        "fire/apps/ezdata.py",
+        "fire/apps/settings.py",
+    ),
+    base_path="..",
+    opt=3,
+)
diff --git a/m5stack/modules/startup/manifest_stamps3.py b/m5stack/modules/startup/manifest_stamps3.py
@@ -0,0 +1,9 @@
+package(
+    "startup",
+    (
+        "__init__.py",
+        "stamps3.py",
+    ),
+    base_path="..",
+    opt=3,
+)
diff --git a/m5stack/modules/startup/manifest_stickcplus.py b/m5stack/modules/startup/manifest_stickcplus.py
@@ -0,0 +1,9 @@
+package(
+    "startup",
+    (
+        "__init__.py",
+        "stickcplus.py",
+    ),
+    base_path="..",
+    opt=0,
+)
diff --git a/m5stack/modules/widgets/manifest.py b/m5stack/modules/widgets/manifest.py
@@ -0,0 +1,12 @@
+package(
+    "widgets",
+    (
+        "__init__.py",
+        "base.py",
+        "button.py",
+        "image.py",
+        "label.py",
+    ),
+    base_path="..",
+    opt=0,
+)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+include("$(MPY_DIR)/../m5stack/modules/startup/manifest_atoms3.py")`