Skip to content

Commit 6c7e66c

Browse files
committed
ci(stm32variant): add SUBGHZSPI support
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent c6f3f08 commit 6c7e66c

File tree

1 file changed

+24
-14
lines changed

1 file changed

+24
-14
lines changed

CI/update/stm32variant.py

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
uartrx_list = [] # ['PIN','name','UARTrx', ['af']]
3131
uartcts_list = [] # ['PIN','name','UARTcts', ['af']]
3232
uartrts_list = [] # ['PIN','name','UARTrts', ['af']]
33-
spimosi_list = [] # ['PIN','name','SPIMOSI', ['af']]
34-
spimiso_list = [] # ['PIN','name','SPIMISO', ['af']]
35-
spissel_list = [] # ['PIN','name','SPISSEL', ['af']]
36-
spisclk_list = [] # ['PIN','name','SPISCLK', ['af']]
33+
spimosi_list = [] # ['PIN','name','SPIMOSI', 'sort name', ['af']]
34+
spimiso_list = [] # ['PIN','name','SPIMISO', 'sort name', ['af']]
35+
spissel_list = [] # ['PIN','name','SPISSEL', 'sort name', ['af']]
36+
spisclk_list = [] # ['PIN','name','SPISCLK', 'sort name', ['af']]
3737
cantd_list = [] # ['PIN','name','CANTD', ['af']]
3838
canrd_list = [] # ['PIN','name','CANRD', ['af']]
3939
eth_list = [] # ['PIN','name','ETH', ['af']]
@@ -464,14 +464,14 @@ def store_uart(pin, name, signal):
464464

465465
# Store SPI pins
466466
def store_spi(pin, name, signal):
467-
if "_MISO" in signal:
468-
spimiso_list.append([pin, name, signal])
469-
if "_MOSI" in signal:
470-
spimosi_list.append([pin, name, signal])
471-
if "_SCK" in signal:
472-
spisclk_list.append([pin, name, signal])
473-
if "_NSS" in signal:
474-
spissel_list.append([pin, name, signal])
467+
if re.search("[-_]MISO", signal):
468+
spimiso_list.append([pin, name, signal, signal.removeprefix("DEBUG_")])
469+
if re.search("[-_]MOSI", signal):
470+
spimosi_list.append([pin, name, signal, signal.removeprefix("DEBUG_")])
471+
if re.search("[-_]SCK", signal):
472+
spisclk_list.append([pin, name, signal, signal.removeprefix("DEBUG_")])
473+
if re.search("[-_]NSS", signal):
474+
spissel_list.append([pin, name, signal, signal.removeprefix("DEBUG_")])
475475

476476

477477
# Store CAN pins
@@ -749,6 +749,7 @@ def spi_pinmap(lst):
749749
spi_pins_list = []
750750
winst = []
751751
wpin = []
752+
sp = re.compile(r"-|_")
752753
if lst == spimosi_list:
753754
aname = "SPI_MOSI"
754755
elif lst == spimiso_list:
@@ -759,7 +760,9 @@ def spi_pinmap(lst):
759760
aname = "SPI_SSEL"
760761
for p in lst:
761762
# 2nd element is the SPI_XXXX signal
762-
inst = p[2].split("_")[0]
763+
# but using 3rd which contains the stripped one
764+
# used to properly sort them
765+
inst = sp.split(p[3])[0]
763766
winst.append(len(inst))
764767
wpin.append(len(p[0]))
765768
spi_pins_list.append(
@@ -768,7 +771,7 @@ def spi_pinmap(lst):
768771
"inst": inst,
769772
"mode": "STM_MODE_AF_PP",
770773
"pull": "GPIO_PULLUP",
771-
"af": p[3],
774+
"af": p[4],
772775
}
773776
)
774777
return dict(
@@ -1536,6 +1539,9 @@ def natural_sortkey2(list_2_elem):
15361539
return tuple(int(num) if num else alpha for num, alpha in tokenize(list_2_elem[2]))
15371540

15381541

1542+
def natural_sortkey3(list_2_elem):
1543+
return tuple(int(num) if num else alpha for num, alpha in tokenize(list_2_elem[3]))
1544+
15391545
def sort_my_lists():
15401546
io_list.sort(key=natural_sortkey)
15411547
dualpad_list.sort(key=natural_sortkey)
@@ -1550,9 +1556,13 @@ def sort_my_lists():
15501556
uartrx_list.sort(key=natural_sortkey)
15511557
uartcts_list.sort(key=natural_sortkey)
15521558
uartrts_list.sort(key=natural_sortkey)
1559+
spimosi_list.sort(key=natural_sortkey3)
15531560
spimosi_list.sort(key=natural_sortkey)
1561+
spimiso_list.sort(key=natural_sortkey3)
15541562
spimiso_list.sort(key=natural_sortkey)
1563+
spissel_list.sort(key=natural_sortkey3)
15551564
spissel_list.sort(key=natural_sortkey)
1565+
spisclk_list.sort(key=natural_sortkey3)
15561566
spisclk_list.sort(key=natural_sortkey)
15571567
cantd_list.sort(key=natural_sortkey)
15581568
canrd_list.sort(key=natural_sortkey)

0 commit comments

Comments
 (0)