From cda1ef7f75546ec7884e7aeeb27390768acd67c6 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@osmocom.org>
Date: Wed, 25 Jan 2023 20:46:37 +0100
Subject: [PATCH] smartcard-fpc: Update to use with JUSHUO-AFA07 FPC connector

---
 hardware/smartcard-fpc/smartcard-fpc.brd | 65 +++++++++++-------------
 hardware/smartcard-fpc/smartcard-fpc.sch | 36 ++++++++++++-
 2 files changed, 65 insertions(+), 36 deletions(-)

diff --git a/hardware/smartcard-fpc/smartcard-fpc.brd b/hardware/smartcard-fpc/smartcard-fpc.brd
index 0d2d8c7..f62a746 100644
--- a/hardware/smartcard-fpc/smartcard-fpc.brd
+++ b/hardware/smartcard-fpc/smartcard-fpc.brd
@@ -166,29 +166,25 @@
 <library name="laforge">
 <description>&lt;b&gt;PCB Matrix Packages&lt;/b&gt;&lt;p&gt;</description>
 <packages>
-<package name="FPC_REBEL_SFW6R-1ST">
-<description>FCI FPC connector SFW6R-1STE1LF
-
-according to Drawing JSA 96336 / revision D, Nov 1, 2009
-
-used in Rebelsim FPC</description>
-<smd name="6" x="2.5" y="0.5" dx="0.6" dy="1.5" layer="1"/>
-<smd name="5" x="1.5" y="0.5" dx="0.6" dy="1.5" layer="1"/>
-<smd name="4" x="0.5" y="0.5" dx="0.6" dy="1.5" layer="1"/>
-<smd name="3" x="-0.5" y="0.5" dx="0.6" dy="1.5" layer="1"/>
-<smd name="2" x="-1.5" y="0.5" dx="0.6" dy="1.5" layer="1"/>
-<smd name="1" x="-2.5" y="0.5" dx="0.6" dy="1.5" layer="1"/>
-<smd name="M1" x="-3.5" y="-1.6" dx="0.7" dy="4.2" layer="1"/>
-<smd name="M2" x="3.5" y="-1.6" dx="0.7" dy="4.2" layer="1"/>
-<wire x1="5.9" y1="-4.3" x2="5.3" y2="-4.3" width="0.127" layer="21"/>
-<wire x1="5.3" y1="-4.3" x2="-5.3" y2="-4.3" width="0.127" layer="21"/>
-<wire x1="-5.3" y1="-4.3" x2="-5.9" y2="-4.3" width="0.127" layer="21"/>
-<wire x1="5.9" y1="-5.5" x2="-5.9" y2="-5.5" width="0.127" layer="21"/>
-<wire x1="-5.9" y1="-4.3" x2="-5.9" y2="-5.5" width="0.127" layer="21"/>
-<wire x1="5.9" y1="-4.3" x2="5.9" y2="-5.5" width="0.127" layer="21"/>
-<wire x1="-5.3" y1="0" x2="5.3" y2="0" width="0.127" layer="21"/>
-<wire x1="-5.3" y1="0" x2="-5.3" y2="-4.3" width="0.127" layer="21"/>
-<wire x1="5.3" y1="0" x2="5.3" y2="-4.3" width="0.127" layer="21"/>
+<package name="FPC_JUSHUO_AFA07-S06">
+<description>JUSUA-AFA07-S06FCC-00_C72727</description>
+<smd name="6" x="2.5" y="0.9" dx="0.6" dy="1.8" layer="1"/>
+<smd name="5" x="1.5" y="0.9" dx="0.6" dy="1.8" layer="1"/>
+<smd name="4" x="0.5" y="0.9" dx="0.6" dy="1.8" layer="1"/>
+<smd name="3" x="-0.5" y="0.9" dx="0.6" dy="1.8" layer="1"/>
+<smd name="2" x="-1.5" y="0.9" dx="0.6" dy="1.8" layer="1"/>
+<smd name="1" x="-2.5" y="0.9" dx="0.6" dy="1.8" layer="1"/>
+<smd name="M1" x="-4.85" y="-1.27" dx="2.6" dy="3" layer="1"/>
+<smd name="M2" x="4.85" y="-1.27" dx="2.6" dy="3" layer="1"/>
+<wire x1="6.5" y1="-4.3" x2="5.525" y2="-4.3" width="0.127" layer="21"/>
+<wire x1="5.525" y1="-4.3" x2="-5.525" y2="-4.3" width="0.127" layer="21"/>
+<wire x1="-5.525" y1="-4.3" x2="-6.5" y2="-4.3" width="0.127" layer="21"/>
+<wire x1="6.5" y1="-5.3" x2="-6.5" y2="-5.3" width="0.127" layer="21"/>
+<wire x1="-6.5" y1="-4.3" x2="-6.5" y2="-5.3" width="0.127" layer="21"/>
+<wire x1="6.5" y1="-4.3" x2="6.5" y2="-5.3" width="0.127" layer="21"/>
+<wire x1="-5.525" y1="0" x2="5.525" y2="0" width="0.127" layer="21"/>
+<wire x1="-5.525" y1="0" x2="-5.525" y2="-4.3" width="0.127" layer="21"/>
+<wire x1="5.525" y1="0" x2="5.525" y2="-4.3" width="0.127" layer="21"/>
 <text x="7.62" y="-5.08" size="1.27" layer="25" font="vector" ratio="14" rot="R90">&gt;NAME</text>
 </package>
 <package name="WEEE_BIN_TOP">
@@ -578,10 +574,10 @@ design rules under a new name.</description>
 </autorouter>
 <elements>
 <element name="X1" library="iso7816-card" package="ISO7816_CARD" value="" x="42.8" y="26.75"/>
-<element name="X2" library="laforge" package="FPC_REBEL_SFW6R-1ST" value="FCI_FPC_REBEL_SFW6R-1" x="94.234" y="28.194" rot="R90">
-<attribute name="OC_DIGIKEY" value="609-1889-1-ND" x="94.234" y="28.194" size="1.778" layer="27" rot="R90" display="off"/>
+<element name="X2" library="laforge" package="FPC_JUSHUO_AFA07-S06" value="FCI_FPC_REBEL_SFW6R-1-JUSHUO-AFA07" x="94.234" y="28.194" smashed="yes" rot="R90">
+<attribute name="NAME" x="99.314" y="36.576" size="1.27" layer="25" font="vector" ratio="14" rot="R180"/>
 </element>
-<element name="C1" library="rc-sysmocom" package="_0603" value="" x="92.202" y="24.638" rot="R90"/>
+<element name="C1" library="rc-sysmocom" package="_0603" value="" x="90.932" y="24.638" rot="R90"/>
 <element name="U$1" library="laforge" package="WEEE_BIN_TOP" value="" x="77.724" y="11.43"/>
 <element name="U$2" library="laforge" package="WEEE_BIN" value="" x="77.724" y="8.89"/>
 <element name="U$3" library="oshw" package="OSHW_8MM" value="" x="93.726" y="8.382"/>
@@ -601,11 +597,10 @@ design rules under a new name.</description>
 <wire x1="86.36" y1="23.368" x2="87.376" y2="24.384" width="0.6" layer="16"/>
 <via x="87.376" y="24.384" extent="1-16" drill="0.3"/>
 <wire x1="87.376" y1="24.384" x2="88.686" y2="25.694" width="0.6" layer="1"/>
-<wire x1="88.686" y1="25.694" x2="92.496" y2="25.694" width="0.6" layer="1"/>
+<wire x1="88.686" y1="25.694" x2="91.48" y2="25.694" width="0.6" layer="1"/>
 <contactref element="C1" pad="2"/>
-<wire x1="93.218" y1="25.694" x2="93.734" y2="25.694" width="0.6" layer="1"/>
-<wire x1="92.202" y1="25.4" x2="92.496" y2="25.694" width="0.6" layer="1"/>
-<wire x1="92.496" y1="25.694" x2="93.218" y2="25.694" width="0.6" layer="1"/>
+<wire x1="90.932" y1="25.4" x2="91.48" y2="25.694" width="0.6" layer="1"/>
+<wire x1="91.48" y1="25.694" x2="93.334" y2="25.694" width="0.6" layer="1"/>
 </signal>
 <signal name="RST">
 <contactref element="X2" pad="2"/>
@@ -619,7 +614,7 @@ design rules under a new name.</description>
 <wire x1="85.852" y1="25.4" x2="86.36" y2="25.908" width="0.6" layer="16"/>
 <via x="86.36" y="25.908" extent="1-16" drill="0.3"/>
 <wire x1="86.36" y1="25.908" x2="87.146" y2="26.694" width="0.6" layer="1"/>
-<wire x1="87.146" y1="26.694" x2="93.734" y2="26.694" width="0.6" layer="1"/>
+<wire x1="87.146" y1="26.694" x2="93.334" y2="26.694" width="0.6" layer="1"/>
 </signal>
 <signal name="CLK">
 <contactref element="X2" pad="3"/>
@@ -631,7 +626,7 @@ design rules under a new name.</description>
 <wire x1="16.002" y1="27.432" x2="86.36" y2="27.432" width="0.6" layer="16"/>
 <via x="86.36" y="27.432" extent="1-16" drill="0.3"/>
 <wire x1="86.36" y1="27.432" x2="86.622" y2="27.694" width="0.6" layer="1"/>
-<wire x1="86.622" y1="27.694" x2="93.734" y2="27.694" width="0.6" layer="1"/>
+<wire x1="86.622" y1="27.694" x2="93.334" y2="27.694" width="0.6" layer="1"/>
 </signal>
 <signal name="GND">
 <contactref element="X1" pad="C5"/>
@@ -640,7 +635,7 @@ design rules under a new name.</description>
 <wire x1="19.140390625" y1="33.782" x2="87.376" y2="33.782" width="0.6" layer="1"/>
 <wire x1="87.376" y1="33.782" x2="90.17110625" y2="30.98689375" width="0.6" layer="1"/>
 <wire x1="90.17110625" y1="30.98689375" x2="90.8782125" y2="30.694" width="0.6" layer="1" curve="45"/>
-<wire x1="90.8782125" y1="30.694" x2="93.734" y2="30.694" width="0.6" layer="1"/>
+<wire x1="90.8782125" y1="30.694" x2="93.334" y2="30.694" width="0.6" layer="1"/>
 <polygon width="0.6" layer="1">
 <vertex x="20.574" y="37.338"/>
 <vertex x="99.568" y="37.084"/>
@@ -702,13 +697,13 @@ design rules under a new name.</description>
 <wire x1="19.6802125" y1="30.734" x2="86.614" y2="30.734" width="0.6" layer="1"/>
 <wire x1="86.614" y1="30.734" x2="87.36110625" y2="29.98689375" width="0.6" layer="1"/>
 <wire x1="87.36110625" y1="29.98689375" x2="88.0682125" y2="29.694" width="0.6" layer="1" curve="45"/>
-<wire x1="88.0682125" y1="29.694" x2="93.734" y2="29.694" width="0.6" layer="1"/>
+<wire x1="88.0682125" y1="29.694" x2="93.334" y2="29.694" width="0.6" layer="1"/>
 </signal>
 <signal name="IO">
 <contactref element="X1" pad="C7"/>
 <contactref element="X2" pad="4"/>
 <wire x1="18.87" y1="28.6" x2="19.0969375" y2="28.694" width="0.6" layer="1" curve="-45"/>
-<wire x1="19.0969375" y1="28.694" x2="93.734" y2="28.694" width="0.6" layer="1"/>
+<wire x1="19.0969375" y1="28.694" x2="93.334" y2="28.694" width="0.6" layer="1"/>
 </signal>
 </signals>
 </board>
diff --git a/hardware/smartcard-fpc/smartcard-fpc.sch b/hardware/smartcard-fpc/smartcard-fpc.sch
index 7225d89..e94329b 100644
--- a/hardware/smartcard-fpc/smartcard-fpc.sch
+++ b/hardware/smartcard-fpc/smartcard-fpc.sch
@@ -269,6 +269,27 @@ used in Rebelsim FPC</description>
 <smd name="2" x="-1.5" y="0.5" dx="0.6" dy="2.5" layer="1"/>
 <smd name="1" x="-2.5" y="0.5" dx="0.6" dy="2.5" layer="1"/>
 </package>
+<package name="FPC_JUSHUO_AFA07-S06">
+<description>JUSUA-AFA07-S06FCC-00_C72727</description>
+<smd name="6" x="2.5" y="0.9" dx="0.6" dy="1.8" layer="1"/>
+<smd name="5" x="1.5" y="0.9" dx="0.6" dy="1.8" layer="1"/>
+<smd name="4" x="0.5" y="0.9" dx="0.6" dy="1.8" layer="1"/>
+<smd name="3" x="-0.5" y="0.9" dx="0.6" dy="1.8" layer="1"/>
+<smd name="2" x="-1.5" y="0.9" dx="0.6" dy="1.8" layer="1"/>
+<smd name="1" x="-2.5" y="0.9" dx="0.6" dy="1.8" layer="1"/>
+<smd name="M1" x="-4.85" y="-1.27" dx="2.6" dy="3" layer="1"/>
+<smd name="M2" x="4.85" y="-1.27" dx="2.6" dy="3" layer="1"/>
+<wire x1="6.5" y1="-4.3" x2="5.525" y2="-4.3" width="0.127" layer="21"/>
+<wire x1="5.525" y1="-4.3" x2="-5.525" y2="-4.3" width="0.127" layer="21"/>
+<wire x1="-5.525" y1="-4.3" x2="-6.5" y2="-4.3" width="0.127" layer="21"/>
+<wire x1="6.5" y1="-5.3" x2="-6.5" y2="-5.3" width="0.127" layer="21"/>
+<wire x1="-6.5" y1="-4.3" x2="-6.5" y2="-5.3" width="0.127" layer="21"/>
+<wire x1="6.5" y1="-4.3" x2="6.5" y2="-5.3" width="0.127" layer="21"/>
+<wire x1="-5.525" y1="0" x2="5.525" y2="0" width="0.127" layer="21"/>
+<wire x1="-5.525" y1="0" x2="-5.525" y2="-4.3" width="0.127" layer="21"/>
+<wire x1="5.525" y1="0" x2="5.525" y2="-4.3" width="0.127" layer="21"/>
+<text x="7.62" y="-5.08" size="1.27" layer="25" font="vector" ratio="14" rot="R90">&gt;NAME</text>
+</package>
 </packages>
 <symbols>
 <symbol name="REBELFPC_CON">
@@ -320,6 +341,19 @@ used in Rebelsim FPC</description>
 <technology name=""/>
 </technologies>
 </device>
+<device name="-JUSHUO-AFA07" package="FPC_JUSHUO_AFA07-S06">
+<connects>
+<connect gate="G$1" pin="!RST" pad="2"/>
+<connect gate="G$1" pin="CLK" pad="3"/>
+<connect gate="G$1" pin="GND" pad="6"/>
+<connect gate="G$1" pin="I/O" pad="4"/>
+<connect gate="G$1" pin="VCC" pad="1"/>
+<connect gate="G$1" pin="VPP" pad="5"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
 </devices>
 </deviceset>
 </devicesets>
@@ -842,7 +876,7 @@ High volt MLC; no solder stop between for higher isolation</description>
 <parts>
 <part name="X1" library="iso7816-card" deviceset="SMARTCARD" device=""/>
 <part name="FRAME1" library="frames" deviceset="DINA4_L" device=""/>
-<part name="X2" library="laforge" deviceset="FCI_FPC_REBEL_SFW6R-1" device=""/>
+<part name="X2" library="laforge" deviceset="FCI_FPC_REBEL_SFW6R-1" device="-JUSHUO-AFA07" value="FCI_FPC_REBEL_SFW6R-1-JUSHUO-AFA07"/>
 <part name="C1" library="rc-sysmocom" deviceset="CAP_CERAMIC" device="_0603"/>
 </parts>
 <sheets>