Merge branch flow3r-firmware:main into main

nix/overlay/default.nix

@@ -5,4 +5,5 @@
   esp-llvm = super.callPackage ./esp-llvm.nix {};
   esp-gdb = super.callPackage ./esp-gdb.nix {};
   run-clang-tidy = super.callPackage ./run-clang-tidy {};
+  mpremote = super.python310Packages.callPackage ./mpremote {};
 })

nix/overlay/mpremote/default.nix

+{ python3
+, fetchPypi
+}:
+python3.pkgs.buildPythonApplication rec {
+  pname = "mpremote";
+  version = "1.20.0";
+  format = "pyproject";
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-XDQnYqBHkTCd1JvOY8cKB1qnxUixwAdiYrlvnMw5jKI=";
+  };
+  doCheck = false;
+  nativeBuildInputs = with python3.pkgs; [
+    hatchling
+    hatch-requirements-txt
+    hatch-vcs
+  ];
+  propagatedBuildInputs = with python3.pkgs; [
+    pyserial
+    importlib-metadata
+  ];
+}

nix/pkgs.nix

@@ -35,5 +35,6 @@ in with nixpkgs; rec {
     emscripten
     ncurses5
     esp-gdb
+    mpremote
   ];
 }

python_payload/README.md

@@ -5,7 +5,7 @@ These are the sources for the Python part of st3m, which implements the core fun
 
 You're either seeing this in our git repository (in `python_payload`) or on a badge itself (in `/flash/sys`).
 
-On the badge, these files are required for the badge to function, and are extracted on first startup. You can edit these to your heart's conent, but this generally shouldn't be necessary.
+On the badge, these files are required for the badge to function, and are extracted on first startup. You can edit these to your heart's content, but this generally shouldn't be necessary.
 
 If you break something, the badge will probably not boot. In this case, start it in recovery mode and remove the `sys` directory fully. This will cause the badge to re-extract the files on next startup.
 

tools/mypy.sh

 #!/usr/bin/env bash
-set -e
+set -e -u
 
 if [ ! -f sdkconfig.defaults ] || [ ! -f recovery/sdkconfig.defaults ]; then
     echo >/dev/stderr "Run this script for the root of the repository (ie. tools/mypy.sh)."
@@ -28,7 +28,7 @@ _mypy python_payload/main.py
 for f in python_payload/apps/*/flow3r.toml; do
     app_name="$(basename $(dirname $f))"
     echo "Checking ${app_name}..."
-    _mypy python_payload/apps/${app}
+    _mypy python_payload/apps/${app_name}
 done
 
 if [ $failed ]; then