Complete layout and select rf diodes

1 files changed, 246 insertions, 297 deletions

diff --git a/tri-band_rfid_card/tri-band_rfid_card.kicad_sch b/tri-band_rfid_card/tri-band_rfid_card.kicad_sch
index 18f8f37..7a1137f 100644
--- a/tri-band_rfid_card/tri-band_rfid_card.kicad_sch
+++ b/tri-band_rfid_card/tri-band_rfid_card.kicad_sch
@@ -262,27 +262,24 @@
 			)
 			(embedded_fonts no)
 		)
-		(symbol "Device:D_Schottky"
-			(pin_numbers
-				(hide yes)
-			)
+		(symbol "Device:D_Schottky_Dual_Series_KAC_Parallel"
 			(pin_names
-				(offset 1.016)
+				(offset 0.762)
 				(hide yes)
 			)
 			(exclude_from_sim no)
 			(in_bom yes)
 			(on_board yes)
 			(property "Reference" "D"
-				(at 0 2.54 0)
+				(at 0 5.08 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
 				)
 			)
-			(property "Value" "D_Schottky"
-				(at 0 -2.54 0)
+			(property "Value" "D_Schottky_Dual_Series_KAC_Parallel"
+				(at 0 -5.08 0)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -290,7 +287,7 @@
 				)
 			)
 			(property "Footprint" ""
-				(at 0 0 0)
+				(at -1.27 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -299,7 +296,7 @@
 				)
 			)
 			(property "Datasheet" "~"
-				(at 0 0 0)
+				(at -1.27 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -307,7 +304,7 @@
 					(hide yes)
 				)
 			)
-			(property "Description" "Schottky diode"
+			(property "Description" "Dual Schottky diode, cathode/anode/center"
 				(at 0 0 0)
 				(effects
 					(font
@@ -316,7 +313,7 @@
 					(hide yes)
 				)
 			)
-			(property "ki_keywords" "diode Schottky"
+			(property "ki_keywords" "diode"
 				(at 0 0 0)
 				(effects
 					(font
@@ -325,19 +322,33 @@
 					(hide yes)
 				)
 			)
-			(property "ki_fp_filters" "TO-???* *_Diode_* *SingleDiode* D_*"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
+			(symbol "D_Schottky_Dual_Series_KAC_Parallel_0_1"
+				(circle
+					(center -1.27 0)
+					(radius 0.254)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type outline)
 					)
-					(hide yes)
 				)
-			)
-			(symbol "D_Schottky_0_1"
 				(polyline
 					(pts
-						(xy -1.905 0.635) (xy -1.905 1.27) (xy -1.27 1.27) (xy -1.27 -1.27) (xy -0.635 -1.27) (xy -0.635 -0.635)
+						(xy -1.27 0) (xy -2.54 0)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy -0.508 -1.524) (xy -0.508 -1.27) (xy 0 -1.27) (xy 0 -3.81) (xy 0.508 -3.81) (xy 0.508 -3.556)
 					)
 					(stroke
 						(width 0.254)
@@ -349,7 +360,7 @@
 				)
 				(polyline
 					(pts
-						(xy 1.27 1.27) (xy 1.27 -1.27) (xy -1.27 0) (xy 1.27 1.27)
+						(xy 0 3.81) (xy 2.54 2.54) (xy 0 1.27) (xy 0 3.81) (xy 0 3.81) (xy 0 3.81)
 					)
 					(stroke
 						(width 0.254)
@@ -361,7 +372,7 @@
 				)
 				(polyline
 					(pts
-						(xy 1.27 0) (xy -1.27 0)
+						(xy 2.54 2.54) (xy -1.27 2.54) (xy -1.27 -2.54) (xy 2.54 -2.54)
 					)
 					(stroke
 						(width 0)
@@ -371,10 +382,50 @@
 						(type none)
 					)
 				)
-			)
-			(symbol "D_Schottky_1_1"
+				(polyline
+					(pts
+						(xy 2.54 -1.27) (xy 0 -2.54) (xy 2.54 -3.81) (xy 2.54 -1.27) (xy 2.54 -1.27) (xy 2.54 -1.27)
+					)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 3.048 3.556) (xy 3.048 3.81) (xy 2.54 3.81) (xy 2.54 1.27) (xy 2.032 1.27) (xy 2.032 1.524)
+					)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
 				(pin passive line
-					(at -3.81 0 0)
+					(at -5.08 0 0)
+					(length 2.54)
+					(name "A"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "3"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 5.08 2.54 180)
 					(length 2.54)
 					(name "K"
 						(effects
@@ -392,9 +443,9 @@
 					)
 				)
 				(pin passive line
-					(at 3.81 0 180)
+					(at 5.08 -2.54 180)
 					(length 2.54)
-					(name "A"
+					(name "K"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -789,12 +840,6 @@
 		(uuid "a7e9215e-35bd-4918-bb02-8c2d29062bc6")
 	)
 	(junction
-		(at 57.15 154.94)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "0103efc2-bcee-443f-98a9-6536b8961ff4")
-	)
-	(junction
 		(at 30.48 157.48)
 		(diameter 0)
 		(color 0 0 0 0)
@@ -807,16 +852,16 @@
 		(uuid "0d23bebb-1007-41f1-88a2-d577e8417c67")
 	)
 	(junction
-		(at 74.93 170.18)
+		(at 76.2 154.94)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "2bfa8b72-2475-4f43-99ce-563c1e752d39")
+		(uuid "39b12b5d-311b-43d5-befe-a572dc528caa")
 	)
 	(junction
-		(at 74.93 154.94)
+		(at 76.2 170.18)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "3041b714-78b9-4759-b99b-dce1e81830c8")
+		(uuid "46235574-56be-4dca-8864-84984101e892")
 	)
 	(junction
 		(at 30.48 167.64)
@@ -837,12 +882,6 @@
 		(uuid "85c655b0-a9ad-42a8-84ba-c57cb3a61889")
 	)
 	(junction
-		(at 57.15 170.18)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "8cea3d9e-1f92-4d23-9d65-9553ca2ccb39")
-	)
-	(junction
 		(at 46.99 96.52)
 		(diameter 0)
 		(color 0 0 0 0)
@@ -855,6 +894,12 @@
 		(uuid "e223497c-15ed-494b-9e3a-9ce625564e02")
 	)
 	(junction
+		(at 64.77 170.18)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "e589c30b-267e-4c0c-9daf-7ee7a4c42933")
+	)
+	(junction
 		(at 55.88 53.34)
 		(diameter 0)
 		(color 0 0 0 0)
@@ -882,27 +927,27 @@
 	)
 	(wire
 		(pts
-			(xy 57.15 154.94) (xy 60.96 154.94)
+			(xy 22.86 157.48) (xy 30.48 157.48)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "0ac3578a-5bc2-4e65-b30d-2cab5be1b46c")
+		(uuid "0d105a68-be21-40f2-8229-634d6d2e0cc0")
 	)
 	(wire
 		(pts
-			(xy 22.86 157.48) (xy 30.48 157.48)
+			(xy 64.77 170.18) (xy 76.2 170.18)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "0d105a68-be21-40f2-8229-634d6d2e0cc0")
+		(uuid "0fca0a80-0f5a-43ac-9f0e-f895b2e747b0")
 	)
 	(wire
 		(pts
-			(xy 86.36 166.37) (xy 86.36 170.18)
+			(xy 88.9 166.37) (xy 88.9 170.18)
 		)
 		(stroke
 			(width 0)
@@ -932,16 +977,6 @@
 	)
 	(wire
 		(pts
-			(xy 57.15 166.37) (xy 57.15 170.18)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "1db6f5ce-2653-415d-bd18-f7fe7e7e85d9")
-	)
-	(wire
-		(pts
 			(xy 25.4 41.91) (xy 25.4 38.1)
 		)
 		(stroke
@@ -962,16 +997,6 @@
 	)
 	(wire
 		(pts
-			(xy 53.34 154.94) (xy 57.15 154.94)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "2227a9ba-5e99-48f7-ac7e-b1a4e6997f1e")
-	)
-	(wire
-		(pts
 			(xy 25.4 111.76) (xy 25.4 107.95)
 		)
 		(stroke
@@ -1022,7 +1047,7 @@
 	)
 	(wire
 		(pts
-			(xy 74.93 166.37) (xy 74.93 170.18)
+			(xy 76.2 166.37) (xy 76.2 170.18)
 		)
 		(stroke
 			(width 0)
@@ -1072,23 +1097,13 @@
 	)
 	(wire
 		(pts
-			(xy 74.93 154.94) (xy 86.36 154.94)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "47c8a6e5-f6d8-4a21-9a0b-650b0e4992e2")
-	)
-	(wire
-		(pts
-			(xy 74.93 170.18) (xy 86.36 170.18)
+			(xy 64.77 154.94) (xy 76.2 154.94)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "4bb2beb0-4ba3-41da-8bfe-54523ee67d3b")
+		(uuid "4d8ad3fb-0b84-4bf0-adc5-d463e6112cba")
 	)
 	(wire
 		(pts
@@ -1102,23 +1117,23 @@
 	)
 	(wire
 		(pts
-			(xy 46.99 111.76) (xy 76.2 111.76)
+			(xy 76.2 154.94) (xy 88.9 154.94)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "5c302ec5-cbd5-4b0a-95d5-e922d356b006")
+		(uuid "5bbd9824-c59e-459a-824a-aaadb50dce1b")
 	)
 	(wire
 		(pts
-			(xy 74.93 154.94) (xy 74.93 158.75)
+			(xy 46.99 111.76) (xy 76.2 111.76)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "5f2253b1-7279-46b7-b327-a57d10be7db7")
+		(uuid "5c302ec5-cbd5-4b0a-95d5-e922d356b006")
 	)
 	(polyline
 		(pts
@@ -1132,33 +1147,33 @@
 	)
 	(wire
 		(pts
-			(xy 46.99 96.52) (xy 46.99 100.33)
+			(xy 76.2 154.94) (xy 76.2 158.75)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "6f453ed4-de00-419e-a42a-a82ae33e0c2e")
+		(uuid "6a477660-5cd2-4542-b910-172655c99759")
 	)
 	(wire
 		(pts
-			(xy 30.48 154.94) (xy 30.48 157.48)
+			(xy 46.99 96.52) (xy 46.99 100.33)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "746cc1d1-0799-4d82-98fd-072610217c50")
+		(uuid "6f453ed4-de00-419e-a42a-a82ae33e0c2e")
 	)
 	(wire
 		(pts
-			(xy 86.36 154.94) (xy 86.36 158.75)
+			(xy 76.2 170.18) (xy 88.9 170.18)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "7f8d2ecb-b1f3-40a2-9c15-b811530b9f95")
+		(uuid "70b3d206-5178-4833-948f-e3aba2e2ab79")
 	)
 	(wire
 		(pts
@@ -1182,7 +1197,7 @@
 	)
 	(wire
 		(pts
-			(xy 33.02 154.94) (xy 30.48 154.94)
+			(xy 33.02 157.48) (xy 30.48 157.48)
 		)
 		(stroke
 			(width 0)
@@ -1262,43 +1277,43 @@
 	)
 	(wire
 		(pts
-			(xy 46.99 96.52) (xy 76.2 96.52)
+			(xy 40.64 157.48) (xy 43.18 157.48)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "c6bcf8be-4c79-4a53-943f-3c277165db1c")
+		(uuid "be5d83d5-157a-464a-a781-480e2664189f")
 	)
 	(wire
 		(pts
-			(xy 30.48 157.48) (xy 30.48 158.75)
+			(xy 46.99 96.52) (xy 76.2 96.52)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "c6ed5ce2-817b-455f-9eb6-88df4ce4e45f")
+		(uuid "c6bcf8be-4c79-4a53-943f-3c277165db1c")
 	)
-	(polyline
+	(wire
 		(pts
-			(xy 17.78 69.85) (xy 160.02 69.85)
+			(xy 30.48 157.48) (xy 30.48 158.75)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "ce8d5f79-63be-4c95-8b62-1051de7723f3")
+		(uuid "c6ed5ce2-817b-455f-9eb6-88df4ce4e45f")
 	)
-	(wire
+	(polyline
 		(pts
-			(xy 74.93 170.18) (xy 57.15 170.18)
+			(xy 17.78 69.85) (xy 160.02 69.85)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "d41b0dfd-4d7a-4ccd-9a1c-fade93ee34de")
+		(uuid "ce8d5f79-63be-4c95-8b62-1051de7723f3")
 	)
 	(wire
 		(pts
@@ -1312,47 +1327,47 @@
 	)
 	(wire
 		(pts
-			(xy 40.64 154.94) (xy 45.72 154.94)
+			(xy 50.8 157.48) (xy 54.61 157.48)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "d785abdb-bea4-4e33-abb6-35531c543ea3")
+		(uuid "e6dc153a-9bb8-4f6b-84ec-14fef7bb163a")
 	)
-	(wire
+	(polyline
 		(pts
-			(xy 57.15 154.94) (xy 57.15 158.75)
+			(xy 16.51 125.73) (xy 160.02 125.73)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "e20a3493-a2a6-4a47-a3b2-f3da1605752f")
+		(uuid "efb71b87-434f-47b8-a7f8-b27329d7175a")
 	)
-	(polyline
+	(wire
 		(pts
-			(xy 16.51 125.73) (xy 160.02 125.73)
+			(xy 64.77 160.02) (xy 64.77 170.18)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "efb71b87-434f-47b8-a7f8-b27329d7175a")
+		(uuid "f8024fbb-7564-4dce-a0e8-3054e8d4a549")
 	)
 	(wire
 		(pts
-			(xy 68.58 154.94) (xy 74.93 154.94)
+			(xy 88.9 154.94) (xy 88.9 158.75)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "f8dbe452-9444-483b-8426-e7cefde70cfd")
+		(uuid "faaa17f5-692f-49a4-ba57-ccdd380d6fd8")
 	)
 	(wire
 		(pts
-			(xy 30.48 170.18) (xy 57.15 170.18)
+			(xy 30.48 170.18) (xy 64.77 170.18)
 		)
 		(stroke
 			(width 0)
@@ -1371,17 +1386,16 @@
 		(uuid "fe3bb206-8032-4ccd-9d8d-3dfb0099bb67")
 	)
 	(symbol
-		(lib_id "Device:LED")
-		(at 76.2 104.14 270)
+		(lib_id "Device:D_Schottky_Dual_Series_KAC_Parallel")
+		(at 59.69 157.48 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "1f664e99-74fb-449b-a4c0-6b913b736c9e")
-		(property "Reference" "D2"
-			(at 78.74 101.2824 90)
+		(uuid "04db3ba5-f565-4538-9a7f-781b9850b083")
+		(property "Reference" "D1"
+			(at 59.69 150.114 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1389,8 +1403,8 @@
 				(justify left)
 			)
 		)
-		(property "Value" "633nm"
-			(at 78.74 103.8224 90)
+		(property "Value" "SMS7621-006LF"
+			(at 53.848 152.146 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1398,8 +1412,8 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "LED_SMD:LED_0603_1608Metric"
-			(at 76.2 104.14 0)
+		(property "Footprint" "Package_TO_SOT_SMD:SOT-23_Handsoldering"
+			(at 58.42 157.48 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1408,7 +1422,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 76.2 104.14 0)
+			(at 58.42 157.48 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1416,17 +1430,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Light emitting diode"
-			(at 76.2 104.14 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Pins" "1=K 2=A"
-			(at 76.2 104.14 0)
+		(property "Description" "Dual Schottky diode, cathode/anode/center"
+			(at 59.69 157.48 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1435,31 +1440,35 @@
 			)
 		)
 		(pin "2"
-			(uuid "160e3d17-f590-4911-a760-36a56ebb8b5f")
+			(uuid "5b2edf0d-859a-44cc-a985-698ca8a4fafe")
 		)
 		(pin "1"
-			(uuid "ea191491-ce97-4739-ad88-b1908d40b91c")
+			(uuid "6404d185-8c1b-40da-be35-29f605e30ff3")
+		)
+		(pin "3"
+			(uuid "41ba8d4e-738d-4772-b021-a915b2127f9b")
 		)
 		(instances
 			(project ""
 				(path "/37be1b74-a3ea-4cc1-84d4-69214e3d96fd"
-					(reference "D2")
+					(reference "D1")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Device:L")
-		(at 25.4 45.72 0)
+		(lib_id "Device:LED")
+		(at 76.2 104.14 270)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "3eb484b6-b2b6-411b-b1fa-09afa390f39a")
-		(property "Reference" "L1"
-			(at 26.67 44.4499 0)
+		(fields_autoplaced yes)
+		(uuid "1f664e99-74fb-449b-a4c0-6b913b736c9e")
+		(property "Reference" "D3"
+			(at 78.74 101.2824 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1467,8 +1476,8 @@
 				(justify left)
 			)
 		)
-		(property "Value" "Ant_125kHz"
-			(at 26.67 46.9899 0)
+		(property "Value" "633nm"
+			(at 78.74 103.8224 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1476,8 +1485,8 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "Library:Antenna_125kHz_v2"
-			(at 25.4 45.72 0)
+		(property "Footprint" "LED_SMD:LED_0603_1608Metric"
+			(at 76.2 104.14 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1485,8 +1494,8 @@
 				(hide yes)
 			)
 		)
-		(property "Datasheet" ""
-			(at 25.4 45.72 0)
+		(property "Datasheet" "~"
+			(at 76.2 104.14 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1494,8 +1503,17 @@
 				(hide yes)
 			)
 		)
-		(property "Description" ""
-			(at 25.4 45.72 0)
+		(property "Description" "Light emitting diode"
+			(at 76.2 104.14 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=K 2=A"
+			(at 76.2 104.14 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1504,15 +1522,15 @@
 			)
 		)
 		(pin "2"
-			(uuid "8dc3d086-c099-42ce-b668-45aed83a9f99")
+			(uuid "160e3d17-f590-4911-a760-36a56ebb8b5f")
 		)
 		(pin "1"
-			(uuid "5545f99c-020f-4141-ba83-fdcebd4ba238")
+			(uuid "ea191491-ce97-4739-ad88-b1908d40b91c")
 		)
 		(instances
 			(project ""
 				(path "/37be1b74-a3ea-4cc1-84d4-69214e3d96fd"
-					(reference "L1")
+					(reference "D3")
 					(unit 1)
 				)
 			)
@@ -1520,32 +1538,33 @@
 	)
 	(symbol
 		(lib_id "Device:L")
-		(at 36.83 154.94 90)
+		(at 25.4 45.72 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "3ef2f29d-72cb-4253-b379-ba2eb8a4204f")
-		(property "Reference" "L3"
-			(at 36.83 149.86 90)
+		(uuid "3eb484b6-b2b6-411b-b1fa-09afa390f39a")
+		(property "Reference" "L1"
+			(at 26.67 44.4499 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 			)
 		)
-		(property "Value" "L"
-			(at 36.83 152.4 90)
+		(property "Value" "Ant_125kHz"
+			(at 26.67 46.9899 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 			)
 		)
-		(property "Footprint" ""
-			(at 36.83 154.94 0)
+		(property "Footprint" "Library:Antenna_125kHz_v2"
+			(at 25.4 45.72 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1553,8 +1572,8 @@
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "~"
-			(at 36.83 154.94 0)
+		(property "Datasheet" ""
+			(at 25.4 45.72 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1562,8 +1581,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Inductor"
-			(at 36.83 154.94 0)
+		(property "Description" ""
+			(at 25.4 45.72 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1572,50 +1591,48 @@
 			)
 		)
 		(pin "2"
-			(uuid "bd8d834b-2be2-47cc-9a00-6c62eee380dd")
+			(uuid "8dc3d086-c099-42ce-b668-45aed83a9f99")
 		)
 		(pin "1"
-			(uuid "c354f561-619f-488c-bb44-a4f8d76e43d7")
+			(uuid "5545f99c-020f-4141-ba83-fdcebd4ba238")
 		)
 		(instances
 			(project ""
 				(path "/37be1b74-a3ea-4cc1-84d4-69214e3d96fd"
-					(reference "L3")
+					(reference "L1")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Device:D_Schottky")
-		(at 57.15 162.56 270)
+		(lib_id "Device:L")
+		(at 36.83 157.48 90)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
 		(fields_autoplaced yes)
-		(uuid "53bd5369-40de-4c8d-9608-24c892b11bd4")
-		(property "Reference" "D4"
-			(at 59.69 160.9724 90)
+		(uuid "3ef2f29d-72cb-4253-b379-ba2eb8a4204f")
+		(property "Reference" "L3"
+			(at 36.83 152.4 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Value" "D_Schottky"
-			(at 59.69 163.5124 90)
+		(property "Value" "L"
+			(at 36.83 154.94 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Footprint" ""
-			(at 57.15 162.56 0)
+		(property "Footprint" "Inductor_SMD:L_0603_1608Metric_Pad1.05x0.95mm_HandSolder"
+			(at 36.83 157.48 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1624,7 +1641,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 57.15 162.56 0)
+			(at 36.83 157.48 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1632,8 +1649,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Schottky diode"
-			(at 57.15 162.56 0)
+		(property "Description" "Inductor"
+			(at 36.83 157.48 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1642,15 +1659,15 @@
 			)
 		)
 		(pin "2"
-			(uuid "a35e0f3b-0337-450d-9e27-fbc4750ed207")
+			(uuid "bd8d834b-2be2-47cc-9a00-6c62eee380dd")
 		)
 		(pin "1"
-			(uuid "c79e30ee-4bc7-477f-bf41-8d45bbfb6da9")
+			(uuid "c354f561-619f-488c-bb44-a4f8d76e43d7")
 		)
 		(instances
 			(project ""
 				(path "/37be1b74-a3ea-4cc1-84d4-69214e3d96fd"
-					(reference "D4")
+					(reference "L3")
 					(unit 1)
 				)
 			)
@@ -1658,7 +1675,7 @@
 	)
 	(symbol
 		(lib_id "Device:LED")
-		(at 86.36 162.56 90)
+		(at 88.9 162.56 90)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -1666,8 +1683,8 @@
 		(dnp no)
 		(fields_autoplaced yes)
 		(uuid "5f242639-c13e-44cf-a111-69182442a096")
-		(property "Reference" "D3"
-			(at 90.17 162.8774 90)
+		(property "Reference" "D4"
+			(at 92.71 162.8774 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1676,7 +1693,7 @@
 			)
 		)
 		(property "Value" "633nm"
-			(at 90.17 165.4174 90)
+			(at 92.71 165.4174 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1685,7 +1702,7 @@
 			)
 		)
 		(property "Footprint" "LED_SMD:LED_0603_1608Metric"
-			(at 86.36 162.56 0)
+			(at 88.9 162.56 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1694,7 +1711,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 86.36 162.56 0)
+			(at 88.9 162.56 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1703,7 +1720,7 @@
 			)
 		)
 		(property "Description" "Light emitting diode"
-			(at 86.36 162.56 0)
+			(at 88.9 162.56 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1712,7 +1729,7 @@
 			)
 		)
 		(property "Sim.Pins" "1=K 2=A"
-			(at 86.36 162.56 0)
+			(at 88.9 162.56 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1729,7 +1746,7 @@
 		(instances
 			(project "tri-band_rfid_card"
 				(path "/37be1b74-a3ea-4cc1-84d4-69214e3d96fd"
-					(reference "D3")
+					(reference "D4")
 					(unit 1)
 				)
 			)
@@ -1745,7 +1762,7 @@
 		(dnp no)
 		(fields_autoplaced yes)
 		(uuid "603fedd0-9bbc-48e5-b8b8-62501960498c")
-		(property "Reference" "C1"
+		(property "Reference" "C2"
 			(at 46.99 44.4499 0)
 			(effects
 				(font
@@ -1763,7 +1780,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric"
+		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder"
 			(at 44.1452 49.53 0)
 			(effects
 				(font
@@ -1799,75 +1816,7 @@
 		(instances
 			(project ""
 				(path "/37be1b74-a3ea-4cc1-84d4-69214e3d96fd"
-					(reference "C1")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
-		(lib_id "Device:D_Schottky")
-		(at 64.77 154.94 180)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "87bb203d-8b47-4ca2-8a39-05ba8a1073ec")
-		(property "Reference" "D5"
-			(at 65.0875 148.59 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Value" "D_Schottky"
-			(at 65.0875 151.13 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Footprint" ""
-			(at 64.77 154.94 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 64.77 154.94 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Schottky diode"
-			(at 64.77 154.94 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "2"
-			(uuid "ee88ca62-d04e-4523-bbad-18d458e729d8")
-		)
-		(pin "1"
-			(uuid "721df4eb-9bd4-45a5-982b-36035b88a2ac")
-		)
-		(instances
-			(project ""
-				(path "/37be1b74-a3ea-4cc1-84d4-69214e3d96fd"
-					(reference "D5")
+					(reference "C2")
 					(unit 1)
 				)
 			)
@@ -1883,7 +1832,7 @@
 		(dnp no)
 		(fields_autoplaced yes)
 		(uuid "8d54c5b0-da31-4988-b247-3506b5d68ad0")
-		(property "Reference" "D1"
+		(property "Reference" "D2"
 			(at 78.74 42.8624 90)
 			(effects
 				(font
@@ -1946,7 +1895,7 @@
 		(instances
 			(project ""
 				(path "/37be1b74-a3ea-4cc1-84d4-69214e3d96fd"
-					(reference "D1")
+					(reference "D2")
 					(unit 1)
 				)
 			)
@@ -1962,7 +1911,7 @@
 		(dnp no)
 		(fields_autoplaced yes)
 		(uuid "93ca1ce2-d3cf-46b7-9293-0130fb503ab8")
-		(property "Reference" "C6"
+		(property "Reference" "C1"
 			(at 34.29 161.2899 0)
 			(effects
 				(font
@@ -1980,7 +1929,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder"
 			(at 31.4452 166.37 0)
 			(effects
 				(font
@@ -2016,7 +1965,7 @@
 		(instances
 			(project ""
 				(path "/37be1b74-a3ea-4cc1-84d4-69214e3d96fd"
-					(reference "C6")
+					(reference "C1")
 					(unit 1)
 				)
 			)
@@ -2093,7 +2042,7 @@
 	)
 	(symbol
 		(lib_id "Device:C")
-		(at 74.93 162.56 0)
+		(at 76.2 162.56 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -2101,8 +2050,8 @@
 		(dnp no)
 		(fields_autoplaced yes)
 		(uuid "a14b3e82-06f4-430c-8f1d-cb2376010130")
-		(property "Reference" "C5"
-			(at 78.74 161.2899 0)
+		(property "Reference" "C6"
+			(at 80.01 161.2899 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2110,8 +2059,8 @@
 				(justify left)
 			)
 		)
-		(property "Value" "C"
-			(at 78.74 163.8299 0)
+		(property "Value" "220p"
+			(at 80.01 163.8299 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2119,8 +2068,8 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
-			(at 75.8952 166.37 0)
+		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder"
+			(at 77.1652 166.37 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2129,7 +2078,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 74.93 162.56 0)
+			(at 76.2 162.56 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2138,7 +2087,7 @@
 			)
 		)
 		(property "Description" "Unpolarized capacitor"
-			(at 74.93 162.56 0)
+			(at 76.2 162.56 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2155,7 +2104,7 @@
 		(instances
 			(project ""
 				(path "/37be1b74-a3ea-4cc1-84d4-69214e3d96fd"
-					(reference "C5")
+					(reference "C6")
 					(unit 1)
 				)
 			)
@@ -2239,7 +2188,7 @@
 		(dnp no)
 		(fields_autoplaced yes)
 		(uuid "d033e899-7695-4653-ab09-820795286b78")
-		(property "Reference" "C3"
+		(property "Reference" "C5"
 			(at 59.69 44.4499 0)
 			(effects
 				(font
@@ -2257,7 +2206,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric"
+		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder"
 			(at 56.8452 49.53 0)
 			(effects
 				(font
@@ -2293,7 +2242,7 @@
 		(instances
 			(project ""
 				(path "/37be1b74-a3ea-4cc1-84d4-69214e3d96fd"
-					(reference "C3")
+					(reference "C5")
 					(unit 1)
 				)
 			)
@@ -2308,7 +2257,7 @@
 		(on_board yes)
 		(dnp no)
 		(uuid "dc23164f-17e2-4e91-8862-5236caf3cbf3")
-		(property "Reference" "C2"
+		(property "Reference" "C3"
 			(at 50.8 102.8699 0)
 			(effects
 				(font
@@ -2326,7 +2275,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric"
+		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder"
 			(at 47.9552 107.95 0)
 			(effects
 				(font
@@ -2362,7 +2311,7 @@
 		(instances
 			(project ""
 				(path "/37be1b74-a3ea-4cc1-84d4-69214e3d96fd"
-					(reference "C2")
+					(reference "C3")
 					(unit 1)
 				)
 			)
@@ -2370,7 +2319,7 @@
 	)
 	(symbol
 		(lib_id "Device:C")
-		(at 49.53 154.94 90)
+		(at 46.99 157.48 90)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -2379,23 +2328,23 @@
 		(fields_autoplaced yes)
 		(uuid "f84296d2-15b7-42f7-8b53-65e239fc8350")
 		(property "Reference" "C4"
-			(at 49.53 147.32 90)
+			(at 46.99 149.86 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 			)
 		)
-		(property "Value" "C"
-			(at 49.53 149.86 90)
+		(property "Value" "220p"
+			(at 46.99 152.4 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 			)
 		)
-		(property "Footprint" ""
-			(at 53.34 153.9748 0)
+		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder"
+			(at 50.8 156.5148 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2404,7 +2353,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 49.53 154.94 0)
+			(at 46.99 157.48 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2413,7 +2362,7 @@
 			)
 		)
 		(property "Description" "Unpolarized capacitor"
-			(at 49.53 154.94 0)
+			(at 46.99 157.48 0)
 			(effects
 				(font
 					(size 1.27 1.27)