Refactor manifests

rt-net · Sep 8, 2023 · 1058fa3 · 1058fa3
1 parent dfb2f04
commit 1058fa3
Show file tree

Hide file tree

Showing 12 changed files with 131 additions and 55 deletions.
diff --git a/firmware/mods/face_tracker/manifest.json b/firmware/mods/face_tracker/manifest.json
@@ -1,6 +1,7 @@
 {
 	"include": [
-		"$(MODDABLE)/examples/manifest_mod.json"
+		"$(MODDABLE)/examples/manifest_mod.json",
+		"$(MODULES)/data/text/decoder/manifest.json"
 	],
 	"modules": {
 		"*": "./mod"

diff --git a/firmware/stackchan/ble/manifest_ble.json b/firmware/stackchan/ble/manifest_ble.json
@@ -0,0 +1,17 @@
+{
+  "include": [
+    "$(MODULES)/network/ble/manifest_server.json",
+    "$(MODULES)/network/ble/manifest_client.json"
+  ],
+  "modules": {
+    "*": [
+      "$(MODULES)/network/ble/uart/uartserver",
+      "./stk-server",
+      "./beacon-packet"
+    ]
+  },
+  "preload": [
+    "stk-server",
+    "beacon-packet"
+  ]
+}
diff --git a/firmware/stackchan/ble/services/stk.json b/firmware/stackchan/ble/services/stk.json
diff --git a/...re/stackchan/dialogue/dialogue-chatgpt.ts → ...e/stackchan/dialogues/dialogue-chatgpt.ts b/...re/stackchan/dialogue/dialogue-chatgpt.ts → ...e/stackchan/dialogues/dialogue-chatgpt.ts
diff --git a/firmware/stackchan/dialogues/manifest_dialogue.json b/firmware/stackchan/dialogues/manifest_dialogue.json
@@ -0,0 +1,13 @@
+{
+  "include": [
+    "$(MODDABLE)/examples/io/tcp/fetch/manifest_fetch.json"
+  ],
+  "modules": {
+    "*": [
+      "./*"
+    ]
+  },
+  "preload": [
+    "dialugue-chatgpt"
+  ]
+}
diff --git a/firmware/stackchan/drivers/manifest_driver.json b/firmware/stackchan/drivers/manifest_driver.json
@@ -0,0 +1,23 @@
+{
+  "include": [
+    "$(MODDABLE)/examples/manifest_base.json",
+    "$(MODDABLE)/examples/manifest_typings.json",
+    "$(MODULES)/pins/servo/manifest.json",
+    "../../extern/scservo/src/manifest-driver.json",
+    "../../extern/rs30x/src/manifest-driver.json",
+    "../utilities/manifest_utility.json"
+  ],
+  "modules": {
+    "*": [
+      "./*"
+    ]
+  },
+  "preload": [
+    "dynamixel",
+    "dynamixel-driver",
+    "none-driver",
+    "rs30x-driver",
+    "scservo-driver",
+    "sg90-driver"
+  ]
+}
diff --git a/firmware/stackchan/manifest.json b/firmware/stackchan/manifest.json
@@ -4,58 +4,29 @@
     },
     "include": [
         "$(MODDABLE)/examples/manifest_base.json",
-        "$(MODDABLE)/examples/manifest_net.json",
         "$(MODDABLE)/examples/manifest_typings.json",
-        "$(MODDABLE)/examples/pins/audioout/resource-stream/manifest_streamer.json",
-        "$(MODDABLE)/examples/io/tcp/fetch/manifest_fetch.json",
-        "$(MODDABLE)/examples/io/tcp/websocket/manifest_websocket.json",
         "$(MODULES)/base/modules/manifest.json",
-        "$(MODULES)/base/deepEqual/manifest.json",
-        "$(MODULES)/base/structuredClone/manifest.json",
-        "$(MODULES)/data/text/decoder/manifest.json",
-        "$(MODULES)/files/preference/manifest.json",
-        "$(MODULES)/files/file/manifest_littlefs.json",
-        "$(MODULES)/network/ble/manifest_server.json",
-        "$(MODULES)/network/ble/manifest_client.json",
-        "$(MODULES)/network/mdns/manifest.json",
-        "$(MODULES)/pins/servo/manifest.json",
-        "$(MODULES)/pins/i2s/manifest.json",
-        "../extern/manifest_extern.json",
+        "./drivers/manifest_driver.json",
+        "./ble/manifest_ble.json",
+        "./dialogues/manifest_dialogue.json",
         "./renderers/manifest_renderer.json",
-        "./manifest_wavstream.json",
+        "./services/manifest_service.json",
+        "./speech/manifest_speech.json",
+        "./utilities/manifest_utility.json",
         "./manifest_typings.json"
     ],
     "modules": {
         "*": [
-            "$(MODULES)/network/ble/uart/uartserver",
-            "./ble/stk-server",
-            "./ble/beacon-packet",
-            "./utilities/*",
-            "./drivers/*",
-            "./services/*",
-            "./speech/*",
-            "./dialogue/*",
             "./touch",
             "./robot",
             "./main"
         ],
         "default-mods/*": "./default-mods/*"
     },
     "preload": [
-        "http",
-        "tts-local",
-        "tts-voicevox",
-        "dialugue-chatgpt",
-        "dynamixel",
-        "dynamixel-driver",
-        "stk-server",
+        "robot",
         "touch"
     ],
-    "ble": {
-        "*": [
-            "$(MODULES)/network/ble/uart/bleservices/*"
-        ]
-    },
     "strip": [],
     "creation": {
         "static": 98304,
@@ -104,9 +75,6 @@
     },
     "platforms": {
         "esp32/m5stack_core2": {
-            "include": [
-                "./manifest_8mb_flash.json"
-            ],
             "config": {
                 "driver": {
                     "pwmPan": 19,

diff --git a/firmware/stackchan/renderers/manifest_renderer.json b/firmware/stackchan/renderers/manifest_renderer.json
@@ -1,7 +1,8 @@
 {
     "include": [
         "$(MODDABLE)/examples/manifest_commodetto.json",
-        "$(MODULES)/commodetto/outline/manifest.json"
+        "$(MODULES)/commodetto/outline/manifest.json",
+        "../utilities/manifest_utility.json"
     ],
     "modules": {
         "*": [

diff --git a/firmware/stackchan/services/manifest_service.json b/firmware/stackchan/services/manifest_service.json
@@ -0,0 +1,25 @@
+{
+  "include": [
+    "$(MODDABLE)/examples/manifest_base.json",
+    "$(MODDABLE)/examples/manifest_net.json",
+    "$(MODDABLE)/examples/manifest_typings.json",
+    "$(MODDABLE)/examples/io/tcp/websocket/manifest_websocket.json",
+    "$(MODULES)/network/ble/manifest_server.json",
+    "$(MODULES)/network/ble/manifest_client.json",
+    "$(MODULES)/network/mdns/manifest.json",
+    "../utilities/manifest_utility.json"
+  ],
+  "modules": {
+    "*": [
+      "./*",
+      "$(MODULES)/network/ble/uart/uartserver",
+      "../../typings/btutils",
+      "../../typings/uartserver"
+    ]
+  },
+  "ble": {
+    "*": [
+      "$(MODULES)/network/ble/uart/bleservices/*"
+    ]
+  }
+}
diff --git a/firmware/stackchan/speech/manifest_speech.json b/firmware/stackchan/speech/manifest_speech.json
@@ -0,0 +1,24 @@
+{
+  "include": [
+    "$(MODDABLE)/examples/manifest_typings.json",
+    "$(MODDABLE)/examples/pins/audioout/resource-stream/manifest_streamer.json",
+    "$(MODDABLE)/examples/pins/audioout/elevenlabs-stream/manifest_elevenlabsstreamer.json",
+    "$(MODULES)/files/file/manifest_littlefs.json",
+    "./manifest_wavstream.json"
+  ],
+  "modules": {
+    "*": [
+      "./*",
+      "$(MODULES)/network/ble/uart/uartserver",
+      "../../typings/elevenlabsstreamer",
+      "../../typings/resourcestreamer",
+      "../../typings/wavstreamer"
+    ]
+  },
+  "preload": [
+    "tts-local",
+    "tts-remote",
+    "tts-voicevox",
+    "tts-elevenlabs"
+  ]
+}
diff --git a/firmware/stackchan/manifest_wavstream.json → .../stackchan/speech/manifest_wavstream.json b/firmware/stackchan/manifest_wavstream.json → .../stackchan/speech/manifest_wavstream.json
diff --git a/firmware/stackchan/utilities/manifest_utility.json b/firmware/stackchan/utilities/manifest_utility.json
@@ -0,0 +1,18 @@
+{
+  "include": [
+    "$(MODDABLE)/examples/manifest_base.json",
+    "$(MODULES)/files/preference/manifest.json",
+    "$(MODULES)/base/structuredClone/manifest.json",
+    "$(MODULES)/base/deepEqual/manifest.json",
+    "$(MODDABLE)/examples/manifest_typings.json"
+  ],
+  "modules": {
+    "*": [
+      "./*"
+    ]
+  },
+  "preload": [
+    "consts",
+    "stackchan-util"
+  ]
+}