--- a/venus/src/MCL	Sat Nov 20 21:54:27 2021 +0000
+++ b/venus/src/MCL	Sun Nov 21 02:14:49 2021 +0000
@@ -1,5 +1,416 @@
 # Master Component List for FreeCalypso Venus development board
 
+# Capacitors
+
+C201:
+ # bypass cap for V-RTC near Calypso
+ hier=mob.core.bb.dbb.C201
+ footprint=0402
+ npins=2
+
+C202:
+ # 32.768 kHz Pierce osc cap, input
+ hier=mob.core.bb.dbb.C202
+ footprint=0402
+ npins=2
+
+C203:
+ # 32.768 kHz Pierce osc cap, output
+ hier=mob.core.bb.dbb.C203
+ footprint=0402
+ npins=2
+
+C204:
+ # cap on Iota VREF pin
+ hier=mob.core.bb.abb.C204
+ footprint=0402
+ npins=2
+
+C205:
+ # AFC output cap
+ hier=mob.core.bb.abb.C205
+ footprint=0402
+ npins=2
+
+C208:
+ # cap on UPR
+ hier=mob.core.bb.abb.C208
+ footprint=0402
+ npins=2
+
+C209:
+ # bypass cap on Calypso VDDS_MIF
+ hier=mob.core.bb.dbb.C209
+ footprint=0402
+ npins=2
+
+C210:
+ # bypass cap on Calypso VDDS_[12]
+ hier=mob.core.bb.dbb.C210
+ footprint=0402
+ npins=2
+
+C211:
+ # bypass cap on Calypso VDD (core)
+ hier=mob.core.bb.dbb.C211
+ footprint=0402
+ npins=2
+
+C212:
+ # bypass cap on Calypso VDD_PLL
+ hier=mob.core.bb.dbb.C212
+ footprint=0402
+ npins=2
+
+C213:
+ # bypass cap on V-ABB
+ hier=mob.core.bb.abb.C213
+ footprint=0805
+ npins=2
+
+C214:
+ # bypass cap on V-DBB
+ hier=mob.core.bb.abb.C214
+ footprint=0805
+ npins=2
+
+C215:
+ # bypass cap on V-IO
+ hier=mob.core.bb.abb.C215
+ footprint=0805
+ npins=2
+
+C216:
+ # bypass cap on V-FLASH
+ hier=mob.core.bb.abb.C216
+ footprint=0805
+ npins=2
+
+C217:
+ # bypass cap on V-SRAM
+ hier=mob.core.bb.abb.C217
+ footprint=0805
+ npins=2
+
+C218:
+ # bypass cap on V-SIM
+ hier=mob.core.bb.abb.C218
+ footprint=0603
+ npins=2
+
+C219:
+ # bypass cap on V-RTC
+ hier=mob.core.bb.abb.C219
+ footprint=0603
+ npins=2
+
+C220:
+ # one of the bypass caps on the VBAT power input to the ABB
+ hier=mob.core.bb.abb.C220
+ footprint=0402
+ npins=2
+
+C221:
+ # the other one - C220's twin
+ hier=mob.core.bb.abb.C221
+ footprint=0402
+ npins=2
+
+C223:
+ # extra (3rd) cap to ground in the 32.768 kHz crystal osc circuit
+ hier=mob.core.bb.dbb.C223
+ footprint=0402
+ npins=2
+
+C224:
+ hier=mob.core.rf.Rita_vcxo.vcxo_passive.C224
+ footprint=0402
+ npins=2
+
+C225:
+ hier=mob.core.rf.Rita_vcxo.vcxo_passive.C225
+ footprint=0402
+ npins=2
+
+C226:
+ hier=mob.core.rf.Rita_vcxo.vcxo_passive.C226
+ footprint=0402
+ npins=2
+
+C253:
+ # series cap in the 26 MHz signal from Rita to Calypso
+ hier=mob.core.clock_rf2dbb.C253
+ footprint=0402
+ npins=2
+
+C295:
+ # cap in the analog I&Q circuit between Iota and Rita (the one for Q)
+ hier=mob.core.bb.abb.abb_rc_network.C295
+ footprint=0402
+ npins=2
+
+C296:
+ # cap in the analog I&Q circuit between Iota and Rita (the one for I)
+ hier=mob.core.bb.abb.abb_rc_network.C296
+ footprint=0402
+ npins=2
+
+C306:
+ # VSIM bypass cap next to the SIM socket, per Leonardo schematics
+ hier=mob.sim.C306
+ value=100n
+ footprint=0402
+ npins=2
+
+C318:
+ # bypass cap for V-SRAM near U301
+ hier=mob.core.mem.C318
+ footprint=0402
+ npins=2
+
+C319:
+ # footprint for possible cap on U302 BYPASS pin
+ #hier=spkr.C319
+ footprint=0402
+ value=DNP
+ part=none
+ npins=2
+
+C322:
+ # bypass cap for V-FLASH near U301
+ hier=mob.core.mem.C322
+ footprint=0402
+ npins=2
+
+C323:
+ # Big capacitor next to the VBAT power input connector
+ hier=mob.batt.big_cap
+ manufacturer=Vishay Sprague
+ manufacturer_part_number=595D108X96R3R2T
+ # Leonardo used 20% version, but the 10% version is now cheaper at Mouser!
+ description=Tantalum capacitor, 1000 uF, 6.3 V, 70 mOhm ESR
+ npins=2
+ source=Mouser
+
+C330:
+ # power supply decoupling cap for U302
+ #hier=spkr.C330
+ value=1uF
+ footprint=0402
+ npins=2
+
+C331:
+ # cap on U302 output
+ #hier=spkr.C331
+ value=47p
+ footprint=0402
+ npins=2
+
+C332:
+ # cap on U302 output
+ #hier=spkr.C332
+ value=47p
+ footprint=0402
+ npins=2
+
+C335:
+ # part of the Leonardo JTAG interface circuit
+ hier=mob.jtag_if.C335
+ value=1n
+ footprint=0402
+ npins=2
+
+C363:
+ # part of the Leonardo JTAG interface circuit
+ hier=mob.jtag_if.C363
+ value=100n
+ footprint=0402
+ npins=2
+
+C600:
+ hier=mob.core.rf.rita2pa_hb.C600
+ footprint=0402
+ npins=2
+
+C606:
+ hier=mob.core.rf.Rita_vcxo.rita.C606
+ footprint=0402
+ npins=2
+
+C607:
+ hier=mob.core.rf.Rita_vcxo.rita.C607
+ footprint=0402
+ npins=2
+
+C608:
+ hier=mob.core.rf.Rita_vcxo.rita.C608
+ footprint=0402
+ npins=2
+
+C609:
+ hier=mob.core.rf.Rita_vcxo.rita.C609
+ footprint=0402
+ npins=2
+
+C610:
+ hier=mob.core.rf.Rita_vcxo.rita.C610
+ footprint=0402
+ npins=2
+
+C613:
+ hier=mob.core.rf.Rita_vcxo.rita.C613
+ footprint=0603
+ npins=2
+
+C614:
+ hier=mob.core.rf.fem2rita_low.C614
+ footprint=0402
+ npins=2
+
+C615:
+ hier=mob.core.rf.fem2rita_low.C615
+ footprint=0402
+ npins=2
+
+C616:
+ hier=mob.core.rf.Rita_vcxo.rita.C616
+ footprint=0402
+ npins=2
+
+C617:
+ hier=mob.core.rf.Rita_vcxo.rita.C617
+ footprint=0402
+ npins=2
+
+C619:
+ hier=mob.core.rf.Rita_vcxo.rita.C619
+ footprint=0603
+ npins=2
+
+C620:
+ hier=mob.core.rf.Rita_vcxo.rita.C620
+ footprint=0402
+ npins=2
+
+C622:
+ hier=mob.core.rf.Rita_vcxo.rita.C622
+ footprint=0603
+ npins=2
+
+C624:
+ hier=mob.core.rf.fem2rita_pcs.C624
+ footprint=0402
+ npins=2
+
+C625:
+ hier=mob.core.rf.fem2rita_pcs.C625
+ footprint=0402
+ npins=2
+
+C628:
+ hier=mob.core.rf.Rita_vcxo.rita.XEN_cap
+ footprint=0402
+ npins=2
+
+C629:
+ hier=mob.core.rf.Rita_vcxo.rita.C629
+ footprint=0402
+ npins=2
+
+C630:
+ hier=mob.core.rf.Rita_vcxo.rita.C630
+ footprint=0402
+ npins=2
+
+C631:
+ hier=mob.core.rf.Rita_vcxo.rita.C631
+ footprint=0402
+ npins=2
+
+C632:
+ hier=mob.core.rf.Rita_vcxo.rita.C632
+ footprint=0402
+ npins=2
+
+C633:
+ hier=mob.core.rf.Rita_vcxo.rita.C633
+ footprint=0402
+ npins=2
+
+C634:
+ hier=mob.core.rf.Rita_vcxo.rita.C634
+ footprint=0402
+ npins=2
+
+C635:
+ hier=mob.core.rf.FEM.C635
+ footprint=0402
+ npins=2
+
+C643:
+ hier=mob.core.rf.FEM.C643
+ footprint=0402
+ npins=2
+
+C644:
+ hier=mob.core.rf.FEM.C644
+ footprint=0402
+ npins=2
+
+C645:
+ hier=mob.core.rf.FEM.C645
+ footprint=0402
+ npins=2
+
+C648:
+ hier=mob.core.rf.PA.C648
+ footprint=0402
+ npins=2
+
+C651:
+ # PA power supply small cap
+ hier=mob.core.rf.PA.C651
+ footprint=0402
+ npins=2
+
+C652:
+ # PA power supply small cap
+ hier=mob.core.rf.PA.C652
+ footprint=0402
+ npins=2
+
+C653:
+ # PA power supply small cap
+ hier=mob.core.rf.PA.C653
+ footprint=0402
+ npins=2
+
+C654:
+ # PA power supply big cap
+ hier=mob.core.rf.PA.C654
+ footprint=0805
+ npins=2
+
+C655:
+ hier=mob.core.rf.rita2pa_lb.C655
+ footprint=0402
+ npins=2
+
+C656:
+ hier=mob.core.rf.PA.C656
+ footprint=0402
+ npins=2
+
+C698:
+ hier=mob.core.rf.Rita_vcxo.rita.XEN_cap2
+ footprint=0805
+ npins=2
+
+C699:
+ hier=mob.core.rf.fem2rita_dcs.C699
+ footprint=0402
+ npins=2
+
 # LEDs and other diodes
 
 part green-led:
@@ -37,7 +448,7 @@
  manufacturer=Renesas
  manufacturer_part_number=HVC375BTRF-E
  description=Varactor diode for VCXO
- hier=core.rf.Rita_vcxo.vcxo_passive.D200
+ hier=mob.core.rf.Rita_vcxo.vcxo_passive.D200
  pinout=HVC375B.pinout
  npins=2
 
@@ -69,7 +480,7 @@
  npins=2
 
 J302:
- hier=sim.socket
+ hier=mob.sim.socket.socket
  description=SIM socket, full size, with latch
  manufacturer=C&K Components
  manufacturer_part_number=CCM03-3013LFT
@@ -79,7 +490,7 @@
 
 # Power input connector
 J305:
- hier=pwr_in.pwr_input_conn
+ hier=mob.batt.batt_conn
  manufacturer=Weidmuller
  manufacturer_part_number=1510460000
  description=Power input connector, 3 pins, 5.08 mm spacing
@@ -88,7 +499,7 @@
  npins=3
 
 J308:
- hier=SMA.pkg
+ hier=mob.SMA.pkg
  description=RF connector, SMA, female, SMT, RA
  manufacturer=Linx
  manufacturer_part_number=CONSMA002-SMD-G	# gold-plated
@@ -96,7 +507,7 @@
 
 # JTAG
 J310:
- hier=jtag_if.connector
+ hier=mob.jtag_if.connector
  footprint=HEADER14_2
  description=Header, 0.100", dual row, 14 posts
  manufacturer=Molex
@@ -127,11 +538,11 @@
 
 # Loudspeaker output
 J403:
- hier=spkr.spkr_connector
+ #hier=spkr.spkr_connector
  part=header-2pin
 
 J701:
- hier=usb.conn.conn
+ hier=usb.usb.conn.conn
  description=USB connector, receptacle, mini-B
  manufacturer=AMP/TE
  manufacturer_part_number=1734035-2
@@ -140,6 +551,43 @@
  footprint=file:USB_CONN_1734035
  npins=9			# 5 actual pins + 4 mounting pads
 
+# Inductors
+
+L600:
+ hier=mob.core.rf.rita2pa_hb.L600
+ footprint=0402
+ npins=2
+
+L601:
+ hier=mob.core.rf.rita2pa_lb.L601
+ footprint=0402
+ npins=2
+
+L604:
+ hier=mob.core.rf.fem2rita_pcs.L604
+ footprint=0402
+ npins=2
+
+L605:
+ hier=mob.core.rf.fem2rita_low.L605
+ footprint=0402
+ npins=2
+
+L606:
+ hier=mob.core.rf.fem2rita_low.L606
+ footprint=0402
+ npins=2
+
+L607:
+ hier=mob.core.rf.fem2rita_dcs.L607
+ footprint=0402
+ npins=2
+
+L608:
+ hier=mob.core.rf.fem2rita_dcs.L608
+ footprint=0402
+ npins=2
+
 # Transistors
 
 part EMB9:
@@ -153,13 +601,40 @@
  vendor=Digi-Key
  vendor_part_number=568-6458-1-ND
 
+# Complex transistor for TI's JTAG interface circuit
+Q308:
+ device=UMD9N
+ footprint=SOT363
+ pinout=UMD9N.pinout
+ npins=6
+ description=NPN+PNP complex transistor, prebiased, SOT363
+ manufacturer=Rohm
+ manufacturer_part_number=UMD9NTR
+ vendor=Digi-Key
+ vendor_part_number=UMD9NCT-ND
+ slotmap=slotmap/Q308
+
+# MOSFET for driving the power on LED
+Q309:
+ #hier=led.Q
+ device=Si1032R
+ pinout=Si1032R.pinout
+ npins=3
+ description=N-channel MOSFET, 1.5V logic level gate, SC75A
+ manufacturer=Vishay Siliconix
+ manufacturer_part_number=SI1032R-T1-GE3
+ vendor=Digi-Key
+ vendor_part_number=SI1032R-T1-GE3CT-ND
+
 Q600:
  part=EMB9
- slotmap=Q600.slotmap
+ slotmap=slotmap/Q600
 
 Q601:
  part=EMB9
- slotmap=Q601.slotmap
+ slotmap=slotmap/Q601
+
+# Resistors
 
 part MNR04-10k:
  description=Pack of 4 resistors, isolated, 10 kOhm
@@ -168,6 +643,7 @@
  manufacturer_part_number=EXB-28V103JX
  vendor=Digi-Key
  vendor_part_number=Y7103CT-ND
+ pinout=rpack4-ti.pinout
  npins=8
 
 part MNR04-1k:
@@ -177,27 +653,126 @@
  manufacturer_part_number=EXB-28V102JX
  vendor=Digi-Key
  vendor_part_number=Y7102CT-ND
+ pinout=rpack4-ti.pinout
  npins=8
 
+R204:
+ # resistor on Iota IBIAS pin
+ hier=mob.core.bb.abb.R204
+ footprint=0402
+ npins=2
+
+R206:
+ # pull-up resistor on SIM-I/O net
+ hier=mob.core.bb.abb.R206
+ footprint=0402
+ npins=2
+
+R207:
+ # resistor for Calypso SIM_PWCTRL
+ hier=mob.core.bb.dbb.R207
+ footprint=0402
+ npins=2
+
+R208:
+ # pull-up of Iota nTESTRESET to UPR
+ hier=mob.core.bb.abb.R208
+ footprint=0402
+ npins=2
+
+R209:
+ # pull-up of Iota VLMEM to UPR
+ hier=mob.core.bb.abb.R209
+ footprint=0402
+ npins=2
+
+R211:
+ # part of the voodoo "internal" VCXO circuit
+ hier=mob.core.rf.Rita_vcxo.vcxo_passive.R211
+ footprint=0402
+ npins=2
+
+R215:
+ # series resistor in the 32.768 kHz crystal osc circuit
+ hier=mob.core.bb.dbb.R215
+ footprint=0402
+ npins=2
+
+R216:
+ # pull-down resistor on MCUDI net
+ hier=mob.core.bb.R216
+ footprint=0402
+ npins=2
+
+R217:
+ # part of the voodoo "internal" VCXO circuit
+ hier=mob.core.rf.Rita_vcxo.vcxo_passive.R217
+ footprint=0402
+ npins=2
+
+R251:
+ # series resistor in the 26 MHz signal from Rita to Calypso
+ hier=mob.core.clock_rf2dbb.R251
+ footprint=0402
+ npins=2
+
 # The following two resistor packs are in the analog I&Q circuit
 # between Iota and Rita
 
 R295:
  # on the side toward Iota
  part=MNR04-1k
- pinout=rpack4-ti.pinout
- slotmap=R295.slotmap
+ slotmap=slotmap/R295
 
 R296:
  # on the side toward Rita
  part=MNR04-1k
- pinout=rpack4-ti.pinout
- slotmap=R296.slotmap
+ slotmap=slotmap/R296
+
+R330:
+ # power on LED series resistor
+ #hier=led.R
+ value=470R
+ footprint=0402
+ npins=2
+
+R331:
+ # U302 feedback resistor
+ #hier=spkr.R331
+ footprint=0402
+ npins=2
+
+R332:
+ # U302 feedback resistor
+ #hier=spkr.R332
+ footprint=0402
+ npins=2
+
+R338:
+ # pull-down resistor on U302 enable control line
+ #hier=spkr.R338
+ value=100k
+ footprint=0402
+ npins=2
+
+R351:
+ # U302 input resistor
+ #hier=spkr.R33xA
+ value=10k
+ footprint=0402
+ npins=2
+
+R352:
+ # U302 input resistor
+ #hier=spkr.R33xB
+ value=10k
+ footprint=0402
+ npins=2
 
 R361:
  # JTAG pull-up/down resistor pack
  part=MNR04-10k
- slotmap=R361.slotmap
+ slotmap=slotmap/R361
 
 # attenuators in the Tx path from Rita to PA
 part chip_atten:
@@ -210,15 +785,29 @@
  source=Jotrin
 
 R600:
- hier=core.rf.rita2pa_lb.R600
+ hier=mob.core.rf.rita2pa_lb.R600
  part=chip_atten
+ pinout=chipatten-1to2.pinout
 
 R601:
- hier=core.rf.rita2pa_hb.R601
+ hier=mob.core.rf.rita2pa_hb.R601
  part=chip_atten
+ pinout=chipatten-2to1.pinout
+
+R604:
+ # 0R (Openmoko) or 47R (iWOW) in the TCXOEN signal path
+ hier=mob.core.rf.Rita_vcxo.R604
+ footprint=0402
+ npins=2
+
+R623:
+ hier=mob.core.rf.PA.R623
+ footprint=0402
+ npins=2
 
 # charging power slide switch
 S701:
+ hier=chg_switch
  manufacturer=C&K
  manufacturer_part_number=L101011MS02Q
  description=Slide switch, SPST, PC mount
@@ -227,7 +816,7 @@
  npins=2
 
 U201:
- hier=core.bb.dbb.calypso.pkg
+ hier=mob.core.bb.dbb.calypso.pkg
  manufacturer=TI
  manufacturer_part_number=D751992AGHH
  description=Calypso GSM/GPRS baseband processor
@@ -235,7 +824,7 @@
  pinout=calypso-179ghh.pinout
 
 U202:
- hier=core.bb.abb.iota.pkg
+ hier=mob.core.bb.abb.iota.pkg
  manufacturer=TI
  manufacturer_part_number=TWL3025BGGM
  description=Iota analog baseband IC
@@ -243,7 +832,7 @@
  pinout=iota-ggm.pinout
 
 U301:
- hier=core.mem.chip.pkg
+ hier=mob.core.mem.chip.pkg
  manufacturer=Spansion
  manufacturer_part_number=S71PL064JA0BFW0B
  description=Memory IC, combined flash and pSRAM
@@ -260,6 +849,7 @@
  npins=14
 
 U402:
+ hier=mob.sim.inv.pkg
  device=74LVC1G04
  manufacturer=Nexperia
  manufacturer_part_number=74LVC1G04GM
@@ -269,21 +859,21 @@
  npins=6
 
 U601:
- hier=core.rf.FEM.M034F.pkg
+ hier=mob.core.rf.FEM.M034F.pkg
  manufacturer=Epcos
  device=M034F
  description=GSM RF front end module, quadband
  npins=19
 
 U602:
- hier=core.rf.Rita_vcxo.rita.rita.pkg
+ hier=mob.core.rf.Rita_vcxo.rita.rita.pkg
  manufacturer=TI
  manufacturer_part_number=TRF6151CRHJ
  description=GSM RF transceiver
  npins=49
 
 U603:
- hier=core.rf.PA.PA.pkg
+ hier=mob.core.rf.PA.PA.pkg
  manufacturer=RFMD
  device=RF3166
  description=GSM RF power amplifier
@@ -291,7 +881,7 @@
  npins=31
 
 U701:
- hier=usb.FT2232D.FT2232D.pkg
+ hier=usb.usb.FT2232D.FT2232D.pkg
  manufacturer=FTDI
  device=FT2232D
  part=yes
@@ -302,7 +892,7 @@
  npins=48
 
 U702:
- hier=usb.FT2232D.eeprom.pkg
+ hier=usb.usb.FT2232D.eeprom.pkg
  device=93C46
  manufacturer=Atmel
  manufacturer_part_number=AT93C46DY6-YH
@@ -312,7 +902,7 @@
  npins=8
 
 U703:
- hier=reg_3V3.reg.pkg
+ hier=usb.reg_3V3.reg.pkg
  manufacturer=TI
  device=TLV70233DBV
  part=yes
@@ -340,18 +930,17 @@
  vendor=Digi-Key
  vendor_part_number=1727-7008-1-ND
  pinout=74LVC2G07.pinout
- slotmap=U7.slotmap
  npins=6
 
 X201:
- hier=core.bb.dbb.xtal.xtal
+ hier=mob.core.bb.dbb.xtal.xtal
  manufacturer=Micro Crystal Switzerland
  manufacturer_part_number=CC7V-T1A
  description=Crystal resonator, 32.768 kHz, 20 ppm, 12.5 pF, miniature SMT
  npins=2
 
 X202:
- hier=core.rf.Rita_vcxo.vcxo_passive.xtal
+ hier=mob.core.rf.Rita_vcxo.vcxo_passive.xtal
  manufacturer=NDK
  manufacturer_part_number=W-168-405
  description=Crystal resonator, 26 MHz, made for GSM VCXO