8000 [massStorageCopy] Handle short node name · stm32duino/Arduino_Tools@0d8f0ce · GitHub
[go: up one dir, main page]
Skip to content

Commit 0d8f0ce

Browse files
fpistmfpistm
committed
[massStorageCopy] Handle short node name
Newest firmware shorten the node name: `NODE_XXX` becomes `NOD_XXX` To avoid updating each board definition in the boards.txt with both values, it is managed by the script. Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent c67dd1d commit 0d8f0ce

File tree

3 files changed

+43
-17
lines changed

3 files changed

+43
-17
lines changed

‎linux/massStorageCopy.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,16 @@ if [ ! -f "$bin_filepath" ]; then
5656
exit 2
5757
fi
5858

59+
# Add short node name
60+
IFS=' ,\t' read -ra mnt_list <<< "$mountpoint_name"
61+
for mnt in "${mnt_list[@]}"; do
62+
if [[ "$mnt" == "NODE_"* ]]; then
63+
mountpoint_name="${mountpoint_name},${mnt//E_/_}"
64+
fi
65+
done
66+
5967
# Search the mountpoint
60-
IFS=',' read -ra mnt_list <<< "$mountpoint_name"
68+
IFS=' ,\t' read -ra mnt_list <<< "$mountpoint_name"
6169
for mnt in "${mnt_list[@]}"; do
6270
# mnt_path_list=(`cat /proc/mounts | cut -d' ' -f2 | sort -u | grep $mnt`)
6371
mnt_path_list=($(df -Hl | grep -v "Mounted on" | rev | cut -d' ' -f1 | rev | sort -u | grep "$mnt"))

‎macosx/massStorageCopy.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,16 @@ if [ ! -f "$bin_filepath" ]; then
5656
exit 2
5757
fi
5858

59+
# Add short node name
60+
IFS=' ,\t' read -ra mnt_list <<< "$mountpoint_name"
61+
for mnt in "${mnt_list[@]}"; do
62+
if [[ "$mnt" == "NODE_"* ]]; then
63+
mountpoint_name="${mountpoint_name},${mnt//E_/_}"
64+
fi
65+
done
66+
5967
# Search the mountpoint
60-
IFS=',' read -ra mnt_list <<< "$mountpoint_name"
68+
IFS=' ,\t' read -ra mnt_list <<< "$mountpoint_name"
6169
for mnt in "${mnt_list[@]}"; do
6270
mnt_path_list=($(df -Hl | grep -v "Mounted on" | rev | cut -d' ' -f1 | rev | sort -u | grep "$mnt"))
6371
if [ ${#mnt_path_list[@]} -ne 0 ]; then

‎win/massStorageCopy.bat

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
@ECHO off
1+
@echo off
22

3-
REM Exit codes for xcopy
4-
REM code | Description
5-
REM 0 | Files were copied without error.
6-
REM 1 | No files were found to copy.
7-
REM 2 | The user pressed CTRL+C to terminate xcopy.
8-
REM 4 | Initialization error occurred. There is not enough memory or disk space, or you entered an invalid drive name or invalid syntax on the command line.
9-
REM 5 | Disk write error occurred.
3+
rem Exit codes for xcopy
4+
rem code | Description
5+
rem 0 | Files were copied without error.
6+
rem 1 | No files were found to copy.
7+
rem 2 | The user pressed CTRL+C to terminate xcopy.
8+
rem 4 | Initialization error occurred. There is not enough memory or disk space, or you entered an invalid drive name or invalid syntax on the command line.
9+
rem 5 | Disk write error occurred.
1010

11-
SET SOURCE=%2
12-
SET SRC_PARSE=%SOURCE:/=\%
13-
SET TARGET=%4
14-
SET TARGET=%TARGET:\=%
11+
set SOURCE=%2
12+
set SRC_PARSE=%SOURCE:/=\%
13+
set TARGET=%4
14+
set TARGET=%TARGET:\=%
1515

1616
call :parse %TARGET%
1717
echo %TARGET% not found. Please ensure the device is correctly connected.
@@ -21,19 +21,29 @@ exit 7
2121
set list=%1
2222
set list=%list:"=%
2323

24-
for /f "tokens=1* delims=," %%a in ("%list%") DO (
24+
for /f "tokens=1* delims=," %%a in ("%list%") do (
2525
if not "%%a" == "" < 8000 span class="pl-k">call :sub %%a
26+
if not "%%a" == "" call :nod %%a
2627
if not "%%b" == "" call :parse "%%b"
2728
)
2829
goto :eof
2930

31+
rem Try with the short name NOD_XXX
32+
:nod
33+
setlocal enabledelayedexpansion
34+
echo.%~1|findstr /C:"NODE_" >nul 2>&1
35+
if not errorlevel 1 (
36+
set name=%~1
37+
call :sub !name:E_=_!
38+
)
39+
goto :eof
3040

3141
:sub
3242
setlocal enabledelayedexpansion
3343
for /F "skip=1 tokens=*" %%a in ('WMIC LOGICALDISK where "volumename like '%~1'" get deviceid 2^>NUL') do if not defined id set id=%%a
34-
call Set "deviceid=%%id: =%%"
44+
call set "deviceid=%%id: =%%"
3545
if not "%deviceid%" == "" (
3646
XCOPY %SRC_PARSE% %deviceid% /Y /Q
37-
if !errorlevel! == 0 (echo Upload complete on %1 ^(%deviceid%^))
47+
if !errorlevel! == 0 (echo Upload complete on %1 ^(%deviceid%^))
3848
exit !errorlevel!)
3949
goto :eof

0 commit comments

Comments
 (0)
0