Skip to content

Fix duplicate STM32 remap pins #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2020
Merged

Fix duplicate STM32 remap pins #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5eaed3d
[dfg] Keep remap pins if not duplicate
salkinium Sep 16, 2020
e102e56
Update STM32 device files
salkinium Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions devices/stm32/stm32f0-42.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,22 +308,22 @@
<signal af="3" driver="tsc" name="g4_io2"/>
<signal af="4" driver="i2c" instance="1" name="sda"/>
</gpio>
<gpio device-pin="c|k|t" port="a" pin="11">
<gpio port="a" pin="11">
<signal driver="usb" name="dm"/>
<signal af="1" driver="usart" instance="1" name="cts"/>
<signal device-pin="c|g|k|t" af="1" driver="usart" instance="1" name="cts"/>
<signal af="2" driver="tim" instance="1" name="ch4"/>
<signal af="3" driver="tsc" name="g4_io3"/>
<signal af="4" driver="can" name="rx"/>
<signal af="5" driver="i2c" instance="1" name="scl"/>
</gpio>
<gpio device-pin="c|k|t" port="a" pin="12">
<gpio port="a" pin="12">
<signal driver="usb" name="dp"/>
<signal af="1" driver="usart" instance="1" name="de"/>
<signal af="1" driver="usart" instance="1" name="rts"/>
<signal device-pin="c|g|k|t" af="1" driver="usart" instance="1" name="de"/>
<signal device-pin="c|g|k|t" af="1" driver="usart" instance="1" name="rts"/>
<signal af="2" driver="tim" instance="1" name="etr"/>
<signal af="3" driver="tsc" name="g4_io4"/>
<signal af="4" driver="can" name="tx"/>
<signal af="5" driver="i2c" instance="1" name="sda"/>
<signal device-pin="c|k|t" af="5" driver="i2c" instance="1" name="sda"/>
</gpio>
<gpio port="a" pin="13">
<signal af="0" driver="sys" name="swdio"/>
Expand Down
6 changes: 3 additions & 3 deletions devices/stm32/stm32f0-48.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,20 +288,20 @@
<signal af="3" driver="tsc" name="g4_io2"/>
<signal af="4" driver="i2c" instance="1" name="sda"/>
</gpio>
<gpio device-pin="c|t" port="a" pin="11">
<gpio port="a" pin="11">
<signal driver="usb" name="dm"/>
<signal af="1" driver="usart" instance="1" name="cts"/>
<signal af="2" driver="tim" instance="1" name="ch4"/>
<signal af="3" driver="tsc" name="g4_io3"/>
<signal af="5" driver="i2c" instance="1" name="scl"/>
</gpio>
<gpio device-pin="c|t" port="a" pin="12">
<gpio port="a" pin="12">
<signal driver="usb" name="dp"/>
<signal af="1" driver="usart" instance="1" name="de"/>
<signal af="1" driver="usart" instance="1" name="rts"/>
<signal af="2" driver="tim" instance="1" name="etr"/>
<signal af="3" driver="tsc" name="g4_io4"/>
<signal af="5" driver="i2c" instance="1" name="sda"/>
<signal device-pin="c|t" af="5" driver="i2c" instance="1" name="sda"/>
</gpio>
<gpio port="a" pin="13">
<signal af="0" driver="sys" name="swdio"/>
Expand Down
5 changes: 3 additions & 2 deletions devices/stm32/stm32f0-70.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,12 +341,13 @@
<signal af="2" driver="tim" instance="1" name="ch3"/>
<signal device-size="6" af="4" driver="i2c" instance="1" name="sda"/>
</gpio>
<gpio device-pin="c|r" port="a" pin="11">
<gpio port="a" pin="11">
<signal driver="usb" name="dm"/>
<signal af="1" driver="usart" instance="1" name="cts"/>
<signal af="2" driver="tim" instance="1" name="ch4"/>
<signal device-pin="f" af="5" driver="i2c" instance="1" name="scl"/>
</gpio>
<gpio device-pin="c|r" port="a" pin="12">
<gpio port="a" pin="12">
<signal driver="usb" name="dp"/>
<signal af="1" driver="usart" instance="1" name="de"/>
<signal af="1" driver="usart" instance="1" name="rts"/>
Expand Down
4 changes: 2 additions & 2 deletions devices/stm32/stm32g0-30.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,14 +279,14 @@
<signal af="1" driver="spi" instance="2" name="nss"/>
<signal af="2" driver="tim" instance="1" name="ch1"/>
</gpio>
<gpio device-pin="c|k" port="a" pin="9">
<gpio port="a" pin="9">
<signal af="0" driver="rcc" name="mco"/>
<signal af="1" driver="usart" instance="1" name="tx"/>
<signal af="2" driver="tim" instance="1" name="ch2"/>
<signal af="4" driver="spi" instance="2" name="miso"/>
<signal af="6" driver="i2c" instance="1" name="scl"/>
</gpio>
<gpio device-pin="c|k" port="a" pin="10">
<gpio port="a" pin="10">
<signal af="0" driver="spi" instance="2" name="mosi"/>
<signal af="1" driver="usart" instance="1" name="rx"/>
<signal af="2" driver="tim" instance="1" name="ch3"/>
Expand Down
4 changes: 2 additions & 2 deletions devices/stm32/stm32g0-31_41.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,14 +377,14 @@
<signal af="2" driver="tim" instance="1" name="ch1"/>
<signal af="5" driver="lptim" instance="2" name="out"/>
</gpio>
<gpio device-pin="c|k" port="a" pin="9">
<gpio port="a" pin="9">
<signal af="0" driver="rcc" name="mco"/>
<signal af="1" driver="usart" instance="1" name="tx"/>
<signal af="2" driver="tim" instance="1" name="ch2"/>
<signal af="4" driver="spi" instance="2" name="miso"/>
<signal af="6" driver="i2c" instance="1" name="scl"/>
</gpio>
<gpio device-pin="c|k" port="a" pin="10">
<gpio port="a" pin="10">
<signal af="0" driver="spi" instance="2" name="mosi"/>
<signal af="1" driver="usart" instance="1" name="rx"/>
<signal af="2" driver="tim" instance="1" name="ch3"/>
Expand Down
6 changes: 2 additions & 4 deletions devices/stm32/stm32g0-71_81.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,17 +535,15 @@
<signal af="2" driver="tim" instance="1" name="ch1"/>
<signal af="5" driver="lptim" instance="2" name="out"/>
</gpio>
<gpio device-pin="c|k|r" port="a" pin="9">
<signal driver="ucpd" instance="1" name="dbcc1"/>
<gpio port="a" pin="9">
<signal af="0" driver="rcc" name="mco"/>
<signal af="1" driver="usart" instance="1" name="tx"/>
<signal af="2" driver="tim" instance="1" name="ch2"/>
<signal af="4" driver="spi" instance="2" name="miso"/>
<signal af="5" driver="tim" instance="15" name="bk"/>
<signal af="6" driver="i2c" instance="1" name="scl"/>
</gpio>
<gpio device-pin="c|k|r" port="a" pin="10">
<signal driver="ucpd" instance="1" name="dbcc2"/>
<gpio port="a" pin="10">
<signal af="0" driver="spi" instance="2" name="mosi"/>
<signal af="1" driver="usart" instance="1" name="rx"/>
<signal af="2" driver="tim" instance="1" name="ch3"/>
Expand Down
62 changes: 0 additions & 62 deletions devices/stm32/stm32h7-25_35.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,27 +777,6 @@
<signal af="11" driver="eth" name="crs"/>
<signal device-pin="a|i|v|z" af="12" driver="fmc" name="a19"/>
</gpio>
<gpio device-package="i|k" port="a" pin="0">
<signal driver="adc" instance="1" name="inn1"/>
<signal driver="adc" instance="1" name="inp0"/>
<signal driver="adc" instance="2" name="inn1"/>
<signal driver="adc" instance="2" name="inp0"/>
<signal driver="pwr" name="wkup1"/>
<signal af="1" driver="tim" instance="2" name="ch1"/>
<signal af="1" driver="tim" instance="2" name="etr"/>
<signal af="2" driver="tim" instance="5" name="ch1"/>
<signal af="3" driver="tim" instance="8" name="etr"/>
<signal af="4" driver="tim" instance="15" name="bkin"/>
<signal af="5" driver="i2s" instance="6" name="ws"/>
<signal af="5" driver="spi" instance="6" name="nss"/>
<signal af="7" driver="usart" instance="2" name="cts"/>
<signal af="7" driver="usart" instance="2" name="nss"/>
<signal af="8" driver="uart" instance="4" name="tx"/>
<signal af="9" driver="sdmmc" instance="2" name="cmd"/>
<signal af="10" driver="sai" instance="4" name="sd_b"/>
<signal af="11" driver="eth" name="crs"/>
<signal af="12" driver="fmc" name="a19"/>
</gpio>
<gpio port="a" pin="1">
<signal driver="adc" instance="1" name="inn16"/>
<signal driver="adc" instance="1" name="inp17"/>
Expand All @@ -815,23 +794,6 @@
<signal af="12" driver="octospim" name="p1_dqs"/>
<signal af="14" driver="ltdc" name="r2"/>
</gpio>
<gpio device-package="i|k" port="a" pin="1">
<signal driver="adc" instance="1" name="inp1"/>
<signal driver="adc" instance="2" name="inp1"/>
<signal af="1" driver="tim" instance="2" name="ch2"/>
<signal af="2" driver="tim" instance="5" name="ch2"/>
<signal af="3" driver="lptim" instance="3" name="out"/>
<signal af="4" driver="tim" instance="15" name="ch1n"/>
<signal af="7" driver="usart" instance="2" name="de"/>
<signal af="7" driver="usart" instance="2" name="rts"/>
<signal af="8" driver="uart" instance="4" name="rx"/>
<signal af="9" driver="octospim" name="p1_io3"/>
<signal af="10" driver="sai" instance="4" name="mclk_b"/>
<signal af="11" driver="eth" name="ref_clk"/>
<signal af="11" driver="eth" name="rx_clk"/>
<signal af="12" driver="octospim" name="p1_dqs"/>
<signal af="14" driver="ltdc" name="r2"/>
</gpio>
<gpio port="a" pin="2">
<signal driver="adc" instance="1" name="inp14"/>
<signal driver="adc" instance="2" name="inp14"/>
Expand Down Expand Up @@ -1348,19 +1310,6 @@
<signal device-package="t" af="11" driver="eth" name="txd2"/>
<signal device-package="t" af="12" driver="fmc" name="sdne0"/>
</gpio>
<gpio device-package="i|k" port="c" pin="2">
<signal driver="adc" instance="3" name="inn1"/>
<signal driver="adc" instance="3" name="inp0"/>
<signal af="3" driver="dfsdm" instance="1" name="ckin1"/>
<signal af="4" driver="octospim" name="p1_io5"/>
<signal af="5" driver="i2s" instance="2" name="sdi"/>
<signal af="5" driver="spi" instance="2" name="miso"/>
<signal af="6" driver="dfsdm" instance="1" name="ckout"/>
<signal af="9" driver="octospim" name="p1_io2"/>
<signal af="10" driver="usb_otg_hs" name="ulpi_dir"/>
<signal af="11" driver="eth" name="txd2"/>
<signal af="12" driver="fmc" name="sdne0"/>
</gpio>
<gpio device-package="i|k|t" port="c" pin="3">
<signal device-package="i|k" driver="adc" instance="1" name="inn12"/>
<signal device-package="i|k" driver="adc" instance="1" name="inp13"/>
Expand All @@ -1384,17 +1333,6 @@
<signal device-package="t" af="11" driver="eth" name="tx_clk"/>
<signal device-package="t" af="12" driver="fmc" name="sdcke0"/>
</gpio>
<gpio device-package="i|k" port="c" pin="3">
<signal driver="adc" instance="3" name="inp1"/>
<signal af="3" driver="dfsdm" instance="1" name="datin1"/>
<signal af="4" driver="octospim" name="p1_io6"/>
<signal af="5" driver="i2s" instance="2" name="sdo"/>
<signal af="5" driver="spi" instance="2" name="mosi"/>
<signal af="9" driver="octospim" name="p1_io0"/>
<signal af="10" driver="usb_otg_hs" name="ulpi_nxt"/>
<signal af="11" driver="eth" name="tx_clk"/>
<signal af="12" driver="fmc" name="sdcke0"/>
</gpio>
<gpio port="c" pin="4">
<signal driver="adc" instance="1" name="inp4"/>
<signal driver="adc" instance="2" name="inp4"/>
Expand Down
34 changes: 0 additions & 34 deletions devices/stm32/stm32h7-30.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,18 +741,6 @@
<signal af="11" driver="eth" name="crs"/>
<signal af="12" driver="fmc" name="a19"/>
</gpio>
<gpio device-pin="a" device-package="i" port="a" pin="0">
<signal driver="adc" instance="1" name="inn1"/>
<signal driver="adc" instance="1" name="inp0"/>
<signal driver="adc" instance="2" name="inn1"/>
<signal driver="adc" instance="2" name="inp0"/>
</gpio>
<gpio device-pin="i" device-package="k" port="a" pin="0">
<signal driver="adc" instance="1" name="inn1"/>
<signal driver="adc" instance="1" name="inp0"/>
<signal driver="adc" instance="2" name="inn1"/>
<signal driver="adc" instance="2" name="inp0"/>
</gpio>
<gpio port="a" pin="1">
<signal driver="adc" instance="1" name="inn16"/>
<signal driver="adc" instance="1" name="inp17"/>
Expand All @@ -770,14 +758,6 @@
<signal af="12" driver="octospim" name="p1_dqs"/>
<signal af="14" driver="ltdc" name="r2"/>
</gpio>
<gpio device-pin="a" device-package="i" port="a" pin="1">
<signal driver="adc" instance="1" name="inp1"/>
<signal driver="adc" instance="2" name="inp1"/>
</gpio>
<gpio device-pin="i" device-package="k" port="a" pin="1">
<signal driver="adc" instance="1" name="inp1"/>
<signal driver="adc" instance="2" name="inp1"/>
</gpio>
<gpio port="a" pin="2">
<signal driver="adc" instance="1" name="inp14"/>
<signal driver="adc" instance="2" name="inp14"/>
Expand Down Expand Up @@ -1285,14 +1265,6 @@
<signal device-package="i|k" driver="spi" instance="2" name="miso"/>
<signal device-package="i|k" driver="usb_otg_hs" name="ulpi_dir"/>
</gpio>
<gpio device-pin="a" device-package="i" port="c" pin="2">
<signal driver="adc" instance="3" name="inn1"/>
<signal driver="adc" instance="3" name="inp0"/>
</gpio>
<gpio device-pin="i" device-package="k" port="c" pin="2">
<signal driver="adc" instance="3" name="inn1"/>
<signal driver="adc" instance="3" name="inp0"/>
</gpio>
<gpio port="c" pin="3">
<signal device-package="i|k" driver="adc" instance="1" name="inn12"/>
<signal device-package="i|k" driver="adc" instance="1" name="inp13"/>
Expand All @@ -1308,12 +1280,6 @@
<signal device-package="i|k" driver="spi" instance="2" name="mosi"/>
<signal device-package="i|k" driver="usb_otg_hs" name="ulpi_nxt"/>
</gpio>
<gpio device-pin="a" device-package="i" port="c" pin="3">
<signal driver="adc" instance="3" name="inp1"/>
</gpio>
<gpio device-pin="i" device-package="k" port="c" pin="3">
<signal driver="adc" instance="3" name="inp1"/>
</gpio>
<gpio port="c" pin="4">
<signal driver="adc" instance="1" name="inp4"/>
<signal driver="adc" instance="2" name="inp4"/>
Expand Down
17 changes: 0 additions & 17 deletions devices/stm32/stm32h7-42.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,12 +658,6 @@
<signal af="10" driver="sai" instance="2" name="sd_b"/>
<signal af="11" driver="eth" name="crs"/>
</gpio>
<gpio device-pin="x" port="a" pin="0">
<signal driver="adc" instance="1" name="inn1"/>
<signal driver="adc" instance="1" name="inp0"/>
<signal driver="adc" instance="2" name="inn1"/>
<signal driver="adc" instance="2" name="inp0"/>
</gpio>
<gpio port="a" pin="1">
<signal driver="adc" instance="1" name="inn16"/>
<signal driver="adc" instance="1" name="inp17"/>
Expand All @@ -679,10 +673,6 @@
<signal af="11" driver="eth" name="ref_clk"/>
<signal af="11" driver="eth" name="rx_clk"/>
</gpio>
<gpio device-pin="x" port="a" pin="1">
<signal driver="adc" instance="1" name="inp1"/>
<signal driver="adc" instance="2" name="inp1"/>
</gpio>
<gpio port="a" pin="2">
<signal driver="adc" instance="1" name="inp14"/>
<signal driver="adc" instance="2" name="inp14"/>
Expand Down Expand Up @@ -1125,10 +1115,6 @@
<signal device-pin="a|b|v|x|z" af="11" driver="eth" name="txd2"/>
<signal device-pin="a|b|v|x|z" af="12" driver="fmc" name="sdne0"/>
</gpio>
<gpio device-pin="x" port="c" pin="2">
<signal driver="adc" instance="3" name="inn1"/>
<signal driver="adc" instance="3" name="inp0"/>
</gpio>
<gpio port="c" pin="3">
<signal device-pin="x" driver="adc" instance="1" name="inn12"/>
<signal device-pin="x" driver="adc" instance="1" name="inp13"/>
Expand All @@ -1142,9 +1128,6 @@
<signal device-pin="a|b|v|x|z" af="11" driver="eth" name="tx_clk"/>
<signal device-pin="a|b|v|x|z" af="12" driver="fmc" name="sdcke0"/>
</gpio>
<gpio device-pin="x" port="c" pin="3">
<signal driver="adc" instance="3" name="inp1"/>
</gpio>
<gpio port="c" pin="4">
<signal driver="adc" instance="1" name="inp4"/>
<signal driver="adc" instance="2" name="inp4"/>
Expand Down
17 changes: 0 additions & 17 deletions devices/stm32/stm32h7-43_53.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,12 +685,6 @@
<signal af="10" driver="sai" instance="2" name="sd_b"/>
<signal af="11" driver="eth" name="crs"/>
</gpio>
<gpio device-pin="x" port="a" pin="0">
<signal driver="adc" instance="1" name="inn1"/>
<signal driver="adc" instance="1" name="inp0"/>
<signal driver="adc" instance="2" name="inn1"/>
<signal driver="adc" instance="2" name="inp0"/>
</gpio>
<gpio port="a" pin="1">
<signal driver="adc" instance="1" name="inn16"/>
<signal driver="adc" instance="1" name="inp17"/>
Expand All @@ -707,10 +701,6 @@
<signal af="11" driver="eth" name="rx_clk"/>
<signal af="14" driver="ltdc" name="r2"/>
</gpio>
<gpio device-pin="x" port="a" pin="1">
<signal driver="adc" instance="1" name="inp1"/>
<signal driver="adc" instance="2" name="inp1"/>
</gpio>
<gpio port="a" pin="2">
<signal driver="adc" instance="1" name="inp14"/>
<signal driver="adc" instance="2" name="inp14"/>
Expand Down Expand Up @@ -1175,10 +1165,6 @@
<signal af="11" driver="eth" name="txd2"/>
<signal af="12" driver="fmc" name="sdne0"/>
</gpio>
<gpio device-pin="x" port="c" pin="2">
<signal driver="adc" instance="3" name="inn1"/>
<signal driver="adc" instance="3" name="inp0"/>
</gpio>
<gpio port="c" pin="3">
<signal device-pin="x" driver="adc" instance="1" name="inn12"/>
<signal device-pin="x" driver="adc" instance="1" name="inp13"/>
Expand All @@ -1192,9 +1178,6 @@
<signal af="11" driver="eth" name="tx_clk"/>
<signal af="12" driver="fmc" name="sdcke0"/>
</gpio>
<gpio device-pin="x" port="c" pin="3">
<signal driver="adc" instance="3" name="inp1"/>
</gpio>
<gpio port="c" pin="4">
<signal driver="adc" instance="1" name="inp4"/>
<signal driver="adc" instance="2" name="inp4"/>
Expand Down
Loading