diff --git a/Electrical/bom.csv b/Electrical/bom.csv index 20b565d..afa0da0 100644 --- a/Electrical/bom.csv +++ b/Electrical/bom.csv @@ -1,28 +1,28 @@ Item #,Reference,Qty,Manufacturer,Part #,Description,Footprint,Mount Type,Link 1,C1,1,Samsung Electro-Mechanics,CL10A475KQ8NNNC,4.7uF 6.3v -55 to 85c 10%+-,0603_1608Metric,SMD,https://www.mouser.co.uk/ProductDetail/Samsung-Electro-Mechanics/CL10A475KQ8NNNC?qs=349EhDEZ59oYfMfehxxCwQ%3D%3D 2,C2,1,Samsung Electro-Mechanics,CL10A226MP8NUNE,22uF 10v -55 to 85c 20%+-,0603_1608Metric,SMD,https://www.mouser.co.uk/ProductDetail/Samsung-Electro-Mechanics/CL10A226MP8NUNE?qs=gRKWieUq2Hb5O0PTfRKzDQ%3D%3D -3,"C3, C8, C12",3,Samsung Electro-Mechanics,CL10B104KO8NNNC,100nF 16v -55 to 125c 10%+-,0603_1608Metric,SMD,https://www.mouser.co.uk/ProductDetail/Samsung-Electro-Mechanics/CL10B104KO8NNNC?qs=349EhDEZ59pqoJFRnk4a8w%3D%3D -4,"C4, C5, C6, C9, C13",5,KEMET,C0603C330K5HAC7867,33pF 50v -55 to 150c 10%+-,0603_1608Metric,SMD,https://www.digikey.co.uk/en/products/detail/kemet/C0603C330K5HAC7867/7946870 -5,"C7, C11",2,Murata,ECASD40J107M015K00,100uF electrolytic cap 6.3v -55 to 125c 20%+-,CAPPM7343X200N,SMD,https://www.mouser.co.uk/ProductDetail/Murata-Electronics/ECASD40J107M015K00?qs=ARJTbBigCIzj8MGk63Vb1w%3D%3D&_gl=1*1y6g7wm*_ga*dW5kZWZpbmVk*_ga_15W4STQT4T*dW5kZWZpbmVk*_ga_1KQLCYKRX3*dW5kZWZpbmVk -6,"C10, C14",2,KYOCERA AVX,06035A100FAT2A,10pF 50v -55 to 125c 1%+-,0603_1608Metric,SMD,https://www.mouser.co.uk/ProductDetail/KYOCERA-AVX/06035A100FAT2A?qs=AGOxcRBkg6a7LiP2sFxhpw%3D%3D -7,D1,1,STMicroelectronics,BAT20JFILM,1A 23v,SOD-323,SMD,https://www.mouser.co.uk/ProductDetail/STMicroelectronics/BAT20JFILM?qs=6cWmAGMIEBzKXM4JcoRdbw%3D%3D -8,D2,1,Lite-On,LTST-C193TBKT-5A,Blue LED,0603_1680Metric,SMD,https://www.mouser.co.uk/ProductDetail/Lite-On/LTST-C193TBKT-5A?qs=xIkB7y1OTorvzzuuxuVkOA%3D%3D -9,D3,1,ams OSRAM,LP L296-J2L2-25,Green LED,0603_1680Metric,SMD,https://www.mouser.co.uk/ProductDetail/ams-OSRAM/LP-L296-J2L2-25?qs=NTcu%252BMSV%252BkMvT90nipgS0w%3D%3D -10,"D4, D5, D6, D7, D8",5,Littelfuse,SP0201B-ULC01UTG,ESD 20kV protection 0.13pF,0201_0603Metric,SMD,https://www.mouser.co.uk/ProductDetail/Littelfuse/SP0201B-ULC-01UTG?qs=lM4gFlnEeEOmudspIlGNsA%3D%3D -11,FL1,1,Murata,DLW21SN900SQ2L,Common mode choke -40 to 85c,FIL_DLW21SN900SQ2L,SMD,https://www.mouser.co.uk/ProductDetail/Murata-Electronics/DLW21SN900SQ2L?qs=yQ3nQrcaeVsNzdZbwxOhwQ%3D%3D -12,IC1,1,Texas Instruments,TPS62A02ADRLR,Max 2A DC to DC -40 to 125c,SOT6_DRL_TEX,SMD,https://www.mouser.co.uk/ProductDetail/Texas-Instruments/TPS62A02ADRLR?qs=By6Nw2ByBD27zXzxBxM12w%3D%3D -13,"J1, J2",2,Linx Technologies,CONSMA002-SMD ,SMA connector,LINX_CONSMA002-SMD,SMD,https://www.digikey.co.uk/en/products/detail/linx-technologies-inc/CONSMA002-SMD/1577205 -14,J3,1,Hirose Electric,U.FL-R-SMT(10),U.FL connector,U.FL_Hirose_U.FL-R-SMT-1_Vertical,SMD,https://www.mouser.co.uk/ProductDetail/Hirose-Connector/U.FL-R-SMT10?qs=Ux3WWAnHpjBT1CWD8UMEMQ%3D%3D -15,L1,1,Laird Performance Materials,TYA2520101R0M-10,1uH 2.2A -40 to 125c,1008_2520Metric,SMD,https://www.mouser.co.uk/ProductDetail/Laird-Performance-Materials/TYA2520101R0M-10?qs=sPbYRqrBIVluTGhoROTEDA%3D%3D -16,P1,1,Molex,105444-0001,Molex Right Angle Plug Type C 3.1 USB Connector,USB_C_Plug_Molex_105444,SMD,https://www.mouser.co.uk/ProductDetail/Molex/105444-0001?qs=aXgFgf7IVOD2b48E0Y%252BztQ%3D%3D -17,"Q1, Q2",Rohm Semiconductor,DTC143Z,Pre-biased transistors,SOTFL3P40_120X120X55L30X32N,SMD,https://www.mouser.co.uk/ProductDetail/ROHM-Semiconductor/DTC143ZMT2L?qs=4kLU8WoGk0vYvE9YcoCW%2Fw%3D%3D -18,R1,1,ROHM Semiconductor,SDR03EZPF5101,5.1kR -55 to 155c 150v,0603_1608Metric,SMD,https://www.mouser.co.uk/ProductDetail/ROHM-Semiconductor/SDR03EZPF5101?qs=MyNHzdoqoQLH%2F5e8e61Hjg%3D%3D -19,R2,1,Vishay,CRMA1206AF500KFKEF,500kR -55 to 155c 550v,1206_3216Metric,SMD,https://www.mouser.co.uk/ProductDetail/Vishay-Techno/CRMA1206AF500KFKEF?qs=sGAEpiMZZMvdGkrng054t7z4BkURc4LzVY8yMPJoqtmSDtBbhOenvQ%3D%3D -20,R3,1,Panasonic,ERA-8VEB1003V,100kR -55 to 155c 200v,1206_3216Metric,SMD,https://www.mouser.co.uk/ProductDetail/Panasonic/ERA-8VEB1003V?qs=sGAEpiMZZMvdGkrng054t2cqbZCzJY7NF4%252BDrdsjp3zxNG93eK9Qng%3D%3D -21,R4,1,Vishay,TNPV0805499KBEEA,499kR -55 to 125c,0805_2012Metric,SMD,https://www.mouser.co.uk/ProductDetail/Vishay/TNPV0805499KBEEA?qs=Li%252BoUPsLEnsOR%252BSI3t%252Bv%252Bw%3D%3D -22,"R5, R15",2,Vishay,CRCW0805200RFKEBC,200R -55 to 155c,0805_2012Metric,SMD,https://www.mouser.co.uk/ProductDetail/Vishay-Dale/CRCW0805200RFKEBC?qs=sGAEpiMZZMvdGkrng054t7z4BkURc4LzkE3Osdacrkc4hYtEH11t1g%3D%3D -23,R6,1,Vishay,CRCW020110K0FKED,10kR -55 to 155c,0201_0603Metric,SMD,https://www.mouser.co.uk/ProductDetail/Vishay-Dale/CRCW020110K0FKED?qs=sGAEpiMZZMvdGkrng054tx3Kv%252BhbWMRFwg6iTn91A9c%3D -24,"R8, R9, R11, R17, R18, R19",6,Stackpole Electronics Inc,RMCF0603ZT0R00,0R jumper,0603_1608Metric,SMD,https://www.digikey.co.uk/en/products/detail/stackpole-electronics-inc/RMCF0603ZT0R00/1756908 +3,C3,1,Samsung Electro-Mechanics,CL21B103KBANNNC,10nF 50v -55 to 125c 10%+-,8005_2021Metric,SMD,https://www.mouser.co.uk/ProductDetail/Samsung-Electro-Mechanics/CL21B103KBANNNC?qs=349EhDEZ59oTK9iJ%2FqCMuw%3D%3D +4,"C4, C9, C13",3,Samsung Electro-Mechanics,CL10B104KO8NNNC,100nF 16v -55 to 125c 10%+-,0603_1608Metric,SMD,https://www.mouser.co.uk/ProductDetail/Samsung-Electro-Mechanics/CL10B104KO8NNNC?qs=349EhDEZ59pqoJFRnk4a8w%3D%3D +5,"C5, C6, C7, C10, C14",5,KEMET,C0603C330K5HAC7867,33pF 50v -55 to 150c 10%+-,0603_1608Metric,SMD,https://www.digikey.co.uk/en/products/detail/kemet/C0603C330K5HAC7867/7946870 +6,"C8, C12",2,Murata,ECASD40J107M015K00,100uF electrolytic cap 6.3v -55 to 125c 20%+-,CAPPM7343X200N,SMD,https://www.mouser.co.uk/ProductDetail/Murata-Electronics/ECASD40J107M015K00?qs=ARJTbBigCIzj8MGk63Vb1w%3D%3D&_gl=1*1y6g7wm*_ga*dW5kZWZpbmVk*_ga_15W4STQT4T*dW5kZWZpbmVk*_ga_1KQLCYKRX3*dW5kZWZpbmVk +7,"C11, C15",2,KYOCERA AVX,06035A100FAT2A,10pF 50v -55 to 125c 1%+-,0603_1608Metric,SMD,https://www.mouser.co.uk/ProductDetail/KYOCERA-AVX/06035A100FAT2A?qs=AGOxcRBkg6a7LiP2sFxhpw%3D%3D +8,D1,1,STMicroelectronics,BAT20JFILM,1A 23v,SOD-323,SMD,https://www.mouser.co.uk/ProductDetail/STMicroelectronics/BAT20JFILM?qs=6cWmAGMIEBzKXM4JcoRdbw%3D%3D +9,D2,1,ams OSRAM,LO L29K-H2L1-24,Orange LED,0603_1680Metric,SMD,https://www.mouser.co.uk/ProductDetail/ams-OSRAM/LO-L29K-H2L1-24?qs=NTcu%252BMSV%252BkNchhs07AWU%252BA%3D%3D +10,D3,1,ams OSRAM,LP L296-J2L2-25,Green LED,0603_1680Metric,SMD,https://www.mouser.co.uk/ProductDetail/ams-OSRAM/LP-L296-J2L2-25?qs=NTcu%252BMSV%252BkMvT90nipgS0w%3D%3D +11,"D4, D5, D6, D7, D8",5,Littelfuse,SP0201B-ULC01UTG,ESD 20kV protection 0.13pF,0201_0603Metric,SMD,https://www.mouser.co.uk/ProductDetail/Littelfuse/SP0201B-ULC-01UTG?qs=lM4gFlnEeEOmudspIlGNsA%3D%3D +12,FL1,1,Murata,DLW21SN900SQ2L,Common mode choke -40 to 85c,FIL_DLW21SN900SQ2L,SMD,https://www.mouser.co.uk/ProductDetail/Murata-Electronics/DLW21SN900SQ2L?qs=yQ3nQrcaeVsNzdZbwxOhwQ%3D%3D +13,IC1,1,Texas Instruments,TPS62A02ADRLR,Max 2A DC to DC -40 to 125c,SOT6_DRL_TEX,SMD,https://www.mouser.co.uk/ProductDetail/Texas-Instruments/TPS62A02ADRLR?qs=By6Nw2ByBD27zXzxBxM12w%3D%3D +14,"J1, J2",2,Linx Technologies,CONSMA002-SMD ,SMA connector,LINX_CONSMA002-SMD,SMD,https://www.digikey.co.uk/en/products/detail/linx-technologies-inc/CONSMA002-SMD/1577205 +15,J3,1,Hirose Electric,U.FL-R-SMT(10),U.FL connector,U.FL_Hirose_U.FL-R-SMT-1_Vertical,SMD,https://www.mouser.co.uk/ProductDetail/Hirose-Connector/U.FL-R-SMT10?qs=Ux3WWAnHpjBT1CWD8UMEMQ%3D%3D +16,L1,1,Laird Performance Materials,TYA2520101R0M-10,1uH 2.2A -40 to 125c,1008_2520Metric,SMD,https://www.mouser.co.uk/ProductDetail/Laird-Performance-Materials/TYA2520101R0M-10?qs=sPbYRqrBIVluTGhoROTEDA%3D%3D +17,P1,1,Molex,105444-0001,Molex Right Angle Plug Type C 3.1 USB Connector,USB_C_Plug_Molex_105444,SMD,https://www.mouser.co.uk/ProductDetail/Molex/105444-0001?qs=aXgFgf7IVOD2b48E0Y%252BztQ%3D%3D +18,"Q1, Q2, Q3",3,Rohm Semiconductor,DTC143Z,Pre-biased transistors,SOTFL3P40_120X120X55L30X32N,SMD,https://www.mouser.co.uk/ProductDetail/ROHM-Semiconductor/DTC143ZMT2L?qs=4kLU8WoGk0vYvE9YcoCW%2Fw%3D%3D +19,R1,1,ROHM Semiconductor,SDR03EZPF5101,5.1kR -55 to 155c 150v,0603_1608Metric,SMD,https://www.mouser.co.uk/ProductDetail/ROHM-Semiconductor/SDR03EZPF5101?qs=MyNHzdoqoQLH%2F5e8e61Hjg%3D%3D +20,R2,1,Vishay,CRMA1206AF500KFKEF,500kR -55 to 155c 550v,1206_3216Metric,SMD,https://www.mouser.co.uk/ProductDetail/Vishay-Techno/CRMA1206AF500KFKEF?qs=sGAEpiMZZMvdGkrng054t7z4BkURc4LzVY8yMPJoqtmSDtBbhOenvQ%3D%3D +21,R3,1,Panasonic,ERA-8VEB1003V,100kR -55 to 155c 200v,1206_3216Metric,SMD,https://www.mouser.co.uk/ProductDetail/Panasonic/ERA-8VEB1003V?qs=sGAEpiMZZMvdGkrng054t2cqbZCzJY7NF4%252BDrdsjp3zxNG93eK9Qng%3D%3D +22,R4,1,Vishay,TNPV0805499KBEEA,499kR -55 to 125c,0805_2012Metric,SMD,https://www.mouser.co.uk/ProductDetail/Vishay/TNPV0805499KBEEA?qs=Li%252BoUPsLEnsOR%252BSI3t%252Bv%252Bw%3D%3D +23,"R5, R15",2,Vishay,CRCW0805200RFKEBC,200R -55 to 155c,0805_2012Metric,SMD,https://www.mouser.co.uk/ProductDetail/Vishay-Dale/CRCW0805200RFKEBC?qs=sGAEpiMZZMvdGkrng054t7z4BkURc4LzkE3Osdacrkc4hYtEH11t1g%3D%3D +24,"R6, R7, R8, R9, R11, R17, R18, R19",8,Stackpole Electronics Inc,RMCF0603ZT0R00,0R jumper,0603_1608Metric,SMD,https://www.digikey.co.uk/en/products/detail/stackpole-electronics-inc/RMCF0603ZT0R00/1756908 25,R10,1,YAGEO,RC0603JR-0751KL,51kR -55 to 155c 5%+-,0603_1608Metric,SMD,https://www.digikey.co.uk/en/products/detail/yageo/RC0603JR-0751KL/726804 26,R12,1,YAGEO,RP0805BRD0715KL,15kR -55 to 155c 150v,0805_2012Metric,SMD,https://www.mouser.co.uk/ProductDetail/YAGEO/RP0805BRD0715KL?qs=Y0Uzf4wQF3kDoFCRhaz7oQ%3D%3D 28,R16,1,YAGEO,RC0603JR-074K7L,4.7kR -55 to 155c,0603_1608Metric,SMD,https://www.digikey.co.uk/en/products/detail/yageo/RC0603JR-074K7L/726785 diff --git a/Electrical/opencom-lte.kicad_pcb b/Electrical/opencom-lte.kicad_pcb index fbaa253..bf587cb 100644 --- a/Electrical/opencom-lte.kicad_pcb +++ b/Electrical/opencom-lte.kicad_pcb @@ -713,7 +713,7 @@ (net 30 "Net-(R13-Pad1)") (pintype "passive") (tstamp bfdaa75c-a9dc-49a8-87bd-4969d7c77512)) (pad "2" smd roundrect (at 0.825 0 180) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 13 "/USB_D+") (pintype "passive") (tstamp 82250f3c-7689-4303-b1ed-2584ff2ebe85)) - (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl" + (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl" hide (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) @@ -1049,7 +1049,7 @@ (property "ki_keywords" "mounting hole") (path "/d7b1f6d7-798a-4f72-a069-756a38153268") (attr exclude_from_pos_files) - (fp_text reference "H2" (at -2.45 0) (layer "F.SilkS") + (fp_text reference "H2" (at -2.2 0) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.153))) (tstamp f4450d08-1b11-4df3-95c3-62af1dd59679) ) @@ -1065,7 +1065,7 @@ (stroke (width 0.15) (type solid)) (fill none) (layer "Cmts.User") (tstamp 3198fd9c-9c5e-425d-9235-a4c4fbdcb222)) (fp_circle (center 0 0) (end 2.45 0) (stroke (width 0.05) (type solid)) (fill none) (layer "F.CrtYd") (tstamp a2bf4c8f-701e-4a07-a0a2-d121255cc9be)) - (pad "" np_thru_hole circle (at 0 0) (size 2.2 2.2) (drill 2.2) (layers "*.Cu" "*.Mask") (tstamp df8f1bee-f70c-40b9-ad80-733d20631f3d)) + (pad "" np_thru_hole circle (at 0 0) (size 1.2 1.2) (drill 1.2) (layers "F&B.Cu" "*.Mask") (tstamp df8f1bee-f70c-40b9-ad80-733d20631f3d)) ) (footprint "LED_SMD:LED_0603_1608Metric" (layer "F.Cu") @@ -1954,7 +1954,7 @@ (property "ki_keywords" "mounting hole") (path "/acdcd984-b1a9-4789-9d51-f18763a2b7b5") (attr exclude_from_pos_files) - (fp_text reference "H1" (at 2.43 0) (layer "F.SilkS") + (fp_text reference "H1" (at 2.18 0) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.153))) (tstamp 29c1957b-de25-4043-a310-e82022e48722) ) @@ -1970,7 +1970,7 @@ (stroke (width 0.15) (type solid)) (fill none) (layer "Cmts.User") (tstamp 5cdb1373-86b6-4a94-bf56-25f677b7b7e9)) (fp_circle (center 0 0) (end 2.45 0) (stroke (width 0.05) (type solid)) (fill none) (layer "F.CrtYd") (tstamp ae9ec120-7d38-4993-a6e6-a106ccbe9449)) - (pad "" np_thru_hole circle (at 0 0) (size 2.2 2.2) (drill 2.2) (layers "*.Cu" "*.Mask") (tstamp 4c72f3f4-016e-496c-947d-14064140e765)) + (pad "" np_thru_hole circle (at 0 0) (size 1.2 1.2) (drill 1.2) (layers "F&B.Cu" "*.Mask") (tstamp 4c72f3f4-016e-496c-947d-14064140e765)) ) (footprint "Resistor_SMD:R_0603_1608Metric" (layer "F.Cu") @@ -2020,7 +2020,7 @@ (net 31 "Net-(R14-Pad1)") (pintype "passive") (tstamp fd52ab1d-4386-44f3-9221-fc9195c95d47)) (pad "2" smd roundrect (at 0.825 0 180) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 14 "/USB_D-") (pintype "passive") (tstamp e4dd109f-4da3-4e00-9ed8-4b08ac763f09)) - (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl" + (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl" hide (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) @@ -11328,7 +11328,7 @@ (property "ki_keywords" "test point tp") (path "/253f5d4d-14f4-433d-ac03-d28034870e41") (attr exclude_from_pos_files) - (fp_text reference "TP6" (at 0 1.55 180) (layer "B.SilkS") + (fp_text reference "TP4" (at 0 1.55 180) (layer "B.SilkS") (effects (font (size 1 1) (thickness 0.153)) (justify mirror)) (tstamp 5d1b9177-4a24-4a4b-8958-97bab1c17977) ) @@ -11819,7 +11819,7 @@ (property "ki_keywords" "test point tp") (path "/2dd0dc5d-641f-4ee8-90c7-a74f8482bf77") (attr exclude_from_pos_files) - (fp_text reference "TP7" (at -0.01 1.65) (layer "B.SilkS") + (fp_text reference "TP5" (at -0.01 1.65) (layer "B.SilkS") (effects (font (size 1 1) (thickness 0.153)) (justify mirror)) (tstamp 2aabc232-ab8d-4ee6-9a2c-9f02fc9cec86) ) @@ -13120,9 +13120,9 @@ (net 68 "Net-(J4-I{slash}O)") (pinfunction "1") (pintype "passive") (tstamp 97a5ad9f-e4eb-47ee-8a22-b147112960bc)) (pad "2" smd roundrect (at 0.32 0) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25) (net 2 "GND") (pinfunction "2") (pintype "passive") (tstamp d9b8bd6e-e068-4d65-8fc8-fbc2805038cc)) - (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl" + (model "${KIPRJMOD}/.footprints/SP0201B-ULC-01UTG/SP0201B-ULC-01UTG.stp" (offset (xyz 0 0 0)) - (scale (xyz 1 1 1)) + (scale (xyz 1 0.9 1)) (rotate (xyz 0 0 0)) ) ) @@ -246867,6 +246867,9 @@ (gr_text "BOARD V1.0" (at 148.27 145.66) (layer "B.SilkS") (tstamp 0048fa71-ca4e-4d57-b020-fe7c447ce454) (effects (font (size 1 1) (thickness 0.153)) (justify left bottom mirror)) ) + (gr_text "JLCJLCJLCJLC" (at 132.93 101.2 90) (layer "B.SilkS") (tstamp 2312c54a-bd3c-4a81-bd01-c2332babd050) + (effects (font (size 1 1) (thickness 0.153)) (justify left bottom mirror)) + ) (gr_text "SIM SLOT" (at 142.45 129.175) (layer "B.SilkS") (tstamp 9837d7a6-4073-465e-ab40-3b2c97d9c369) (effects (font (size 1 1) (thickness 0.25) bold) (justify left bottom mirror)) ) @@ -248641,77 +248644,61 @@ (xy 125.876891 143.526395) (xy 125.853141 143.480766) (xy 125.852498 143.470969) - (xy 125.852498 139.23) - (xy 126.394341 139.23) - (xy 126.414936 139.465403) - (xy 126.476097 139.693662) - (xy 126.476098 139.693666) - (xy 126.575961 139.907823) - (xy 126.711507 140.101404) - (xy 126.878595 140.268492) - (xy 126.878598 140.268494) - (xy 126.878599 140.268495) - (xy 127.072171 140.404035) - (xy 127.072173 140.404035) - (xy 127.072176 140.404038) - (xy 127.22903 140.47718) - (xy 127.286337 140.503903) - (xy 127.514592 140.565063) - (xy 127.632219 140.575354) - (xy 127.691032 140.5805) - (xy 127.691034 140.5805) - (xy 127.808968 140.5805) - (xy 127.859377 140.576089) - (xy 127.985408 140.565063) - (xy 128.213663 140.503903) - (xy 128.387264 140.422951) - (xy 128.427823 140.404038) - (xy 128.427823 140.404037) - (xy 128.427829 140.404035) - (xy 128.621401 140.268495) - (xy 128.788495 140.101401) - (xy 128.924035 139.90783) - (xy 129.023903 139.693663) - (xy 129.085063 139.465408) - (xy 129.105659 139.23) - (xy 129.085063 138.994592) - (xy 129.023903 138.766337) - (xy 128.967871 138.646177) - (xy 128.924038 138.552176) - (xy 128.924035 138.552173) - (xy 128.924035 138.552171) - (xy 128.788495 138.358599) - (xy 128.788494 138.358598) - (xy 128.788492 138.358595) - (xy 128.621404 138.191507) - (xy 128.556547 138.146094) - (xy 128.427829 138.055965) - (xy 128.427828 138.055964) - (xy 128.427823 138.055961) - (xy 128.213666 137.956098) - (xy 128.213664 137.956097) - (xy 128.213663 137.956097) - (xy 127.985408 137.894937) - (xy 127.985406 137.894936) - (xy 127.985403 137.894936) - (xy 127.808968 137.8795) - (xy 127.808966 137.8795) - (xy 127.691034 137.8795) - (xy 127.691032 137.8795) - (xy 127.514596 137.894936) - (xy 127.514592 137.894936) - (xy 127.514592 137.894937) - (xy 127.474334 137.905724) - (xy 127.286337 137.956097) - (xy 127.286333 137.956098) - (xy 127.072176 138.055961) - (xy 126.878595 138.191507) - (xy 126.711507 138.358595) - (xy 126.575961 138.552175) - (xy 126.476098 138.766333) - (xy 126.414936 138.994596) - (xy 126.394341 139.23) - (xy 125.852498 139.23) + (xy 125.852498 139.183678) + (xy 126.89574 139.183678) + (xy 126.905755 139.368407) + (xy 126.905755 139.36841) + (xy 126.955245 139.546656) + (xy 126.955246 139.54666) + (xy 126.998573 139.628381) + (xy 127.0419 139.710104) + (xy 127.041901 139.710105) + (xy 127.161663 139.8511) + (xy 127.161665 139.851102) + (xy 127.308933 139.963052) + (xy 127.308936 139.963054) + (xy 127.476833 140.040732) + (xy 127.657503 140.0805) + (xy 127.657505 140.0805) + (xy 127.796111 140.0805) + (xy 127.796113 140.0805) + (xy 127.93391 140.065514) + (xy 128.109221 140.006444) + (xy 128.267736 139.91107) + (xy 128.402041 139.783849) + (xy 128.505858 139.63073) + (xy 128.574331 139.458875) + (xy 128.574331 139.458869) + (xy 128.574333 139.458866) + (xy 128.604259 139.276322) + (xy 128.60426 139.276317) + (xy 128.594245 139.091593) + (xy 128.544754 138.913341) + (xy 128.4581 138.749896) + (xy 128.338337 138.6089) + (xy 128.338336 138.608899) + (xy 128.338334 138.608897) + (xy 128.191066 138.496947) + (xy 128.023167 138.419268) + (xy 128.005594 138.4154) + (xy 127.842497 138.3795) + (xy 127.703887 138.3795) + (xy 127.670259 138.383157) + (xy 127.566093 138.394485) + (xy 127.566085 138.394487) + (xy 127.390781 138.453554) + (xy 127.390778 138.453556) + (xy 127.232268 138.548926) + (xy 127.23226 138.548933) + (xy 127.097958 138.676151) + (xy 127.097957 138.676153) + (xy 126.994144 138.829265) + (xy 126.99414 138.829274) + (xy 126.92567 139.001121) + (xy 126.925666 139.001133) + (xy 126.89574 139.183676) + (xy 126.89574 139.183678) + (xy 125.852498 139.183678) (xy 125.852498 136.305724) (xy 126.7971 136.305724) (xy 126.81158 136.397145) @@ -249214,7 +249201,7 @@ (xy 140.5221 139.169275) (xy 140.5221 139.730724) (xy 140.53658 139.822145) - (xy 140.576328 139.900155) + (xy 140.581891 139.911073) (xy 140.592723 139.932332) (xy 140.680168 140.019777) (xy 140.777091 140.069161) @@ -249620,77 +249607,61 @@ (xy 152.099884 141.033966) (xy 152.061166 141.000098) (xy 152.05185 140.963844) - (xy 152.05185 139.23) - (xy 158.394341 139.23) - (xy 158.414936 139.465403) - (xy 158.476097 139.693662) - (xy 158.476098 139.693666) - (xy 158.575961 139.907823) - (xy 158.711507 140.101404) - (xy 158.878595 140.268492) - (xy 158.878598 140.268494) - (xy 158.878599 140.268495) - (xy 159.072171 140.404035) - (xy 159.072173 140.404035) - (xy 159.072176 140.404038) - (xy 159.22903 140.47718) - (xy 159.286337 140.503903) - (xy 159.514592 140.565063) - (xy 159.632219 140.575354) - (xy 159.691032 140.5805) - (xy 159.691034 140.5805) - (xy 159.808968 140.5805) - (xy 159.859377 140.576089) - (xy 159.985408 140.565063) - (xy 160.213663 140.503903) - (xy 160.387264 140.422951) - (xy 160.427823 140.404038) - (xy 160.427823 140.404037) - (xy 160.427829 140.404035) - (xy 160.621401 140.268495) - (xy 160.788495 140.101401) - (xy 160.924035 139.90783) - (xy 161.023903 139.693663) - (xy 161.085063 139.465408) - (xy 161.105659 139.23) - (xy 161.085063 138.994592) - (xy 161.023903 138.766337) - (xy 160.967871 138.646177) - (xy 160.924038 138.552176) - (xy 160.924035 138.552173) - (xy 160.924035 138.552171) - (xy 160.788495 138.358599) - (xy 160.788494 138.358598) - (xy 160.788492 138.358595) - (xy 160.621404 138.191507) - (xy 160.556547 138.146094) - (xy 160.427829 138.055965) - (xy 160.427828 138.055964) - (xy 160.427823 138.055961) - (xy 160.213666 137.956098) - (xy 160.213664 137.956097) - (xy 160.213663 137.956097) - (xy 159.985408 137.894937) - (xy 159.985406 137.894936) - (xy 159.985403 137.894936) - (xy 159.808968 137.8795) - (xy 159.808966 137.8795) - (xy 159.691034 137.8795) - (xy 159.691032 137.8795) - (xy 159.514596 137.894936) - (xy 159.514592 137.894936) - (xy 159.514592 137.894937) - (xy 159.474334 137.905724) - (xy 159.286337 137.956097) - (xy 159.286333 137.956098) - (xy 159.072176 138.055961) - (xy 158.878595 138.191507) - (xy 158.711507 138.358595) - (xy 158.575961 138.552175) - (xy 158.476098 138.766333) - (xy 158.414936 138.994596) - (xy 158.394341 139.23) - (xy 152.05185 139.23) + (xy 152.05185 139.183678) + (xy 158.89574 139.183678) + (xy 158.905755 139.368407) + (xy 158.905755 139.36841) + (xy 158.955245 139.546656) + (xy 158.955246 139.54666) + (xy 158.998572 139.628381) + (xy 159.0419 139.710104) + (xy 159.041901 139.710105) + (xy 159.161663 139.8511) + (xy 159.161665 139.851102) + (xy 159.308933 139.963052) + (xy 159.308936 139.963054) + (xy 159.476833 140.040732) + (xy 159.657503 140.0805) + (xy 159.657505 140.0805) + (xy 159.796111 140.0805) + (xy 159.796113 140.0805) + (xy 159.93391 140.065514) + (xy 160.109221 140.006444) + (xy 160.267736 139.91107) + (xy 160.402041 139.783849) + (xy 160.505858 139.63073) + (xy 160.574331 139.458875) + (xy 160.574331 139.458869) + (xy 160.574333 139.458866) + (xy 160.604259 139.276322) + (xy 160.60426 139.276317) + (xy 160.594245 139.091593) + (xy 160.544754 138.913341) + (xy 160.4581 138.749896) + (xy 160.338337 138.6089) + (xy 160.338336 138.608899) + (xy 160.338334 138.608897) + (xy 160.191066 138.496947) + (xy 160.023167 138.419268) + (xy 160.005594 138.4154) + (xy 159.842497 138.3795) + (xy 159.703887 138.3795) + (xy 159.670259 138.383157) + (xy 159.566093 138.394485) + (xy 159.566085 138.394487) + (xy 159.390781 138.453554) + (xy 159.390778 138.453556) + (xy 159.232268 138.548926) + (xy 159.23226 138.548933) + (xy 159.097958 138.676151) + (xy 159.097957 138.676153) + (xy 158.994144 138.829265) + (xy 158.99414 138.829274) + (xy 158.92567 139.001121) + (xy 158.925666 139.001133) + (xy 158.89574 139.183676) + (xy 158.89574 139.183678) + (xy 152.05185 139.183678) (xy 152.05185 136.692488) (xy 152.069443 136.64415) (xy 152.073876 136.639314) @@ -254747,39 +254718,38 @@ (xy 125.876891 143.526395) (xy 125.853141 143.480766) (xy 125.852498 143.470969) - (xy 125.852498 139.23) - (xy 126.394341 139.23) - (xy 126.414936 139.465403) - (xy 126.476097 139.693662) - (xy 126.476098 139.693666) - (xy 126.575961 139.907823) - (xy 126.711507 140.101404) - (xy 126.878595 140.268492) - (xy 126.878598 140.268494) - (xy 126.878599 140.268495) - (xy 127.072171 140.404035) - (xy 127.072173 140.404035) - (xy 127.072176 140.404038) - (xy 127.250403 140.487146) - (xy 127.286337 140.503903) - (xy 127.514592 140.565063) - (xy 127.632219 140.575354) - (xy 127.691032 140.5805) - (xy 127.691034 140.5805) - (xy 127.808968 140.5805) - (xy 127.859377 140.576089) - (xy 127.985408 140.565063) - (xy 128.213663 140.503903) - (xy 128.427829 140.404035) - (xy 128.621401 140.268495) - (xy 128.788495 140.101401) - (xy 128.924035 139.90783) - (xy 129.023903 139.693663) - (xy 129.085063 139.465408) - (xy 129.105659 139.23) - (xy 129.085063 138.994592) - (xy 129.023903 138.766337) - (xy 129.004627 138.725) + (xy 125.852498 139.183678) + (xy 126.89574 139.183678) + (xy 126.905755 139.368407) + (xy 126.905755 139.36841) + (xy 126.955245 139.546656) + (xy 126.955246 139.54666) + (xy 126.998573 139.628381) + (xy 127.0419 139.710104) + (xy 127.041901 139.710105) + (xy 127.161663 139.8511) + (xy 127.161665 139.851102) + (xy 127.240552 139.91107) + (xy 127.308936 139.963054) + (xy 127.476833 140.040732) + (xy 127.657503 140.0805) + (xy 127.657505 140.0805) + (xy 127.796111 140.0805) + (xy 127.796113 140.0805) + (xy 127.93391 140.065514) + (xy 128.109221 140.006444) + (xy 128.267736 139.91107) + (xy 128.402041 139.783849) + (xy 128.505858 139.63073) + (xy 128.574331 139.458875) + (xy 128.574331 139.458869) + (xy 128.574333 139.458866) + (xy 128.604259 139.276322) + (xy 128.60426 139.276317) + (xy 128.594245 139.091593) + (xy 128.544754 138.913341) + (xy 128.4581 138.749896) + (xy 128.436953 138.725) (xy 141.875 138.725) (xy 141.875 143.725) (xy 145.5 143.725) @@ -254822,100 +254792,88 @@ (xy 155.961331 143.155662) (xy 155.942329 143.3) (xy 145.5 143.3) - (xy 145.5 139.23) - (xy 158.394341 139.23) - (xy 158.414936 139.465403) - (xy 158.476097 139.693662) - (xy 158.476098 139.693666) - (xy 158.575961 139.907823) - (xy 158.711507 140.101404) - (xy 158.878595 140.268492) - (xy 158.878598 140.268494) - (xy 158.878599 140.268495) - (xy 159.072171 140.404035) - (xy 159.072173 140.404035) - (xy 159.072176 140.404038) - (xy 159.250403 140.487146) - (xy 159.286337 140.503903) - (xy 159.514592 140.565063) - (xy 159.632219 140.575354) - (xy 159.691032 140.5805) - (xy 159.691034 140.5805) - (xy 159.808968 140.5805) - (xy 159.859377 140.576089) - (xy 159.985408 140.565063) - (xy 160.213663 140.503903) - (xy 160.427829 140.404035) - (xy 160.621401 140.268495) - (xy 160.788495 140.101401) - (xy 160.924035 139.90783) - (xy 161.023903 139.693663) - (xy 161.085063 139.465408) - (xy 161.105659 139.23) - (xy 161.085063 138.994592) - (xy 161.023903 138.766337) - (xy 161.004627 138.725) - (xy 160.924038 138.552176) - (xy 160.924035 138.552173) - (xy 160.924035 138.552171) - (xy 160.788495 138.358599) - (xy 160.788494 138.358598) - (xy 160.788492 138.358595) - (xy 160.621404 138.191507) - (xy 160.427823 138.055961) - (xy 160.213666 137.956098) - (xy 160.213664 137.956097) - (xy 160.213663 137.956097) - (xy 159.985408 137.894937) - (xy 159.985406 137.894936) - (xy 159.985403 137.894936) - (xy 159.808968 137.8795) - (xy 159.808966 137.8795) - (xy 159.691034 137.8795) - (xy 159.691032 137.8795) - (xy 159.514596 137.894936) - (xy 159.286337 137.956097) - (xy 159.286333 137.956098) - (xy 159.072176 138.055961) - (xy 158.878595 138.191507) - (xy 158.711507 138.358595) - (xy 158.575961 138.552175) - (xy 158.476098 138.766333) - (xy 158.414936 138.994596) - (xy 158.394341 139.23) - (xy 145.5 139.23) + (xy 145.5 139.183678) + (xy 158.89574 139.183678) + (xy 158.905755 139.368407) + (xy 158.905755 139.36841) + (xy 158.955245 139.546656) + (xy 158.955246 139.54666) + (xy 158.998572 139.628381) + (xy 159.0419 139.710104) + (xy 159.041901 139.710105) + (xy 159.161663 139.8511) + (xy 159.161665 139.851102) + (xy 159.240552 139.91107) + (xy 159.308936 139.963054) + (xy 159.476833 140.040732) + (xy 159.657503 140.0805) + (xy 159.657505 140.0805) + (xy 159.796111 140.0805) + (xy 159.796113 140.0805) + (xy 159.93391 140.065514) + (xy 160.109221 140.006444) + (xy 160.267736 139.91107) + (xy 160.402041 139.783849) + (xy 160.505858 139.63073) + (xy 160.574331 139.458875) + (xy 160.574331 139.458869) + (xy 160.574333 139.458866) + (xy 160.604259 139.276322) + (xy 160.60426 139.276317) + (xy 160.594245 139.091593) + (xy 160.544754 138.913341) + (xy 160.4581 138.749896) + (xy 160.338337 138.6089) + (xy 160.338336 138.608899) + (xy 160.338334 138.608897) + (xy 160.191066 138.496947) + (xy 160.023167 138.419268) + (xy 160.023167 138.419267) + (xy 159.842497 138.3795) + (xy 159.703887 138.3795) + (xy 159.670259 138.383157) + (xy 159.566093 138.394485) + (xy 159.566085 138.394487) + (xy 159.390781 138.453554) + (xy 159.390778 138.453556) + (xy 159.232268 138.548926) + (xy 159.23226 138.548933) + (xy 159.097958 138.676151) + (xy 159.097957 138.676153) + (xy 158.994144 138.829265) + (xy 158.99414 138.829274) + (xy 158.92567 139.001121) + (xy 158.925666 139.001133) + (xy 158.89574 139.183676) + (xy 158.89574 139.183678) + (xy 145.5 139.183678) (xy 145.5 138.725) (xy 141.875 138.725) - (xy 129.004627 138.725) - (xy 128.924038 138.552176) - (xy 128.924035 138.552173) - (xy 128.924035 138.552171) - (xy 128.788495 138.358599) - (xy 128.788494 138.358598) - (xy 128.788492 138.358595) - (xy 128.621404 138.191507) - (xy 128.427823 138.055961) - (xy 128.213666 137.956098) - (xy 128.213664 137.956097) - (xy 128.213663 137.956097) - (xy 127.985408 137.894937) - (xy 127.985406 137.894936) - (xy 127.985403 137.894936) - (xy 127.808968 137.8795) - (xy 127.808966 137.8795) - (xy 127.691034 137.8795) - (xy 127.691032 137.8795) - (xy 127.514596 137.894936) - (xy 127.286337 137.956097) - (xy 127.286333 137.956098) - (xy 127.072176 138.055961) - (xy 126.878595 138.191507) - (xy 126.711507 138.358595) - (xy 126.575961 138.552175) - (xy 126.476098 138.766333) - (xy 126.414936 138.994596) - (xy 126.394341 139.23) - (xy 125.852498 139.23) + (xy 128.436953 138.725) + (xy 128.338337 138.6089) + (xy 128.338336 138.608899) + (xy 128.338334 138.608897) + (xy 128.191066 138.496947) + (xy 128.023167 138.419268) + (xy 128.023167 138.419267) + (xy 127.842497 138.3795) + (xy 127.703887 138.3795) + (xy 127.670259 138.383157) + (xy 127.566093 138.394485) + (xy 127.566085 138.394487) + (xy 127.390781 138.453554) + (xy 127.390778 138.453556) + (xy 127.232268 138.548926) + (xy 127.23226 138.548933) + (xy 127.097958 138.676151) + (xy 127.097957 138.676153) + (xy 126.994144 138.829265) + (xy 126.99414 138.829274) + (xy 126.92567 139.001121) + (xy 126.925666 139.001133) + (xy 126.89574 139.183676) + (xy 126.89574 139.183678) + (xy 125.852498 139.183678) (xy 125.852498 136.25) (xy 141.617329 136.25) (xy 141.636331 136.394336) @@ -257267,42 +257225,38 @@ (xy 139.786331 141.055662) (xy 139.767329 141.2) (xy 125.852499 141.2) - (xy 125.852499 139.23) - (xy 126.394341 139.23) - (xy 126.414936 139.465403) - (xy 126.476097 139.693662) - (xy 126.476098 139.693666) - (xy 126.575961 139.907823) - (xy 126.711507 140.101404) - (xy 126.878595 140.268492) - (xy 126.878598 140.268494) - (xy 126.878599 140.268495) - (xy 127.072171 140.404035) - (xy 127.072173 140.404035) - (xy 127.072176 140.404038) - (xy 127.250403 140.487146) - (xy 127.286337 140.503903) - (xy 127.514592 140.565063) - (xy 127.632219 140.575354) - (xy 127.691032 140.5805) - (xy 127.691034 140.5805) - (xy 127.808968 140.5805) - (xy 127.859377 140.576089) - (xy 127.985408 140.565063) - (xy 128.213663 140.503903) - (xy 128.412543 140.411163) - (xy 128.427823 140.404038) - (xy 128.427823 140.404037) - (xy 128.427829 140.404035) - (xy 128.621401 140.268495) - (xy 128.788495 140.101401) - (xy 128.924035 139.90783) - (xy 129.023903 139.693663) - (xy 129.085063 139.465408) - (xy 129.105659 139.23) - (xy 129.085063 138.994592) - (xy 129.023903 138.766337) - (xy 129.004627 138.725) + (xy 125.852499 139.183678) + (xy 126.89574 139.183678) + (xy 126.905755 139.368407) + (xy 126.905755 139.36841) + (xy 126.955245 139.546656) + (xy 126.955246 139.54666) + (xy 126.998573 139.628381) + (xy 127.0419 139.710104) + (xy 127.041901 139.710105) + (xy 127.161663 139.8511) + (xy 127.161665 139.851102) + (xy 127.240552 139.91107) + (xy 127.308936 139.963054) + (xy 127.476833 140.040732) + (xy 127.657503 140.0805) + (xy 127.657505 140.0805) + (xy 127.796111 140.0805) + (xy 127.796113 140.0805) + (xy 127.93391 140.065514) + (xy 128.109221 140.006444) + (xy 128.267736 139.91107) + (xy 128.402041 139.783849) + (xy 128.505858 139.63073) + (xy 128.574331 139.458875) + (xy 128.574331 139.458869) + (xy 128.574333 139.458866) + (xy 128.604259 139.276322) + (xy 128.60426 139.276317) + (xy 128.594245 139.091593) + (xy 128.544754 138.913341) + (xy 128.4581 138.749896) + (xy 128.436953 138.725) (xy 141.875 138.725) (xy 141.875 143.725) (xy 145.5 143.725) @@ -257451,109 +257405,88 @@ (xy 146.582329 141.209999) (xy 146.582329 141.21) (xy 145.5 141.21) - (xy 145.5 139.23) - (xy 158.394341 139.23) - (xy 158.414936 139.465403) - (xy 158.476097 139.693662) - (xy 158.476098 139.693666) - (xy 158.575961 139.907823) - (xy 158.711507 140.101404) - (xy 158.878595 140.268492) - (xy 158.878598 140.268494) - (xy 158.878599 140.268495) - (xy 159.072171 140.404035) - (xy 159.072173 140.404035) - (xy 159.072176 140.404038) - (xy 159.250403 140.487146) - (xy 159.286337 140.503903) - (xy 159.514592 140.565063) - (xy 159.632219 140.575354) - (xy 159.691032 140.5805) - (xy 159.691034 140.5805) - (xy 159.808968 140.5805) - (xy 159.859377 140.576089) - (xy 159.985408 140.565063) - (xy 160.213663 140.503903) - (xy 160.412543 140.411163) - (xy 160.427823 140.404038) - (xy 160.427823 140.404037) - (xy 160.427829 140.404035) - (xy 160.621401 140.268495) - (xy 160.788495 140.101401) - (xy 160.924035 139.90783) - (xy 161.023903 139.693663) - (xy 161.085063 139.465408) - (xy 161.105659 139.23) - (xy 161.085063 138.994592) - (xy 161.023903 138.766337) - (xy 161.004627 138.725) - (xy 160.924038 138.552176) - (xy 160.924035 138.552173) - (xy 160.924035 138.552171) - (xy 160.788495 138.358599) - (xy 160.788494 138.358598) - (xy 160.788492 138.358595) - (xy 160.621404 138.191507) - (xy 160.427823 138.055961) - (xy 160.213666 137.956098) - (xy 160.213664 137.956097) - (xy 160.213663 137.956097) - (xy 159.985408 137.894937) - (xy 159.985406 137.894936) - (xy 159.985403 137.894936) - (xy 159.808968 137.8795) - (xy 159.808966 137.8795) - (xy 159.691034 137.8795) - (xy 159.691032 137.8795) - (xy 159.514596 137.894936) - (xy 159.514592 137.894936) - (xy 159.514592 137.894937) - (xy 159.286337 137.956096) - (xy 159.286337 137.956097) - (xy 159.286333 137.956098) - (xy 159.072176 138.055961) - (xy 158.878595 138.191507) - (xy 158.711507 138.358595) - (xy 158.575961 138.552175) - (xy 158.476098 138.766333) - (xy 158.414936 138.994596) - (xy 158.394341 139.23) - (xy 145.5 139.23) + (xy 145.5 139.183678) + (xy 158.89574 139.183678) + (xy 158.905755 139.368407) + (xy 158.905755 139.36841) + (xy 158.955245 139.546656) + (xy 158.955246 139.54666) + (xy 158.998572 139.628381) + (xy 159.0419 139.710104) + (xy 159.041901 139.710105) + (xy 159.161663 139.8511) + (xy 159.161665 139.851102) + (xy 159.240552 139.91107) + (xy 159.308936 139.963054) + (xy 159.476833 140.040732) + (xy 159.657503 140.0805) + (xy 159.657505 140.0805) + (xy 159.796111 140.0805) + (xy 159.796113 140.0805) + (xy 159.93391 140.065514) + (xy 160.109221 140.006444) + (xy 160.267736 139.91107) + (xy 160.402041 139.783849) + (xy 160.505858 139.63073) + (xy 160.574331 139.458875) + (xy 160.574331 139.458869) + (xy 160.574333 139.458866) + (xy 160.604259 139.276322) + (xy 160.60426 139.276317) + (xy 160.594245 139.091593) + (xy 160.544754 138.913341) + (xy 160.4581 138.749896) + (xy 160.338337 138.6089) + (xy 160.338336 138.608899) + (xy 160.338334 138.608897) + (xy 160.191066 138.496947) + (xy 160.023167 138.419268) + (xy 160.023167 138.419267) + (xy 159.842497 138.3795) + (xy 159.703887 138.3795) + (xy 159.670259 138.383157) + (xy 159.566093 138.394485) + (xy 159.566085 138.394487) + (xy 159.390781 138.453554) + (xy 159.390778 138.453556) + (xy 159.232268 138.548926) + (xy 159.23226 138.548933) + (xy 159.097958 138.676151) + (xy 159.097957 138.676153) + (xy 158.994144 138.829265) + (xy 158.99414 138.829274) + (xy 158.92567 139.001121) + (xy 158.925666 139.001133) + (xy 158.89574 139.183676) + (xy 158.89574 139.183678) + (xy 145.5 139.183678) (xy 145.5 138.725) (xy 141.875 138.725) - (xy 129.004627 138.725) - (xy 128.924038 138.552176) - (xy 128.924035 138.552173) - (xy 128.924035 138.552171) - (xy 128.788495 138.358599) - (xy 128.788494 138.358598) - (xy 128.788492 138.358595) - (xy 128.621404 138.191507) - (xy 128.427823 138.055961) - (xy 128.213666 137.956098) - (xy 128.213664 137.956097) - (xy 128.213663 137.956097) - (xy 127.985408 137.894937) - (xy 127.985406 137.894936) - (xy 127.985403 137.894936) - (xy 127.808968 137.8795) - (xy 127.808966 137.8795) - (xy 127.691034 137.8795) - (xy 127.691032 137.8795) - (xy 127.514596 137.894936) - (xy 127.514592 137.894936) - (xy 127.514592 137.894937) - (xy 127.286336 137.956096) - (xy 127.286337 137.956097) - (xy 127.286333 137.956098) - (xy 127.072176 138.055961) - (xy 126.878595 138.191507) - (xy 126.711507 138.358595) - (xy 126.575961 138.552175) - (xy 126.476098 138.766333) - (xy 126.414936 138.994596) - (xy 126.394341 139.23) - (xy 125.852499 139.23) + (xy 128.436953 138.725) + (xy 128.338337 138.6089) + (xy 128.338336 138.608899) + (xy 128.338334 138.608897) + (xy 128.191066 138.496947) + (xy 128.023167 138.419268) + (xy 128.023167 138.419267) + (xy 127.842497 138.3795) + (xy 127.703887 138.3795) + (xy 127.670259 138.383157) + (xy 127.566093 138.394485) + (xy 127.566085 138.394487) + (xy 127.390781 138.453554) + (xy 127.390778 138.453556) + (xy 127.232268 138.548926) + (xy 127.23226 138.548933) + (xy 127.097958 138.676151) + (xy 127.097957 138.676153) + (xy 126.994144 138.829265) + (xy 126.99414 138.829274) + (xy 126.92567 139.001121) + (xy 126.925666 139.001133) + (xy 126.89574 139.183676) + (xy 126.89574 139.183678) + (xy 125.852499 139.183678) (xy 125.852499 137.64) (xy 130.532329 137.64) (xy 130.551331 137.784336) @@ -257561,7 +257494,7 @@ (xy 130.607044 137.918838) (xy 130.607045 137.918839) (xy 130.695666 138.034333) - (xy 130.723858 138.055965) + (xy 130.81116 138.122954) (xy 130.811164 138.122957) (xy 130.945664 138.178669) (xy 131.09 138.197671) @@ -263935,7 +263868,7 @@ (xy 151.212692 138.278191) (xy 151.097847 138.336708) (xy 151.006708 138.427847) - (xy 150.967696 138.504412) + (xy 150.971501 138.496946) (xy 150.948191 138.542694) (xy 150.94819 138.542695) (xy 150.948191 138.542695) @@ -263952,78 +263885,61 @@ (xy 150.69 139.009668) (xy 150.69 139.3075) (xy 153.29 139.3075) - (xy 153.29 139.23) - (xy 158.394341 139.23) - (xy 158.414936 139.465403) - (xy 158.414936 139.465406) - (xy 158.414937 139.465408) - (xy 158.476097 139.693662) - (xy 158.476098 139.693666) - (xy 158.575961 139.907823) - (xy 158.575964 139.907828) - (xy 158.575965 139.907829) - (xy 158.643856 140.004788) - (xy 158.711507 140.101404) - (xy 158.878595 140.268492) - (xy 158.878598 140.268494) - (xy 158.878599 140.268495) - (xy 159.072171 140.404035) - (xy 159.072173 140.404035) - (xy 159.072176 140.404038) - (xy 159.248011 140.486031) - (xy 159.286337 140.503903) - (xy 159.514592 140.565063) - (xy 159.632219 140.575354) - (xy 159.691032 140.5805) - (xy 159.691034 140.5805) - (xy 159.808968 140.5805) - (xy 159.859377 140.576089) - (xy 159.985408 140.565063) - (xy 160.213663 140.503903) - (xy 160.427829 140.404035) - (xy 160.621401 140.268495) - (xy 160.788495 140.101401) - (xy 160.924035 139.90783) - (xy 160.941676 139.87) - (xy 160.958511 139.833896) - (xy 161.023903 139.693663) - (xy 161.085063 139.465408) - (xy 161.105659 139.23) - (xy 161.085063 138.994592) - (xy 161.023903 138.766337) - (xy 160.97898 138.67) - (xy 160.924038 138.552176) - (xy 160.924035 138.552173) - (xy 160.924035 138.552171) - (xy 160.788495 138.358599) - (xy 160.788494 138.358598) - (xy 160.788492 138.358595) - (xy 160.621404 138.191507) - (xy 160.556876 138.146325) - (xy 160.427829 138.055965) - (xy 160.427828 138.055964) - (xy 160.427823 138.055961) - (xy 160.213666 137.956098) - (xy 160.213664 137.956097) - (xy 160.213663 137.956097) - (xy 159.985408 137.894937) - (xy 159.985406 137.894936) - (xy 159.985403 137.894936) - (xy 159.808968 137.8795) - (xy 159.808966 137.8795) - (xy 159.691034 137.8795) - (xy 159.691032 137.8795) - (xy 159.514596 137.894936) - (xy 159.286337 137.956097) - (xy 159.286333 137.956098) - (xy 159.072176 138.055961) - (xy 158.878595 138.191507) - (xy 158.711507 138.358595) - (xy 158.575961 138.552175) - (xy 158.476098 138.766333) - (xy 158.414936 138.994596) - (xy 158.394341 139.23) - (xy 153.29 139.23) + (xy 153.29 139.183678) + (xy 158.89574 139.183678) + (xy 158.905755 139.368407) + (xy 158.905755 139.36841) + (xy 158.955245 139.546656) + (xy 158.955246 139.54666) + (xy 158.973047 139.580235) + (xy 159.0419 139.710104) + (xy 159.041901 139.710105) + (xy 159.161663 139.8511) + (xy 159.161665 139.851102) + (xy 159.286544 139.946032) + (xy 159.308936 139.963054) + (xy 159.476833 140.040732) + (xy 159.657503 140.0805) + (xy 159.657505 140.0805) + (xy 159.796111 140.0805) + (xy 159.796113 140.0805) + (xy 159.93391 140.065514) + (xy 160.109221 140.006444) + (xy 160.267736 139.91107) + (xy 160.402041 139.783849) + (xy 160.505858 139.63073) + (xy 160.574331 139.458875) + (xy 160.574331 139.458869) + (xy 160.574333 139.458866) + (xy 160.604259 139.276322) + (xy 160.60426 139.276317) + (xy 160.594245 139.091593) + (xy 160.544754 138.913341) + (xy 160.4581 138.749896) + (xy 160.338337 138.6089) + (xy 160.338336 138.608899) + (xy 160.338334 138.608897) + (xy 160.191066 138.496947) + (xy 160.159167 138.482189) + (xy 160.023167 138.419268) + (xy 159.842497 138.3795) + (xy 159.703887 138.3795) + (xy 159.670259 138.383157) + (xy 159.566093 138.394485) + (xy 159.566085 138.394487) + (xy 159.390781 138.453554) + (xy 159.390778 138.453556) + (xy 159.232268 138.548926) + (xy 159.23226 138.548933) + (xy 159.097958 138.676151) + (xy 159.097957 138.676153) + (xy 158.994144 138.829265) + (xy 158.99414 138.829274) + (xy 158.92567 139.001121) + (xy 158.925666 139.001133) + (xy 158.89574 139.183676) + (xy 158.89574 139.183678) + (xy 153.29 139.183678) (xy 153.29 139.1521) (xy 153.307593 139.103762) (xy 153.352142 139.078042) @@ -264559,78 +264475,61 @@ (xy 131.7096 140.393402) (xy 131.7096 141.031594) (xy 125.852498 141.031594) - (xy 125.852498 139.23) - (xy 126.394341 139.23) - (xy 126.414936 139.465403) - (xy 126.414936 139.465406) - (xy 126.414937 139.465408) - (xy 126.476097 139.693662) - (xy 126.476098 139.693666) - (xy 126.575961 139.907823) - (xy 126.575964 139.907828) - (xy 126.575965 139.907829) - (xy 126.643856 140.004788) - (xy 126.711507 140.101404) - (xy 126.878595 140.268492) - (xy 126.878598 140.268494) - (xy 126.878599 140.268495) - (xy 127.072171 140.404035) - (xy 127.072173 140.404035) - (xy 127.072176 140.404038) - (xy 127.248011 140.486031) - (xy 127.286337 140.503903) - (xy 127.514592 140.565063) - (xy 127.632219 140.575354) - (xy 127.691032 140.5805) - (xy 127.691034 140.5805) - (xy 127.808968 140.5805) - (xy 127.859377 140.576089) - (xy 127.985408 140.565063) - (xy 128.213663 140.503903) - (xy 128.427829 140.404035) - (xy 128.621401 140.268495) - (xy 128.788495 140.101401) - (xy 128.924035 139.90783) - (xy 128.941676 139.87) - (xy 128.958511 139.833896) - (xy 129.023903 139.693663) - (xy 129.085063 139.465408) - (xy 129.105659 139.23) - (xy 129.085063 138.994592) - (xy 129.023903 138.766337) - (xy 128.97898 138.67) - (xy 128.924038 138.552176) - (xy 128.924035 138.552173) - (xy 128.924035 138.552171) - (xy 128.788495 138.358599) - (xy 128.788494 138.358598) - (xy 128.788492 138.358595) - (xy 128.621404 138.191507) - (xy 128.556876 138.146325) - (xy 128.427829 138.055965) - (xy 128.427828 138.055964) - (xy 128.427823 138.055961) - (xy 128.213666 137.956098) - (xy 128.213664 137.956097) - (xy 128.213663 137.956097) - (xy 127.985408 137.894937) - (xy 127.985406 137.894936) - (xy 127.985403 137.894936) - (xy 127.808968 137.8795) - (xy 127.808966 137.8795) - (xy 127.691034 137.8795) - (xy 127.691032 137.8795) - (xy 127.514596 137.894936) - (xy 127.286337 137.956097) - (xy 127.286333 137.956098) - (xy 127.072176 138.055961) - (xy 126.878595 138.191507) - (xy 126.711507 138.358595) - (xy 126.575961 138.552175) - (xy 126.476098 138.766333) - (xy 126.414936 138.994596) - (xy 126.394341 139.23) - (xy 125.852498 139.23) + (xy 125.852498 139.183678) + (xy 126.89574 139.183678) + (xy 126.905755 139.368407) + (xy 126.905755 139.36841) + (xy 126.955245 139.546656) + (xy 126.955246 139.54666) + (xy 126.973047 139.580235) + (xy 127.0419 139.710104) + (xy 127.041901 139.710105) + (xy 127.161663 139.8511) + (xy 127.161665 139.851102) + (xy 127.286544 139.946032) + (xy 127.308936 139.963054) + (xy 127.476833 140.040732) + (xy 127.657503 140.0805) + (xy 127.657505 140.0805) + (xy 127.796111 140.0805) + (xy 127.796113 140.0805) + (xy 127.93391 140.065514) + (xy 128.109221 140.006444) + (xy 128.267736 139.91107) + (xy 128.402041 139.783849) + (xy 128.505858 139.63073) + (xy 128.574331 139.458875) + (xy 128.574331 139.458869) + (xy 128.574333 139.458866) + (xy 128.604259 139.276322) + (xy 128.60426 139.276317) + (xy 128.594245 139.091593) + (xy 128.544754 138.913341) + (xy 128.4581 138.749896) + (xy 128.338337 138.6089) + (xy 128.338336 138.608899) + (xy 128.338334 138.608897) + (xy 128.191066 138.496947) + (xy 128.159167 138.482189) + (xy 128.023167 138.419268) + (xy 127.842497 138.3795) + (xy 127.703887 138.3795) + (xy 127.670259 138.383157) + (xy 127.566093 138.394485) + (xy 127.566085 138.394487) + (xy 127.390781 138.453554) + (xy 127.390778 138.453556) + (xy 127.232268 138.548926) + (xy 127.23226 138.548933) + (xy 127.097958 138.676151) + (xy 127.097957 138.676153) + (xy 126.994144 138.829265) + (xy 126.99414 138.829274) + (xy 126.92567 139.001121) + (xy 126.925666 139.001133) + (xy 126.89574 139.183676) + (xy 126.89574 139.183678) + (xy 125.852498 139.183678) (xy 125.852498 130.159123) (xy 125.852505 130.159074) (xy 125.852502 130.146908) diff --git a/Electrical/opencom-lte.kicad_pro b/Electrical/opencom-lte.kicad_pro index ebc76ff..a4a0fa3 100644 --- a/Electrical/opencom-lte.kicad_pro +++ b/Electrical/opencom-lte.kicad_pro @@ -55,12 +55,7 @@ "width": 0.0 } ], - "drc_exclusions": [ - "lib_footprint_mismatch|143730000|118685000|f851ed5b-4e23-405b-b1aa-e8d65dde7576|00000000-0000-0000-0000-000000000000", - "silk_edge_clearance|135100000|146210000|817865ca-6565-4a12-ae67-31e7bc751cd4|7d3f5ab3-16c8-455c-8f91-072f763f7880", - "silk_edge_clearance|152400000|146210000|817865ca-6565-4a12-ae67-31e7bc751cd4|d223f8c0-f0b7-46d8-a1d5-7cd060dc9933", - "unconnected_items|143180000|107660000|9c152211-54f1-4517-aa69-d87b1de2ba44|bd1d9f21-a123-4fab-9d84-d6d167973a57" - ], + "drc_exclusions": [], "meta": { "filename": "board_design_settings.json", "version": 2 diff --git a/Electrical/opencom-lte.kicad_sch b/Electrical/opencom-lte.kicad_sch index 1bf65b7..fc563f2 100644 --- a/Electrical/opencom-lte.kicad_sch +++ b/Electrical/opencom-lte.kicad_sch @@ -3362,7 +3362,7 @@ (symbol (lib_id "Connector:TestPoint") (at 205.105 71.12 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 253f5d4d-14f4-433d-ac03-d28034870e41) - (property "Reference" "TP6" (at 206.502 67.818 0) + (property "Reference" "TP4" (at 206.502 67.818 0) (effects (font (size 1.27 1.27)) (justify left)) ) (property "Value" "USB_BOOT" (at 206.248 69.85 0) @@ -3378,7 +3378,7 @@ (instances (project "opencom-lte" (path "/e7f5bf03-fb2c-47bf-a5e6-8bf502aef220" - (reference "TP6") (unit 1) + (reference "TP4") (unit 1) ) ) ) @@ -3490,7 +3490,7 @@ (symbol (lib_id "Connector:TestPoint") (at 188.976 71.12 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 2dd0dc5d-641f-4ee8-90c7-a74f8482bf77) - (property "Reference" "TP7" (at 189.738 67.818 0) + (property "Reference" "TP5" (at 189.738 67.818 0) (effects (font (size 1.27 1.27)) (justify left)) ) (property "Value" "VDD_EXT" (at 189.738 69.85 0) @@ -3506,7 +3506,7 @@ (instances (project "opencom-lte" (path "/e7f5bf03-fb2c-47bf-a5e6-8bf502aef220" - (reference "TP7") (unit 1) + (reference "TP5") (unit 1) ) ) ) diff --git a/Manual/main.pdf b/Manual/main.pdf index 668ab50..afac8fa 100644 Binary files a/Manual/main.pdf and b/Manual/main.pdf differ diff --git a/Manual/main.tex b/Manual/main.tex index 4879d06..71a09b7 100644 --- a/Manual/main.tex +++ b/Manual/main.tex @@ -15,11 +15,9 @@ {\huge openCom LTE - User Manual} \\ LTE connectivity for your Framework Laptop. \\ \vspace{5mm} - \includegraphics[scale=0.35]{opencom-lte} + \includegraphics[scale=0.35]{opencom-lte.png} \end{center} -\newpage\phantom{a} % blank pages to avoid TOC being on card -\thispagestyle{empty} \newpage \tableofcontents @@ -228,8 +226,6 @@ We are not to be held responsible if the customer chooses to download classified F35 schematics using our product, to build their own in their garage. -\newpage\phantom{a} % blank page to stop printing on card -\thispagestyle{empty} \newpage \begin{center} diff --git a/Mechanical/OpenSCAD/Enclosure.scad b/Mechanical/OpenSCAD/Enclosure.scad index d05b1ff..4e19dcb 100644 --- a/Mechanical/OpenSCAD/Enclosure.scad +++ b/Mechanical/OpenSCAD/Enclosure.scad @@ -1,13 +1,17 @@ -// Parametric Expansion Card -// An OpenSCAD implementation of a basic enclosure of an Expansion Card for -// use with Framework products like the Framework Laptop. -// -// See https://frame.work for more information about Framework products and -// additional documentation around Expansion Cards. +// openCom LTE Expansion Card +// An implementation of an enclosure for the openCom LTE, which features holes +// for the antenna SMA connectors and transluscent columns for the indicator +// LEDs. -// Parametric Expansion Card © 2021 by Nirav Patel at Framework Computer LLC -// is licensed under Attribution 4.0 International. -// To view a copy of this license, visit http://creativecommons.org/licenses/by/4.0/ +// Original design - Parametric Expansion Card © 2021 by Nirav Patel at +// Framework Computer LLC. To view a copy of this license, visit +// http://creativecommons.org/licenses/by/4.0/ + +// See https://frame.work for more information about Framework products and +// additional documentation around Expansion Cards. + +// Modified by Jacob Owen Eva at Liberated Embedded Systems Ltd, licensed under +// Attribution-ShareAlike 4.0 International. // The basic dimensions of an Expansion Card base = [30.0, 32.0, 6.8]; @@ -15,14 +19,12 @@ base = [30.0, 32.0, 6.8]; // The extension for the SMA connectors & EG95 base_ext = [40, 20.2, 16.5]; -// The dimensions of the NSCCP sim holder -sim = [13.5, 13, 1.37]; - -bay = [12, 8.95, 0.92]; - // The default wall thickness side_wall = 1.5; +// The dimensions of the sim holder bay +bay = [side_wall, 9.62, 0.79]; + // Size and location of the typical PCB pcb_gap = 0.5; pcb = [26.0, 30.0, 0.8]; @@ -38,17 +40,17 @@ rail_h = 4.25; // to top of rail // Boss locations matching the other Framework Expansion Cards boss_inc_x = 4.2; boss_r = 1.5; -boss_inc_y = 18.5+boss_r; +boss_inc_y = 21; boss_ext_y = 8.57; boss_ext_x = 4; boss_ext_r = 2.5; -boss_ext_inner = 2.1; +boss_ext_inner = 0.8; boss_ext_top_y = 6; -lid_boss_r = 1.05; -lid_wall_thickness = 3+side_wall; +lid_boss_inner = 3; +lid_wall_thickness = 4+side_wall; gap = 0.25; @@ -63,8 +65,10 @@ ext_screw_hole = 2.5+side_wall; ledge_cut = 0.6; ledge_cut_d = 3.2; -led_guide = [1.2, 10.65]; -led_guide_stopper = [1.5, 1,]; +led_guide = [1, 11.95]; +led_guide_stopper = [1.3, 1]; + +led_h = 0.7; // The rail cutout in the sides of the card module rail(make_printable) { @@ -103,9 +107,7 @@ module rail(make_printable) { // The pocket that the latch bar drops into, including a 45 degree cut for printability translate([0, latch_wall, -latch_h]) cube([latch_d, latch_l, latch_h]); - if (make_printable) { - translate([latch_d, latch_wall+latch_l, -latch_h]) rotate([0, 0, -180+45]) translate([0, -latch_l, 0]) cube([latch_d*2, latch_l, latch_h]); - } + translate([latch_d, latch_wall+latch_l, -latch_h]) rotate([0, 0, -180+45]) translate([0, -latch_l, 0]) cube([latch_d*2, latch_l, latch_h]); } } @@ -171,7 +173,7 @@ module expansion_card_lid() { difference() { translate([-side_wall*2-gap, -base_ext[1]+side_wall+gap, base_ext[2]-side_wall]) cube([base_ext[0]-side_wall*2-gap*2, base_ext[1]-side_wall*2-gap*2, side_wall]); translate([-0.5,-16.4,8]) led_cylinder(); // hollow for D2 LED cylinder - translate([30.55,-16.4,8]) led_cylinder(); // hollow for D3 LED cylinder + translate([30.60,-16.4,8]) led_cylinder(); // hollow for D3 LED cylinder } // joins them together translate([side_wall+gap, -side_wall, base[2]-lower_lid_z]) cube([base[0]-side_wall*2-gap*2, side_wall, base_ext[2]-base[2]+gap*2+0.1]); @@ -185,13 +187,13 @@ module expansion_card_lid() { // add screw holder to lid difference() { translate([-3.25,-base_ext[2]-side_wall-gap*3,sma_height]) cube([lid_wall_thickness, base_ext[2]+gap*2, base_ext[2]-sma_height-side_wall]); - rotate([0,90,0]) translate([-base_ext[2]+3,-6,-3.25]) cylinder(r = lid_boss_r, h = 3, $fn = 64); + rotate([0,90,0]) translate([-base_ext[2]+3,-6,-3.25]) cylinder(r = lid_boss_inner/2, h = 4, $fn = 64); translate([-0.5,-16.4,8]) led_cylinder(); // hollow for D2 LED cylinder } difference() { - translate([base_ext[0]-3.25*2-side_wall*3-gap,-base_ext[2]-side_wall-gap*3,sma_height]) cube([lid_wall_thickness, base_ext[2]+gap*2, base_ext[2]-sma_height-side_wall]); - rotate([0,90,0]) translate([-base_ext[2]+3,-6,base_ext[0]-2.5*2-side_wall*3-gap]) cylinder(r = lid_boss_r, h = 3, $fn = 64); + translate([base_ext[0]-3.75*2-side_wall*3-gap,-base_ext[2]-side_wall-gap*3,sma_height]) cube([lid_wall_thickness, base_ext[2]+gap*2, base_ext[2]-sma_height-side_wall]); + rotate([0,90,0]) translate([-base_ext[2]+3,-6,base_ext[0]-3*2-side_wall*3-gap]) cylinder(r = lid_boss_inner/2, h = 4, $fn = 64); translate([30.55,-16.4,8]) led_cylinder(); // hollow for D3 LED cylinder } } @@ -230,10 +232,12 @@ module expansion_card_base(open_end, make_printable, pcb_mount="boss") { translate([side_wall, inner[1]+side_wall-notch_l, side_wall]) cube([notch, notch_l, notch_h]); translate([inner[0]+side_wall, inner[1]+side_wall-notch_l, side_wall+notch_h/2]) rotate([0, 0, 180]) rotate([0, 90, 0]); translate([inner[0]+side_wall-notch, inner[1]+side_wall-notch_l, side_wall]) cube([notch, notch_l, notch_h]); + translate([side_wall, inner[1]+side_wall-notch_l, side_wall+notch_h/2]) rotate([0, 0, -90]) rotate([0, 90, 0]) rib(notch_h, notch); + translate([inner[0]+side_wall, inner[1]+side_wall-notch_l, side_wall+notch_h/2]) rotate([0, 0, 180]) rotate([0, 90, 0]) rib(notch_h, notch); } // cutout for sim card access - translate([0,bay[1]-sim[1]/2+2.53,1.67]) cube(bay); + translate([0,1.6,pcb_h-1.4]) cube(bay); // The rounded front edge to match the laptop edge_r = 0.8; @@ -249,7 +253,7 @@ module expansion_card_base(open_end, make_printable, pcb_mount="boss") { translate([0, base[1]-ledge_cut_d, 0]) cube([base[0], ledge_cut_d, ledge_cut]); // hollow bottom to provide room for back of board - translate([side_wall,-notch_l,-hollow_bottom_z+1.5]) cube([base[0]-side_wall*2, base[1]-side_wall, hollow_bottom_z]); + //translate([side_wall,-notch_l,-hollow_bottom_z+1.5]) cube([base[0]-side_wall*2, base[1]-side_wall, hollow_bottom_z]); } difference() { @@ -285,6 +289,13 @@ module expansion_card_base(open_end, make_printable, pcb_mount="boss") { } } +// A simple 45 degree rib to improve printability +module rib(thickness, height) { + translate([-thickness/2, 0, 0]) difference() { + cube([thickness, height, height]); + translate([-thickness/2, height, 0]) rotate([45, 0, 0]) cube([thickness*2, height*2, height*2]); + } +} module expansion_card_ext(make_printable, pcb_mount="boss_insert") { // Hollowing of the inside @@ -329,13 +340,6 @@ module expansion_card_ext(make_printable, pcb_mount="boss_insert") { } } -module sim_holder() { - difference() { - cube(sim); - translate([0,bay[1]-sim[1]/2+1,0]) cube(bay); - } -} - module led_cylinder(stopper) { if (stopper) { // if a stopper should be inserted cylinder(h = led_guide[1], r = led_guide[0], $fn = 64); @@ -346,17 +350,15 @@ module led_cylinder(stopper) { } } -translate([base_ext[0]-6.45-side_wall*2, -base[1]-base_ext[1]+side_wall*2+0.8, pcb_h+2.75]) led_cylinder(true); // D2 LED column +translate([base_ext[0]-6.4-side_wall*2, -base[1]-base_ext[1]+side_wall*2+0.8, pcb_h+0.78+led_h]) led_cylinder(true); // D2 LED column -translate([-0.5, -base[1]-base_ext[1]+side_wall*2+0.8, pcb_h+2.75]) led_cylinder(true); // D3 LED column +translate([-0.5, -base[1]-base_ext[1]+side_wall*2+0.8, pcb_h+0.78+led_h]) led_cylinder(true); // D3 LED column translate([0, -base[1], 0]) expansion_card_base(open_end = false, make_printable = true, pcb_mount="boss"); translate([-base_ext[0]+base[0]+5, -base_ext[1]-base[1], 0]) expansion_card_ext(make_printable = true, pcb_mount="boss"); -//translate([0, -32, 0]) expansion_card_lid(); +translate([0, -32, 0]) expansion_card_lid(); -//translate([-128.75, 95.6, pcb_h]) import("PCB.stl"); - -translate([2, -30.48, 1.68]) sim_holder(); +translate([-128.75, 95.6, pcb_h]) import("PCB.stl"); diff --git a/README.md b/README.md index 50669b7..1d88d8e 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ is based in the `Mechanical` folder. The enclosure is designed to be used with M2 x 5mm screws to secure the top lid, with M2 x 4mm inserts for threading. The board is secured with self-tapping M1 x 2mm screws. -## Disclaimer +# Disclaimer Ensure you ramp up your openCom LTE TX power if you ever see BBC TV licensing vans approaching you or your laptop, it's the only way to repel them and prevent them from appropriating £159 a year from your person and wasting it on diff --git a/opencom-lte.png b/opencom-lte.png index c9c1377..8e50103 100644 Binary files a/opencom-lte.png and b/opencom-lte.png differ