From 7ada3b64baa8ec943fe428842a1dbc26cbc332e5 Mon Sep 17 00:00:00 2001
From: irriden <irriden@proton.me>
Date: Fri, 30 Jun 2023 21:34:18 +0000
Subject: [PATCH] scripts: update to cargo-espflash v2.0.0

---
 deploy.sh        |  6 +++---
 monitor.sh       | 12 ++++++++++--
 sphinx-key/up.sh | 10 ++++------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 1f5b07d..2d0f259 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -4,7 +4,7 @@ check_exists() {
     command -v "$1" > /dev/null
 }
 check_port() {
-    cargo espflash board-info "$1" &> /dev/null
+    cargo espflash board-info --port "$1" &> /dev/null
 }
 if ! check_exists esptool.py
 then
@@ -65,7 +65,7 @@ fi
 esptool.py erase_flash &&
 git pull &&
 cd factory &&
-cargo espflash --release $PORT &&
+cargo espflash flash --release --port $PORT &&
 cd ../sphinx-key &&
 
 if [ $MODE = "release" ]
@@ -77,4 +77,4 @@ fi &&
 
 esptool.py --chip esp32-c3 elf2image ../target/riscv32imc-esp-espidf/$MODE/sphinx-key &&
 esptool.py --chip esp32c3 -b 460800 --before=default_reset --after=hard_reset write_flash --flash_mode dio --flash_freq 40m --flash_size 4MB 0x80000 ../target/riscv32imc-esp-espidf/$MODE/sphinx-key.bin &&
-cargo espflash serial-monitor $PORT
+cargo espflash monitor --port $PORT
diff --git a/monitor.sh b/monitor.sh
index aa0b01b..96dcfc2 100755
--- a/monitor.sh
+++ b/monitor.sh
@@ -2,7 +2,7 @@ check_exists() {
     command -v "$1" > /dev/null
 }
 check_port() {
-    cargo espflash board-info "$1" &> /dev/null
+    cargo espflash board-info --port "$1" &> /dev/null
 }
 if ! check_exists esptool.py
 then
@@ -31,9 +31,17 @@ do
     fi
 done
 if [ -z "$PORT" ]
+then
+    # Check for port on linux
+    if check_port /dev/ttyUSB0
+    then
+        PORT=/dev/ttyUSB0
+    fi
+fi
+if [ -z "$PORT" ]
 then
     echo "ESP likely not connected! Exiting now."
     echo "Make sure the ESP is connected with a data USB cable, and try again."
     exit 1
 fi
-cargo espflash serial-monitor $PORT
+cargo espflash monitor --port $PORT
diff --git a/sphinx-key/up.sh b/sphinx-key/up.sh
index dac87a4..3ef4465 100755
--- a/sphinx-key/up.sh
+++ b/sphinx-key/up.sh
@@ -1,12 +1,10 @@
-MODE=debug
-# MODE=release
-SSID=sphinx
-PASS=sphinxkey
+# MODE=debug
+MODE=release
 check_exists() {
     command -v "$1" > /dev/null
 }
 check_port() {
-    cargo espflash board-info "$1" &> /dev/null
+    cargo espflash board-info --port "$1" &> /dev/null
 }
 if ! check_exists esptool.py
 then
@@ -72,4 +70,4 @@ else
 fi &&
 esptool.py --chip esp32-c3 elf2image ../target/riscv32imc-esp-espidf/$MODE/sphinx-key &&
 esptool.py --chip esp32c3 -b 460800 --before=default_reset --after=hard_reset write_flash --flash_mode dio --flash_freq 40m --flash_size 4MB 0x80000 ../target/riscv32imc-esp-espidf/$MODE/sphinx-key.bin &&
-cargo espflash serial-monitor $PORT
+cargo espflash monitor --port $PORT