Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0ca1f4c

Browse files
committed
ci(stm32cube): update parse version
New series defined HAL version in header file insteadof c source one.Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent50629bd commit0ca1f4c

File tree

1 file changed

+37
-27
lines changed

1 file changed

+37
-27
lines changed

‎CI/update/stm32cube.py‎

Lines changed: 37 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -369,41 +369,23 @@ def latestTag(serie, repo_name, repo_path):
369369
# print(f"Latest tagged version available for {repo_name} is {version_tag}")
370370

371371

372-
defparseVersion(path):
372+
defparseVersion(path,patterns):
373373
main_found=False
374374
sub1_found=False
375375
sub2_found=False
376376
rc_found=False
377-
if"HAL"instr(path):
378-
main_pattern=re.compile(r"HAL_VERSION_MAIN.*0x([\dA-Fa-f]+)")
379-
sub1_pattern=re.compile(r"HAL_VERSION_SUB1.*0x([\dA-Fa-f]+)")
380-
sub2_pattern=re.compile(r"HAL_VERSION_SUB2.*0x([\dA-Fa-f]+)")
381-
rc_pattern=re.compile(r"HAL_VERSION_RC.*0x([\dA-Fa-f]+)")
382-
else:
383-
main_pattern=re.compile(
384-
r"(?:CMSIS|DEVICE|CMSIS_DEVICE)_VERSION_MAIN.*0x([\dA-Fa-f]+)"
385-
)
386-
sub1_pattern=re.compile(
387-
r"(?:CMSIS|DEVICE|CMSIS_DEVICE)_VERSION_SUB1.*0x([\dA-Fa-f]+)"
388-
)
389-
sub2_pattern=re.compile(
390-
r"(?:CMSIS|DEVICE|CMSIS_DEVICE)_VERSION_SUB2.*0x([\dA-Fa-f]+)"
391-
)
392-
rc_pattern=re.compile(
393-
r"(?:CMSIS|DEVICE|CMSIS_DEVICE)_VERSION_RC.*0x([\dA-Fa-f]+)"
394-
)
395377

396378
fori,lineinenumerate(open(path,encoding="utf8",errors="ignore")):
397-
formatchinre.finditer(main_pattern,line):
379+
formatchinre.finditer(patterns[0],line):
398380
VERSION_MAIN=int(match.group(1),16)
399381
main_found=True
400-
formatchinre.finditer(sub1_pattern,line):
382+
formatchinre.finditer(patterns[1],line):
401383
VERSION_SUB1=int(match.group(1),16)
402384
sub1_found=True
403-
formatchinre.finditer(sub2_pattern,line):
385+
formatchinre.finditer(patterns[2],line):
404386
VERSION_SUB2=int(match.group(1),16)
405387
sub2_found=True
406-
formatchinre.finditer(rc_pattern,line):
388+
formatchinre.finditer(patterns[3],line):
407389
VERSION_RC=int(match.group(1),16)
408390
rc_found=True
409391
ifmain_foundandsub1_foundandsub2_foundandrc_found:
@@ -434,14 +416,30 @@ def parseVersion(path):
434416
defcheckVersion(serie,repo_path):
435417
lserie=serie.lower()
436418
userie=serie.upper()
419+
420+
patterns= [re.compile(r"HAL_VERSION_MAIN.*0x([\dA-Fa-f]+)")]
421+
patterns.append(re.compile(r"HAL_VERSION_SUB1.*0x([\dA-Fa-f]+)"))
422+
patterns.append(re.compile(r"HAL_VERSION_SUB2.*0x([\dA-Fa-f]+)"))
423+
patterns.append(re.compile(r"HAL_VERSION_RC.*0x([\dA-Fa-f]+)"))
424+
437425
HAL_file= (
438426
repo_path
439427
/hal_src_path
440428
/f"STM32{userie}xx_HAL_Driver"
441429
/"Src"
442430
/f"stm32{lserie}xx_hal.c"
443431
)
444-
cube_HAL_versions[serie]=parseVersion(HAL_file)
432+
withopen(HAL_file,"r")asfp:
433+
data=fp.read()
434+
if"HAL_VERSION_MAIN"notindata:
435+
HAL_file= (
436+
repo_path
437+
/hal_src_path
438+
/f"STM32{userie}xx_HAL_Driver"
439+
/"Inc"
440+
/f"stm32{lserie}xx_hal.h"
441+
)
442+
cube_HAL_versions[serie]=parseVersion(HAL_file,patterns)
445443
ifupargs.add:
446444
core_HAL_versions[serie]="0.0.0"
447445
else:
@@ -451,23 +449,35 @@ def checkVersion(serie, repo_path):
451449
/"Src"
452450
/f"stm32{lserie}xx_hal.c"
453451
)
454-
core_HAL_versions[serie]=parseVersion(HAL_file)
452+
core_HAL_versions[serie]=parseVersion(HAL_file,patterns)
455453

454+
patterns= [
455+
re.compile(r"(?:CMSIS|DEVICE|CMSIS_DEVICE)_VERSION_MAIN.*0x([\dA-Fa-f]+)")
456+
]
457+
patterns.append(
458+
re.compile(r"(?:CMSIS|DEVICE|CMSIS_DEVICE)_VERSION_SUB1.*0x([\dA-Fa-f]+)")
459+
)
460+
patterns.append(
461+
re.compile(r"(?:CMSIS|DEVICE|CMSIS_DEVICE)_VERSION_SUB2.*0x([\dA-Fa-f]+)")
462+
)
463+
patterns.append(
464+
re.compile(r"(?:CMSIS|DEVICE|CMSIS_DEVICE)_VERSION_RC.*0x([\dA-Fa-f]+)")
465+
)
456466
CMSIS_file= (
457467
repo_path
458468
/cmsis_src_path
459469
/f"STM32{userie}xx"
460470
/"Include"
461471
/f"stm32{lserie}xx.h"
462472
)
463-
cube_CMSIS_versions[serie]=parseVersion(CMSIS_file)
473+
cube_CMSIS_versions[serie]=parseVersion(CMSIS_file,patterns)
464474
ifupargs.add:
465475
core_CMSIS_versions[serie]="0.0.0"
466476
else:
467477
CMSIS_file= (
468478
cmsis_dest_path/f"STM32{userie}xx"/"Include"/f"stm32{lserie}xx.h"
469479
)
470-
core_CMSIS_versions[serie]=parseVersion(CMSIS_file)
480+
core_CMSIS_versions[serie]=parseVersion(CMSIS_file,patterns)
471481

472482
# print(f"STM32Cube{serie} HAL version: {cube_HAL_versions[serie]}")
473483
# print(f"STM32Core{serie} HAL version: {core_HAL_versions[serie]}")

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp