30
30
uartrx_list = [] # ['PIN','name','UARTrx', ['af']]
31
31
uartcts_list = [] # ['PIN','name','UARTcts', ['af']]
32
32
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']]
37
37
cantd_list = [] # ['PIN','name','CANTD', ['af']]
38
38
canrd_list = [] # ['PIN','name','CANRD', ['af']]
39
39
eth_list = [] # ['PIN','name','ETH', ['af']]
@@ -464,14 +464,14 @@ def store_uart(pin, name, signal):
464
464
465
465
# Store SPI pins
466
466
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_" ) ])
475
475
476
476
477
477
# Store CAN pins
@@ -749,6 +749,7 @@ def spi_pinmap(lst):
749
749
spi_pins_list = []
750
750
winst = []
751
751
wpin = []
752
+ sp = re .compile (r"-|_" )
752
753
if lst == spimosi_list :
753
754
aname = "SPI_MOSI"
754
755
elif lst == spimiso_list :
@@ -759,7 +760,9 @@ def spi_pinmap(lst):
759
760
aname = "SPI_SSEL"
760
761
for p in lst :
761
762
# 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 ]
763
766
winst .append (len (inst ))
764
767
wpin .append (len (p [0 ]))
765
768
spi_pins_list .append (
@@ -768,7 +771,7 @@ def spi_pinmap(lst):
768
771
"inst" : inst ,
769
772
"mode" : "STM_MODE_AF_PP" ,
770
773
"pull" : "GPIO_PULLUP" ,
771
- "af" : p [3 ],
774
+ "af" : p [4 ],
772
775
}
773
776
)
774
777
return dict (
@@ -1536,6 +1539,9 @@ def natural_sortkey2(list_2_elem):
1536
1539
return tuple (int (num ) if num else alpha for num , alpha in tokenize (list_2_elem [2 ]))
1537
1540
1538
1541
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
+
1539
1545
def sort_my_lists ():
1540
1546
io_list .sort (key = natural_sortkey )
1541
1547
dualpad_list .sort (key = natural_sortkey )
@@ -1550,9 +1556,13 @@ def sort_my_lists():
1550
1556
uartrx_list .sort (key = natural_sortkey )
1551
1557
uartcts_list .sort (key = natural_sortkey )
1552
1558
uartrts_list .sort (key = natural_sortkey )
1559
+ spimosi_list .sort (key = natural_sortkey3 )
1553
1560
spimosi_list .sort (key = natural_sortkey )
1561
+ spimiso_list .sort (key = natural_sortkey3 )
1554
1562
spimiso_list .sort (key = natural_sortkey )
1563
+ spissel_list .sort (key = natural_sortkey3 )
1555
1564
spissel_list .sort (key = natural_sortkey )
1565
+ spisclk_list .sort (key = natural_sortkey3 )
1556
1566
spisclk_list .sort (key = natural_sortkey )
1557
1567
cantd_list .sort (key = natural_sortkey )
1558
1568
canrd_list .sort (key = natural_sortkey )
0 commit comments