1 files changed, 31 insertions, 11 deletions
diff --git a/hid/patch.py b/hid/patch.py
index 100c0d5b..58462bc1 100644
--- a/hid/patch.py
+++ b/hid/patch.py
@@ -1,20 +1,40 @@
-from os.path import join
+# https://docs.platformio.org/en/latest/projectconf/advanced_scripting.html
+
+
 from os.path import exists
+from os.path import join
+from os.path import basename
+
+from typing import Dict
 
 Import("env")
 
 
 # =====
-deps_path = env.get("PROJECT_LIBDEPS_DIR", env.get("PROJECTLIBDEPS_DIR"))
-assert deps_path, deps_path
-env_path = join(deps_path, env["PIOENV"])
-flag_path = join(env_path, ".patched")
+def _get_pkg_path(name: str) -> str:
+    path = env.PioPlatform().get_package_dir(name)
+    assert exists(path)
+    return path
 
-if not exists(flag_path):
-    env.Execute(f"patch -p1 -d {join(env_path, 'HID-Project')} < {join('patches', 'absmouse.patch')}")
 
-    def touch_flag(*_, **__) -> None:
-        with open(flag_path, "w") as flag_file:
-            pass
+def _get_libs() -> Dict[str, str]:
+    return {
+        builder.name: builder.path
+        for builder in env.GetLibBuilders()
+    }
+
+
+def _patch(path: str, patch_path: str) -> None:
+    assert exists(path)
+    flag_path: str = join(path, f".{basename(patch_path)}.done")
+    if not exists(flag_path):
+        env.Execute(f"patch -p1 -d {path} < {patch_path}")
+        env.Execute(lambda *_, **__: open(flag_path, "w").close())
+
+
+# =====
+_patch(_get_pkg_path("framework-arduino-avr"), "patches/serial.patch")
 
-    env.Execute(touch_flag)
+_libs = _get_libs()
+if "HID-Project" in _libs:
+    _patch(_libs["HID-Project"], "patches/absmouse.patch")