From c59f790c15f773a1874159705638192bf500f540 Mon Sep 17 00:00:00 2001 From: Marcus Date: Sat, 14 Sep 2024 15:57:14 +0200 Subject: [PATCH] arduino-cli now wants to have board specified in monitor mode --- Arduino/CanGrow/CanGrow_Version.h | 2 +- cangrow.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Arduino/CanGrow/CanGrow_Version.h b/Arduino/CanGrow/CanGrow_Version.h index 27c6918..68f50b0 100644 --- a/Arduino/CanGrow/CanGrow_Version.h +++ b/Arduino/CanGrow/CanGrow_Version.h @@ -1,5 +1,5 @@ /* CanGrow_Version.h gets generated from cangrow.sh */ const char* CanGrowVer = "0.1-dev"; -const char* CanGrowBuild = "6554c0a-20240728025133"; +const char* CanGrowBuild = "1a1fd39-20240912013347"; diff --git a/cangrow.sh b/cangrow.sh index 47fa178..59c9315 100755 --- a/cangrow.sh +++ b/cangrow.sh @@ -8,7 +8,7 @@ BUILD="$(git rev-parse --short HEAD)-$(date '+%Y%m%d%H%M%S')" ACLI="$HOME/.local/bin/arduino-cli" ACLI_CMD="$ACLI --config-file arduino-cli.yml" - +BOARD="esp8266:esp8266:d1_mini_clone" function help() { echo "$0 [setup|build|upload|webupload|monitor]" @@ -79,13 +79,13 @@ case $1 in const char* CanGrowVer = \"${VER}\"; const char* CanGrowBuild = \"${BUILD}\"; " > Arduino/CanGrow/CanGrow_Version.h - ${ACLI_CMD} --no-color compile -b esp8266:esp8266:d1_mini_clone "Arduino/CanGrow/CanGrow.ino" --output-dir build/ || exit 1 + ${ACLI_CMD} --no-color compile -b ${BOARD} "Arduino/CanGrow/CanGrow.ino" --output-dir build/ || exit 1 cp build/CanGrow.ino.bin build/CanGrow_v${VER}_${BUILD}.bin ;; u|upload) check_acli echo ":: Uploading to $TTY" - ${ACLI_CMD} --no-color compile -v -b esp8266:esp8266:d1_mini_clone -u -p $TTY "Arduino/CanGrow/CanGrow.ino" + ${ACLI_CMD} --no-color compile -v -b ${BOARD} -u -p $TTY "Arduino/CanGrow/CanGrow.ino" ;; w|webupload) echo ":: Uploading to $IP" @@ -95,7 +95,7 @@ const char* CanGrowBuild = \"${BUILD}\"; m|mon|monitor) check_acli echo ":: Open serial monitor $TTY" - ${ACLI_CMD} monitor -c baudrate=115200 -p $TTY + ${ACLI_CMD} monitor -c baudrate=115200 -b ${BOARD} -p $TTY ;; *) help