move to use of altusmetrum symbols and footprints

[hw/megadongle] / megadongle.sch

diff --git a/megadongle.sch b/megadongle.sch
index 5a3b74b363fe69c1f8d4192a35d16b961803270c..715e13b02f876e2d2aa993ad6bd43eaf4655f107 100644 (file)
--- a/megadongle.sch
+++ b/megadongle.sch
@@ -1,4 +1,4 @@
-v 20110115 2
+v 20121123 2
 C 40000 40000 0 0 0 EMBEDDEDtitle-D-bdale.sym
 [
 T 56500 41800 5 10 0 0 0 0 1
@@ -24,7 +24,7 @@ B 40000 40000 34000 22000 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
 T 68700 41900 9 30 1 0 0 0 1
 MegaDongle
 T 72400 40400 9 10 1 0 0 0 1
-0.2
+0.3
 T 70000 40400 9 10 1 0 0 0 1
 1
 T 70600 40400 9 10 1 0 0 0 1
@@ -37,342 +37,342 @@ T 13300 -8600 8 10 0 1 0 0 1
 vendor_part_number=MMA7260QT-ND
 T 13300 -8600 8 10 0 1 0 0 1
 vendor_part_number=MCP9700-E/TO-ND
-C 72200 46200 1 0 0 EMBEDDEDhole_plated.sym
+C 68300 46900 1 0 0 EMBEDDEDhole_plated.sym
 [
-V 72400 46400 200 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-T 72300 47900 5 10 0 0 0 0 1
+V 68500 47100 200 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+T 68400 48600 5 10 0 0 0 0 1
 device=HOLE_PLATED
-T 72300 47100 5 10 0 0 0 0 1
+T 68400 47800 5 10 0 0 0 0 1
 nobom=1
-T 72300 46700 8 10 0 1 0 0 1
+T 68400 47400 8 10 0 1 0 0 1
 refdes=H?
-T 72300 47700 5 10 0 0 0 0 1
+T 68400 48400 5 10 0 0 0 0 1
 description=hole, plated
-T 72300 47500 5 10 0 0 0 0 1
+T 68400 48200 5 10 0 0 0 0 1
 author=Kai-Martin Knaak
-T 72300 47300 5 10 0 0 0 0 1
+T 68400 48000 5 10 0 0 0 0 1
 license=GPL2
-T 72300 46700 8 10 0 1 0 0 1
+T 68400 47400 8 10 0 1 0 0 1
 refdes=hole_plated
-P 72800 46400 72600 46400 1 0 0
+P 68900 47100 68700 47100 1 0 0
 {
-T 72650 46450 5 10 0 1 0 0 1
+T 68750 47150 5 10 0 1 0 0 1
 pinseq=1
-T 72650 46450 5 10 1 1 0 0 1
+T 68750 47150 5 10 1 1 0 0 1
 pinnumber=1
-T 72600 46200 5 10 0 1 0 0 1
+T 68700 46900 5 10 0 1 0 0 1
 pintype=pas
 }
 ]
 {
-T 72300 48000 5 10 0 0 0 0 1
+T 68400 48700 5 10 0 0 0 0 1
 device=HOLE_PLATED
-T 71800 46400 5 10 1 1 0 0 1
+T 67900 47100 5 10 1 1 0 0 1
 refdes=H1
-T 72200 46200 5 10 0 0 0 0 1
+T 68300 46900 5 10 0 0 0 0 1
 footprint=hole-M2.5
-T 72200 46200 5 10 0 1 0 0 1
+T 68300 46900 5 10 0 1 0 0 1
 loadstatus=noload
 }
-T 71900 47000 9 10 1 0 0 0 2
+T 68000 47700 9 10 1 0 0 0 2
 mounting holes
 for 2-56 screws
-C 73300 44400 1 0 0 gnd.sym
-N 72800 45400 73400 45400 4
-N 72800 46400 73400 46400 4
-N 73400 44700 73400 46400 4
-C 72200 45200 1 0 0 EMBEDDEDhole_plated.sym
+C 69400 45100 1 0 0 gnd.sym
+N 68900 46100 69500 46100 4
+N 68900 47100 69500 47100 4
+N 69500 45400 69500 47100 4
+C 68300 45900 1 0 0 EMBEDDEDhole_plated.sym
 [
-V 72400 45400 200 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-T 72300 46900 5 10 0 0 0 0 1
+V 68500 46100 200 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+T 68400 47600 5 10 0 0 0 0 1
 device=HOLE_PLATED
-T 72300 46100 5 10 0 0 0 0 1
+T 68400 46800 5 10 0 0 0 0 1
 nobom=1
-T 72300 45700 8 10 0 1 0 0 1
+T 68400 46400 8 10 0 1 0 0 1
 refdes=H?
-T 72300 46700 5 10 0 0 0 0 1
+T 68400 47400 5 10 0 0 0 0 1
 description=hole, plated
-T 72300 46500 5 10 0 0 0 0 1
+T 68400 47200 5 10 0 0 0 0 1
 author=Kai-Martin Knaak
-T 72300 46300 5 10 0 0 0 0 1
+T 68400 47000 5 10 0 0 0 0 1
 license=GPL2
-T 72300 45700 8 10 0 1 0 0 1
+T 68400 46400 8 10 0 1 0 0 1
 refdes=hole_plated
-P 72800 45400 72600 45400 1 0 0
+P 68900 46100 68700 46100 1 0 0
 {
-T 72650 45450 5 10 0 1 0 0 1
+T 68750 46150 5 10 0 1 0 0 1
 pinseq=1
-T 72650 45450 5 10 1 1 0 0 1
+T 68750 46150 5 10 1 1 0 0 1
 pinnumber=1
-T 72600 45200 5 10 0 1 0 0 1
+T 68700 45900 5 10 0 1 0 0 1
 pintype=pas
 }
 ]
 {
-T 72300 47000 5 10 0 0 0 0 1
+T 68400 47700 5 10 0 0 0 0 1
 device=HOLE_PLATED
-T 71800 45400 5 10 1 1 0 0 1
+T 67900 46100 5 10 1 1 0 0 1
 refdes=H2
-T 72200 45200 5 10 0 0 0 0 1
+T 68300 45900 5 10 0 0 0 0 1
 footprint=hole-M2.5
-T 72200 45200 5 10 0 1 0 0 1
+T 68300 45900 5 10 0 1 0 0 1
 loadstatus=noload
 }
-C 66000 48000 1 0 0 gnd.sym
-N 64700 46300 66400 46300 4
+C 62100 48700 1 0 0 gnd.sym
+N 60800 47000 62500 47000 4
 {
-T 64700 46400 5 10 1 1 0 0 1
+T 60800 47100 5 10 1 1 0 0 1
 netname=cs_companion0
 }
-N 66400 47900 64700 47900 4
+N 62500 48600 60800 48600 4
 {
-T 64700 48000 5 10 1 1 0 0 1
-netname=c2
+T 60800 48700 5 10 1 1 0 0 1
+netname=sck2
 }
-N 64700 47500 66400 47500 4
+N 60800 48200 62500 48200 4
 {
-T 64700 47600 5 10 1 1 0 0 1
-netname=mo2
+T 60800 48300 5 10 1 1 0 0 1
+netname=mosi2
 }
-N 66400 47100 64700 47100 4
+N 62500 47800 60800 47800 4
 {
-T 64700 47200 5 10 1 1 0 0 1
-netname=mi2
+T 60800 47900 5 10 1 1 0 0 1
+netname=miso2
 }
-N 66400 45500 64700 45500 4
-N 66100 48300 66400 48300 4
-C 66400 45400 1 0 0 EMBEDDEDconn-8.sym
+N 62500 46200 60800 46200 4
+N 62200 49000 62500 49000 4
+C 62500 46100 1 0 0 EMBEDDEDconn-8.sym
 [
-P 66400 48300 66700 48300 1 0 0
+P 62500 49000 62800 49000 1 0 0
 {
-T 66400 48300 5 10 0 0 0 0 1
+T 62500 49000 5 10 0 0 0 0 1
 pintype=unknown
-T 66755 48295 5 10 0 1 0 0 1
+T 62855 48995 5 10 0 1 0 0 1
 pinlabel=unknown
-T 66605 48345 5 10 1 1 0 6 1
+T 62705 49045 5 10 1 1 0 6 1
 pinnumber=1
-T 66400 48300 5 10 0 0 0 0 1
+T 62500 49000 5 10 0 0 0 0 1
 pinseq=0
 }
-P 66400 47900 66700 47900 1 0 0
+P 62500 48600 62800 48600 1 0 0
 {
-T 66400 47900 5 10 0 0 0 0 1
+T 62500 48600 5 10 0 0 0 0 1
 pintype=unknown
-T 66755 47895 5 10 0 1 0 0 1
+T 62855 48595 5 10 0 1 0 0 1
 pinlabel=unknown
-T 66605 47945 5 10 1 1 0 6 1
+T 62705 48645 5 10 1 1 0 6 1
 pinnumber=2
-T 66400 47900 5 10 0 0 0 0 1
+T 62500 48600 5 10 0 0 0 0 1
 pinseq=0
 }
-P 66400 47500 66700 47500 1 0 0
+P 62500 48200 62800 48200 1 0 0
 {
-T 66400 47500 5 10 0 0 0 0 1
+T 62500 48200 5 10 0 0 0 0 1
 pintype=unknown
-T 66755 47495 5 10 0 1 0 0 1
+T 62855 48195 5 10 0 1 0 0 1
 pinlabel=unknown
-T 66605 47545 5 10 1 1 0 6 1
+T 62705 48245 5 10 1 1 0 6 1
 pinnumber=3
-T 66400 47500 5 10 0 0 0 0 1
+T 62500 48200 5 10 0 0 0 0 1
 pinseq=0
 }
-P 66400 47100 66700 47100 1 0 0
+P 62500 47800 62800 47800 1 0 0
 {
-T 66400 47100 5 10 0 0 0 0 1
+T 62500 47800 5 10 0 0 0 0 1
 pintype=unknown
-T 66755 47095 5 10 0 1 0 0 1
+T 62855 47795 5 10 0 1 0 0 1
 pinlabel=unknown
-T 66605 47145 5 10 1 1 0 6 1
+T 62705 47845 5 10 1 1 0 6 1
 pinnumber=4
-T 66400 47100 5 10 0 0 0 0 1
+T 62500 47800 5 10 0 0 0 0 1
 pinseq=0
 }
-P 66400 46700 66700 46700 1 0 0
+P 62500 47400 62800 47400 1 0 0
 {
-T 66400 46700 5 10 0 0 0 0 1
+T 62500 47400 5 10 0 0 0 0 1
 pintype=unknown
-T 66755 46695 5 10 0 1 0 0 1
+T 62855 47395 5 10 0 1 0 0 1
 pinlabel=unknown
-T 66605 46745 5 10 1 1 0 6 1
+T 62705 47445 5 10 1 1 0 6 1
 pinnumber=5
-T 66400 46700 5 10 0 0 0 0 1
+T 62500 47400 5 10 0 0 0 0 1
 pinseq=0
 }
-P 66400 46300 66700 46300 1 0 0
+P 62500 47000 62800 47000 1 0 0
 {
-T 66400 46300 5 10 0 0 0 0 1
+T 62500 47000 5 10 0 0 0 0 1
 pintype=unknown
-T 66755 46295 5 10 0 1 0 0 1
+T 62855 46995 5 10 0 1 0 0 1
 pinlabel=unknown
-T 66605 46345 5 10 1 1 0 6 1
+T 62705 47045 5 10 1 1 0 6 1
 pinnumber=6
-T 66400 46300 5 10 0 0 0 0 1
+T 62500 47000 5 10 0 0 0 0 1
 pinseq=0
 }
-P 66400 45900 66700 45900 1 0 0
+P 62500 46600 62800 46600 1 0 0
 {
-T 66400 45900 5 10 0 0 0 0 1
+T 62500 46600 5 10 0 0 0 0 1
 pintype=unknown
-T 66755 45895 5 10 0 1 0 0 1
+T 62855 46595 5 10 0 1 0 0 1
 pinlabel=unknown
-T 66605 45945 5 10 1 1 0 6 1
+T 62705 46645 5 10 1 1 0 6 1
 pinnumber=7
-T 66400 45900 5 10 0 0 0 0 1
+T 62500 46600 5 10 0 0 0 0 1
 pinseq=0
 }
-P 66400 45500 66700 45500 1 0 0
+P 62500 46200 62800 46200 1 0 0
 {
-T 66400 45500 5 10 0 0 0 0 1
+T 62500 46200 5 10 0 0 0 0 1
 pintype=unknown
-T 66755 45495 5 10 0 1 0 0 1
+T 62855 46195 5 10 0 1 0 0 1
 pinlabel=unknown
-T 66605 45545 5 10 1 1 0 6 1
+T 62705 46245 5 10 1 1 0 6 1
 pinnumber=8
-T 66400 45500 5 10 0 0 0 0 1
+T 62500 46200 5 10 0 0 0 0 1
 pinseq=0
 }
-B 66700 45400 400 3000 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-T 66755 48495 8 10 0 1 0 0 1
+B 62800 46100 400 3000 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+T 62855 49195 8 10 0 1 0 0 1
 refdes=J?
 ]
 {
-T 66755 48495 5 10 1 1 0 0 1
+T 62855 49195 5 10 1 1 0 0 1
 refdes=J9
-T 66400 45100 5 10 1 1 0 0 1
+T 62500 45800 5 10 1 1 0 0 1
 value=Companion
-T 66400 45400 5 10 0 0 0 0 1
+T 62500 46100 5 10 0 0 0 0 1
 footprint=0-215079-8
-T 66400 45400 5 10 0 0 0 0 1
+T 62500 46100 5 10 0 0 0 0 1
 vendor_part_number=571-215079-8
-T 66400 45400 5 10 0 0 0 0 1
+T 62500 46100 5 10 0 0 0 0 1
 loadstatus=throughhole
-T 66400 45400 5 10 0 1 0 0 1
+T 62500 46100 5 10 0 1 0 0 1
 device=CONNECTOR
-T 66400 45400 5 10 0 1 0 0 1
+T 62500 46100 5 10 0 1 0 0 1
 vendor=mouser
 }
-C 64900 43400 1 90 0 capacitor.sym
+C 61000 44100 1 90 0 capacitor.sym
 {
-T 64200 43600 5 10 0 0 90 0 1
+T 60300 44300 5 10 0 0 90 0 1
 device=CAPACITOR
-T 65100 44200 5 10 1 1 180 0 1
+T 61200 44900 5 10 1 1 180 0 1
 refdes=C1
-T 64000 43600 5 10 0 0 90 0 1
+T 60100 44300 5 10 0 0 90 0 1
 symversion=0.1
-T 64900 43395 5 10 0 1 90 0 1
+T 61000 44095 5 10 0 1 90 0 1
 footprint=0402
-T 64900 43500 5 10 1 1 0 0 1
+T 61000 44200 5 10 1 1 0 0 1
 value=1uF
-T 64900 43400 5 10 0 1 0 0 1
+T 61000 44100 5 10 0 1 0 0 1
 loadstatus=smt
-T 64900 43400 5 10 0 1 0 0 1
+T 61000 44100 5 10 0 1 0 0 1
 vendor=digikey
-T 64900 43400 5 10 0 1 0 0 1
+T 61000 44100 5 10 0 1 0 0 1
 vendor_part_number=490-1320-1-ND
 }
-C 68100 43400 1 90 0 capacitor.sym
+C 64700 44100 1 90 0 capacitor.sym
 {
-T 67400 43600 5 10 0 0 90 0 1
+T 64000 44300 5 10 0 0 90 0 1
 device=CAPACITOR
-T 68300 44200 5 10 1 1 180 0 1
+T 64900 44900 5 10 1 1 180 0 1
 refdes=C2
-T 67200 43600 5 10 0 0 90 0 1
+T 63800 44300 5 10 0 0 90 0 1
 symversion=0.1
-T 68100 43395 5 10 0 1 90 0 1
+T 64700 44095 5 10 0 1 90 0 1
 footprint=0402
-T 68000 43500 5 10 1 1 0 0 1
+T 64600 44200 5 10 1 1 0 0 1
 value=1uF
-T 68100 43400 5 10 0 1 0 0 1
+T 64700 44100 5 10 0 1 0 0 1
 loadstatus=smt
-T 68100 43400 5 10 0 1 0 0 1
+T 64700 44100 5 10 0 1 0 0 1
 vendor=digikey
-T 68100 43400 5 10 0 1 0 0 1
+T 64700 44100 5 10 0 1 0 0 1
 vendor_part_number=490-1320-1-ND
 }
-C 66400 43100 1 0 0 gnd.sym
-N 64700 43400 70300 43400 4
-N 63500 44300 65400 44300 4
+C 62500 43400 1 0 0 gnd.sym
+N 60800 43700 66900 43700 4
+N 59600 45000 61500 45000 4
 {
-T 63500 44400 5 10 1 1 0 0 1
+T 59600 45100 5 10 1 1 0 0 1
 netname=v_usb
 }
-N 65400 43900 65400 44300 4
-N 67500 44300 70300 44300 4
-C 67700 44500 1 0 0 3.3V-plus.sym
-N 64700 44300 64700 45500 4
-N 67900 44500 67900 44300 4
-C 68900 43400 1 90 0 capacitor.sym
+N 61500 44600 61500 45000 4
+N 63600 45000 66900 45000 4
+C 64300 45200 1 0 0 3.3V-plus.sym
+N 60800 45000 60800 46200 4
+N 64500 45200 64500 45000 4
+C 65500 44100 1 90 0 capacitor.sym
 {
-T 68200 43600 5 10 0 0 90 0 1
+T 64800 44300 5 10 0 0 90 0 1
 device=CAPACITOR
-T 69100 44200 5 10 1 1 180 0 1
+T 65700 44900 5 10 1 1 180 0 1
 refdes=C3
-T 68000 43600 5 10 0 0 90 0 1
+T 64600 44300 5 10 0 0 90 0 1
 symversion=0.1
-T 68800 43500 5 10 1 1 0 0 1
+T 65400 44200 5 10 1 1 0 0 1
 value=0.1uF
-T 68900 43400 5 10 0 1 0 0 1
+T 65500 44100 5 10 0 1 0 0 1
 footprint=0402
-T 68900 43400 5 10 0 1 0 0 1
+T 65500 44100 5 10 0 1 0 0 1
 loadstatus=smt
-T 68900 43400 5 10 0 1 0 0 1
+T 65500 44100 5 10 0 1 0 0 1
 vendor=digikey
-T 68900 43400 5 10 0 1 0 0 1
+T 65500 44100 5 10 0 1 0 0 1
 vendor_part_number=399-3027-1-ND
 }
-C 69700 43400 1 90 0 capacitor.sym
+C 66300 44100 1 90 0 capacitor.sym
 {
-T 69000 43600 5 10 0 0 90 0 1
+T 65600 44300 5 10 0 0 90 0 1
 device=CAPACITOR
-T 69900 44200 5 10 1 1 180 0 1
+T 66500 44900 5 10 1 1 180 0 1
 refdes=C4
-T 68800 43600 5 10 0 0 90 0 1
+T 65400 44300 5 10 0 0 90 0 1
 symversion=0.1
-T 69600 43500 5 10 1 1 0 0 1
+T 66200 44200 5 10 1 1 0 0 1
 value=0.1uF
-T 69700 43400 5 10 0 1 0 0 1
+T 66300 44100 5 10 0 1 0 0 1
 footprint=0402
-T 69700 43400 5 10 0 1 0 0 1
+T 66300 44100 5 10 0 1 0 0 1
 loadstatus=smt
-T 69700 43400 5 10 0 1 0 0 1
+T 66300 44100 5 10 0 1 0 0 1
 vendor=digikey
-T 69700 43400 5 10 0 1 0 0 1
+T 66300 44100 5 10 0 1 0 0 1
 vendor_part_number=399-3027-1-ND
 }
-C 65400 43400 1 0 0 TC2185.sym
+C 61500 44100 1 0 0 TC2185.sym
 {
-T 65695 44595 5 10 1 1 0 0 1
+T 61795 45295 5 10 1 1 0 0 1
 refdes=U1
-T 65995 44095 5 10 0 1 0 0 1
+T 62095 44795 5 10 0 1 0 0 1
 device=IC
-T 65395 43395 5 10 0 1 0 0 1
+T 61495 44095 5 10 0 1 0 0 1
 footprint=SOT23-5
-T 66300 44600 5 10 1 1 0 0 1
+T 62400 45300 5 10 1 1 0 0 1
 value=TC2185-3.3
-T 65400 43400 5 10 0 1 0 0 1
+T 61500 44100 5 10 0 1 0 0 1
 vendor=digikey
-T 65400 43400 5 10 0 1 0 0 1
+T 61500 44100 5 10 0 1 0 0 1
 vendor_part_number=TC2185-3.3VCCT-ND
-T 65400 43400 5 10 0 1 0 0 1
+T 61500 44100 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 70500 43400 1 90 0 capacitor.sym
+C 67100 44100 1 90 0 capacitor.sym
 {
-T 69800 43600 5 10 0 0 90 0 1
+T 66400 44300 5 10 0 0 90 0 1
 device=CAPACITOR
-T 70700 44200 5 10 1 1 180 0 1
+T 67300 44900 5 10 1 1 180 0 1
 refdes=C5
-T 69600 43600 5 10 0 0 90 0 1
+T 66200 44300 5 10 0 0 90 0 1
 symversion=0.1
-T 70400 43500 5 10 1 1 0 0 1
+T 67000 44200 5 10 1 1 0 0 1
 value=0.1uF
-T 70500 43400 5 10 0 1 0 0 1
+T 67100 44100 5 10 0 1 0 0 1
 footprint=0402
-T 70500 43400 5 10 0 1 0 0 1
+T 67100 44100 5 10 0 1 0 0 1
 loadstatus=smt
-T 70500 43400 5 10 0 1 0 0 1
+T 67100 44100 5 10 0 1 0 0 1
 vendor=digikey
-T 70500 43400 5 10 0 1 0 0 1
+T 67100 44100 5 10 0 1 0 0 1
 vendor_part_number=399-3027-1-ND
 }
 T 13300 -8600 8 10 0 1 0 0 1
@@ -383,84 +383,84 @@ T 13300 -8600 8 10 0 1 0 0 1
 vendor_part_number=MMA7260QT-ND
 T 13300 -8600 8 10 0 1 0 0 1
 vendor_part_number=MCP9700-E/TO-ND
-C 57700 54200 1 90 1 resistor.sym
+C 44200 53800 1 90 1 resistor.sym
 {
-T 57300 53900 5 10 0 0 270 2 1
+T 43800 53500 5 10 0 0 270 2 1
 device=RESISTOR
-T 58100 53800 5 10 1 1 0 6 1
+T 44600 53400 5 10 1 1 0 6 1
 refdes=R13
-T 58100 53500 5 10 1 1 0 6 1
+T 44600 53100 5 10 1 1 0 6 1
 value=270
-T 57700 54200 5 10 0 0 0 6 1
+T 44200 53800 5 10 0 0 0 6 1
 footprint=0402
-T 57700 54200 5 10 0 0 0 6 1
-vendor_part_number=541-270LCT-ND
-T 57700 54200 5 10 0 0 0 6 1
+T 44200 53800 5 10 0 0 0 6 1
+vendor_part_number=P270LCT-ND
+T 44200 53800 5 10 0 0 0 6 1
 vendor=digikey
-T 57700 54200 5 10 0 1 0 6 1
+T 44200 53800 5 10 0 1 0 6 1
 loadstatus=smt
 }
-C 57700 52600 1 0 1 gnd.sym
-N 55400 54600 57600 54600 4
+C 44200 52200 1 0 1 gnd.sym
+N 45900 54200 44100 54200 4
 {
-T 56600 54700 5 10 1 1 0 6 1
+T 45200 54300 5 10 1 1 0 6 1
 netname=led_red
 }
-C 57700 53300 1 90 1 led.sym
+C 44200 52900 1 90 1 led.sym
 {
-T 58000 53150 5 10 1 1 0 6 1
+T 44500 52750 5 10 1 1 0 6 1
 refdes=D2
-T 57100 53400 5 10 0 0 270 2 1
+T 43600 53000 5 10 0 0 270 2 1
 device=LED
-T 57700 53350 5 10 0 1 270 2 1
+T 44200 52950 5 10 0 1 270 2 1
 footprint=0603diode
-T 57700 53300 5 10 0 0 0 6 1
+T 44200 52900 5 10 0 0 0 6 1
 vendor_part_number=160-1433-1-ND
-T 58000 52900 5 10 1 1 0 6 1
+T 44500 52500 5 10 1 1 0 6 1
 value=red
-T 57700 53300 5 10 0 0 0 6 1
+T 44200 52900 5 10 0 0 0 6 1
 vendor=digikey
-T 57700 53300 5 10 0 1 0 6 1
+T 44200 52900 5 10 0 1 0 6 1
 loadstatus=smt
 }
-C 56700 54200 1 90 1 resistor.sym
+C 44300 43400 1 270 1 resistor.sym
 {
-T 56300 53900 5 10 0 0 270 2 1
+T 44700 43700 5 10 0 0 90 2 1
 device=RESISTOR
-T 57100 53900 5 10 1 1 0 6 1
+T 43900 43700 5 10 1 1 180 6 1
 refdes=R12
-T 57100 53600 5 10 1 1 0 6 1
+T 43900 44000 5 10 1 1 180 6 1
 value=270
-T 56700 54200 5 10 0 0 0 6 1
+T 44300 43400 5 10 0 0 180 6 1
 footprint=0402
-T 56700 54200 5 10 0 0 0 6 1
-vendor_part_number=541-270LCT-ND
-T 56700 54200 5 10 0 0 0 6 1
+T 44300 43400 5 10 0 0 180 6 1
+vendor_part_number=P270LCT-ND
+T 44300 43400 5 10 0 0 180 6 1
 vendor=digikey
-T 56700 54200 5 10 0 1 0 6 1
+T 44300 43400 5 10 0 1 180 6 1
 loadstatus=smt
 }
-C 56700 52600 1 0 1 gnd.sym
-C 56700 53300 1 90 1 led.sym
+C 44300 45000 1 180 1 gnd.sym
+C 44300 44300 1 270 1 led.sym
 {
-T 57100 53150 5 10 1 1 0 6 1
+T 43900 44450 5 10 1 1 180 6 1
 refdes=D1
-T 56100 53400 5 10 0 0 270 2 1
+T 44900 44200 5 10 0 0 90 2 1
 device=LED
-T 56700 53350 5 10 0 1 270 2 1
+T 44300 44250 5 10 0 1 90 2 1
 footprint=0603diode
-T 56700 53300 5 10 0 0 0 6 1
+T 44300 44300 5 10 0 0 180 6 1
 vendor_part_number=160-1435-1-ND
-T 57200 52900 5 10 1 1 0 6 1
+T 43800 44700 5 10 1 1 180 6 1
 value=green
-T 56700 53300 5 10 0 0 0 6 1
+T 44300 44300 5 10 0 0 180 6 1
 vendor=digikey
-T 56700 53300 5 10 0 1 0 6 1
+T 44300 44300 5 10 0 1 180 6 1
 loadstatus=smt
 }
-N 55400 54200 56600 54200 4
+N 45900 43400 44400 43400 4
 {
-T 56600 54300 5 10 1 1 0 6 1
+T 45400 43500 5 10 1 1 0 6 1
 netname=led_green
 }
 C 72200 52600 1 0 0 conn-2.sym
@@ -569,13 +569,13 @@ device=IC
 T 61100 53700 5 10 0 1 0 0 1
 footprint=TI-QFN32
 T 61100 54300 5 10 0 1 0 0 1
-value=CC1120
+value=CC1125
 T 61100 53700 5 10 0 1 0 0 1
 loadstatus=smt
 T 61100 53700 5 10 0 1 0 0 1
 vendor=digikey
 T 61100 53700 5 10 0 1 0 0 1
-vendor_part_number=296-29559-1-ND
+vendor_part_number=CC1125RHMT-ND
 }
 C 64600 53600 1 0 0 gnd.sym
 C 65300 52900 1 90 0 inductor.sym
@@ -612,7 +612,7 @@ loadstatus=smt
 T 65300 51800 5 10 0 1 0 0 1
 vendor=digikey
 T 65300 51800 5 10 0 1 0 0 1
-vendor_part_number=311-18JRCT-ND
+vendor_part_number=P18.0LCT-ND
 }
 C 66600 51800 1 90 0 capacitor.sym
 {
@@ -1114,29 +1114,29 @@ N 66800 59100 67000 59100 4
 N 64800 57500 64800 58300 4
 N 64800 58300 64800 60600 4
 C 64600 60600 1 0 0 3.3V-plus.sym
-N 61100 57900 60100 57900 4
+N 61100 57900 59800 57900 4
 {
-T 60100 58000 5 10 1 1 0 0 1
-netname=mo2
+T 59800 58000 5 10 1 1 0 0 1
+netname=mosi2
 }
-N 61100 57500 60100 57500 4
+N 61100 57500 59800 57500 4
 {
-T 60100 57600 5 10 1 1 0 0 1
-netname=c2
+T 59800 57600 5 10 1 1 0 0 1
+netname=sck2
 }
-N 61100 57100 60100 57100 4
+N 61100 57100 59800 57100 4
 {
-T 60100 57200 5 10 1 1 0 0 1
-netname=mi2
+T 59800 57200 5 10 1 1 0 0 1
+netname=miso2
 }
-N 61100 56300 60100 56300 4
+N 61100 56300 59800 56300 4
 {
-T 60100 56400 5 10 1 1 0 0 1
+T 59800 56400 5 10 1 1 0 0 1
 netname=cs_radio
 }
-N 61100 59900 60100 59900 4
+N 61100 59900 59800 59900 4
 {
-T 60100 60000 5 10 1 1 0 0 1
+T 59800 60000 5 10 1 1 0 0 1
 netname=reset_n
 }
 C 68200 57100 1 0 0 capacitor.sym
@@ -1171,76 +1171,76 @@ footprint=0402
 T 61000 53200 5 10 0 1 90 0 1
 vendor=digikey
 T 61000 53200 5 10 0 1 90 0 1
-vendor_part_number=RHM56.0KLCT-ND
+vendor_part_number=P56.0KLCT-ND
 T 61000 53200 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 59900 57400 1 90 0 capacitor.sym
+C 59500 57400 1 90 0 capacitor.sym
 {
-T 59200 57600 5 10 0 0 90 0 1
+T 58800 57600 5 10 0 0 90 0 1
 device=CAPACITOR
-T 59600 58200 5 10 1 1 180 0 1
+T 59200 58200 5 10 1 1 180 0 1
 refdes=C42
-T 59000 57600 5 10 0 0 90 0 1
+T 58600 57600 5 10 0 0 90 0 1
 symversion=0.1
-T 59900 57400 5 10 0 0 90 0 1
+T 59500 57400 5 10 0 0 90 0 1
 footprint=0402
-T 59700 57700 5 10 1 1 180 0 1
+T 59300 57700 5 10 1 1 180 0 1
 value=0.22uF
-T 59900 57400 5 10 0 1 90 0 1
+T 59500 57400 5 10 0 1 90 0 1
 vendor=digikey
-T 59900 57400 5 10 0 1 90 0 1
+T 59500 57400 5 10 0 1 90 0 1
 vendor_part_number=587-1228-1-ND
-T 59900 57400 5 10 0 1 0 0 1
+T 59500 57400 5 10 0 1 0 0 1
 loadstatus=smt
 }
 C 60800 52900 1 0 0 gnd.sym
-N 61100 58300 59700 58300 4
-C 59600 57100 1 0 0 gnd.sym
-C 59300 60300 1 0 0 3.3V-plus.sym
-N 61100 60300 59500 60300 4
-N 61100 58700 59000 58700 4
-C 59700 59400 1 90 0 capacitor.sym
-{
-T 59000 59600 5 10 0 0 90 0 1
+N 61100 58300 59300 58300 4
+C 59200 57100 1 0 0 gnd.sym
+C 58900 60300 1 0 0 3.3V-plus.sym
+N 61100 60300 59100 60300 4
+N 61100 58700 58600 58700 4
+C 59300 59400 1 90 0 capacitor.sym
+{
+T 58600 59600 5 10 0 0 90 0 1
 device=CAPACITOR
-T 59300 60200 5 10 1 1 180 0 1
+T 58900 60200 5 10 1 1 180 0 1
 refdes=C43
-T 58800 59600 5 10 0 0 90 0 1
+T 58400 59600 5 10 0 0 90 0 1
 symversion=0.1
-T 59700 59400 5 10 0 0 90 0 1
+T 59300 59400 5 10 0 0 90 0 1
 footprint=0402
-T 59400 59600 5 10 1 1 180 0 1
+T 59000 59600 5 10 1 1 180 0 1
 value=47nF
-T 59700 59400 5 10 0 1 0 0 1
+T 59300 59400 5 10 0 1 0 0 1
 loadstatus=smt
-T 59700 59400 5 10 0 1 0 0 1
+T 59300 59400 5 10 0 1 0 0 1
 vendor=digikey
-T 59700 59400 5 10 0 1 0 0 1
+T 59300 59400 5 10 0 1 0 0 1
 vendor_part_number=490-5412-1-ND
 }
-C 59400 59100 1 0 0 gnd.sym
-C 58800 58700 1 0 0 3.3V-plus.sym
-C 59200 57800 1 90 0 capacitor.sym
+C 59000 59100 1 0 0 gnd.sym
+C 58400 58700 1 0 0 3.3V-plus.sym
+C 58800 57800 1 90 0 capacitor.sym
 {
-T 58500 58000 5 10 0 0 90 0 1
+T 58100 58000 5 10 0 0 90 0 1
 device=CAPACITOR
-T 58800 58600 5 10 1 1 180 0 1
+T 58400 58600 5 10 1 1 180 0 1
 refdes=C44
-T 58300 58000 5 10 0 0 90 0 1
+T 57900 58000 5 10 0 0 90 0 1
 symversion=0.1
-T 59200 57800 5 10 0 0 90 0 1
+T 58800 57800 5 10 0 0 90 0 1
 footprint=0402
-T 58900 58000 5 10 1 1 180 0 1
+T 58500 58000 5 10 1 1 180 0 1
 value=47nF
-T 59200 57800 5 10 0 1 0 0 1
+T 58800 57800 5 10 0 1 0 0 1
 loadstatus=smt
-T 59200 57800 5 10 0 1 0 0 1
+T 58800 57800 5 10 0 1 0 0 1
 vendor=digikey
-T 59200 57800 5 10 0 1 0 0 1
+T 58800 57800 5 10 0 1 0 0 1
 vendor_part_number=490-5412-1-ND
 }
-C 58900 57500 1 0 0 gnd.sym
+C 58500 57500 1 0 0 gnd.sym
 C 60100 54700 1 0 0 3.3V-plus.sym
 C 60500 53800 1 90 0 capacitor.sym
 {
@@ -1291,9 +1291,9 @@ N 61100 55500 59600 55500 4
 C 65000 60000 1 0 0 gnd.sym
 N 64700 60300 65100 60300 4
 N 60800 55900 60800 55500 4
-N 61100 59100 60100 59100 4
+N 61100 59100 59800 59100 4
 {
-T 60100 59200 5 10 1 1 0 0 1
+T 59800 59200 5 10 1 1 0 0 1
 netname=radio_int
 }
 N 42800 50600 42000 50600 4
@@ -1310,26 +1310,9 @@ T -36000 -59700 8 10 0 1 0 0 1
 vendor_part_number=MMA7260QT-ND
 T -36000 -59700 8 10 0 1 0 0 1
 vendor_part_number=MCP9700-E/TO-ND
-C 45900 40600 1 0 0 STM32L151-48.sym
-{
-T 39500 39000 5 10 0 0 0 0 1
-device=IC
-T 46300 60700 5 10 1 1 0 0 1
-refdes=U2
-T 45900 40600 5 10 0 0 0 0 1
-vendor=digikey
-T 45900 40600 5 10 0 1 0 0 1
-value=STM32L151
-T 45900 40600 5 10 0 0 0 0 1
-vendor_part_number=497-11190-ND
-T 45900 40600 5 10 0 1 0 0 1
-loadstatus=smt
-T 45900 40600 5 10 0 1 0 0 1
-footprint=lqfp48
-}
 C 49300 61500 1 0 0 3.3V-plus.sym
 N 49500 61000 49500 61500 4
-N 49500 61000 50300 61000 4
+N 49500 61000 51500 61000 4
 C 50600 40100 1 0 0 gnd.sym
 N 49700 40600 49700 40500 4
 N 49700 40500 51700 40500 4
@@ -1426,7 +1409,7 @@ value=10k
 T 44500 47500 5 10 0 0 90 0 1
 footprint=0402
 T 44500 47500 5 10 0 0 90 0 1
-vendor_part_number=RMCF1/16S10K1%RCT-ND
+vendor_part_number=P10.0KLCT-ND
 T 44500 47500 5 10 0 0 90 0 1
 vendor=digikey
 T 44500 47500 5 10 0 1 90 0 1
@@ -1451,7 +1434,7 @@ value=10k
 T 44500 56700 5 10 0 0 90 0 1
 footprint=0402
 T 44500 56700 5 10 0 0 90 0 1
-vendor_part_number=RMCF1/16S10K1%RCT-ND
+vendor_part_number=P10.0KLCT-ND
 T 44500 56700 5 10 0 0 90 0 1
 vendor=digikey
 T 44500 56700 5 10 0 1 90 0 1
@@ -1473,21 +1456,6 @@ N 45900 49000 44600 49000 4
 T 44600 49100 5 10 1 1 0 0 1
 netname=swclk
 }
-N 45900 42200 44600 42200 4
-{
-T 44900 42300 5 10 1 1 0 6 1
-netname=mo2
-}
-N 45900 43000 44600 43000 4
-{
-T 44800 43100 5 10 1 1 0 6 1
-netname=c2
-}
-N 45900 42600 44600 42600 4
-{
-T 44900 42700 5 10 1 1 0 6 1
-netname=mi2
-}
 C 52100 61300 1 0 0 capacitor.sym
 {
 T 52300 62000 5 10 0 0 0 0 1
@@ -1552,7 +1520,7 @@ T 51000 61600 5 10 1 1 0 0 1
 netname=vdda
 }
 N 51900 61500 51900 61000 4
-N 51500 61000 52100 61000 4
+N 51900 61000 52100 61000 4
 C 53200 60700 1 0 0 gnd.sym
 N 53300 61500 53300 61000 4
 N 53300 61000 53000 61000 4
@@ -1577,8 +1545,8 @@ T 44100 54900 5 10 0 1 0 0 1
 vendor_part_number=399-3027-1-ND
 }
 C 43800 54600 1 0 0 gnd.sym
-C 65900 45900 1 0 0 3.3V-plus.sym
-N 66100 45900 66400 45900 4
+C 62000 46600 1 0 0 3.3V-plus.sym
+N 62200 46600 62500 46600 4
 N 55400 55000 56700 55000 4
 {
 T 55900 55100 5 10 1 1 0 0 1
@@ -1617,7 +1585,7 @@ loadstatus=smt
 T 43100 50100 5 10 0 1 0 0 1
 vendor=digikey
 T 43100 50100 5 10 0 1 0 0 1
-vendor_part_number=RHM22.0LCT-ND
+vendor_part_number=P22.0LCT-ND
 }
 C 43100 49700 1 0 0 resistor.sym
 {
@@ -1634,49 +1602,49 @@ loadstatus=smt
 T 43100 49700 5 10 0 1 0 0 1
 vendor=digikey
 T 43100 49700 5 10 0 1 0 0 1
-vendor_part_number=RHM22.0LCT-ND
+vendor_part_number=P22.0LCT-ND
 }
 N 42000 50200 43100 50200 4
 N 43100 49800 42000 49800 4
-N 57600 54200 57600 54600 4
+N 44100 53800 44100 54200 4
 N 69000 53800 69400 53800 4
-C 69700 46200 1 0 0 conn-4.sym
+C 65800 46900 1 0 0 conn-4.sym
 {
-T 70000 47800 5 10 1 1 0 0 1
+T 66100 48500 5 10 1 1 0 0 1
 refdes=J1
-T 69900 46000 5 10 1 1 0 0 1
+T 66000 46700 5 10 1 1 0 0 1
 value=Debug
-T 69700 46200 5 10 0 0 0 0 1
+T 65800 46900 5 10 0 0 0 0 1
 footprint=0-215079-4
-T 69700 46200 5 10 0 0 0 0 1
+T 65800 46900 5 10 0 0 0 0 1
 vendor_part_number=A99472CT-ND
-T 69700 46200 5 10 0 0 0 0 1
+T 65800 46900 5 10 0 0 0 0 1
 vendor=digikey
-T 69700 46200 5 10 0 0 0 0 1
+T 65800 46900 5 10 0 0 0 0 1
 loadstatus=throughhole
-T 69700 46200 5 10 0 0 0 0 1
+T 65800 46900 5 10 0 0 0 0 1
 device=CONNECTOR
 }
-C 69300 47200 1 0 0 gnd.sym
-N 69400 47500 69700 47500 4
-N 69700 47100 68400 47100 4
+C 65400 47900 1 0 0 gnd.sym
+N 65500 48200 65800 48200 4
+N 65800 47800 64500 47800 4
 {
-T 68400 47200 5 10 1 1 0 0 1
+T 64500 47900 5 10 1 1 0 0 1
 netname=reset_n
 }
-N 69700 46700 68400 46700 4
+N 65800 47400 64500 47400 4
 {
-T 68400 46800 5 10 1 1 0 0 1
+T 64500 47500 5 10 1 1 0 0 1
 netname=swdio
 }
-N 69700 46300 68400 46300 4
+N 65800 47000 64500 47000 4
 {
-T 68400 46400 5 10 1 1 0 0 1
+T 64500 47100 5 10 1 1 0 0 1
 netname=swclk
 }
-N 64700 46700 66400 46700 4
+N 60800 47400 62500 47400 4
 {
-T 64700 46800 5 10 1 1 0 0 1
+T 60800 47500 5 10 1 1 0 0 1
 netname=cs_companion1
 }
 N 45900 54600 44600 54600 4
@@ -1694,3 +1662,186 @@ N 45900 50600 44600 50600 4
 T 44600 50700 5 10 1 1 0 0 1
 netname=cs_companion1
 }
+C 45900 40600 1 0 0 STM32L151-64.sym
+{
+T 39500 39000 5 10 0 0 0 0 1
+device=IC
+T 46300 60700 5 10 1 1 0 0 1
+refdes=U7
+T 45900 40600 5 10 0 1 0 0 1
+footprint=lqfp64
+T 45900 40600 5 10 1 1 0 0 1
+value=STM32L151
+T 45900 40600 5 10 0 1 0 0 1
+loadstatus=smt
+T 45900 40600 5 10 0 1 0 0 1
+vendor=digikey
+T 45900 40600 5 10 0 1 0 0 1
+vendor_part_number=497-11482-ND
+}
+N 50900 40600 50900 40500 4
+N 62600 43700 62600 44100 4
+N 60800 44100 60800 43700 4
+N 64500 44100 64500 43700 4
+N 65300 43700 65300 44100 4
+N 66100 44100 66100 43700 4
+N 66900 43700 66900 44100 4
+C 63800 43700 1 90 0 capacitor.sym
+{
+T 63100 43900 5 10 0 0 90 0 1
+device=CAPACITOR
+T 64000 44500 5 10 1 1 180 0 1
+refdes=C6
+T 62900 43900 5 10 0 0 90 0 1
+symversion=0.1
+T 63800 43695 5 10 0 1 90 0 1
+footprint=0402
+T 63700 43800 5 10 1 1 0 0 1
+value=0.001uF
+T 63800 43700 5 10 0 1 0 0 1
+loadstatus=smt
+T 63800 43700 5 10 0 1 0 0 1
+vendor=digikey
+T 63800 43700 5 10 0 1 0 0 1
+vendor_part_number=311-1036-1-ND
+}
+N 43500 42200 42900 42200 4
+{
+T 43400 42300 5 10 1 1 0 6 1
+netname=mosi2
+}
+N 42200 43000 41700 43000 4
+{
+T 42100 43100 5 10 1 1 0 6 1
+netname=sck2
+}
+N 41000 42600 40500 42600 4
+{
+T 41000 42700 5 10 1 1 0 6 1
+netname=miso2
+}
+C 43100 43400 1 0 1 capacitor.sym
+{
+T 42900 44100 5 10 0 0 0 6 1
+device=CAPACITOR
+T 42500 43800 5 10 1 1 180 2 1
+refdes=C403
+T 42900 44300 5 10 0 0 0 6 1
+symversion=0.1
+T 42800 43900 5 10 1 1 0 2 1
+value=47pF
+T 43100 43400 5 10 0 1 0 0 1
+footprint=0402
+T 43100 43400 5 10 0 1 0 0 1
+loadstatus=smt
+T 43100 43400 5 10 0 1 0 0 1
+vendor=digikey
+T 43100 43400 5 10 0 1 0 0 1
+vendor_part_number=399-1019-1-ND
+}
+C 42200 42900 1 0 0 resistor.sym
+{
+T 42500 43300 5 10 0 0 0 0 1
+device=RESISTOR
+T 42300 43200 5 10 1 1 0 0 1
+refdes=R203
+T 42800 43200 5 10 1 1 0 0 1
+value=330
+T 42200 42900 5 10 0 1 0 0 1
+footprint=0402
+T 42200 42900 5 10 0 1 0 0 1
+loadstatus=smt
+T 42200 42900 5 10 0 1 0 0 1
+vendor=digikey
+T 42200 42900 5 10 0 1 0 0 1
+vendor_part_number=P330LCT-ND
+}
+C 43400 43500 1 90 0 gnd.sym
+N 43100 43000 45900 43000 4
+C 43700 41300 1 90 0 capacitor.sym
+{
+T 43000 41500 5 10 0 0 90 0 1
+device=CAPACITOR
+T 43300 42000 5 10 1 1 180 0 1
+refdes=C405
+T 42800 41500 5 10 0 0 90 0 1
+symversion=0.1
+T 43000 41500 5 10 1 1 0 0 1
+value=47pF
+T 43700 41300 5 10 0 1 0 0 1
+footprint=0402
+T 43700 41300 5 10 0 1 0 0 1
+loadstatus=smt
+T 43700 41300 5 10 0 1 0 0 1
+vendor=digikey
+T 43700 41300 5 10 0 1 0 0 1
+vendor_part_number=399-1019-1-ND
+}
+C 43500 42100 1 0 0 resistor.sym
+{
+T 43800 42500 5 10 0 0 0 0 1
+device=RESISTOR
+T 43600 42400 5 10 1 1 0 0 1
+refdes=R205
+T 44100 42400 5 10 1 1 0 0 1
+value=330
+T 43500 42100 5 10 0 1 0 0 1
+footprint=0402
+T 43500 42100 5 10 0 1 0 0 1
+loadstatus=smt
+T 43500 42100 5 10 0 1 0 0 1
+vendor=digikey
+T 43500 42100 5 10 0 1 0 0 1
+vendor_part_number=P330LCT-ND
+}
+C 43400 41000 1 0 0 gnd.sym
+C 41700 41700 1 270 1 capacitor.sym
+{
+T 42400 41900 5 10 0 0 90 2 1
+device=CAPACITOR
+T 42100 42400 5 10 1 1 180 6 1
+refdes=C404
+T 42600 41900 5 10 0 0 90 2 1
+symversion=0.1
+T 42400 41900 5 10 1 1 0 6 1
+value=47pF
+T 41700 41700 5 10 0 1 0 0 1
+footprint=0402
+T 41700 41700 5 10 0 1 0 0 1
+loadstatus=smt
+T 41700 41700 5 10 0 1 0 0 1
+vendor=digikey
+T 41700 41700 5 10 0 1 0 0 1
+vendor_part_number=399-1019-1-ND
+}
+C 41900 42500 1 0 1 resistor.sym
+{
+T 41600 42900 5 10 0 0 0 6 1
+device=RESISTOR
+T 41300 42300 5 10 1 1 0 6 1
+refdes=R204
+T 41800 42300 5 10 1 1 0 6 1
+value=330
+T 41900 42500 5 10 0 1 0 0 1
+footprint=0402
+T 41900 42500 5 10 0 1 0 0 1
+loadstatus=smt
+T 41900 42500 5 10 0 1 0 0 1
+vendor=digikey
+T 41900 42500 5 10 0 1 0 0 1
+vendor_part_number=P330LCT-ND
+}
+C 42000 41400 1 0 1 gnd.sym
+N 42200 43600 42200 43000 4
+N 41900 42600 45900 42600 4
+N 44400 42200 45900 42200 4
+N 55400 60200 56700 60200 4
+{
+T 55600 60300 5 10 1 1 0 0 1
+netname=radio_marc_isr
+}
+N 59800 59500 61100 59500 4
+{
+T 59800 59600 5 10 1 1 0 0 1
+netname=radio_marc_isr
+}