diff --git a/KiCAD model/Custom.pretty/PEC12R-2120F-N0012.kicad_mod b/KiCAD model/Custom.pretty/PEC12R-2120F-N0012.kicad_mod
new file mode 100644
index 0000000000000000000000000000000000000000..859e8f5437b9b89cdcb1a6f2bbb8f6487b99d450
--- /dev/null
+++ b/KiCAD model/Custom.pretty/PEC12R-2120F-N0012.kicad_mod	
@@ -0,0 +1,17 @@
+(module PEC12R-2120F-N0012 (layer F.Cu) (tedit 6023E258)
+  (fp_text reference REF** (at 11.45 5.05) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value PEC12R-2120F-N0012 (at 11.25 3.4) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 4.25 5.9) (end 4.25 28.3) (layer F.SilkS) (width 0.12))
+  (fp_line (start 4.25 28.3) (end 17.35 28.3) (layer F.SilkS) (width 0.12))
+  (fp_line (start 17.35 28.3) (end 17.35 5.9) (layer F.SilkS) (width 0.12))
+  (fp_line (start 17.35 5.9) (end 4.25 5.9) (layer F.SilkS) (width 0.12))
+  (pad 1 thru_hole circle (at 8.3 10.8) (size 1.524 1.524) (drill 1) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at 10.8 10.8) (size 1.524 1.524) (drill 1) (layers *.Cu *.Mask))
+  (pad 3 thru_hole circle (at 13.3 10.8) (size 1.524 1.524) (drill 1) (layers *.Cu *.Mask))
+  (pad 4 thru_hole rect (at 16.2 8.3) (size 2.2 2.1) (drill oval 2.1 2) (layers *.Cu *.Mask))
+  (pad MP thru_hole rect (at 5.4 8.3) (size 2.2 2.1) (drill oval 2.1 2) (layers *.Cu *.Mask))
+)
diff --git a/KiCAD model/Custom.pretty/PMW3389.kicad_mod b/KiCAD model/Custom.pretty/PMW3389.kicad_mod
new file mode 100644
index 0000000000000000000000000000000000000000..b15fd08e465f8d549006dd738db2f2faac0b477c
--- /dev/null
+++ b/KiCAD model/Custom.pretty/PMW3389.kicad_mod	
@@ -0,0 +1,28 @@
+(module PMW3389 (layer F.Cu) (tedit 600FD639)
+  (fp_text reference REF** (at 0 0.5) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value PMW3389 (at 0 -0.5) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 9.65 -2.78) (end 1.05 -2.78) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.05 -2.78) (end 1.05 14.48) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.05 14.48) (end 9.65 14.48) (layer F.SilkS) (width 0.12))
+  (fp_line (start 9.65 14.48) (end 9.65 -2.8) (layer F.SilkS) (width 0.12))
+  (pad 16 thru_hole circle (at 10.7 0.89) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 15 thru_hole circle (at 10.7 2.67) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 14 thru_hole circle (at 10.7 4.45) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 13 thru_hole circle (at 10.7 6.23) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 12 thru_hole circle (at 10.7 8.01) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 11 thru_hole circle (at 10.7 9.79) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 10 thru_hole circle (at 10.7 11.57) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 9 thru_hole circle (at 10.7 13.35) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 8 thru_hole circle (at 0 12.46) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 7 thru_hole circle (at 0 10.68) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 6 thru_hole circle (at 0 8.9) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 5 thru_hole circle (at 0 7.12) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 4 thru_hole circle (at 0 5.34) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 3 thru_hole circle (at 0 3.56) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at 0 1.78) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 1 thru_hole circle (at 0 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+)
diff --git a/KiCAD model/Lab1-MyNewLibrary.lib b/KiCAD model/Lab1-MyNewLibrary.lib
index fff2dee9c9989b39ee0da9f0e50784ee0d5c7e32..da0f1a19c71b96db951ae3bee4ebd1db3f669d78 100644
--- a/KiCAD model/Lab1-MyNewLibrary.lib	
+++ b/KiCAD model/Lab1-MyNewLibrary.lib	
@@ -11,7 +11,7 @@ F3 "" 1200 -300 50 H I C CNN
 DRAW
 S 1550 -150 850 -1100 0 1 0 f
 X NC 1 750 -300 100 R 50 50 1 1 I X
-X SCLK 10 1650 -900 100 L 50 50 1 1 I X
+X SCLK 10 1650 -900 100 L 50 50 1 1 I
 X MOSI 11 1650 -800 100 L 50 50 1 1 I
 X MISO 12 1650 -700 100 L 50 50 1 1 O
 X NCS 13 1650 -600 100 L 50 50 1 1 I
@@ -19,13 +19,13 @@ X NC 14 1650 -500 100 L 50 50 1 1 N
 X LED_P 15 1650 -400 100 L 50 50 1 1 I
 X NC 16 1650 -300 100 L 50 50 1 1 N
 X NC 2 750 -400 100 R 50 50 1 1 I X
-X VDCPIX 3 750 -500 100 R 50 50 1 1 w X
-X VDD 4 750 -600 100 R 50 50 1 1 W X
-X VDDIO 5 750 -700 100 R 50 50 1 1 W X
+X VDCPIX 3 750 -500 100 R 50 50 1 1 w
+X VDD 4 750 -600 100 R 50 50 1 1 W
+X VDDIO 5 750 -700 100 R 50 50 1 1 W
 X GPO 6 750 -800 100 R 50 50 1 1 O
 X NRESET 7 750 -900 100 R 50 50 1 1 I
 X GND 8 750 -1000 100 R 50 50 1 1 W
-X MOTION 9 1650 -1000 100 L 50 50 1 1 O X
+X MOTION 9 1650 -1000 100 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
diff --git a/KiCAD model/Lab1-cache.lib b/KiCAD model/Lab1-cache.lib
index 52a34f879fc90ef848aa3345f094ee9855327a75..7daa8c8a233ca936d0b31d155b1955f061235e30 100644
--- a/KiCAD model/Lab1-cache.lib	
+++ b/KiCAD model/Lab1-cache.lib	
@@ -159,41 +159,33 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Device_Rotary_Encoder_Switch
+# Device_Rotary_Encoder
 #
-DEF Device_Rotary_Encoder_Switch SW 0 10 Y N 1 F N
+DEF Device_Rotary_Encoder SW 0 10 Y N 1 F N
 F0 "SW" 0 260 50 H V C CNN
-F1 "Device_Rotary_Encoder_Switch" 0 -260 50 H V C CNN
+F1 "Device_Rotary_Encoder" 0 -260 50 H V C CNN
 F2 "" -150 160 50 H I C CNN
 F3 "" 0 260 50 H I C CNN
 $FPLIST
- RotaryEncoder*Switch*
+ RotaryEncoder*
 $ENDFPLIST
 DRAW
 A -15 -2 108 -899 899 0 1 10 N -15 -110 -15 105
 C -150 0 10 0 1 0 F
 C -15 0 75 0 1 10 N
-C 170 -40 5 0 1 10 N
-C 170 40 5 0 1 10 N
 S -200 200 200 -200 0 1 10 f
 P 2 0 1 10 -25 -70 -25 70 N
 P 2 0 1 10 -15 -70 -15 70 N
 P 2 0 1 10 -5 70 -5 -70 N
-P 2 0 1 10 150 0 135 0 N
-P 2 0 1 10 150 40 150 -40 N
 P 3 0 1 0 -200 -100 -150 -100 -150 -80 N
 P 3 0 1 0 -200 100 -150 100 -150 80 N
 P 3 0 1 10 10 -120 -20 -110 5 -95 N
 P 3 0 1 10 10 115 -20 105 5 90 N
-P 3 0 1 10 200 -100 170 -100 170 -40 N
-P 3 0 1 10 200 100 170 100 170 40 N
 P 4 0 1 0 -200 0 -150 0 -150 -40 -130 -80 N
 P 4 0 1 0 -170 0 -150 0 -150 40 -130 80 N
 X A A -300 100 100 R 50 50 1 1 P
 X B B -300 -100 100 R 50 50 1 1 P
 X C C -300 0 100 R 50 50 1 1 P
-X S1 S1 300 100 100 L 50 50 1 1 P
-X S2 S2 300 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -252,7 +244,7 @@ F3 "" 1200 -300 50 H I C CNN
 DRAW
 S 1550 -150 850 -1100 0 1 0 f
 X NC 1 750 -300 100 R 50 50 1 1 I X
-X SCLK 10 1650 -900 100 L 50 50 1 1 I X
+X SCLK 10 1650 -900 100 L 50 50 1 1 I
 X MOSI 11 1650 -800 100 L 50 50 1 1 I
 X MISO 12 1650 -700 100 L 50 50 1 1 O
 X NCS 13 1650 -600 100 L 50 50 1 1 I
@@ -260,13 +252,13 @@ X NC 14 1650 -500 100 L 50 50 1 1 N
 X LED_P 15 1650 -400 100 L 50 50 1 1 I
 X NC 16 1650 -300 100 L 50 50 1 1 N
 X NC 2 750 -400 100 R 50 50 1 1 I X
-X VDCPIX 3 750 -500 100 R 50 50 1 1 w X
-X VDD 4 750 -600 100 R 50 50 1 1 W X
-X VDDIO 5 750 -700 100 R 50 50 1 1 W X
+X VDCPIX 3 750 -500 100 R 50 50 1 1 w
+X VDD 4 750 -600 100 R 50 50 1 1 W
+X VDDIO 5 750 -700 100 R 50 50 1 1 W
 X GPO 6 750 -800 100 R 50 50 1 1 O
 X NRESET 7 750 -900 100 R 50 50 1 1 I
 X GND 8 750 -1000 100 R 50 50 1 1 W
-X MOTION 9 1650 -1000 100 L 50 50 1 1 O X
+X MOTION 9 1650 -1000 100 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
diff --git a/KiCAD model/Lab1.net b/KiCAD model/Lab1.net
index c724fba6339415d0374d0ad9fd21d94a61922a3e..66b05d4fe7b9060cc411b17b63cd7097b080ae54 100644
--- a/KiCAD model/Lab1.net	
+++ b/KiCAD model/Lab1.net	
@@ -1,7 +1,7 @@
 (export (version D)
   (design
     (source C:\Users\User\Documents\Lab1\Lab1.sch)
-    (date "2021-01-27 16:21:38")
+    (date "2021-02-10 10:53:42")
     (tool "Eeschema (5.1.9)-1")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -85,27 +85,6 @@
       (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor, small symbol"))
       (sheetpath (names /) (tstamps /))
       (tstamp 600E2AB5))
-    (comp (ref J2)
-      (value SWD)
-      (footprint Connector_PinHeader_2.00mm:PinHeader_1x06_P2.00mm_Vertical)
-      (datasheet ~)
-      (libsource (lib Connector) (part Conn_01x06_Male) (description "Generic connector, single row, 01x06, script generated (kicad-library-utils/schlib/autogen/connector/)"))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 60081960))
-    (comp (ref SW2)
-      (value Reset)
-      (footprint Button_Switch_SMD:SW_SPST_B3U-1000P)
-      (datasheet ~)
-      (libsource (lib Switch) (part SW_Push) (description "Push button switch, generic, two pins"))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 6010D7D8))
-    (comp (ref C15)
-      (value 100n)
-      (footprint Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder)
-      (datasheet ~)
-      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor, small symbol"))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 601141BD))
     (comp (ref C2)
       (value 4u7)
       (footprint Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder)
@@ -162,13 +141,6 @@
       (libsource (lib Connector) (part TestPoint) (description "test point"))
       (sheetpath (names /) (tstamps /))
       (tstamp 601AABDA))
-    (comp (ref TP7)
-      (value TestPoint)
-      (footprint TestPoint:TestPoint_Pad_1.5x1.5mm)
-      (datasheet ~)
-      (libsource (lib Connector) (part TestPoint) (description "test point"))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 601B3570))
     (comp (ref JP1)
       (value DFU)
       (footprint Connector:FanPinHeader_1x03_P2.54mm_Vertical)
@@ -190,20 +162,6 @@
       (libsource (lib Connector) (part TestPoint) (description "test point"))
       (sheetpath (names /) (tstamps /))
       (tstamp 60196B94))
-    (comp (ref U2)
-      (value AP2125N-3.3TRG)
-      (footprint Package_TO_SOT_SMD:TO-252-3_TabPin2)
-      (datasheet https://static6.arrow.com/aropdfconversion/dc75757ae45a88e5f69bdce3f2a651a5fe0ca07d/ifx27001_ds_10.pdf)
-      (libsource (lib Regulator_Linear) (part IFX27001TFV33) (description "1A Low Dropout Regulator, positive, 3.3V fixed output, TO-252-3"))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 6026BF1B))
-    (comp (ref U4)
-      (value STM32F411RETx)
-      (footprint Package_QFP:LQFP-64_10x10mm_P0.5mm)
-      (datasheet http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00115249.pdf)
-      (libsource (lib MCU_ST_STM32F4) (part STM32F411RETx) (description "ARM Cortex-M4 MCU, 512KB flash, 128KB RAM, 100MHz, 1.7-3.6V, 50 GPIO, LQFP-64"))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 60055F5F))
     (comp (ref C19)
       (value 10u)
       (footprint Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder)
@@ -266,13 +224,6 @@
       (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor, small symbol"))
       (sheetpath (names /) (tstamps /))
       (tstamp 601DBE60))
-    (comp (ref D1)
-      (value "Indicator LED")
-      (footprint LED_SMD:LED_1206_3216Metric)
-      (datasheet http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf)
-      (libsource (lib LED) (part IR26-21C_L110_TR8) (description "940nm, 20 deg, Infrared LED, 1206"))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 601E5474))
     (comp (ref C1)
       (value 4u7)
       (footprint Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder)
@@ -287,20 +238,6 @@
       (libsource (lib Connector) (part USB_OTG) (description "USB mini/micro connector"))
       (sheetpath (names /) (tstamps /))
       (tstamp 6009969E))
-    (comp (ref D2)
-      (value "Indicator LED")
-      (footprint LED_SMD:LED_1206_3216Metric)
-      (datasheet http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf)
-      (libsource (lib LED) (part IR26-21C_L110_TR8) (description "940nm, 20 deg, Infrared LED, 1206"))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 602BC446))
-    (comp (ref D3)
-      (value "Indicator LED")
-      (footprint LED_SMD:LED_1206_3216Metric)
-      (datasheet http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf)
-      (libsource (lib LED) (part IR26-21C_L110_TR8) (description "940nm, 20 deg, Infrared LED, 1206"))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 602C3066))
     (comp (ref TP2)
       (value 1.9V)
       (footprint TestPoint:TestPoint_Pad_1.5x1.5mm)
@@ -308,13 +245,6 @@
       (libsource (lib Connector) (part TestPoint) (description "test point"))
       (sheetpath (names /) (tstamps /))
       (tstamp 6018AFCC))
-    (comp (ref R1)
-      (value 1.5k)
-      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
-      (datasheet ~)
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 601EB13E))
     (comp (ref C9)
       (value 1u)
       (footprint Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder)
@@ -329,20 +259,453 @@
       (libsource (lib Connector) (part TestPoint) (description "test point"))
       (sheetpath (names /) (tstamps /))
       (tstamp 6019C4CF))
-    (comp (ref R5)
+    (comp (ref TP7)
+      (value TestPoint)
+      (footprint TestPoint:TestPoint_Pad_1.5x1.5mm)
+      (datasheet ~)
+      (libsource (lib Connector) (part TestPoint) (description "test point"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 601B3570))
+    (comp (ref C15)
+      (value 100n)
+      (footprint Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor, small symbol"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 601141BD))
+    (comp (ref SW2)
+      (value Reset)
+      (footprint Button_Switch_SMD:SW_SPST_B3U-1000P)
+      (datasheet ~)
+      (libsource (lib Switch) (part SW_Push) (description "Push button switch, generic, two pins"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 6010D7D8))
+    (comp (ref TP11)
+      (value TestPoint)
+      (footprint TestPoint:TestPoint_Pad_1.5x1.5mm)
+      (datasheet ~)
+      (libsource (lib Connector) (part TestPoint) (description "test point"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 6020246B))
+    (comp (ref SW5)
+      (value Reset)
+      (footprint Button_Switch_SMD:SW_SPST_B3U-1000P)
+      (datasheet ~)
+      (libsource (lib Switch) (part SW_Push) (description "Push button switch, generic, two pins"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 6020248A))
+    (comp (ref U2)
+      (value AP2125N-3.3TRG)
+      (footprint Package_TO_SOT_SMD:TO-252-3_TabPin2)
+      (datasheet https://static6.arrow.com/aropdfconversion/dc75757ae45a88e5f69bdce3f2a651a5fe0ca07d/ifx27001_ds_10.pdf)
+      (libsource (lib Regulator_Linear) (part IFX27001TFV33) (description "1A Low Dropout Regulator, positive, 3.3V fixed output, TO-252-3"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 6026BF1B))
+    (comp (ref C25)
+      (value 100n)
+      (footprint Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor, small symbol"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 6020247B))
+    (comp (ref R20)
+      (value 5k)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 604B639F))
+    (comp (ref R19)
+      (value 5k)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 604C1473))
+    (comp (ref SW8)
+      (value Rotary_Encoder_Switch)
+      (datasheet ~)
+      (libsource (lib Device) (part Rotary_Encoder_Switch) (description "Rotary encoder, dual channel, incremental quadrate outputs, with switch"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 604FC53D))
+    (comp (ref TP15)
+      (value TestPoint)
+      (footprint TestPoint:TestPoint_Pad_1.5x1.5mm)
+      (datasheet ~)
+      (libsource (lib Connector) (part TestPoint) (description "test point"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 60524636))
+    (comp (ref TP14)
+      (value TestPoint)
+      (footprint TestPoint:TestPoint_Pad_1.5x1.5mm)
+      (datasheet ~)
+      (libsource (lib Connector) (part TestPoint) (description "test point"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 6052FEC3))
+    (comp (ref R12)
+      (value 150)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 60601B5A))
+    (comp (ref R14)
+      (value 10k)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 6061918A))
+    (comp (ref TP10)
+      (value TestPoint)
+      (footprint TestPoint:TestPoint_Pad_1.5x1.5mm)
+      (datasheet ~)
+      (libsource (lib Connector) (part TestPoint) (description "test point"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606C1CDE))
+    (comp (ref SW4)
+      (value Reset)
+      (footprint Button_Switch_SMD:SW_SPST_B3U-1000P)
+      (datasheet ~)
+      (libsource (lib Switch) (part SW_Push) (description "Push button switch, generic, two pins"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606C1CE6))
+    (comp (ref C24)
+      (value 100n)
+      (footprint Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor, small symbol"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606C1CF3))
+    (comp (ref R11)
+      (value 150)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606C1CF9))
+    (comp (ref R13)
+      (value 10k)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606C1D01))
+    (comp (ref TP13)
+      (value TestPoint)
+      (footprint TestPoint:TestPoint_Pad_1.5x1.5mm)
+      (datasheet ~)
+      (libsource (lib Connector) (part TestPoint) (description "test point"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606CDF0C))
+    (comp (ref SW7)
+      (value Reset)
+      (footprint Button_Switch_SMD:SW_SPST_B3U-1000P)
+      (datasheet ~)
+      (libsource (lib Switch) (part SW_Push) (description "Push button switch, generic, two pins"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606CDF14))
+    (comp (ref C27)
+      (value 100n)
+      (footprint Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor, small symbol"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606CDF21))
+    (comp (ref R16)
+      (value 150)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606CDF27))
+    (comp (ref R18)
+      (value 10k)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606CDF2F))
+    (comp (ref TP12)
+      (value TestPoint)
+      (footprint TestPoint:TestPoint_Pad_1.5x1.5mm)
+      (datasheet ~)
+      (libsource (lib Connector) (part TestPoint) (description "test point"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606DD8DB))
+    (comp (ref SW6)
+      (value Reset)
+      (footprint Button_Switch_SMD:SW_SPST_B3U-1000P)
+      (datasheet ~)
+      (libsource (lib Switch) (part SW_Push) (description "Push button switch, generic, two pins"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606DD8E3))
+    (comp (ref C26)
+      (value 100n)
+      (footprint Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor, small symbol"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606DD8F0))
+    (comp (ref R15)
+      (value 150)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606DD8F6))
+    (comp (ref R17)
+      (value 10k)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606DD8FE))
+    (comp (ref TP9)
+      (value TestPoint)
+      (footprint TestPoint:TestPoint_Pad_1.5x1.5mm)
+      (datasheet ~)
+      (libsource (lib Connector) (part TestPoint) (description "test point"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606EC1C5))
+    (comp (ref SW3)
+      (value Reset)
+      (footprint Button_Switch_SMD:SW_SPST_B3U-1000P)
+      (datasheet ~)
+      (libsource (lib Switch) (part SW_Push) (description "Push button switch, generic, two pins"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606EC1CD))
+    (comp (ref C23)
+      (value 100n)
+      (footprint Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor, small symbol"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606EC1DA))
+    (comp (ref R8)
+      (value 150)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606EC1E0))
+    (comp (ref R10)
+      (value 10k)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606EC1E8))
+    (comp (ref TP5)
+      (value TestPoint)
+      (footprint TestPoint:TestPoint_Pad_1.5x1.5mm)
+      (datasheet ~)
+      (libsource (lib Connector) (part TestPoint) (description "test point"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606FEE71))
+    (comp (ref SW1)
+      (value Reset)
+      (footprint Button_Switch_SMD:SW_SPST_B3U-1000P)
+      (datasheet ~)
+      (libsource (lib Switch) (part SW_Push) (description "Push button switch, generic, two pins"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606FEE79))
+    (comp (ref C22)
+      (value 100n)
+      (footprint Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor, small symbol"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606FEE86))
+    (comp (ref R7)
+      (value 150)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606FEE8C))
+    (comp (ref R9)
+      (value 10k)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606FEE94))
+    (comp (ref TP16)
+      (value TestPoint)
+      (footprint TestPoint:TestPoint_Pad_1.5x1.5mm)
+      (datasheet ~)
+      (libsource (lib Connector) (part TestPoint) (description "test point"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 60824766))
+    (comp (ref SW9)
+      (value Reset)
+      (footprint Button_Switch_SMD:SW_SPST_B3U-1000P)
+      (datasheet ~)
+      (libsource (lib Switch) (part SW_Push) (description "Push button switch, generic, two pins"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 6082476E))
+    (comp (ref C28)
+      (value 100n)
+      (footprint Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor, small symbol"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 6082477B))
+    (comp (ref R21)
+      (value ?)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 60824781))
+    (comp (ref R22)
+      (value ?)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 60824789))
+    (comp (ref U4)
+      (value STM32F411RETx)
+      (footprint Package_QFP:LQFP-64_10x10mm_P0.5mm)
+      (datasheet http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00115249.pdf)
+      (libsource (lib MCU_ST_STM32F4) (part STM32F411RETx) (description "ARM Cortex-M4 MCU, 512KB flash, 128KB RAM, 100MHz, 1.7-3.6V, 50 GPIO, LQFP-64"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 60055F5F))
+    (comp (ref R23)
+      (value 5k)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 60EF44BA))
+    (comp (ref C29)
+      (value 100n)
+      (footprint Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor, small symbol"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 60F2BC33))
+    (comp (ref D4)
+      (value "Indicator LED")
+      (footprint LED_SMD:LED_1206_3216Metric)
+      (datasheet http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf)
+      (libsource (lib LED) (part IR26-21C_L110_TR8) (description "940nm, 20 deg, Infrared LED, 1206"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 60FE96B3))
+    (comp (ref R24)
+      (value 820)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 60FE96BA))
+    (comp (ref D5)
+      (value "Indicator LED")
+      (footprint LED_SMD:LED_1206_3216Metric)
+      (datasheet http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf)
+      (libsource (lib LED) (part IR26-21C_L110_TR8) (description "940nm, 20 deg, Infrared LED, 1206"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 610016AF))
+    (comp (ref R25)
+      (value 820)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 610016B6))
+    (comp (ref D6)
+      (value "Indicator LED")
+      (footprint LED_SMD:LED_1206_3216Metric)
+      (datasheet http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf)
+      (libsource (lib LED) (part IR26-21C_L110_TR8) (description "940nm, 20 deg, Infrared LED, 1206"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 61017346))
+    (comp (ref R26)
       (value 820)
       (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
       (datasheet ~)
       (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
-      (tstamp 601752BE))
+      (tstamp 6101734D))
+    (comp (ref J2)
+      (value SWD)
+      (footprint Connector_PinHeader_2.00mm:PinHeader_1x06_P2.00mm_Vertical)
+      (datasheet ~)
+      (libsource (lib Connector) (part Conn_01x06_Male) (description "Generic connector, single row, 01x06, script generated (kicad-library-utils/schlib/autogen/connector/)"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 60081960))
+    (comp (ref JP5)
+      (value DFU)
+      (footprint Connector:FanPinHeader_1x03_P2.54mm_Vertical)
+      (datasheet ~)
+      (libsource (lib Jumper) (part Jumper_3_Bridged12) (description "Jumper, 3-pole, pins 1+2 closed/bridged"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 602B78F1))
+    (comp (ref JP4)
+      (value DFU)
+      (footprint Connector:FanPinHeader_1x03_P2.54mm_Vertical)
+      (datasheet ~)
+      (libsource (lib Jumper) (part Jumper_3_Bridged12) (description "Jumper, 3-pole, pins 1+2 closed/bridged"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 6075715F))
     (comp (ref R6)
+      (value 1.5k)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 60757151))
+    (comp (ref JP2)
+      (value DFU)
+      (footprint Connector:FanPinHeader_1x03_P2.54mm_Vertical)
+      (datasheet ~)
+      (libsource (lib Jumper) (part Jumper_3_Bridged12) (description "Jumper, 3-pole, pins 1+2 closed/bridged"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 6074062D))
+    (comp (ref R1)
       (value 47)
       (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
       (datasheet ~)
       (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
-      (tstamp 6018FB9B)))
+      (tstamp 6074061F))
+    (comp (ref JP3)
+      (value DFU)
+      (footprint Connector:FanPinHeader_1x03_P2.54mm_Vertical)
+      (datasheet ~)
+      (libsource (lib Jumper) (part Jumper_3_Bridged12) (description "Jumper, 3-pole, pins 1+2 closed/bridged"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606D1383))
+    (comp (ref R5)
+      (value 820)
+      (footprint Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 606D1373))
+    (comp (ref D1)
+      (value "Indicator LED")
+      (footprint LED_SMD:LED_1206_3216Metric)
+      (datasheet http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf)
+      (libsource (lib LED) (part IR26-21C_L110_TR8) (description "940nm, 20 deg, Infrared LED, 1206"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 601E5474))
+    (comp (ref D3)
+      (value "Indicator LED")
+      (footprint LED_SMD:LED_1206_3216Metric)
+      (datasheet http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf)
+      (libsource (lib LED) (part IR26-21C_L110_TR8) (description "940nm, 20 deg, Infrared LED, 1206"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 602C3066))
+    (comp (ref D2)
+      (value "Indicator LED")
+      (footprint LED_SMD:LED_1206_3216Metric)
+      (datasheet http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf)
+      (libsource (lib LED) (part IR26-21C_L110_TR8) (description "940nm, 20 deg, Infrared LED, 1206"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 602BC446)))
   (libparts
     (libpart (lib Connector) (part Conn_01x06_Male)
       (description "Generic connector, single row, 01x06, script generated (kicad-library-utils/schlib/autogen/connector/)")
@@ -429,6 +792,20 @@
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
+    (libpart (lib Device) (part Rotary_Encoder_Switch)
+      (description "Rotary encoder, dual channel, incremental quadrate outputs, with switch")
+      (docs ~)
+      (footprints
+        (fp RotaryEncoder*Switch*))
+      (fields
+        (field (name Reference) SW)
+        (field (name Value) Rotary_Encoder_Switch))
+      (pins
+        (pin (num A) (name A) (type passive))
+        (pin (num B) (name B) (type passive))
+        (pin (num C) (name C) (type passive))
+        (pin (num S1) (name S1) (type passive))
+        (pin (num S2) (name S2) (type passive))))
     (libpart (lib Jumper) (part Jumper_3_Bridged12)
       (description "Jumper, 3-pole, pins 1+2 closed/bridged")
       (docs ~)
@@ -670,258 +1047,379 @@
     (library (logical Switch)
       (uri D:\KiCad\share\kicad\library/Switch.lib)))
   (nets
-    (net (code 1) (name "Net-(C18-Pad1)")
-      (node (ref U1) (pin 3))
-      (node (ref C21) (pin 1))
-      (node (ref C18) (pin 1)))
-    (net (code 2) (name GND)
-      (node (ref C5) (pin 1))
-      (node (ref C6) (pin 1))
-      (node (ref C12) (pin 2))
-      (node (ref C9) (pin 2))
-      (node (ref R4) (pin 2))
-      (node (ref C7) (pin 2))
-      (node (ref D3) (pin 1))
-      (node (ref C11) (pin 2))
-      (node (ref D2) (pin 1))
+    (net (code 1) (name +3V3)
+      (node (ref R13) (pin 1))
+      (node (ref R22) (pin 1))
+      (node (ref C12) (pin 1))
+      (node (ref C20) (pin 2))
+      (node (ref C19) (pin 2))
+      (node (ref R14) (pin 1))
+      (node (ref R17) (pin 1))
+      (node (ref U2) (pin 2))
+      (node (ref R18) (pin 1))
+      (node (ref C9) (pin 1))
+      (node (ref TP6) (pin 1))
+      (node (ref TP1) (pin 1))
+      (node (ref R19) (pin 2))
+      (node (ref JP1) (pin 3))
+      (node (ref C2) (pin 1))
+      (node (ref U1) (pin 5))
+      (node (ref U4) (pin 13))
+      (node (ref U4) (pin 64))
+      (node (ref U4) (pin 48))
+      (node (ref U4) (pin 32))
+      (node (ref J2) (pin 1))
+      (node (ref U4) (pin 19))
+      (node (ref U4) (pin 1))
+      (node (ref JP3) (pin 3))
+      (node (ref C13) (pin 1))
+      (node (ref C11) (pin 1))
+      (node (ref R9) (pin 1))
+      (node (ref C14) (pin 1))
+      (node (ref C10) (pin 1))
+      (node (ref R10) (pin 1)))
+    (net (code 2) (name "Net-(R7-Pad1)")
+      (node (ref R7) (pin 1))
+      (node (ref SW1) (pin 1))
+      (node (ref R9) (pin 2)))
+    (net (code 3) (name GND)
+      (node (ref D4) (pin 1))
+      (node (ref D6) (pin 1))
+      (node (ref C1) (pin 2))
+      (node (ref U4) (pin 18))
+      (node (ref U4) (pin 31))
+      (node (ref C16) (pin 2))
+      (node (ref C17) (pin 2))
+      (node (ref C20) (pin 1))
+      (node (ref C18) (pin 2))
       (node (ref U4) (pin 12))
       (node (ref U4) (pin 63))
+      (node (ref C25) (pin 2))
+      (node (ref D5) (pin 1))
       (node (ref U4) (pin 47))
-      (node (ref U4) (pin 31))
-      (node (ref U4) (pin 18))
-      (node (ref J1) (pin 5))
-      (node (ref SW2) (pin 2))
-      (node (ref C15) (pin 2))
-      (node (ref C2) (pin 2))
-      (node (ref C1) (pin 2))
-      (node (ref D1) (pin 1))
-      (node (ref C20) (pin 1))
-      (node (ref C14) (pin 2))
+      (node (ref C21) (pin 2))
+      (node (ref C11) (pin 2))
+      (node (ref C6) (pin 1))
+      (node (ref C5) (pin 1))
+      (node (ref C10) (pin 2))
+      (node (ref C12) (pin 2))
       (node (ref C13) (pin 2))
-      (node (ref U5) (pin 2))
-      (node (ref U3) (pin 2))
-      (node (ref C19) (pin 1))
-      (node (ref U2) (pin 1))
       (node (ref C3) (pin 2))
+      (node (ref U3) (pin 2))
+      (node (ref C2) (pin 2))
+      (node (ref C14) (pin 2))
+      (node (ref C7) (pin 2))
+      (node (ref R4) (pin 2))
+      (node (ref C9) (pin 2))
+      (node (ref J1) (pin 5))
+      (node (ref SW2) (pin 2))
       (node (ref R3) (pin 2))
       (node (ref C4) (pin 2))
+      (node (ref SW8) (pin C))
+      (node (ref SW8) (pin S1))
+      (node (ref R20) (pin 1))
+      (node (ref C29) (pin 2))
+      (node (ref U2) (pin 1))
+      (node (ref SW5) (pin 2))
+      (node (ref C19) (pin 1))
+      (node (ref C15) (pin 2))
+      (node (ref SW4) (pin 2))
+      (node (ref U5) (pin 2))
+      (node (ref C27) (pin 2))
+      (node (ref C24) (pin 2))
+      (node (ref SW7) (pin 2))
+      (node (ref C26) (pin 2))
+      (node (ref SW6) (pin 2))
+      (node (ref SW3) (pin 2))
+      (node (ref D1) (pin 1))
+      (node (ref D3) (pin 1))
+      (node (ref C22) (pin 2))
+      (node (ref D2) (pin 1))
       (node (ref J2) (pin 3))
-      (node (ref C17) (pin 2))
-      (node (ref C16) (pin 2))
-      (node (ref C21) (pin 2))
-      (node (ref C10) (pin 2))
-      (node (ref C18) (pin 2)))
-    (net (code 3) (name "Net-(U1-Pad15)")
-      (node (ref U1) (pin 15)))
-    (net (code 4) (name "Net-(U1-Pad8)")
-      (node (ref U1) (pin 8)))
-    (net (code 5) (name "Net-(U1-Pad7)")
-      (node (ref U1) (pin 7)))
-    (net (code 6) (name "Net-(U1-Pad1)")
-      (node (ref U1) (pin 1)))
-    (net (code 7) (name SCK)
+      (node (ref C23) (pin 2))
+      (node (ref C28) (pin 2))
+      (node (ref SW9) (pin 2))
+      (node (ref SW1) (pin 2)))
+    (net (code 4) (name left_click)
+      (node (ref U4) (pin 14))
+      (node (ref R7) (pin 2))
+      (node (ref TP5) (pin 1))
+      (node (ref C22) (pin 1)))
+    (net (code 5) (name right_click)
+      (node (ref U4) (pin 15))
+      (node (ref TP9) (pin 1))
+      (node (ref C23) (pin 1))
+      (node (ref R8) (pin 2)))
+    (net (code 6) (name "Net-(R10-Pad2)")
+      (node (ref SW3) (pin 1))
+      (node (ref R8) (pin 1))
+      (node (ref R10) (pin 2)))
+    (net (code 7) (name BOOT0)
+      (node (ref U4) (pin 60))
+      (node (ref JP1) (pin 1))
+      (node (ref JP1) (pin 2))
+      (node (ref TP8) (pin 1))
+      (node (ref R4) (pin 1)))
+    (net (code 8) (name OUT_D-)
+      (node (ref U5) (pin 4))
+      (node (ref U4) (pin 44)))
+    (net (code 9) (name OUT_D+)
+      (node (ref U5) (pin 6))
+      (node (ref U4) (pin 45)))
+    (net (code 10) (name "Net-(U4-Pad50)")
+      (node (ref U4) (pin 50)))
+    (net (code 11) (name "Net-(U4-Pad26)")
+      (node (ref U4) (pin 26)))
+    (net (code 12) (name "Net-(U4-Pad27)")
+      (node (ref U4) (pin 27)))
+    (net (code 13) (name SCK)
       (node (ref U4) (pin 29))
       (node (ref U1) (pin 10)))
-    (net (code 8) (name "Net-(U1-Pad6)")
-      (node (ref U1) (pin 6)))
-    (net (code 9) (name +3V3)
-      (node (ref C20) (pin 2))
-      (node (ref C19) (pin 2))
-      (node (ref C14) (pin 1))
-      (node (ref JP1) (pin 3))
-      (node (ref C2) (pin 1))
-      (node (ref U1) (pin 5))
-      (node (ref U4) (pin 19))
-      (node (ref U4) (pin 1))
-      (node (ref U2) (pin 2))
-      (node (ref C9) (pin 1))
-      (node (ref U4) (pin 32))
-      (node (ref TP1) (pin 1))
-      (node (ref TP6) (pin 1))
-      (node (ref U4) (pin 48))
-      (node (ref U4) (pin 64))
-      (node (ref U4) (pin 13))
-      (node (ref C10) (pin 1))
-      (node (ref J2) (pin 1))
+    (net (code 14) (name "Net-(U4-Pad34)")
+      (node (ref U4) (pin 34)))
+    (net (code 15) (name "Net-(U4-Pad35)")
+      (node (ref U4) (pin 35)))
+    (net (code 16) (name wheel_click)
+      (node (ref U4) (pin 22))
+      (node (ref C28) (pin 1))
+      (node (ref TP16) (pin 1))
+      (node (ref R21) (pin 2)))
+    (net (code 17) (name "Net-(R21-Pad1)")
+      (node (ref R22) (pin 2))
+      (node (ref R21) (pin 1))
+      (node (ref SW9) (pin 1)))
+    (net (code 18) (name backward)
+      (node (ref TP13) (pin 1))
+      (node (ref U4) (pin 21))
+      (node (ref C27) (pin 1))
+      (node (ref R16) (pin 2)))
+    (net (code 19) (name "Net-(R11-Pad1)")
+      (node (ref R13) (pin 2))
+      (node (ref SW4) (pin 1))
+      (node (ref R11) (pin 1)))
+    (net (code 20) (name sense_up)
+      (node (ref TP10) (pin 1))
+      (node (ref U4) (pin 16))
+      (node (ref R11) (pin 2))
+      (node (ref C24) (pin 1)))
+    (net (code 21) (name forward)
+      (node (ref R15) (pin 2))
+      (node (ref TP12) (pin 1))
+      (node (ref U4) (pin 20))
+      (node (ref C26) (pin 1)))
+    (net (code 22) (name "Net-(R15-Pad1)")
+      (node (ref R17) (pin 2))
+      (node (ref SW6) (pin 1))
+      (node (ref R15) (pin 1)))
+    (net (code 23) (name "Net-(R16-Pad1)")
+      (node (ref R16) (pin 1))
+      (node (ref SW7) (pin 1))
+      (node (ref R18) (pin 2)))
+    (net (code 24) (name "Net-(U4-Pad36)")
+      (node (ref U4) (pin 36)))
+    (net (code 25) (name NRST)
+      (node (ref U4) (pin 7))
+      (node (ref J2) (pin 5))
+      (node (ref SW2) (pin 1))
+      (node (ref C15) (pin 1))
+      (node (ref TP7) (pin 1)))
+    (net (code 26) (name SWDIO)
+      (node (ref J2) (pin 4))
+      (node (ref U4) (pin 46)))
+    (net (code 27) (name SWO)
+      (node (ref U4) (pin 55))
+      (node (ref J2) (pin 6)))
+    (net (code 28) (name SWCLK)
+      (node (ref J2) (pin 2))
+      (node (ref U4) (pin 49)))
+    (net (code 29) (name "Net-(JP5-Pad1)")
+      (node (ref JP5) (pin 1)))
+    (net (code 30) (name "Net-(JP5-Pad2)")
+      (node (ref JP5) (pin 2)))
+    (net (code 31) (name "Net-(JP5-Pad3)")
+      (node (ref JP5) (pin 3)))
+    (net (code 32) (name "Net-(D3-Pad2)")
+      (node (ref R1) (pin 2))
+      (node (ref D3) (pin 2)))
+    (net (code 33) (name "Net-(D2-Pad2)")
       (node (ref R5) (pin 2))
-      (node (ref C12) (pin 1))
-      (node (ref C13) (pin 1))
-      (node (ref C11) (pin 1)))
-    (net (code 10) (name VDD)
-      (node (ref U3) (pin 5))
-      (node (ref C4) (pin 1))
-      (node (ref R2) (pin 1))
+      (node (ref D2) (pin 2)))
+    (net (code 34) (name "Net-(D1-Pad2)")
       (node (ref R6) (pin 2))
+      (node (ref D1) (pin 2)))
+    (net (code 35) (name "Net-(D6-Pad2)")
+      (node (ref R26) (pin 1))
+      (node (ref D6) (pin 2)))
+    (net (code 36) (name BLUE)
+      (node (ref R26) (pin 2))
+      (node (ref U4) (pin 43)))
+    (net (code 37) (name RED)
+      (node (ref U4) (pin 41))
+      (node (ref R24) (pin 2)))
+    (net (code 38) (name "Net-(JP4-Pad1)")
+      (node (ref JP4) (pin 2))
+      (node (ref JP4) (pin 1))
+      (node (ref R6) (pin 1)))
+    (net (code 39) (name +5V)
+      (node (ref C1) (pin 1))
+      (node (ref J1) (pin 1))
+      (node (ref U2) (pin 3))
+      (node (ref C8) (pin 2))
+      (node (ref U3) (pin 3))
+      (node (ref U3) (pin 1))
+      (node (ref JP4) (pin 3))
+      (node (ref C3) (pin 1)))
+    (net (code 40) (name "Net-(JP2-Pad1)")
+      (node (ref R1) (pin 1))
+      (node (ref JP2) (pin 1))
+      (node (ref JP2) (pin 2)))
+    (net (code 41) (name VDD)
       (node (ref TP2) (pin 1))
+      (node (ref C4) (pin 1))
       (node (ref U1) (pin 4))
       (node (ref C17) (pin 1))
+      (node (ref U3) (pin 5))
+      (node (ref JP2) (pin 3))
+      (node (ref R2) (pin 1))
       (node (ref C16) (pin 1)))
-    (net (code 11) (name "Net-(U4-Pad4)")
-      (node (ref U4) (pin 4)))
-    (net (code 12) (name "Net-(U4-Pad62)")
+    (net (code 42) (name "Net-(JP3-Pad1)")
+      (node (ref R5) (pin 1))
+      (node (ref JP3) (pin 1))
+      (node (ref JP3) (pin 2)))
+    (net (code 43) (name "Net-(C7-Pad1)")
+      (node (ref C7) (pin 1))
+      (node (ref U4) (pin 30)))
+    (net (code 44) (name "Net-(U4-Pad53)")
+      (node (ref U4) (pin 53)))
+    (net (code 45) (name "Net-(U4-Pad28)")
+      (node (ref U4) (pin 28)))
+    (net (code 46) (name "Net-(U4-Pad56)")
+      (node (ref U4) (pin 56)))
+    (net (code 47) (name "Net-(U4-Pad57)")
+      (node (ref U4) (pin 57)))
+    (net (code 48) (name "Net-(U4-Pad58)")
+      (node (ref U4) (pin 58)))
+    (net (code 49) (name "Net-(U4-Pad59)")
+      (node (ref U4) (pin 59)))
+    (net (code 50) (name "Net-(U4-Pad61)")
+      (node (ref U4) (pin 61)))
+    (net (code 51) (name "Net-(U4-Pad62)")
       (node (ref U4) (pin 62)))
-    (net (code 13) (name "Net-(U4-Pad8)")
+    (net (code 52) (name "Net-(U4-Pad8)")
       (node (ref U4) (pin 8)))
-    (net (code 14) (name "Net-(U4-Pad9)")
+    (net (code 53) (name "Net-(U4-Pad9)")
       (node (ref U4) (pin 9)))
-    (net (code 15) (name "Net-(U4-Pad51)")
+    (net (code 54) (name "Net-(U4-Pad51)")
       (node (ref U4) (pin 51)))
-    (net (code 16) (name "Net-(U4-Pad52)")
+    (net (code 55) (name "Net-(U4-Pad52)")
       (node (ref U4) (pin 52)))
-    (net (code 17) (name "Net-(U4-Pad53)")
-      (node (ref U4) (pin 53)))
-    (net (code 18) (name "Net-(U4-Pad2)")
+    (net (code 56) (name "Net-(U4-Pad2)")
       (node (ref U4) (pin 2)))
-    (net (code 19) (name "Net-(U4-Pad3)")
+    (net (code 57) (name "Net-(U4-Pad3)")
       (node (ref U4) (pin 3)))
-    (net (code 20) (name "Net-(U4-Pad61)")
-      (node (ref U4) (pin 61)))
-    (net (code 21) (name MISO)
-      (node (ref U4) (pin 10))
-      (node (ref U1) (pin 12)))
-    (net (code 22) (name MOSI)
-      (node (ref U1) (pin 11))
-      (node (ref U4) (pin 11)))
-    (net (code 23) (name "Net-(U4-Pad25)")
+    (net (code 58) (name "Net-(U4-Pad4)")
+      (node (ref U4) (pin 4)))
+    (net (code 59) (name MISO)
+      (node (ref U1) (pin 12))
+      (node (ref U4) (pin 10)))
+    (net (code 60) (name "Net-(U4-Pad25)")
       (node (ref U4) (pin 25)))
-    (net (code 24) (name "Net-(U4-Pad37)")
+    (net (code 61) (name "Net-(U4-Pad37)")
       (node (ref U4) (pin 37)))
-    (net (code 25) (name "Net-(U4-Pad38)")
+    (net (code 62) (name "Net-(U4-Pad38)")
       (node (ref U4) (pin 38)))
-    (net (code 26) (name "Net-(U4-Pad39)")
+    (net (code 63) (name "Net-(U4-Pad39)")
       (node (ref U4) (pin 39)))
-    (net (code 27) (name "Net-(U4-Pad40)")
+    (net (code 64) (name "Net-(U4-Pad40)")
       (node (ref U4) (pin 40)))
-    (net (code 28) (name "Net-(U4-Pad59)")
-      (node (ref U4) (pin 59)))
-    (net (code 29) (name "Net-(U4-Pad58)")
-      (node (ref U4) (pin 58)))
-    (net (code 30) (name "Net-(U4-Pad57)")
-      (node (ref U4) (pin 57)))
-    (net (code 31) (name "Net-(U4-Pad56)")
-      (node (ref U4) (pin 56)))
-    (net (code 32) (name SWO)
-      (node (ref U4) (pin 55))
-      (node (ref J2) (pin 6)))
-    (net (code 33) (name "Net-(U4-Pad28)")
-      (node (ref U4) (pin 28)))
-    (net (code 34) (name "Net-(U4-Pad36)")
-      (node (ref U4) (pin 36)))
-    (net (code 35) (name "Net-(U4-Pad35)")
-      (node (ref U4) (pin 35)))
-    (net (code 36) (name "Net-(U4-Pad34)")
-      (node (ref U4) (pin 34)))
-    (net (code 37) (name NCS)
-      (node (ref U4) (pin 33))
-      (node (ref U1) (pin 13)))
-    (net (code 38) (name "Net-(U4-Pad27)")
-      (node (ref U4) (pin 27)))
-    (net (code 39) (name "Net-(U4-Pad26)")
-      (node (ref U4) (pin 26)))
-    (net (code 40) (name "Net-(U4-Pad42)")
+    (net (code 65) (name "Net-(U4-Pad54)")
+      (node (ref U4) (pin 54)))
+    (net (code 66) (name "Net-(D4-Pad2)")
+      (node (ref R24) (pin 1))
+      (node (ref D4) (pin 2)))
+    (net (code 67) (name "Net-(D5-Pad2)")
+      (node (ref R25) (pin 1))
+      (node (ref D5) (pin 2)))
+    (net (code 68) (name GREEN)
+      (node (ref R25) (pin 2))
       (node (ref U4) (pin 42)))
-    (net (code 41) (name "Net-(U4-Pad41)")
-      (node (ref U4) (pin 41)))
-    (net (code 42) (name "Net-(U1-Pad2)")
-      (node (ref U1) (pin 2)))
-    (net (code 43) (name "Net-(U1-Pad14)")
-      (node (ref U1) (pin 14)))
-    (net (code 44) (name "Net-(C6-Pad2)")
-      (node (ref U4) (pin 6))
+    (net (code 69) (name Scroll_wheel)
+      (node (ref C29) (pin 1))
+      (node (ref R23) (pin 1))
+      (node (ref U4) (pin 23)))
+    (net (code 70) (name "Net-(R23-Pad2)")
+      (node (ref SW8) (pin S2))
+      (node (ref R23) (pin 2)))
+    (net (code 71) (name "Net-(C6-Pad2)")
       (node (ref Y1) (pin 2))
       (node (ref C6) (pin 2))
+      (node (ref U4) (pin 6))
       (node (ref TP4) (pin 1)))
-    (net (code 45) (name "Net-(U4-Pad54)")
-      (node (ref U4) (pin 54)))
-    (net (code 46) (name "Net-(D1-Pad2)")
-      (node (ref R1) (pin 1))
-      (node (ref D1) (pin 2)))
-    (net (code 47) (name "Net-(D2-Pad2)")
-      (node (ref D2) (pin 2))
-      (node (ref R5) (pin 1)))
-    (net (code 48) (name "Net-(D3-Pad2)")
-      (node (ref D3) (pin 2))
-      (node (ref R6) (pin 1)))
-    (net (code 49) (name +5V)
-      (node (ref U2) (pin 3))
-      (node (ref J1) (pin 1))
-      (node (ref C8) (pin 2))
-      (node (ref U3) (pin 3))
-      (node (ref U3) (pin 1))
-      (node (ref C1) (pin 1))
-      (node (ref C3) (pin 1))
-      (node (ref R1) (pin 2)))
-    (net (code 50) (name IN_D-)
+    (net (code 72) (name "Net-(R2-Pad2)")
+      (node (ref U3) (pin 4))
+      (node (ref R3) (pin 1))
+      (node (ref R2) (pin 2)))
+    (net (code 73) (name "Net-(U1-Pad2)")
+      (node (ref U1) (pin 2)))
+    (net (code 74) (name "Net-(U1-Pad1)")
+      (node (ref U1) (pin 1)))
+    (net (code 75) (name "Net-(U1-Pad6)")
+      (node (ref U1) (pin 6)))
+    (net (code 76) (name "Net-(U1-Pad7)")
+      (node (ref U1) (pin 7)))
+    (net (code 77) (name "Net-(U1-Pad8)")
+      (node (ref U1) (pin 8)))
+    (net (code 78) (name "Net-(U1-Pad15)")
+      (node (ref U1) (pin 15)))
+    (net (code 79) (name "Net-(C5-Pad2)")
+      (node (ref C5) (pin 2))
+      (node (ref U4) (pin 5))
+      (node (ref TP3) (pin 1))
+      (node (ref Y1) (pin 1)))
+    (net (code 80) (name IN_D-)
       (node (ref J1) (pin 2))
       (node (ref U5) (pin 3)))
-    (net (code 51) (name OUT_D-)
-      (node (ref U5) (pin 4))
-      (node (ref U4) (pin 44)))
-    (net (code 52) (name OUT_D+)
-      (node (ref U5) (pin 6))
-      (node (ref U4) (pin 45)))
-    (net (code 53) (name "Net-(C8-Pad1)")
-      (node (ref U5) (pin 5))
-      (node (ref C8) (pin 1)))
-    (net (code 54) (name IN_D+)
+    (net (code 81) (name IN_D+)
       (node (ref U5) (pin 1))
       (node (ref J1) (pin 3)))
-    (net (code 55) (name Motion)
-      (node (ref U1) (pin 9))
-      (node (ref U4) (pin 24)))
-    (net (code 56) (name "Net-(U1-Pad16)")
-      (node (ref U1) (pin 16)))
-    (net (code 57) (name "Net-(J1-Pad6)")
-      (node (ref J1) (pin 6)))
-    (net (code 58) (name "Net-(J1-Pad4)")
+    (net (code 82) (name "Net-(J1-Pad4)")
       (node (ref J1) (pin 4)))
-    (net (code 59) (name "Net-(U4-Pad23)")
-      (node (ref U4) (pin 23)))
-    (net (code 60) (name "Net-(C5-Pad2)")
-      (node (ref U4) (pin 5))
-      (node (ref C5) (pin 2))
-      (node (ref Y1) (pin 1))
-      (node (ref TP3) (pin 1)))
-    (net (code 61) (name NRST)
-      (node (ref J2) (pin 5))
-      (node (ref TP7) (pin 1))
-      (node (ref SW2) (pin 1))
-      (node (ref C15) (pin 1))
-      (node (ref U4) (pin 7)))
-    (net (code 62) (name "Net-(R2-Pad2)")
-      (node (ref R3) (pin 1))
-      (node (ref U3) (pin 4))
-      (node (ref R2) (pin 2)))
-    (net (code 63) (name SWCLK)
-      (node (ref J2) (pin 2))
-      (node (ref U4) (pin 49)))
-    (net (code 64) (name SWDIO)
-      (node (ref U4) (pin 46))
-      (node (ref J2) (pin 4)))
-    (net (code 65) (name "Net-(C7-Pad1)")
-      (node (ref C7) (pin 1))
-      (node (ref U4) (pin 30)))
-    (net (code 66) (name "Net-(U4-Pad22)")
-      (node (ref U4) (pin 22)))
-    (net (code 67) (name "Net-(U4-Pad43)")
-      (node (ref U4) (pin 43)))
-    (net (code 68) (name "Net-(U4-Pad50)")
-      (node (ref U4) (pin 50)))
-    (net (code 69) (name "Net-(U4-Pad21)")
-      (node (ref U4) (pin 21)))
-    (net (code 70) (name "Net-(U4-Pad20)")
-      (node (ref U4) (pin 20)))
-    (net (code 71) (name "Net-(U4-Pad17)")
-      (node (ref U4) (pin 17)))
-    (net (code 72) (name "Net-(U4-Pad16)")
-      (node (ref U4) (pin 16)))
-    (net (code 73) (name "Net-(U4-Pad15)")
-      (node (ref U4) (pin 15)))
-    (net (code 74) (name "Net-(U4-Pad14)")
-      (node (ref U4) (pin 14)))
-    (net (code 75) (name BOOT0)
-      (node (ref JP1) (pin 1))
-      (node (ref U4) (pin 60))
-      (node (ref JP1) (pin 2))
-      (node (ref TP8) (pin 1))
-      (node (ref R4) (pin 1)))))
\ No newline at end of file
+    (net (code 83) (name "Net-(J1-Pad6)")
+      (node (ref J1) (pin 6)))
+    (net (code 84) (name "Net-(R19-Pad1)")
+      (node (ref R19) (pin 1))
+      (node (ref TP14) (pin 1))
+      (node (ref SW8) (pin A)))
+    (net (code 85) (name "Net-(R20-Pad2)")
+      (node (ref SW8) (pin B))
+      (node (ref TP15) (pin 1))
+      (node (ref R20) (pin 2)))
+    (net (code 86) (name "Net-(R12-Pad1)")
+      (node (ref R12) (pin 1))
+      (node (ref R14) (pin 2))
+      (node (ref SW5) (pin 1)))
+    (net (code 87) (name sense_down)
+      (node (ref U4) (pin 17))
+      (node (ref C25) (pin 1))
+      (node (ref TP11) (pin 1))
+      (node (ref R12) (pin 2)))
+    (net (code 88) (name MOSI)
+      (node (ref U1) (pin 11))
+      (node (ref U4) (pin 11)))
+    (net (code 89) (name NCS)
+      (node (ref U1) (pin 13))
+      (node (ref U4) (pin 33)))
+    (net (code 90) (name "Net-(C18-Pad1)")
+      (node (ref U1) (pin 3))
+      (node (ref C18) (pin 1))
+      (node (ref C21) (pin 1)))
+    (net (code 91) (name "Net-(U1-Pad14)")
+      (node (ref U1) (pin 14)))
+    (net (code 92) (name "Net-(C8-Pad1)")
+      (node (ref U5) (pin 5))
+      (node (ref C8) (pin 1)))
+    (net (code 93) (name "Net-(U1-Pad16)")
+      (node (ref U1) (pin 16)))
+    (net (code 94) (name Motion)
+      (node (ref U1) (pin 9))
+      (node (ref U4) (pin 24)))))
\ No newline at end of file
diff --git a/KiCAD model/Lab1.sch b/KiCAD model/Lab1.sch
index 896e2944e39155dd35fc957d47740c2b59124654..f1ee7fade3c3bf691e1b5d3a57e80ce699187c0c 100644
--- a/KiCAD model/Lab1.sch	
+++ b/KiCAD model/Lab1.sch	
@@ -14,17 +14,6 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Device:Crystal Y1
-U 1 1 600CDE48
-P 6050 2650
-F 0 "Y1" H 6050 2918 50  0000 C CNN
-F 1 "16Mhz" H 6050 2827 50  0000 C CNN
-F 2 "Crystal:Crystal_SMD_0603-2Pin_6.0x3.5mm_HandSoldering" H 6050 2650 50  0001 C CNN
-F 3 "~" H 6050 2650 50  0001 C CNN
-	1    6050 2650
-	0    1    1    0   
-$EndComp
-$Comp
 L Device:C C5
 U 1 1 600CFABF
 P 5600 2400
@@ -76,7 +65,7 @@ U 1 1 600A0E9A
 P 10500 4700
 F 0 "R4" H 10570 4746 50  0000 L CNN
 F 1 "10k" H 10570 4655 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 10430 4700 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 10430 4700 50  0001 C CNN
 F 3 "~" H 10500 4700 50  0001 C CNN
 	1    10500 4700
 	1    0    0    -1  
@@ -92,8 +81,6 @@ F 3 "~" H 7300 2050 50  0001 C CNN
 	1    7300 2050
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	7450 1900 7300 1900
 Wire Wire Line
 	7300 1900 7300 1950
 $Comp
@@ -229,45 +216,16 @@ Wire Wire Line
 	10250 4200 10300 4200
 Text Notes 5100 2050 0    50   ~ 0
 2*(Cload - Cstrat) = 2 * (18 - 6) = 24pF = 22pF
-Wire Wire Line
-	5750 2400 6050 2400
-Wire Wire Line
-	5750 2850 6050 2850
-Wire Wire Line
-	6050 2800 6050 2850
-Wire Wire Line
-	6050 2400 6050 2500
-Connection ~ 6050 2400
-Wire Wire Line
-	6050 2400 6800 2400
 Wire Wire Line
 	6800 2700 6800 2850
 Wire Wire Line
 	6800 2400 6800 2600
-$Comp
-L power:GND #PWR0111
-U 1 1 601CE119
-P 5850 6550
-F 0 "#PWR0111" H 5850 6300 50  0001 C CNN
-F 1 "GND" H 5855 6377 50  0000 C CNN
-F 2 "" H 5850 6550 50  0001 C CNN
-F 3 "" H 5850 6550 50  0001 C CNN
-	1    5850 6550
-	0    1    1    0   
-$EndComp
-Text GLabel 8900 2800 2    50   BiDi ~ 0
+Text GLabel 8900 2700 2    50   BiDi ~ 0
 SWDIO
-Text GLabel 8900 2900 2    50   Input ~ 0
+Text GLabel 8900 2800 2    50   Input ~ 0
 SWCLK
 Wire Wire Line
 	8850 2800 8900 2800
-Wire Wire Line
-	8850 2900 8900 2900
-Wire Wire Line
-	6800 2850 6050 2850
-Connection ~ 6050 2850
-Wire Notes Line
-	5000 450  5000 5500
 $Comp
 L power:GND #PWR0116
 U 1 1 6026F6EE
@@ -310,137 +268,137 @@ Wire Wire Line
 $Comp
 L Regulator_Linear:MIC5205-5.0YM5 U3
 U 1 1 602A02F8
-P 3350 1800
-F 0 "U3" H 3350 2142 50  0000 C CNN
-F 1 "MIC5235YM5-TR" H 3350 2051 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23-5" H 3350 2125 50  0001 C CNN
-F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/20005785A.pdf" H 3350 1800 50  0001 C CNN
-	1    3350 1800
+P 2700 1800
+F 0 "U3" H 2700 2142 50  0000 C CNN
+F 1 "MIC5235YM5-TR" H 2700 2051 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23-5" H 2700 2125 50  0001 C CNN
+F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/20005785A.pdf" H 2700 1800 50  0001 C CNN
+	1    2700 1800
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0119
 U 1 1 602A284F
-P 3350 2150
-F 0 "#PWR0119" H 3350 1900 50  0001 C CNN
-F 1 "GND" H 3355 1977 50  0000 C CNN
-F 2 "" H 3350 2150 50  0001 C CNN
-F 3 "" H 3350 2150 50  0001 C CNN
-	1    3350 2150
+P 2700 2150
+F 0 "#PWR0119" H 2700 1900 50  0001 C CNN
+F 1 "GND" H 2705 1977 50  0000 C CNN
+F 2 "" H 2700 2150 50  0001 C CNN
+F 3 "" H 2700 2150 50  0001 C CNN
+	1    2700 2150
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3350 2150 3350 2100
+	2700 2150 2700 2100
 Wire Wire Line
-	2800 1650 2800 1700
+	2150 1650 2150 1700
 $Comp
 L Device:C_Small C3
 U 1 1 602B63C7
-P 2800 1800
-F 0 "C3" H 2892 1846 50  0000 L CNN
-F 1 "1u" H 2892 1755 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 2800 1800 50  0001 C CNN
-F 3 "~" H 2800 1800 50  0001 C CNN
-	1    2800 1800
+P 2150 1800
+F 0 "C3" H 2242 1846 50  0000 L CNN
+F 1 "1u" H 2242 1755 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 2150 1800 50  0001 C CNN
+F 3 "~" H 2150 1800 50  0001 C CNN
+	1    2150 1800
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0121
 U 1 1 602B63CD
-P 2800 1950
-F 0 "#PWR0121" H 2800 1700 50  0001 C CNN
-F 1 "GND" H 2805 1777 50  0000 C CNN
-F 2 "" H 2800 1950 50  0001 C CNN
-F 3 "" H 2800 1950 50  0001 C CNN
-	1    2800 1950
+P 2150 1950
+F 0 "#PWR0121" H 2150 1700 50  0001 C CNN
+F 1 "GND" H 2155 1777 50  0000 C CNN
+F 2 "" H 2150 1950 50  0001 C CNN
+F 3 "" H 2150 1950 50  0001 C CNN
+	1    2150 1950
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2800 1950 2800 1900
-Connection ~ 2800 1700
+	2150 1950 2150 1900
+Connection ~ 2150 1700
 Wire Wire Line
-	2800 1700 3000 1700
+	2150 1700 2350 1700
 Wire Wire Line
-	3050 1800 3000 1800
+	2400 1800 2350 1800
 Wire Wire Line
-	3000 1800 3000 1700
-Connection ~ 3000 1700
+	2350 1800 2350 1700
+Connection ~ 2350 1700
 Wire Wire Line
-	3000 1700 3050 1700
+	2350 1700 2400 1700
 $Comp
 L Device:R R2
 U 1 1 602C1523
-P 3850 1600
-F 0 "R2" H 3920 1646 50  0000 L CNN
-F 1 "5.6k" H 3920 1555 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 3780 1600 50  0001 C CNN
-F 3 "~" H 3850 1600 50  0001 C CNN
-	1    3850 1600
+P 3200 1600
+F 0 "R2" H 3270 1646 50  0000 L CNN
+F 1 "5.6k" H 3270 1555 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 3130 1600 50  0001 C CNN
+F 3 "~" H 3200 1600 50  0001 C CNN
+	1    3200 1600
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R3
 U 1 1 602C29F7
-P 3850 2050
-F 0 "R3" H 3920 2096 50  0000 L CNN
-F 1 "10k" H 3920 2005 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 3780 2050 50  0001 C CNN
-F 3 "~" H 3850 2050 50  0001 C CNN
-	1    3850 2050
+P 3200 2050
+F 0 "R3" H 3270 2096 50  0000 L CNN
+F 1 "10k" H 3270 2005 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 3130 2050 50  0001 C CNN
+F 3 "~" H 3200 2050 50  0001 C CNN
+	1    3200 2050
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0122
 U 1 1 602C5872
-P 3850 2250
-F 0 "#PWR0122" H 3850 2000 50  0001 C CNN
-F 1 "GND" H 3855 2077 50  0000 C CNN
-F 2 "" H 3850 2250 50  0001 C CNN
-F 3 "" H 3850 2250 50  0001 C CNN
-	1    3850 2250
+P 3200 2250
+F 0 "#PWR0122" H 3200 2000 50  0001 C CNN
+F 1 "GND" H 3205 2077 50  0000 C CNN
+F 2 "" H 3200 2250 50  0001 C CNN
+F 3 "" H 3200 2250 50  0001 C CNN
+	1    3200 2250
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3650 1800 3850 1800
+	3000 1800 3200 1800
 Wire Wire Line
-	3850 1750 3850 1800
-Connection ~ 3850 1800
+	3200 1750 3200 1800
+Connection ~ 3200 1800
 Wire Wire Line
-	3850 1800 3850 1900
+	3200 1800 3200 1900
 Wire Wire Line
-	3850 1450 3700 1450
+	3200 1450 3050 1450
 Wire Wire Line
-	3700 1450 3700 1700
+	3050 1450 3050 1700
 Wire Wire Line
-	4400 1450 4400 1500
+	3750 1450 3750 1500
 $Comp
 L Device:C_Small C4
 U 1 1 602DE883
-P 4400 1600
-F 0 "C4" H 4492 1646 50  0000 L CNN
-F 1 "2.2u" H 4492 1555 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 4400 1600 50  0001 C CNN
-F 3 "~" H 4400 1600 50  0001 C CNN
-	1    4400 1600
+P 3750 1600
+F 0 "C4" H 3842 1646 50  0000 L CNN
+F 1 "2.2u" H 3842 1555 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 3750 1600 50  0001 C CNN
+F 3 "~" H 3750 1600 50  0001 C CNN
+	1    3750 1600
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0123
 U 1 1 602DE88A
-P 4400 1750
-F 0 "#PWR0123" H 4400 1500 50  0001 C CNN
-F 1 "GND" H 4405 1577 50  0000 C CNN
-F 2 "" H 4400 1750 50  0001 C CNN
-F 3 "" H 4400 1750 50  0001 C CNN
-	1    4400 1750
+P 3750 1750
+F 0 "#PWR0123" H 3750 1500 50  0001 C CNN
+F 1 "GND" H 3755 1577 50  0000 C CNN
+F 2 "" H 3750 1750 50  0001 C CNN
+F 3 "" H 3750 1750 50  0001 C CNN
+	1    3750 1750
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4400 1750 4400 1700
+	3750 1750 3750 1700
 Wire Wire Line
-	3850 2200 3850 2250
+	3200 2200 3200 2250
 Wire Wire Line
-	3650 1700 3700 1700
+	3000 1700 3050 1700
 $Comp
 L power:GND #PWR0124
 U 1 1 600D9E06
@@ -456,56 +414,6 @@ Wire Wire Line
 	5450 2400 5400 2400
 Wire Wire Line
 	5400 2850 5450 2850
-$Comp
-L Connector:TestPoint TP3
-U 1 1 601A5C6D
-P 6850 2600
-F 0 "TP3" H 6908 2718 50  0000 L CNN
-F 1 "TestPoint" H 6908 2627 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 7050 2600 50  0001 C CNN
-F 3 "~" H 7050 2600 50  0001 C CNN
-	1    6850 2600
-	-1   0    0    -1  
-$EndComp
-$Comp
-L Connector:TestPoint TP4
-U 1 1 601AABDA
-P 6850 2700
-F 0 "TP4" H 6908 2818 50  0000 L CNN
-F 1 "TestPoint" H 6908 2727 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 7050 2700 50  0001 C CNN
-F 3 "~" H 7050 2700 50  0001 C CNN
-	1    6850 2700
-	-1   0    0    1   
-$EndComp
-$Comp
-L Jumper:Jumper_3_Bridged12 JP1
-U 1 1 6015F930
-P 10500 4200
-F 0 "JP1" V 10546 4267 50  0000 L CNN
-F 1 "DFU" V 10455 4267 50  0000 L CNN
-F 2 "Connector:FanPinHeader_1x03_P2.54mm_Vertical" H 10500 4200 50  0001 C CNN
-F 3 "~" H 10500 4200 50  0001 C CNN
-	1    10500 4200
-	0    1    -1   0   
-$EndComp
-$Comp
-L Connector:TestPoint TP8
-U 1 1 601B7A99
-P 10300 4100
-F 0 "TP8" H 10358 4218 50  0000 L CNN
-F 1 "TestPoint" H 10358 4127 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 10500 4100 50  0001 C CNN
-F 3 "~" H 10500 4100 50  0001 C CNN
-	1    10300 4100
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	6800 2700 6850 2700
-Wire Wire Line
-	6850 2600 6800 2600
-Wire Wire Line
-	10300 4100 10300 4200
 Connection ~ 10300 4200
 Wire Wire Line
 	10300 4200 10350 4200
@@ -513,7 +421,7 @@ Text GLabel 8850 4200 2    50   Input ~ 0
 SCK
 Text GLabel 3000 7450 2    50   Output ~ 0
 SCK
-Text GLabel 3000 7250 2    50   Output ~ 0
+Text GLabel 3400 7350 3    50   Output ~ 0
 MISO
 Text GLabel 3000 7350 2    50   Output ~ 0
 MOSI
@@ -525,37 +433,23 @@ Text GLabel 7450 3300 0    50   Input ~ 0
 MISO
 Text GLabel 7450 3400 0    50   Input ~ 0
 MOSI
-Text GLabel 8850 2700 2    50   Output ~ 0
-OUT_D+
 Text GLabel 8850 2600 2    50   Output ~ 0
+OUT_D+
+Text GLabel 8850 2500 2    50   Output ~ 0
 OUT_D-
 Text GLabel 8850 3500 2    50   Output ~ 0
 SWO
 $Comp
-L Connector:TestPoint TP1
-U 1 1 60196B94
-P 3000 850
-F 0 "TP1" V 3046 1038 50  0000 L CNN
-F 1 "TestPoint" V 2955 1038 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 3200 850 50  0001 C CNN
-F 3 "~" H 3200 850 50  0001 C CNN
-	1    3000 850 
-	1    0    0    1   
-$EndComp
-$Comp
 L power:+5V #PWR0120
 U 1 1 602B63C0
-P 2800 1650
-F 0 "#PWR0120" H 2800 1500 50  0001 C CNN
-F 1 "+5V" H 2815 1823 50  0000 C CNN
-F 2 "" H 2800 1650 50  0001 C CNN
-F 3 "" H 2800 1650 50  0001 C CNN
-	1    2800 1650
+P 2150 1650
+F 0 "#PWR0120" H 2150 1500 50  0001 C CNN
+F 1 "+5V" H 2165 1823 50  0000 C CNN
+F 2 "" H 2150 1650 50  0001 C CNN
+F 3 "" H 2150 1650 50  0001 C CNN
+	1    2150 1650
 	1    0    0    -1  
 $EndComp
-NoConn ~ 8850 3000
-NoConn ~ 8850 3200
-NoConn ~ 8850 3300
 NoConn ~ 8850 3400
 NoConn ~ 8850 3600
 NoConn ~ 8850 3700
@@ -652,7 +546,6 @@ NoConn ~ 2100 6950
 NoConn ~ 2100 7350
 NoConn ~ 2100 7450
 NoConn ~ 2100 7550
-NoConn ~ 3000 6950
 Text GLabel 3000 7550 2    50   Input ~ 0
 Motion
 $Comp
@@ -945,30 +838,6 @@ Text GLabel 1100 1350 2    50   Input ~ 0
 IN_D-
 Text GLabel 1100 1250 2    50   Input ~ 0
 IN_D+
-Wire Wire Line
-	4300 7450 4300 7500
-$Comp
-L power:GND #PWR0128
-U 1 1 6022D61E
-P 4300 7500
-F 0 "#PWR0128" H 4300 7250 50  0001 C CNN
-F 1 "GND" H 4305 7327 50  0000 C CNN
-F 2 "" H 4300 7500 50  0001 C CNN
-F 3 "" H 4300 7500 50  0001 C CNN
-	1    4300 7500
-	1    0    0    -1  
-$EndComp
-$Comp
-L LED:IR26-21C_L110_TR8 D1
-U 1 1 601E5474
-P 4300 7300
-F 0 "D1" H 4293 7517 50  0000 C CNN
-F 1 "Indicator LED" H 4293 7426 50  0000 C CNN
-F 2 "LED_SMD:LED_1206_3216Metric" H 4300 7500 50  0001 C CNN
-F 3 "http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf" H 4300 7300 50  0001 C CNN
-	1    4300 7300
-	0    1    -1   0   
-$EndComp
 Wire Wire Line
 	2200 800  2350 800 
 Connection ~ 2200 800 
@@ -1051,71 +920,9 @@ Wire Notes Line
 	2050 700  2050 450 
 Wire Notes Line
 	6550 700  6550 450 
-Wire Wire Line
-	4700 7450 4700 7500
-$Comp
-L power:GND #PWR0141
-U 1 1 602BC440
-P 4700 7500
-F 0 "#PWR0141" H 4700 7250 50  0001 C CNN
-F 1 "GND" H 4705 7327 50  0000 C CNN
-F 2 "" H 4700 7500 50  0001 C CNN
-F 3 "" H 4700 7500 50  0001 C CNN
-	1    4700 7500
-	1    0    0    -1  
-$EndComp
-$Comp
-L LED:IR26-21C_L110_TR8 D2
-U 1 1 602BC446
-P 4700 7300
-F 0 "D2" H 4693 7517 50  0000 C CNN
-F 1 "Indicator LED" H 4693 7426 50  0000 C CNN
-F 2 "LED_SMD:LED_1206_3216Metric" H 4700 7500 50  0001 C CNN
-F 3 "http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf" H 4700 7300 50  0001 C CNN
-	1    4700 7300
-	0    1    -1   0   
-$EndComp
-Wire Wire Line
-	5100 7450 5100 7500
-$Comp
-L power:GND #PWR0142
-U 1 1 602C3060
-P 5100 7500
-F 0 "#PWR0142" H 5100 7250 50  0001 C CNN
-F 1 "GND" H 5105 7327 50  0000 C CNN
-F 2 "" H 5100 7500 50  0001 C CNN
-F 3 "" H 5100 7500 50  0001 C CNN
-	1    5100 7500
-	1    0    0    -1  
-$EndComp
-$Comp
-L LED:IR26-21C_L110_TR8 D3
-U 1 1 602C3066
-P 5100 7300
-F 0 "D3" H 5093 7517 50  0000 C CNN
-F 1 "Indicator LED" H 5093 7426 50  0000 C CNN
-F 2 "LED_SMD:LED_1206_3216Metric" H 5100 7500 50  0001 C CNN
-F 3 "http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf" H 5100 7300 50  0001 C CNN
-	1    5100 7300
-	0    1    -1   0   
-$EndComp
-Connection ~ 3850 1450
-Wire Notes Line
-	5400 5500 5400 7800
+Connection ~ 3200 1450
 Wire Notes Line
 	6950 5500 6950 7800
-Text Notes 4100 6400 0    98   ~ 0
-LEDS
-Text Notes 5450 5700 0    98   ~ 0
-SWD
-Wire Notes Line
-	4500 6200 4500 6450
-Wire Notes Line
-	5400 5750 5800 5750
-Wire Notes Line
-	5800 5750 5800 5500
-Wire Notes Line
-	4050 6450 4500 6450
 Wire Notes Line
 	5000 700  6550 700 
 Wire Notes Line
@@ -1128,28 +935,17 @@ Wire Notes Line
 	9500 2050 11250 2050
 Wire Notes Line
 	11250 2300 9500 2300
-$Comp
-L Connector:TestPoint TP2
-U 1 1 6018AFCC
-P 3850 1450
-F 0 "TP2" V 3804 1638 50  0000 L CNN
-F 1 "1.9V" V 3895 1638 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4050 1450 50  0001 C CNN
-F 3 "~" H 4050 1450 50  0001 C CNN
-	1    3850 1450
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
-	3850 1450 4400 1450
+	3200 1450 3750 1450
 $Comp
 L power:VDD #PWR0125
 U 1 1 602B4447
-P 4400 1450
-F 0 "#PWR0125" H 4400 1300 50  0001 C CNN
-F 1 "VDD" H 4415 1623 50  0000 C CNN
-F 2 "" H 4400 1450 50  0001 C CNN
-F 3 "" H 4400 1450 50  0001 C CNN
-	1    4400 1450
+P 3750 1450
+F 0 "#PWR0125" H 3750 1300 50  0001 C CNN
+F 1 "VDD" H 3765 1623 50  0000 C CNN
+F 2 "" H 3750 1450 50  0001 C CNN
+F 3 "" H 3750 1450 50  0001 C CNN
+	1    3750 1450
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1163,25 +959,8 @@ F 3 "" H 3500 750 50  0001 C CNN
 	1    3500 750 
 	1    0    0    -1  
 $EndComp
-Connection ~ 4400 1450
+Connection ~ 3750 1450
 Connection ~ 3500 800 
-Wire Wire Line
-	4300 7050 4300 7150
-Wire Wire Line
-	4700 7050 4700 7150
-Wire Wire Line
-	5100 7050 5100 7150
-$Comp
-L Device:R R1
-U 1 1 601EB13E
-P 4300 6900
-F 0 "R1" V 4093 6900 50  0000 C CNN
-F 1 "1.5k" V 4184 6900 50  0000 C CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 4230 6900 50  0001 C CNN
-F 3 "~" H 4300 6900 50  0001 C CNN
-	1    4300 6900
-	-1   0    0    1   
-$EndComp
 $Comp
 L Device:C_Small C9
 U 1 1 600E34A0
@@ -1193,17 +972,6 @@ F 3 "~" H 8650 1100 50  0001 C CNN
 	1    8650 1100
 	1    0    0    -1  
 $EndComp
-$Comp
-L Connector:TestPoint TP6
-U 1 1 6019C4CF
-P 7950 950
-F 0 "TP6" H 8008 1068 50  0000 L CNN
-F 1 "TestPoint" H 8008 977 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 8150 950 50  0001 C CNN
-F 3 "~" H 8150 950 50  0001 C CNN
-	1    7950 950 
-	0    -1   -1   0   
-$EndComp
 Wire Wire Line
 	7950 950  8050 950 
 Connection ~ 8050 950 
@@ -1223,146 +991,39 @@ Wire Wire Line
 Connection ~ 8450 950 
 Connection ~ 9900 1250
 Wire Wire Line
-	9900 1250 9900 1300
+	10150 1250 10150 1300
 $Comp
 L power:GND #PWR0105
 U 1 1 600DD8A0
-P 9900 1300
-F 0 "#PWR0105" H 9900 1050 50  0001 C CNN
-F 1 "GND" H 9905 1127 50  0000 C CNN
-F 2 "" H 9900 1300 50  0001 C CNN
-F 3 "" H 9900 1300 50  0001 C CNN
-	1    9900 1300
+P 10150 1300
+F 0 "#PWR0105" H 10150 1050 50  0001 C CNN
+F 1 "GND" H 10155 1127 50  0000 C CNN
+F 2 "" H 10150 1300 50  0001 C CNN
+F 3 "" H 10150 1300 50  0001 C CNN
+	1    10150 1300
 	1    0    0    -1  
 $EndComp
 Connection ~ 9900 950 
 $Comp
 L power:+3.3V #PWR0106
 U 1 1 60108874
-P 9900 950
-F 0 "#PWR0106" H 9900 800 50  0001 C CNN
-F 1 "+3.3V" H 9915 1123 50  0000 C CNN
-F 2 "" H 9900 950 50  0001 C CNN
-F 3 "" H 9900 950 50  0001 C CNN
-	1    9900 950 
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:+5V #PWR0143
-U 1 1 6016DDF7
-P 4300 6700
-F 0 "#PWR0143" H 4300 6550 50  0001 C CNN
-F 1 "+5V" H 4315 6873 50  0000 C CNN
-F 2 "" H 4300 6700 50  0001 C CNN
-F 3 "" H 4300 6700 50  0001 C CNN
-	1    4300 6700
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R5
-U 1 1 601752BE
-P 4700 6900
-F 0 "R5" V 4493 6900 50  0000 C CNN
-F 1 "820" V 4584 6900 50  0000 C CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 4630 6900 50  0001 C CNN
-F 3 "~" H 4700 6900 50  0001 C CNN
-	1    4700 6900
-	-1   0    0    1   
-$EndComp
-$Comp
-L Device:R R6
-U 1 1 6018FB9B
-P 5100 6900
-F 0 "R6" V 4893 6900 50  0000 C CNN
-F 1 "47" V 4984 6900 50  0000 C CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 5030 6900 50  0001 C CNN
-F 3 "~" H 5100 6900 50  0001 C CNN
-	1    5100 6900
-	-1   0    0    1   
-$EndComp
-$Comp
-L power:+3.3V #PWR0144
-U 1 1 601A3403
-P 4700 6700
-F 0 "#PWR0144" H 4700 6550 50  0001 C CNN
-F 1 "+3.3V" H 4715 6873 50  0000 C CNN
-F 2 "" H 4700 6700 50  0001 C CNN
-F 3 "" H 4700 6700 50  0001 C CNN
-	1    4700 6700
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:VDD #PWR0145
-U 1 1 601A96AE
-P 5100 6700
-F 0 "#PWR0145" H 5100 6550 50  0001 C CNN
-F 1 "VDD" H 5115 6873 50  0000 C CNN
-F 2 "" H 5100 6700 50  0001 C CNN
-F 3 "" H 5100 6700 50  0001 C CNN
-	1    5100 6700
+P 10150 900
+F 0 "#PWR0106" H 10150 750 50  0001 C CNN
+F 1 "+3.3V" H 10165 1073 50  0000 C CNN
+F 2 "" H 10150 900 50  0001 C CNN
+F 3 "" H 10150 900 50  0001 C CNN
+	1    10150 900 
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	4300 6700 4300 6750
-Wire Wire Line
-	4700 6750 4700 6700
-Wire Wire Line
-	5100 6750 5100 6700
-Text GLabel 6150 6650 0    50   Output ~ 0
-SWCLK
-Text GLabel 6150 6250 0    50   Output ~ 0
-SWO
-Wire Wire Line
-	6200 6650 6150 6650
-Wire Wire Line
-	5850 6550 6200 6550
-Wire Wire Line
-	6200 6450 6150 6450
-Wire Wire Line
-	6200 6350 6150 6350
-Wire Wire Line
-	6200 6250 6150 6250
-Text GLabel 6150 6450 0    50   BiDi ~ 0
-SWDIO
-Text GLabel 6150 6350 0    50   Input ~ 0
-NRST
-Wire Wire Line
-	6100 6750 6100 6800
-Wire Wire Line
-	6200 6750 6100 6750
-$Comp
-L power:+3.3V #PWR0110
-U 1 1 601C0A0E
-P 6100 6800
-F 0 "#PWR0110" H 6100 6650 50  0001 C CNN
-F 1 "+3.3V" H 6115 6973 50  0000 C CNN
-F 2 "" H 6100 6800 50  0001 C CNN
-F 3 "" H 6100 6800 50  0001 C CNN
-	1    6100 6800
-	-1   0    0    1   
-$EndComp
-$Comp
-L Connector:Conn_01x06_Male J2
-U 1 1 60081960
-P 6400 6550
-F 0 "J2" H 6372 6432 50  0000 R CNN
-F 1 "SWD" H 6372 6523 50  0000 R CNN
-F 2 "Connector_PinHeader_2.00mm:PinHeader_1x06_P2.00mm_Vertical" H 6400 6550 50  0001 C CNN
-F 3 "~" H 6400 6550 50  0001 C CNN
-	1    6400 6550
-	-1   0    0    1   
-$EndComp
-Wire Wire Line
-	10150 2650 10150 2700
 $Comp
 L Connector:TestPoint TP7
 U 1 1 601B3570
-P 10150 2650
-F 0 "TP7" H 10208 2768 50  0000 L CNN
-F 1 "TestPoint" H 10208 2677 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 10350 2650 50  0001 C CNN
-F 3 "~" H 10350 2650 50  0001 C CNN
-	1    10150 2650
+P 10150 2700
+F 0 "TP7" H 10208 2818 50  0000 L CNN
+F 1 "NRST" H 10208 2727 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 10350 2700 50  0001 C CNN
+F 3 "~" H 10350 2700 50  0001 C CNN
+	1    10150 2700
 	1    0    0    -1  
 $EndComp
 Connection ~ 10150 2700
@@ -1426,12 +1087,6 @@ Text GLabel 10050 2700 0    50   Input ~ 0
 NRST
 Text GLabel 7450 3500 0    50   Input ~ 0
 Motion
-Connection ~ 6850 2600
-Connection ~ 6850 2700
-Wire Wire Line
-	6850 2700 7450 2700
-Wire Wire Line
-	7450 2600 6850 2600
 Wire Wire Line
 	2450 5350 2450 5400
 $Comp
@@ -1470,13 +1125,6 @@ F 3 "https://static6.arrow.com/aropdfconversion/dc75757ae45a88e5f69bdce3f2a651a5
 	1    2650 800 
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	2950 800  3000 800 
-Wire Wire Line
-	3000 800  3000 850 
-Connection ~ 3000 800 
-Wire Wire Line
-	3000 800  3500 800 
 Text Notes 500  650  0    98   ~ 0
 POWER MANAGEMENT
 Text Notes 2250 3050 0    98   ~ 0
@@ -1504,94 +1152,23 @@ F 3 "~" H 2450 5650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0146
-U 1 1 604B382A
-P 5800 4850
-F 0 "#PWR0146" H 5800 4600 50  0001 C CNN
-F 1 "GND" H 5805 4677 50  0000 C CNN
-F 2 "" H 5800 4850 50  0001 C CNN
-F 3 "" H 5800 4850 50  0001 C CNN
-	1    5800 4850
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R20
-U 1 1 604B639F
-P 6100 4900
-F 0 "R20" H 6170 4946 50  0000 L CNN
-F 1 "5k" H 6170 4855 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 6030 4900 50  0001 C CNN
-F 3 "~" H 6100 4900 50  0001 C CNN
-	1    6100 4900
-	0    1    1    0   
-$EndComp
-$Comp
 L Device:R R19
 U 1 1 604C1473
-P 5500 4900
-F 0 "R19" H 5570 4946 50  0000 L CNN
-F 1 "5k" H 5570 4855 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 5430 4900 50  0001 C CNN
-F 3 "~" H 5500 4900 50  0001 C CNN
-	1    5500 4900
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	5900 4800 5900 4900
-Wire Wire Line
-	5900 4900 5950 4900
-Wire Wire Line
-	5800 4800 5800 4850
-Wire Wire Line
-	5650 4900 5700 4900
-Wire Wire Line
-	5700 4900 5700 4800
-$Comp
-L Device:Rotary_Encoder_Switch SW8
-U 1 1 604FC53D
-P 5800 4500
-F 0 "SW8" H 5800 4867 50  0000 C CNN
-F 1 "Rotary_Encoder_Switch" H 5800 4776 50  0000 C CNN
-F 2 "" H 5650 4660 50  0001 C CNN
-F 3 "~" H 5800 4760 50  0001 C CNN
-	1    5800 4500
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Connector:TestPoint TP15
-U 1 1 60524636
-P 5900 4900
-F 0 "TP15" V 5946 5088 50  0000 L CNN
-F 1 "TestPoint" V 5855 5088 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 6100 4900 50  0001 C CNN
-F 3 "~" H 6100 4900 50  0001 C CNN
-	1    5900 4900
-	1    0    0    1   
-$EndComp
-$Comp
-L Connector:TestPoint TP14
-U 1 1 6052FEC3
-P 5700 4900
-F 0 "TP14" V 5746 5088 50  0000 L CNN
-F 1 "TestPoint" V 5655 5088 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 5900 4900 50  0001 C CNN
-F 3 "~" H 5900 4900 50  0001 C CNN
-	1    5700 4900
-	1    0    0    1   
+P 5700 3950
+F 0 "R19" H 5770 3996 50  0000 L CNN
+F 1 "10k" H 5770 3905 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 5630 3950 50  0001 C CNN
+F 3 "~" H 5700 3950 50  0001 C CNN
+	1    5700 3950
+	-1   0    0    -1  
 $EndComp
-Wire Wire Line
-	5350 4900 5300 4900
-Wire Wire Line
-	6300 4900 6250 4900
-Connection ~ 5700 4900
-Connection ~ 5900 4900
 $Comp
 L Device:R R12
 U 1 1 60601B5A
 P 2700 5400
 F 0 "R12" H 2770 5446 50  0000 L CNN
 F 1 "150" H 2770 5355 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 2630 5400 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 2630 5400 50  0001 C CNN
 F 3 "~" H 2700 5400 50  0001 C CNN
 	1    2700 5400
 	0    1    1    0   
@@ -1606,7 +1183,7 @@ U 1 1 6061918A
 P 2900 5200
 F 0 "R14" H 2970 5246 50  0000 L CNN
 F 1 "10k" H 2970 5155 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 2830 5200 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 2830 5200 50  0001 C CNN
 F 3 "~" H 2900 5200 50  0001 C CNN
 	1    2900 5200
 	1    0    0    -1  
@@ -1695,7 +1272,7 @@ U 1 1 606C1CF9
 P 2700 3900
 F 0 "R11" H 2770 3946 50  0000 L CNN
 F 1 "150" H 2770 3855 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 2630 3900 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 2630 3900 50  0001 C CNN
 F 3 "~" H 2700 3900 50  0001 C CNN
 	1    2700 3900
 	0    1    1    0   
@@ -1710,7 +1287,7 @@ U 1 1 606C1D01
 P 2900 3700
 F 0 "R13" H 2970 3746 50  0000 L CNN
 F 1 "10k" H 2970 3655 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 2830 3700 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 2830 3700 50  0001 C CNN
 F 3 "~" H 2900 3700 50  0001 C CNN
 	1    2900 3700
 	1    0    0    -1  
@@ -1799,7 +1376,7 @@ U 1 1 606CDF27
 P 4200 5400
 F 0 "R16" H 4270 5446 50  0000 L CNN
 F 1 "150" H 4270 5355 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 4130 5400 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 4130 5400 50  0001 C CNN
 F 3 "~" H 4200 5400 50  0001 C CNN
 	1    4200 5400
 	0    1    1    0   
@@ -1814,7 +1391,7 @@ U 1 1 606CDF2F
 P 4400 5200
 F 0 "R18" H 4470 5246 50  0000 L CNN
 F 1 "10k" H 4470 5155 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 4330 5200 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 4330 5200 50  0001 C CNN
 F 3 "~" H 4400 5200 50  0001 C CNN
 	1    4400 5200
 	1    0    0    -1  
@@ -1903,7 +1480,7 @@ U 1 1 606DD8F6
 P 4200 3900
 F 0 "R15" H 4270 3946 50  0000 L CNN
 F 1 "150" H 4270 3855 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 4130 3900 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 4130 3900 50  0001 C CNN
 F 3 "~" H 4200 3900 50  0001 C CNN
 	1    4200 3900
 	0    1    1    0   
@@ -1918,7 +1495,7 @@ U 1 1 606DD8FE
 P 4400 3700
 F 0 "R17" H 4470 3746 50  0000 L CNN
 F 1 "10k" H 4470 3655 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 4330 3700 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 4330 3700 50  0001 C CNN
 F 3 "~" H 4400 3700 50  0001 C CNN
 	1    4400 3700
 	1    0    0    -1  
@@ -2007,7 +1584,7 @@ U 1 1 606EC1E0
 P 1200 5400
 F 0 "R8" H 1270 5446 50  0000 L CNN
 F 1 "150" H 1270 5355 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 1130 5400 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 1130 5400 50  0001 C CNN
 F 3 "~" H 1200 5400 50  0001 C CNN
 	1    1200 5400
 	0    1    1    0   
@@ -2022,7 +1599,7 @@ U 1 1 606EC1E8
 P 1400 5200
 F 0 "R10" H 1470 5246 50  0000 L CNN
 F 1 "10k" H 1470 5155 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 1330 5200 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 1330 5200 50  0001 C CNN
 F 3 "~" H 1400 5200 50  0001 C CNN
 	1    1400 5200
 	1    0    0    -1  
@@ -2111,7 +1688,7 @@ U 1 1 606FEE8C
 P 1200 3900
 F 0 "R7" H 1270 3946 50  0000 L CNN
 F 1 "150" H 1270 3855 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 1130 3900 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 1130 3900 50  0001 C CNN
 F 3 "~" H 1200 3900 50  0001 C CNN
 	1    1200 3900
 	0    1    1    0   
@@ -2126,7 +1703,7 @@ U 1 1 606FEE94
 P 1400 3700
 F 0 "R9" H 1470 3746 50  0000 L CNN
 F 1 "10k" H 1470 3655 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 1330 3700 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 1330 3700 50  0001 C CNN
 F 3 "~" H 1400 3700 50  0001 C CNN
 	1    1400 3700
 	1    0    0    -1  
@@ -2175,21 +1752,18 @@ forward
 Text GLabel 3850 5400 0    39   Input ~ 0
 backward
 Wire Wire Line
-	6700 4650 6700 4700
+	6000 1200 6000 1150
 $Comp
 L Connector:TestPoint TP16
 U 1 1 60824766
-P 6700 4650
-F 0 "TP16" H 6758 4768 50  0000 L CNN
-F 1 "TestPoint" H 6758 4677 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 6900 4650 50  0001 C CNN
-F 3 "~" H 6900 4650 50  0001 C CNN
-	1    6700 4650
-	1    0    0    -1  
+P 6000 1200
+F 0 "TP16" H 6058 1318 50  0000 L CNN
+F 1 "wheel_click" H 6058 1227 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 6200 1200 50  0001 C CNN
+F 3 "~" H 6200 1200 50  0001 C CNN
+	1    6000 1200
+	1    0    0    1   
 $EndComp
-Connection ~ 6700 4700
-Wire Wire Line
-	6700 4700 6600 4700
 $Comp
 L Switch:SW_Push SW9
 U 1 1 6082476E
@@ -2213,29 +1787,16 @@ F 3 "" H 7150 5250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C28
-U 1 1 6082477B
-P 6700 4950
-F 0 "C28" H 6792 4996 50  0000 L CNN
-F 1 "100n" H 6792 4905 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 6700 4950 50  0001 C CNN
-F 3 "~" H 6700 4950 50  0001 C CNN
-	1    6700 4950
-	1    0    0    -1  
-$EndComp
-$Comp
 L Device:R R21
 U 1 1 60824781
 P 6950 4700
 F 0 "R21" H 7020 4746 50  0000 L CNN
 F 1 "?" H 7020 4655 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 6880 4700 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 6880 4700 50  0001 C CNN
 F 3 "~" H 6950 4700 50  0001 C CNN
 	1    6950 4700
 	0    1    1    0   
 $EndComp
-Wire Wire Line
-	6700 4700 6800 4700
 Wire Wire Line
 	7100 4700 7150 4700
 $Comp
@@ -2244,7 +1805,7 @@ U 1 1 60824789
 P 7150 4500
 F 0 "R22" H 7220 4546 50  0000 L CNN
 F 1 "?" H 7220 4455 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 7080 4500 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 7080 4500 50  0001 C CNN
 F 3 "~" H 7150 4500 50  0001 C CNN
 	1    7150 4500
 	1    0    0    -1  
@@ -2256,8 +1817,6 @@ Wire Wire Line
 Connection ~ 7150 4700
 Wire Wire Line
 	6700 5050 6700 5200
-Wire Wire Line
-	6700 4700 6700 4850
 $Comp
 L power:+3.3V #PWR0162
 U 1 1 60824794
@@ -2288,24 +1847,10 @@ Wire Notes Line
 	7350 4800 7550 4800
 Wire Notes Line
 	7550 4800 7550 5500
-Wire Notes Line
-	5000 3300 7100 3300
-Text GLabel 6600 4700 0    39   Input ~ 0
-wheel_click
-Text Notes 5000 3450 0    98   ~ 0
-SCROLL WHEEL AND BUTTON
-Wire Notes Line
-	5000 3500 7100 3500
-Wire Notes Line
-	4050 6200 4050 7800
-Wire Notes Line
-	450  6200 5400 6200
 Wire Notes Line
 	450  3100 5000 3100
 Wire Notes Line
 	1900 3100 1900 6200
-Wire Notes Line
-	3450 6200 3450 3100
 Text Notes 3450 3200 0    59   ~ 0
 Forwards / Backwards
 Wire Notes Line
@@ -2314,29 +1859,6 @@ Text Notes 1900 3200 0    59   ~ 0
 Sense up / down
 Text Notes 500  3200 0    59   ~ 0
 Left / right click
-$Comp
-L MCU_ST_STM32F4:STM32F411RETx U4
-U 1 1 60055F5F
-P 8150 3000
-F 0 "U4" H 8150 1111 50  0000 C CNN
-F 1 "STM32F411RETx" H 8150 1020 50  0000 C CNN
-F 2 "Package_QFP:LQFP-64_10x10mm_P0.5mm" H 7550 1300 50  0001 R CNN
-F 3 "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00115249.pdf" H 8150 3000 50  0001 C CNN
-	1    8150 3000
-	1    0    0    -1  
-$EndComp
-Text GLabel 8900 1500 2    39   Input ~ 0
-left_click
-Text GLabel 8900 1600 2    39   Input ~ 0
-right_click
-Text GLabel 8900 1700 2    39   Input ~ 0
-sense_up
-Text GLabel 8900 1800 2    39   Input ~ 0
-sense_down
-Text GLabel 8900 1900 2    39   Input ~ 0
-forward
-Text GLabel 8900 2000 2    39   Input ~ 0
-backward
 Text GLabel 8900 2100 2    39   Input ~ 0
 wheel_click
 Wire Wire Line
@@ -2353,36 +1875,6 @@ Wire Wire Line
 	8900 2000 8850 2000
 Wire Wire Line
 	8900 2100 8850 2100
-$Comp
-L power:GND #PWR0148
-U 1 1 60D58ED6
-P 6300 4900
-F 0 "#PWR0148" H 6300 4650 50  0001 C CNN
-F 1 "GND" H 6305 4727 50  0000 C CNN
-F 2 "" H 6300 4900 50  0001 C CNN
-F 3 "" H 6300 4900 50  0001 C CNN
-	1    6300 4900
-	0    -1   -1   0   
-$EndComp
-$Comp
-L power:GND #PWR0163
-U 1 1 60DA0789
-P 5700 4150
-F 0 "#PWR0163" H 5700 3900 50  0001 C CNN
-F 1 "GND" H 5705 3977 50  0000 C CNN
-F 2 "" H 5700 4150 50  0001 C CNN
-F 3 "" H 5700 4150 50  0001 C CNN
-	1    5700 4150
-	-1   0    0    1   
-$EndComp
-Wire Wire Line
-	5700 4200 5700 4150
-Text GLabel 6350 4150 2    39   Input ~ 0
-Scroll_wheel
-Wire Wire Line
-	5900 4150 5900 4200
-Text GLabel 8900 2200 2    39   Input ~ 0
-Scroll_wheel
 Wire Wire Line
 	9400 1250 9650 1250
 Wire Wire Line
@@ -2396,61 +1888,6 @@ Wire Wire Line
 Connection ~ 8900 950 
 Wire Wire Line
 	8900 950  8650 950 
-$Comp
-L Device:R R23
-U 1 1 60EF44BA
-P 6100 4150
-F 0 "R23" H 6170 4196 50  0000 L CNN
-F 1 "5k" H 6170 4105 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 6030 4150 50  0001 C CNN
-F 3 "~" H 6100 4150 50  0001 C CNN
-	1    6100 4150
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	5950 4150 5900 4150
-$Comp
-L Device:C_Small C29
-U 1 1 60F2BC33
-P 6300 4300
-F 0 "C29" H 6392 4346 50  0000 L CNN
-F 1 "100n" H 6392 4255 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 6300 4300 50  0001 C CNN
-F 3 "~" H 6300 4300 50  0001 C CNN
-	1    6300 4300
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	6350 4150 6300 4150
-Wire Wire Line
-	6300 4200 6300 4150
-Connection ~ 6300 4150
-Wire Wire Line
-	6300 4150 6250 4150
-Wire Wire Line
-	6300 4400 6300 4450
-$Comp
-L power:GND #PWR0164
-U 1 1 60F8A4C9
-P 6300 4450
-F 0 "#PWR0164" H 6300 4200 50  0001 C CNN
-F 1 "GND" H 6305 4277 50  0000 C CNN
-F 2 "" H 6300 4450 50  0001 C CNN
-F 3 "" H 6300 4450 50  0001 C CNN
-	1    6300 4450
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:+3.3V #PWR0147
-U 1 1 60FB5238
-P 5300 4900
-F 0 "#PWR0147" H 5300 4750 50  0001 C CNN
-F 1 "+3.3V" H 5315 5073 50  0000 C CNN
-F 2 "" H 5300 4900 50  0001 C CNN
-F 3 "" H 5300 4900 50  0001 C CNN
-	1    5300 4900
-	0    -1   -1   0   
-$EndComp
 Wire Wire Line
 	8000 6350 8050 6350
 $Comp
@@ -2483,7 +1920,7 @@ U 1 1 60FE96BA
 P 7450 6350
 F 0 "R24" V 7243 6350 50  0000 C CNN
 F 1 "820" V 7334 6350 50  0000 C CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 7380 6350 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 7380 6350 50  0001 C CNN
 F 3 "~" H 7450 6350 50  0001 C CNN
 	1    7450 6350
 	0    1    1    0   
@@ -2522,7 +1959,7 @@ U 1 1 610016B6
 P 8850 6350
 F 0 "R25" V 8643 6350 50  0000 C CNN
 F 1 "820" V 8734 6350 50  0000 C CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 8780 6350 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 8780 6350 50  0001 C CNN
 F 3 "~" H 8850 6350 50  0001 C CNN
 	1    8850 6350
 	0    1    1    0   
@@ -2561,7 +1998,7 @@ U 1 1 6101734D
 P 10350 6350
 F 0 "R26" V 10143 6350 50  0000 C CNN
 F 1 "820" V 10234 6350 50  0000 C CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 10280 6350 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 10280 6350 50  0001 C CNN
 F 3 "~" H 10350 6350 50  0001 C CNN
 	1    10350 6350
 	0    1    1    0   
@@ -2602,11 +2039,11 @@ Wire Wire Line
 	8450 950  8450 1300
 Wire Wire Line
 	8150 950  8150 1300
-Text GLabel 8900 2300 2    39   Input ~ 0
+Text GLabel 8900 2200 2    39   Input ~ 0
 RED
-Text GLabel 8900 2400 2    39   Input ~ 0
+Text GLabel 8900 2300 2    39   Input ~ 0
 GREEN
-Text GLabel 8900 2500 2    39   Input ~ 0
+Text GLabel 8900 2400 2    39   Input ~ 0
 BLUE
 Wire Wire Line
 	8900 2300 8850 2300
@@ -2614,4 +2051,1054 @@ Wire Wire Line
 	8850 2400 8900 2400
 Wire Wire Line
 	8900 2500 8850 2500
+$Comp
+L Connector:Conn_01x06_Male J2
+U 1 1 60081960
+P 6550 5900
+F 0 "J2" H 6522 5782 50  0000 R CNN
+F 1 "SWD" H 6522 5873 50  0000 R CNN
+F 2 "Connector_PinHeader_2.00mm:PinHeader_1x06_P2.00mm_Vertical" H 6550 5900 50  0001 C CNN
+F 3 "~" H 6550 5900 50  0001 C CNN
+	1    6550 5900
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:+3.3V #PWR0110
+U 1 1 601C0A0E
+P 6250 6100
+F 0 "#PWR0110" H 6250 5950 50  0001 C CNN
+F 1 "+3.3V" H 6265 6273 50  0000 C CNN
+F 2 "" H 6250 6100 50  0001 C CNN
+F 3 "" H 6250 6100 50  0001 C CNN
+	1    6250 6100
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	6350 6100 6250 6100
+Text GLabel 6300 5700 0    50   Input ~ 0
+NRST
+Text GLabel 6300 5800 0    50   BiDi ~ 0
+SWDIO
+Wire Wire Line
+	6350 5600 6300 5600
+Wire Wire Line
+	6350 5700 6300 5700
+Wire Wire Line
+	6350 5800 6300 5800
+Wire Wire Line
+	6000 5900 6350 5900
+Wire Wire Line
+	6350 6000 6300 6000
+Text GLabel 6300 5600 0    50   Output ~ 0
+SWO
+Text GLabel 6300 6000 0    50   Output ~ 0
+SWCLK
+$Comp
+L power:GND #PWR0111
+U 1 1 601CE119
+P 6000 5900
+F 0 "#PWR0111" H 6000 5650 50  0001 C CNN
+F 1 "GND" H 6005 5727 50  0000 C CNN
+F 2 "" H 6000 5900 50  0001 C CNN
+F 3 "" H 6000 5900 50  0001 C CNN
+	1    6000 5900
+	0    1    1    0   
+$EndComp
+Wire Notes Line
+	4950 6450 5400 6450
+Text Notes 5000 6400 0    98   ~ 0
+LEDS
+Wire Wire Line
+	6250 6600 6200 6600
+Wire Wire Line
+	6250 7050 6200 7050
+Wire Wire Line
+	6250 7550 6200 7550
+Wire Wire Line
+	5850 7550 5900 7550
+Connection ~ 5850 7550
+Wire Wire Line
+	5850 7750 5550 7750
+Wire Wire Line
+	5850 7550 5850 7750
+Wire Wire Line
+	5550 7750 5550 7700
+$Comp
+L Jumper:Jumper_3_Bridged12 JP4
+U 1 1 6075715F
+P 5550 7550
+F 0 "JP4" V 5596 7617 50  0000 L CNN
+F 1 "DFU" V 5505 7617 50  0000 L CNN
+F 2 "Connector:FanPinHeader_1x03_P2.54mm_Vertical" H 5550 7550 50  0001 C CNN
+F 3 "~" H 5550 7550 50  0001 C CNN
+	1    5550 7550
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	5300 7550 5250 7550
+Wire Wire Line
+	5800 7550 5850 7550
+$Comp
+L Device:R R6
+U 1 1 60757151
+P 6050 7550
+F 0 "R6" H 6120 7596 50  0000 L CNN
+F 1 "1.5k" H 6120 7505 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 5980 7550 50  0001 C CNN
+F 3 "~" H 6050 7550 50  0001 C CNN
+	1    6050 7550
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	5850 6600 5900 6600
+Connection ~ 5850 6600
+Wire Wire Line
+	5850 6800 5550 6800
+Wire Wire Line
+	5850 6600 5850 6800
+Wire Wire Line
+	5550 6800 5550 6750
+$Comp
+L Jumper:Jumper_3_Bridged12 JP2
+U 1 1 6074062D
+P 5550 6600
+F 0 "JP2" V 5596 6667 50  0000 L CNN
+F 1 "DFU" V 5505 6667 50  0000 L CNN
+F 2 "Connector:FanPinHeader_1x03_P2.54mm_Vertical" H 5550 6600 50  0001 C CNN
+F 3 "~" H 5550 6600 50  0001 C CNN
+	1    5550 6600
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	5300 6600 5250 6600
+Wire Wire Line
+	5800 6600 5850 6600
+$Comp
+L Device:R R1
+U 1 1 6074061F
+P 6050 6600
+F 0 "R1" H 6120 6646 50  0000 L CNN
+F 1 "47" H 6120 6555 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 5980 6600 50  0001 C CNN
+F 3 "~" H 6050 6600 50  0001 C CNN
+	1    6050 6600
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	5850 7050 5900 7050
+Connection ~ 5850 7050
+Wire Wire Line
+	5850 7250 5550 7250
+Wire Wire Line
+	5850 7050 5850 7250
+Wire Wire Line
+	5550 7250 5550 7200
+$Comp
+L Jumper:Jumper_3_Bridged12 JP3
+U 1 1 606D1383
+P 5550 7050
+F 0 "JP3" V 5596 7117 50  0000 L CNN
+F 1 "DFU" V 5505 7117 50  0000 L CNN
+F 2 "Connector:FanPinHeader_1x03_P2.54mm_Vertical" H 5550 7050 50  0001 C CNN
+F 3 "~" H 5550 7050 50  0001 C CNN
+	1    5550 7050
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	5300 7050 5250 7050
+Wire Wire Line
+	5800 7050 5850 7050
+$Comp
+L power:+3.3V #PWR0144
+U 1 1 606D137A
+P 5250 7050
+F 0 "#PWR0144" H 5250 6900 50  0001 C CNN
+F 1 "+3.3V" H 5265 7223 50  0000 C CNN
+F 2 "" H 5250 7050 50  0001 C CNN
+F 3 "" H 5250 7050 50  0001 C CNN
+	1    5250 7050
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Device:R R5
+U 1 1 606D1373
+P 6050 7050
+F 0 "R5" H 6120 7096 50  0000 L CNN
+F 1 "820" H 6120 7005 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 5980 7050 50  0001 C CNN
+F 3 "~" H 6050 7050 50  0001 C CNN
+	1    6050 7050
+	0    -1   -1   0   
+$EndComp
+$Comp
+L power:+5V #PWR0143
+U 1 1 6016DDF7
+P 5250 7550
+F 0 "#PWR0143" H 5250 7400 50  0001 C CNN
+F 1 "+5V" H 5265 7723 50  0000 C CNN
+F 2 "" H 5250 7550 50  0001 C CNN
+F 3 "" H 5250 7550 50  0001 C CNN
+	1    5250 7550
+	0    -1   -1   0   
+$EndComp
+$Comp
+L LED:IR26-21C_L110_TR8 D1
+U 1 1 601E5474
+P 6400 7550
+F 0 "D1" H 6393 7767 50  0000 C CNN
+F 1 "Indicator LED" H 6393 7676 50  0000 C CNN
+F 2 "LED_SMD:LED_1206_3216Metric" H 6400 7750 50  0001 C CNN
+F 3 "http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf" H 6400 7550 50  0001 C CNN
+	1    6400 7550
+	-1   0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0128
+U 1 1 6022D61E
+P 6600 7550
+F 0 "#PWR0128" H 6600 7300 50  0001 C CNN
+F 1 "GND" H 6605 7377 50  0000 C CNN
+F 2 "" H 6600 7550 50  0001 C CNN
+F 3 "" H 6600 7550 50  0001 C CNN
+	1    6600 7550
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	6550 7550 6600 7550
+$Comp
+L power:VDD #PWR0145
+U 1 1 601A96AE
+P 5250 6600
+F 0 "#PWR0145" H 5250 6450 50  0001 C CNN
+F 1 "VDD" H 5265 6773 50  0000 C CNN
+F 2 "" H 5250 6600 50  0001 C CNN
+F 3 "" H 5250 6600 50  0001 C CNN
+	1    5250 6600
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	6550 6600 6600 6600
+$Comp
+L power:GND #PWR0142
+U 1 1 602C3060
+P 6600 6600
+F 0 "#PWR0142" H 6600 6350 50  0001 C CNN
+F 1 "GND" H 6605 6427 50  0000 C CNN
+F 2 "" H 6600 6600 50  0001 C CNN
+F 3 "" H 6600 6600 50  0001 C CNN
+	1    6600 6600
+	0    -1   -1   0   
+$EndComp
+$Comp
+L LED:IR26-21C_L110_TR8 D3
+U 1 1 602C3066
+P 6400 6600
+F 0 "D3" H 6393 6817 50  0000 C CNN
+F 1 "Indicator LED" H 6393 6726 50  0000 C CNN
+F 2 "LED_SMD:LED_1206_3216Metric" H 6400 6800 50  0001 C CNN
+F 3 "http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf" H 6400 6600 50  0001 C CNN
+	1    6400 6600
+	-1   0    0    -1  
+$EndComp
+$Comp
+L LED:IR26-21C_L110_TR8 D2
+U 1 1 602BC446
+P 6400 7050
+F 0 "D2" H 6393 7267 50  0000 C CNN
+F 1 "Indicator LED" H 6393 7176 50  0000 C CNN
+F 2 "LED_SMD:LED_1206_3216Metric" H 6400 7250 50  0001 C CNN
+F 3 "http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf" H 6400 7050 50  0001 C CNN
+	1    6400 7050
+	-1   0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0141
+U 1 1 602BC440
+P 6600 7050
+F 0 "#PWR0141" H 6600 6800 50  0001 C CNN
+F 1 "GND" H 6605 6877 50  0000 C CNN
+F 2 "" H 6600 7050 50  0001 C CNN
+F 3 "" H 6600 7050 50  0001 C CNN
+	1    6600 7050
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	6550 7050 6600 7050
+$Comp
+L Device:C_Small C32
+U 1 1 609B8D57
+P 10150 1100
+F 0 "C32" H 10242 1146 50  0000 L CNN
+F 1 "4.7u" H 10242 1055 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 10150 1100 50  0001 C CNN
+F 3 "~" H 10150 1100 50  0001 C CNN
+	1    10150 1100
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9900 1250 10150 1250
+Wire Wire Line
+	10150 1250 10150 1200
+Wire Wire Line
+	10150 1000 10150 950 
+Wire Wire Line
+	10150 950  9900 950 
+Connection ~ 10150 1250
+Wire Wire Line
+	10150 900  10150 950 
+Connection ~ 10150 950 
+$Comp
+L Device:R R27
+U 1 1 60A8200B
+P 3200 6650
+F 0 "R27" H 3270 6696 50  0000 L CNN
+F 1 "47" H 3270 6605 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 3130 6650 50  0001 C CNN
+F 3 "~" H 3200 6650 50  0001 C CNN
+	1    3200 6650
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Device:C_Small C30
+U 1 1 60A989CD
+P 3400 6800
+F 0 "C30" H 3492 6846 50  0000 L CNN
+F 1 "10u" H 3492 6755 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 3400 6800 50  0001 C CNN
+F 3 "~" H 3400 6800 50  0001 C CNN
+	1    3400 6800
+	1    0    0    1   
+$EndComp
+$Comp
+L Device:C_Small C31
+U 1 1 60A989D3
+P 3700 6800
+F 0 "C31" H 3792 6846 50  0000 L CNN
+F 1 "100n" H 3792 6755 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 3700 6800 50  0001 C CNN
+F 3 "~" H 3700 6800 50  0001 C CNN
+	1    3700 6800
+	1    0    0    1   
+$EndComp
+Wire Notes Line
+	6100 6200 6100 6350
+Wire Notes Line
+	6100 6350 6950 6350
+Wire Notes Line
+	450  6200 6100 6200
+Wire Notes Line
+	4950 6200 4950 7800
+Wire Notes Line
+	3450 3100 3450 6200
+$Comp
+L power:VDD #PWR0168
+U 1 1 60C829FC
+P 3750 6650
+F 0 "#PWR0168" H 3750 6500 50  0001 C CNN
+F 1 "VDD" H 3765 6823 50  0000 C CNN
+F 2 "" H 3750 6650 50  0001 C CNN
+F 3 "" H 3750 6650 50  0001 C CNN
+	1    3750 6650
+	0    1    1    0   
+$EndComp
+$Comp
+L power:GND #PWR0169
+U 1 1 60C99D3E
+P 3700 6950
+F 0 "#PWR0169" H 3700 6700 50  0001 C CNN
+F 1 "GND" H 3705 6777 50  0000 C CNN
+F 2 "" H 3700 6950 50  0001 C CNN
+F 3 "" H 3700 6950 50  0001 C CNN
+	1    3700 6950
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0170
+U 1 1 60CAF940
+P 3400 6950
+F 0 "#PWR0170" H 3400 6700 50  0001 C CNN
+F 1 "GND" H 3405 6777 50  0000 C CNN
+F 2 "" H 3400 6950 50  0001 C CNN
+F 3 "" H 3400 6950 50  0001 C CNN
+	1    3400 6950
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3700 6900 3700 6950
+Wire Wire Line
+	3400 6900 3400 6950
+Wire Wire Line
+	3350 6650 3400 6650
+Wire Wire Line
+	3400 6650 3400 6700
+Wire Wire Line
+	3050 6950 3000 6950
+Wire Wire Line
+	3400 6650 3700 6650
+Connection ~ 3400 6650
+Wire Wire Line
+	3700 6650 3700 6700
+Connection ~ 3700 6650
+Wire Wire Line
+	3700 6650 3750 6650
+$Comp
+L Device:R R28
+U 1 1 60D695E4
+P 3600 7250
+F 0 "R28" H 3670 7296 50  0000 L CNN
+F 1 "10k" H 3670 7205 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 3530 7250 50  0001 C CNN
+F 3 "~" H 3600 7250 50  0001 C CNN
+	1    3600 7250
+	0    1    1    0   
+$EndComp
+$Comp
+L power:+3.3V #PWR0171
+U 1 1 60D98A0F
+P 3800 7250
+F 0 "#PWR0171" H 3800 7100 50  0001 C CNN
+F 1 "+3.3V" H 3815 7423 50  0000 C CNN
+F 2 "" H 3800 7250 50  0001 C CNN
+F 3 "" H 3800 7250 50  0001 C CNN
+	1    3800 7250
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	3050 6650 3050 6950
+Wire Wire Line
+	3450 7250 3400 7250
+Wire Wire Line
+	3800 7250 3750 7250
+Wire Wire Line
+	3400 7250 3400 7350
+Text GLabel 4400 6500 3    50   Output ~ 0
+NCS
+$Comp
+L Connector:TestPoint TP20
+U 1 1 60EFB280
+P 4400 6450
+F 0 "TP20" H 4458 6568 50  0000 L CNN
+F 1 "NCS" H 4458 6477 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4600 6450 50  0001 C CNN
+F 3 "~" H 4600 6450 50  0001 C CNN
+	1    4400 6450
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP2
+U 1 1 60F2BC56
+P 4100 6450
+F 0 "TP2" H 4158 6568 50  0000 L CNN
+F 1 "MOSI" H 4158 6477 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4300 6450 50  0001 C CNN
+F 3 "~" H 4300 6450 50  0001 C CNN
+	1    4100 6450
+	1    0    0    -1  
+$EndComp
+Text GLabel 4100 6500 3    50   Output ~ 0
+MOSI
+Wire Wire Line
+	3000 7250 3400 7250
+Connection ~ 3400 7250
+Text GLabel 4650 6500 3    50   Output ~ 0
+MISO
+Text GLabel 4100 7000 3    50   Output ~ 0
+SCK
+Text GLabel 4350 7000 3    50   Input ~ 0
+Motion
+$Comp
+L Connector:TestPoint TP3
+U 1 1 6107F83F
+P 4100 6950
+F 0 "TP3" H 4158 7068 50  0000 L CNN
+F 1 "SCK" H 4158 6977 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4300 6950 50  0001 C CNN
+F 3 "~" H 4300 6950 50  0001 C CNN
+	1    4100 6950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP18
+U 1 1 610979A7
+P 4350 6950
+F 0 "TP18" H 4408 7068 50  0000 L CNN
+F 1 "Motion" H 4408 6977 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4550 6950 50  0001 C CNN
+F 3 "~" H 4550 6950 50  0001 C CNN
+	1    4350 6950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP24
+U 1 1 610AFC53
+P 4650 6450
+F 0 "TP24" H 4708 6568 50  0000 L CNN
+F 1 "MISO" H 4708 6477 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4850 6450 50  0001 C CNN
+F 3 "~" H 4850 6450 50  0001 C CNN
+	1    4650 6450
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4100 6450 4100 6500
+Wire Wire Line
+	4400 6450 4400 6500
+Wire Wire Line
+	4650 6450 4650 6500
+Wire Wire Line
+	4350 6950 4350 7000
+Wire Wire Line
+	4100 6950 4100 7000
+$Comp
+L power:GND #PWR0172
+U 1 1 612236F5
+P 4700 7000
+F 0 "#PWR0172" H 4700 6750 50  0001 C CNN
+F 1 "GND" H 4705 6827 50  0000 C CNN
+F 2 "" H 4700 7000 50  0001 C CNN
+F 3 "" H 4700 7000 50  0001 C CNN
+	1    4700 7000
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP25
+U 1 1 6123CCCE
+P 4700 6950
+F 0 "TP25" H 4758 7068 50  0000 L CNN
+F 1 "GRD" H 4758 6977 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4900 6950 50  0001 C CNN
+F 3 "~" H 4900 6950 50  0001 C CNN
+	1    4700 6950
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4700 6950 4700 7000
+Wire Notes Line
+	5000 5750 5400 5750
+Wire Notes Line
+	5400 5750 5400 5500
+Text Notes 5050 5700 0    98   ~ 0
+SWD
+Wire Notes Line
+	5000 450  5000 6200
+Wire Notes Line
+	5400 6450 5400 6200
+Wire Wire Line
+	2950 800  3500 800 
+$Comp
+L Connector:TestPoint TP1
+U 1 1 613BA215
+P 3900 850
+F 0 "TP1" H 3958 968 50  0000 L CNN
+F 1 "5V" H 3958 877 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4100 850 50  0001 C CNN
+F 3 "~" H 4100 850 50  0001 C CNN
+	1    3900 850 
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+5V #PWR0173
+U 1 1 613D4F39
+P 3900 900
+F 0 "#PWR0173" H 3900 750 50  0001 C CNN
+F 1 "+5V" H 3915 1073 50  0000 C CNN
+F 2 "" H 3900 900 50  0001 C CNN
+F 3 "" H 3900 900 50  0001 C CNN
+	1    3900 900 
+	-1   0    0    1   
+$EndComp
+$Comp
+L Connector:TestPoint TP6
+U 1 1 613EF1B1
+P 4150 850
+F 0 "TP6" H 4208 968 50  0000 L CNN
+F 1 "3.3V" H 4208 877 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4350 850 50  0001 C CNN
+F 3 "~" H 4350 850 50  0001 C CNN
+	1    4150 850 
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0174
+U 1 1 6140845F
+P 4150 900
+F 0 "#PWR0174" H 4150 750 50  0001 C CNN
+F 1 "+3.3V" H 4165 1073 50  0000 C CNN
+F 2 "" H 4150 900 50  0001 C CNN
+F 3 "" H 4150 900 50  0001 C CNN
+	1    4150 900 
+	-1   0    0    1   
+$EndComp
+$Comp
+L Connector:TestPoint TP19
+U 1 1 61439D6C
+P 4400 850
+F 0 "TP19" H 4458 968 50  0000 L CNN
+F 1 "VDD" H 4458 877 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4600 850 50  0001 C CNN
+F 3 "~" H 4600 850 50  0001 C CNN
+	1    4400 850 
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:VDD #PWR0175
+U 1 1 6145321C
+P 4400 900
+F 0 "#PWR0175" H 4400 750 50  0001 C CNN
+F 1 "VDD" H 4415 1073 50  0000 C CNN
+F 2 "" H 4400 900 50  0001 C CNN
+F 3 "" H 4400 900 50  0001 C CNN
+	1    4400 900 
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:GND #PWR0176
+U 1 1 6146C4E5
+P 4650 900
+F 0 "#PWR0176" H 4650 650 50  0001 C CNN
+F 1 "GND" H 4655 727 50  0000 C CNN
+F 2 "" H 4650 900 50  0001 C CNN
+F 3 "" H 4650 900 50  0001 C CNN
+	1    4650 900 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP21
+U 1 1 614855F6
+P 4650 850
+F 0 "TP21" H 4708 968 50  0000 L CNN
+F 1 "GND" H 4708 877 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4850 850 50  0001 C CNN
+F 3 "~" H 4850 850 50  0001 C CNN
+	1    4650 850 
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4650 850  4650 900 
+Wire Wire Line
+	4400 850  4400 900 
+Wire Wire Line
+	4150 850  4150 900 
+Wire Wire Line
+	3900 850  3900 900 
+$Comp
+L Connector:TestPoint TP27
+U 1 1 615BA919
+P 5400 1200
+F 0 "TP27" H 5458 1318 50  0000 L CNN
+F 1 "MCO2" H 5458 1227 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 5600 1200 50  0001 C CNN
+F 3 "~" H 5600 1200 50  0001 C CNN
+	1    5400 1200
+	1    0    0    1   
+$EndComp
+Text GLabel 8900 3200 2    50   Input ~ 0
+MCO1
+Text GLabel 8900 3300 2    50   Input ~ 0
+MCO2
+Wire Wire Line
+	8850 3200 8900 3200
+Wire Wire Line
+	8850 3300 8900 3300
+Text GLabel 5100 1150 1    50   Input ~ 0
+MCO1
+Text GLabel 5400 1150 1    50   Input ~ 0
+MCO2
+$Comp
+L Connector:TestPoint TP26
+U 1 1 615A1620
+P 5100 1200
+F 0 "TP26" H 5158 1318 50  0000 L CNN
+F 1 "MCO1" H 5158 1227 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 5300 1200 50  0001 C CNN
+F 3 "~" H 5300 1200 50  0001 C CNN
+	1    5100 1200
+	1    0    0    1   
+$EndComp
+$Comp
+L power:GND #PWR0177
+U 1 1 617B1488
+P 5700 1150
+F 0 "#PWR0177" H 5700 900 50  0001 C CNN
+F 1 "GND" H 5705 977 50  0000 C CNN
+F 2 "" H 5700 1150 50  0001 C CNN
+F 3 "" H 5700 1150 50  0001 C CNN
+	1    5700 1150
+	1    0    0    1   
+$EndComp
+$Comp
+L Connector:TestPoint TP28
+U 1 1 617B148E
+P 5700 1200
+F 0 "TP28" H 5758 1318 50  0000 L CNN
+F 1 "GND" H 5758 1227 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 5900 1200 50  0001 C CNN
+F 3 "~" H 5900 1200 50  0001 C CNN
+	1    5700 1200
+	1    0    0    1   
+$EndComp
+Wire Wire Line
+	5700 1200 5700 1150
+Wire Wire Line
+	5400 1150 5400 1200
+Wire Wire Line
+	5100 1150 5100 1200
+Text GLabel 6000 1150 1    39   Input ~ 0
+wheel_click
+$Comp
+L Connector:TestPoint TP29
+U 1 1 618F0AAF
+P 6500 1200
+F 0 "TP29" H 6558 1318 50  0000 L CNN
+F 1 "Scroll_a" H 6558 1227 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 6700 1200 50  0001 C CNN
+F 3 "~" H 6700 1200 50  0001 C CNN
+	1    6500 1200
+	1    0    0    1   
+$EndComp
+Wire Wire Line
+	6500 1150 6500 1200
+Wire Wire Line
+	6800 2700 7450 2700
+Wire Wire Line
+	6800 2600 7450 2600
+Wire Wire Line
+	7450 1900 7300 1900
+$Comp
+L MCU_ST_STM32F4:STM32F411RETx U4
+U 1 1 60055F5F
+P 8150 3000
+F 0 "U4" H 8150 1111 50  0000 C CNN
+F 1 "STM32F411RETx" H 8150 1020 50  0000 C CNN
+F 2 "Package_QFP:LQFP-64_10x10mm_P0.5mm" H 7550 1300 50  0001 R CNN
+F 3 "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00115249.pdf" H 8150 3000 50  0001 C CNN
+	1    8150 3000
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP30
+U 1 1 619AB575
+P 10300 4200
+F 0 "TP30" H 10358 4318 50  0000 L CNN
+F 1 "BOOT0" H 10358 4227 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 10500 4200 50  0001 C CNN
+F 3 "~" H 10500 4200 50  0001 C CNN
+	1    10300 4200
+	1    0    0    -1  
+$EndComp
+$Comp
+L Jumper:Jumper_3_Bridged12 JP1
+U 1 1 6015F930
+P 10500 4200
+F 0 "JP1" V 10546 4267 50  0000 L CNN
+F 1 "DFU" V 10455 4267 50  0000 L CNN
+F 2 "Connector:FanPinHeader_1x03_P2.54mm_Vertical" H 10500 4200 50  0001 C CNN
+F 3 "~" H 10500 4200 50  0001 C CNN
+	1    10500 4200
+	0    1    -1   0   
+$EndComp
+Text GLabel 8900 2000 2    39   Input ~ 0
+backward
+Text GLabel 8900 1900 2    39   Input ~ 0
+forward
+Text GLabel 8900 1800 2    39   Input ~ 0
+sense_down
+Text GLabel 8900 1700 2    39   Input ~ 0
+sense_up
+Text GLabel 8900 1600 2    39   Input ~ 0
+right_click
+Text GLabel 8900 1500 2    39   Input ~ 0
+left_click
+Text GLabel 4650 1850 3    50   Output ~ 0
+OUT_D-
+Text GLabel 4650 2500 3    50   Output ~ 0
+OUT_D+
+Text GLabel 4350 1850 3    50   Input ~ 0
+IN_D-
+Text GLabel 4350 2500 3    50   Input ~ 0
+IN_D+
+$Comp
+L Connector:TestPoint TP17
+U 1 1 61C7C487
+P 4350 2450
+F 0 "TP17" H 4408 2568 50  0000 L CNN
+F 1 "in_D+" H 4408 2477 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4550 2450 50  0001 C CNN
+F 3 "~" H 4550 2450 50  0001 C CNN
+	1    4350 2450
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP23
+U 1 1 61CAF95D
+P 4650 2450
+F 0 "TP23" H 4708 2568 50  0000 L CNN
+F 1 "out_D+" H 4708 2477 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4850 2450 50  0001 C CNN
+F 3 "~" H 4850 2450 50  0001 C CNN
+	1    4650 2450
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP8
+U 1 1 61CC914B
+P 4350 1800
+F 0 "TP8" H 4408 1918 50  0000 L CNN
+F 1 "in_D-" H 4408 1827 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4550 1800 50  0001 C CNN
+F 3 "~" H 4550 1800 50  0001 C CNN
+	1    4350 1800
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP22
+U 1 1 61CE2BBC
+P 4650 1800
+F 0 "TP22" H 4708 1918 50  0000 L CNN
+F 1 "out_D-" H 4708 1827 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4850 1800 50  0001 C CNN
+F 3 "~" H 4850 1800 50  0001 C CNN
+	1    4650 1800
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4350 1850 4350 1800
+Wire Wire Line
+	4650 1850 4650 1800
+Wire Wire Line
+	4350 2500 4350 2450
+Wire Wire Line
+	4650 2500 4650 2450
+Wire Wire Line
+	5700 3800 5700 3750
+Text GLabel 5850 4100 1    50   Input ~ 0
+Scroll_a
+Wire Wire Line
+	8900 2700 8850 2700
+Text GLabel 8900 2900 2    50   Input ~ 0
+Scroll_a
+Text GLabel 8900 3000 2    50   Input ~ 0
+Scroll_b
+Wire Wire Line
+	8900 2900 8850 2900
+Wire Wire Line
+	8900 3000 8850 3000
+$Comp
+L power:GND #PWR0179
+U 1 1 624B3DA7
+P 5400 4150
+F 0 "#PWR0179" H 5400 3900 50  0001 C CNN
+F 1 "GND" H 5405 3977 50  0000 C CNN
+F 2 "" H 5400 4150 50  0001 C CNN
+F 3 "" H 5400 4150 50  0001 C CNN
+	1    5400 4150
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	5450 4150 5400 4150
+$Comp
+L power:+3.3V #PWR0180
+U 1 1 62523590
+P 5700 3750
+F 0 "#PWR0180" H 5700 3600 50  0001 C CNN
+F 1 "+3.3V" H 5715 3923 50  0000 C CNN
+F 2 "" H 5700 3750 50  0001 C CNN
+F 3 "" H 5700 3750 50  0001 C CNN
+	1    5700 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C_Small C33
+U 1 1 624984FF
+P 5550 4150
+F 0 "C33" H 5642 4196 50  0000 L CNN
+F 1 "100n" H 5642 4105 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 5550 4150 50  0001 C CNN
+F 3 "~" H 5550 4150 50  0001 C CNN
+	1    5550 4150
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	5700 4150 5700 4100
+Wire Wire Line
+	5700 4150 5650 4150
+Connection ~ 5700 4150
+Wire Wire Line
+	5850 4100 5850 4150
+Wire Wire Line
+	5850 4150 5700 4150
+$Comp
+L power:GND #PWR0181
+U 1 1 626C35AF
+P 5400 4600
+F 0 "#PWR0181" H 5400 4350 50  0001 C CNN
+F 1 "GND" H 5405 4427 50  0000 C CNN
+F 2 "" H 5400 4600 50  0001 C CNN
+F 3 "" H 5400 4600 50  0001 C CNN
+	1    5400 4600
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	5450 4600 5400 4600
+$Comp
+L Device:C_Small C34
+U 1 1 626C35B6
+P 5550 4600
+F 0 "C34" H 5642 4646 50  0000 L CNN
+F 1 "100n" H 5642 4555 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 5550 4600 50  0001 C CNN
+F 3 "~" H 5550 4600 50  0001 C CNN
+	1    5550 4600
+	0    1    -1   0   
+$EndComp
+$Comp
+L Device:R R20
+U 1 1 626E168D
+P 5700 4800
+F 0 "R20" H 5770 4846 50  0000 L CNN
+F 1 "10k" H 5770 4755 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 5630 4800 50  0001 C CNN
+F 3 "~" H 5700 4800 50  0001 C CNN
+	1    5700 4800
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5700 4950 5700 5000
+$Comp
+L power:+3.3V #PWR0182
+U 1 1 626E1695
+P 5700 5000
+F 0 "#PWR0182" H 5700 4850 50  0001 C CNN
+F 1 "+3.3V" H 5715 5173 50  0000 C CNN
+F 2 "" H 5700 5000 50  0001 C CNN
+F 3 "" H 5700 5000 50  0001 C CNN
+	1    5700 5000
+	-1   0    0    1   
+$EndComp
+Text GLabel 5850 4650 3    50   Input ~ 0
+Scroll_b
+Wire Wire Line
+	5850 4650 5850 4600
+Wire Wire Line
+	5850 4600 5700 4600
+Wire Wire Line
+	5700 4650 5700 4600
+Connection ~ 5700 4600
+Wire Wire Line
+	5700 4600 5650 4600
+$Comp
+L Connector:TestPoint TP14
+U 1 1 628DBFFB
+P 6900 1200
+F 0 "TP14" H 6958 1318 50  0000 L CNN
+F 1 "Scroll_b" H 6958 1227 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 7100 1200 50  0001 C CNN
+F 3 "~" H 7100 1200 50  0001 C CNN
+	1    6900 1200
+	1    0    0    1   
+$EndComp
+Wire Wire Line
+	6900 1150 6900 1200
+Text GLabel 6500 1150 1    50   Input ~ 0
+Scroll_a
+Connection ~ 5850 4600
+Connection ~ 5850 4150
+Connection ~ 6050 2400
+Wire Wire Line
+	6050 2400 6800 2400
+Wire Wire Line
+	5750 2400 6050 2400
+Wire Wire Line
+	6000 4600 5850 4600
+Wire Wire Line
+	6000 4450 6000 4600
+Wire Wire Line
+	6000 4150 5850 4150
+Wire Wire Line
+	6000 4250 6000 4150
+Wire Wire Line
+	5950 4350 6000 4350
+$Comp
+L power:GND #PWR0178
+U 1 1 62097B1A
+P 5950 4350
+F 0 "#PWR0178" H 5950 4100 50  0001 C CNN
+F 1 "GND" H 5955 4177 50  0000 C CNN
+F 2 "" H 5950 4350 50  0001 C CNN
+F 3 "" H 5950 4350 50  0001 C CNN
+	1    5950 4350
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:Rotary_Encoder SW10
+U 1 1 61F68259
+P 6300 4350
+F 0 "SW10" H 6530 4396 50  0000 L CNN
+F 1 "Rotary_Encoder" H 6530 4305 50  0000 L CNN
+F 2 "Custom:PEC12R-2120F-N0012" H 6150 4510 50  0001 C CNN
+F 3 "~" H 6300 4610 50  0001 C CNN
+	1    6300 4350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6050 2850 6050 2900
+Wire Notes Line
+	5000 3500 7100 3500
+Text Notes 5000 3450 0    98   ~ 0
+SCROLL WHEEL AND BUTTON
+Text GLabel 6600 4700 0    39   Input ~ 0
+wheel_click
+Wire Notes Line
+	5000 3300 7100 3300
+Wire Wire Line
+	6700 4700 6700 4850
+Wire Wire Line
+	6700 4700 6800 4700
+$Comp
+L Device:C_Small C28
+U 1 1 6082477B
+P 6700 4950
+F 0 "C28" H 6792 4996 50  0000 L CNN
+F 1 "100n" H 6792 4905 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 6700 4950 50  0001 C CNN
+F 3 "~" H 6700 4950 50  0001 C CNN
+	1    6700 4950
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6700 4700 6600 4700
+Connection ~ 6700 4700
+$Comp
+L Connector:TestPoint TP4
+U 1 1 601AABDA
+P 6050 2900
+F 0 "TP4" H 6108 3018 50  0000 L CNN
+F 1 "TestPoint" H 6108 2927 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 6250 2900 50  0001 C CNN
+F 3 "~" H 6250 2900 50  0001 C CNN
+	1    6050 2900
+	-1   0    0    1   
+$EndComp
+Connection ~ 6050 2850
+Wire Wire Line
+	6800 2850 6050 2850
+Wire Wire Line
+	6050 2400 6050 2500
+Wire Wire Line
+	6050 2800 6050 2850
+Wire Wire Line
+	5750 2850 6050 2850
+$Comp
+L Device:Crystal Y1
+U 1 1 600CDE48
+P 6050 2650
+F 0 "Y1" H 6050 2918 50  0000 C CNN
+F 1 "16Mhz" H 6050 2827 50  0000 C CNN
+F 2 "Crystal:Crystal_SMD_0603-2Pin_6.0x3.5mm_HandSoldering" H 6050 2650 50  0001 C CNN
+F 3 "~" H 6050 2650 50  0001 C CNN
+	1    6050 2650
+	0    1    1    0   
+$EndComp
+Text GLabel 6900 1150 1    50   Input ~ 0
+Scroll_b
 $EndSCHEMATC
diff --git a/KiCAD model/Lab1.sch-bak b/KiCAD model/Lab1.sch-bak
index a2e065785a4e3541577212bb3b4c457395d93af0..73bcc5c089e761c6f64e229c4dabe7b3bbf961e9 100644
--- a/KiCAD model/Lab1.sch-bak	
+++ b/KiCAD model/Lab1.sch-bak	
@@ -14,17 +14,6 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Device:Crystal Y1
-U 1 1 600CDE48
-P 6050 2650
-F 0 "Y1" H 6050 2918 50  0000 C CNN
-F 1 "16Mhz" H 6050 2827 50  0000 C CNN
-F 2 "Crystal:Crystal_SMD_0603-2Pin_6.0x3.5mm_HandSoldering" H 6050 2650 50  0001 C CNN
-F 3 "~" H 6050 2650 50  0001 C CNN
-	1    6050 2650
-	0    1    1    0   
-$EndComp
-$Comp
 L Device:C C5
 U 1 1 600CFABF
 P 5600 2400
@@ -76,7 +65,7 @@ U 1 1 600A0E9A
 P 10500 4700
 F 0 "R4" H 10570 4746 50  0000 L CNN
 F 1 "10k" H 10570 4655 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 10430 4700 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 10430 4700 50  0001 C CNN
 F 3 "~" H 10500 4700 50  0001 C CNN
 	1    10500 4700
 	1    0    0    -1  
@@ -92,8 +81,6 @@ F 3 "~" H 7300 2050 50  0001 C CNN
 	1    7300 2050
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	7450 1900 7300 1900
 Wire Wire Line
 	7300 1900 7300 1950
 $Comp
@@ -229,45 +216,16 @@ Wire Wire Line
 	10250 4200 10300 4200
 Text Notes 5100 2050 0    50   ~ 0
 2*(Cload - Cstrat) = 2 * (18 - 6) = 24pF = 22pF
-Wire Wire Line
-	5750 2400 6050 2400
-Wire Wire Line
-	5750 2850 6050 2850
-Wire Wire Line
-	6050 2800 6050 2850
-Wire Wire Line
-	6050 2400 6050 2500
-Connection ~ 6050 2400
-Wire Wire Line
-	6050 2400 6800 2400
 Wire Wire Line
 	6800 2700 6800 2850
 Wire Wire Line
 	6800 2400 6800 2600
-$Comp
-L power:GND #PWR0111
-U 1 1 601CE119
-P 5850 6550
-F 0 "#PWR0111" H 5850 6300 50  0001 C CNN
-F 1 "GND" H 5855 6377 50  0000 C CNN
-F 2 "" H 5850 6550 50  0001 C CNN
-F 3 "" H 5850 6550 50  0001 C CNN
-	1    5850 6550
-	0    1    1    0   
-$EndComp
-Text GLabel 8900 2800 2    50   BiDi ~ 0
+Text GLabel 8900 2700 2    50   BiDi ~ 0
 SWDIO
-Text GLabel 8900 2900 2    50   Input ~ 0
+Text GLabel 8900 2800 2    50   Input ~ 0
 SWCLK
 Wire Wire Line
 	8850 2800 8900 2800
-Wire Wire Line
-	8850 2900 8900 2900
-Wire Wire Line
-	6800 2850 6050 2850
-Connection ~ 6050 2850
-Wire Notes Line
-	5000 450  5000 5500
 $Comp
 L power:GND #PWR0116
 U 1 1 6026F6EE
@@ -310,137 +268,137 @@ Wire Wire Line
 $Comp
 L Regulator_Linear:MIC5205-5.0YM5 U3
 U 1 1 602A02F8
-P 3350 1800
-F 0 "U3" H 3350 2142 50  0000 C CNN
-F 1 "MIC5235YM5-TR" H 3350 2051 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23-5" H 3350 2125 50  0001 C CNN
-F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/20005785A.pdf" H 3350 1800 50  0001 C CNN
-	1    3350 1800
+P 2700 1800
+F 0 "U3" H 2700 2142 50  0000 C CNN
+F 1 "MIC5235YM5-TR" H 2700 2051 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23-5" H 2700 2125 50  0001 C CNN
+F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/20005785A.pdf" H 2700 1800 50  0001 C CNN
+	1    2700 1800
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0119
 U 1 1 602A284F
-P 3350 2150
-F 0 "#PWR0119" H 3350 1900 50  0001 C CNN
-F 1 "GND" H 3355 1977 50  0000 C CNN
-F 2 "" H 3350 2150 50  0001 C CNN
-F 3 "" H 3350 2150 50  0001 C CNN
-	1    3350 2150
+P 2700 2150
+F 0 "#PWR0119" H 2700 1900 50  0001 C CNN
+F 1 "GND" H 2705 1977 50  0000 C CNN
+F 2 "" H 2700 2150 50  0001 C CNN
+F 3 "" H 2700 2150 50  0001 C CNN
+	1    2700 2150
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3350 2150 3350 2100
+	2700 2150 2700 2100
 Wire Wire Line
-	2800 1650 2800 1700
+	2150 1650 2150 1700
 $Comp
 L Device:C_Small C3
 U 1 1 602B63C7
-P 2800 1800
-F 0 "C3" H 2892 1846 50  0000 L CNN
-F 1 "1u" H 2892 1755 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 2800 1800 50  0001 C CNN
-F 3 "~" H 2800 1800 50  0001 C CNN
-	1    2800 1800
+P 2150 1800
+F 0 "C3" H 2242 1846 50  0000 L CNN
+F 1 "1u" H 2242 1755 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 2150 1800 50  0001 C CNN
+F 3 "~" H 2150 1800 50  0001 C CNN
+	1    2150 1800
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0121
 U 1 1 602B63CD
-P 2800 1950
-F 0 "#PWR0121" H 2800 1700 50  0001 C CNN
-F 1 "GND" H 2805 1777 50  0000 C CNN
-F 2 "" H 2800 1950 50  0001 C CNN
-F 3 "" H 2800 1950 50  0001 C CNN
-	1    2800 1950
+P 2150 1950
+F 0 "#PWR0121" H 2150 1700 50  0001 C CNN
+F 1 "GND" H 2155 1777 50  0000 C CNN
+F 2 "" H 2150 1950 50  0001 C CNN
+F 3 "" H 2150 1950 50  0001 C CNN
+	1    2150 1950
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2800 1950 2800 1900
-Connection ~ 2800 1700
+	2150 1950 2150 1900
+Connection ~ 2150 1700
 Wire Wire Line
-	2800 1700 3000 1700
+	2150 1700 2350 1700
 Wire Wire Line
-	3050 1800 3000 1800
+	2400 1800 2350 1800
 Wire Wire Line
-	3000 1800 3000 1700
-Connection ~ 3000 1700
+	2350 1800 2350 1700
+Connection ~ 2350 1700
 Wire Wire Line
-	3000 1700 3050 1700
+	2350 1700 2400 1700
 $Comp
 L Device:R R2
 U 1 1 602C1523
-P 3850 1600
-F 0 "R2" H 3920 1646 50  0000 L CNN
-F 1 "5.6k" H 3920 1555 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 3780 1600 50  0001 C CNN
-F 3 "~" H 3850 1600 50  0001 C CNN
-	1    3850 1600
+P 3200 1600
+F 0 "R2" H 3270 1646 50  0000 L CNN
+F 1 "5.6k" H 3270 1555 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 3130 1600 50  0001 C CNN
+F 3 "~" H 3200 1600 50  0001 C CNN
+	1    3200 1600
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R3
 U 1 1 602C29F7
-P 3850 2050
-F 0 "R3" H 3920 2096 50  0000 L CNN
-F 1 "10k" H 3920 2005 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 3780 2050 50  0001 C CNN
-F 3 "~" H 3850 2050 50  0001 C CNN
-	1    3850 2050
+P 3200 2050
+F 0 "R3" H 3270 2096 50  0000 L CNN
+F 1 "10k" H 3270 2005 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 3130 2050 50  0001 C CNN
+F 3 "~" H 3200 2050 50  0001 C CNN
+	1    3200 2050
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0122
 U 1 1 602C5872
-P 3850 2250
-F 0 "#PWR0122" H 3850 2000 50  0001 C CNN
-F 1 "GND" H 3855 2077 50  0000 C CNN
-F 2 "" H 3850 2250 50  0001 C CNN
-F 3 "" H 3850 2250 50  0001 C CNN
-	1    3850 2250
+P 3200 2250
+F 0 "#PWR0122" H 3200 2000 50  0001 C CNN
+F 1 "GND" H 3205 2077 50  0000 C CNN
+F 2 "" H 3200 2250 50  0001 C CNN
+F 3 "" H 3200 2250 50  0001 C CNN
+	1    3200 2250
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3650 1800 3850 1800
+	3000 1800 3200 1800
 Wire Wire Line
-	3850 1750 3850 1800
-Connection ~ 3850 1800
+	3200 1750 3200 1800
+Connection ~ 3200 1800
 Wire Wire Line
-	3850 1800 3850 1900
+	3200 1800 3200 1900
 Wire Wire Line
-	3850 1450 3700 1450
+	3200 1450 3050 1450
 Wire Wire Line
-	3700 1450 3700 1700
+	3050 1450 3050 1700
 Wire Wire Line
-	4400 1450 4400 1500
+	3750 1450 3750 1500
 $Comp
 L Device:C_Small C4
 U 1 1 602DE883
-P 4400 1600
-F 0 "C4" H 4492 1646 50  0000 L CNN
-F 1 "2.2u" H 4492 1555 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 4400 1600 50  0001 C CNN
-F 3 "~" H 4400 1600 50  0001 C CNN
-	1    4400 1600
+P 3750 1600
+F 0 "C4" H 3842 1646 50  0000 L CNN
+F 1 "2.2u" H 3842 1555 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 3750 1600 50  0001 C CNN
+F 3 "~" H 3750 1600 50  0001 C CNN
+	1    3750 1600
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0123
 U 1 1 602DE88A
-P 4400 1750
-F 0 "#PWR0123" H 4400 1500 50  0001 C CNN
-F 1 "GND" H 4405 1577 50  0000 C CNN
-F 2 "" H 4400 1750 50  0001 C CNN
-F 3 "" H 4400 1750 50  0001 C CNN
-	1    4400 1750
+P 3750 1750
+F 0 "#PWR0123" H 3750 1500 50  0001 C CNN
+F 1 "GND" H 3755 1577 50  0000 C CNN
+F 2 "" H 3750 1750 50  0001 C CNN
+F 3 "" H 3750 1750 50  0001 C CNN
+	1    3750 1750
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4400 1750 4400 1700
+	3750 1750 3750 1700
 Wire Wire Line
-	3850 2200 3850 2250
+	3200 2200 3200 2250
 Wire Wire Line
-	3650 1700 3700 1700
+	3000 1700 3050 1700
 $Comp
 L power:GND #PWR0124
 U 1 1 600D9E06
@@ -456,56 +414,6 @@ Wire Wire Line
 	5450 2400 5400 2400
 Wire Wire Line
 	5400 2850 5450 2850
-$Comp
-L Connector:TestPoint TP3
-U 1 1 601A5C6D
-P 6850 2600
-F 0 "TP3" H 6908 2718 50  0000 L CNN
-F 1 "TestPoint" H 6908 2627 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 7050 2600 50  0001 C CNN
-F 3 "~" H 7050 2600 50  0001 C CNN
-	1    6850 2600
-	-1   0    0    -1  
-$EndComp
-$Comp
-L Connector:TestPoint TP4
-U 1 1 601AABDA
-P 6850 2700
-F 0 "TP4" H 6908 2818 50  0000 L CNN
-F 1 "TestPoint" H 6908 2727 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 7050 2700 50  0001 C CNN
-F 3 "~" H 7050 2700 50  0001 C CNN
-	1    6850 2700
-	-1   0    0    1   
-$EndComp
-$Comp
-L Jumper:Jumper_3_Bridged12 JP1
-U 1 1 6015F930
-P 10500 4200
-F 0 "JP1" V 10546 4267 50  0000 L CNN
-F 1 "DFU" V 10455 4267 50  0000 L CNN
-F 2 "Connector:FanPinHeader_1x03_P2.54mm_Vertical" H 10500 4200 50  0001 C CNN
-F 3 "~" H 10500 4200 50  0001 C CNN
-	1    10500 4200
-	0    1    -1   0   
-$EndComp
-$Comp
-L Connector:TestPoint TP8
-U 1 1 601B7A99
-P 10300 4100
-F 0 "TP8" H 10358 4218 50  0000 L CNN
-F 1 "TestPoint" H 10358 4127 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 10500 4100 50  0001 C CNN
-F 3 "~" H 10500 4100 50  0001 C CNN
-	1    10300 4100
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	6800 2700 6850 2700
-Wire Wire Line
-	6850 2600 6800 2600
-Wire Wire Line
-	10300 4100 10300 4200
 Connection ~ 10300 4200
 Wire Wire Line
 	10300 4200 10350 4200
@@ -513,7 +421,7 @@ Text GLabel 8850 4200 2    50   Input ~ 0
 SCK
 Text GLabel 3000 7450 2    50   Output ~ 0
 SCK
-Text GLabel 3000 7250 2    50   Output ~ 0
+Text GLabel 3400 7350 3    50   Output ~ 0
 MISO
 Text GLabel 3000 7350 2    50   Output ~ 0
 MOSI
@@ -525,37 +433,23 @@ Text GLabel 7450 3300 0    50   Input ~ 0
 MISO
 Text GLabel 7450 3400 0    50   Input ~ 0
 MOSI
-Text GLabel 8850 2700 2    50   Output ~ 0
-OUT_D+
 Text GLabel 8850 2600 2    50   Output ~ 0
+OUT_D+
+Text GLabel 8850 2500 2    50   Output ~ 0
 OUT_D-
 Text GLabel 8850 3500 2    50   Output ~ 0
 SWO
 $Comp
-L Connector:TestPoint TP1
-U 1 1 60196B94
-P 3000 850
-F 0 "TP1" V 3046 1038 50  0000 L CNN
-F 1 "TestPoint" V 2955 1038 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 3200 850 50  0001 C CNN
-F 3 "~" H 3200 850 50  0001 C CNN
-	1    3000 850 
-	1    0    0    1   
-$EndComp
-$Comp
 L power:+5V #PWR0120
 U 1 1 602B63C0
-P 2800 1650
-F 0 "#PWR0120" H 2800 1500 50  0001 C CNN
-F 1 "+5V" H 2815 1823 50  0000 C CNN
-F 2 "" H 2800 1650 50  0001 C CNN
-F 3 "" H 2800 1650 50  0001 C CNN
-	1    2800 1650
+P 2150 1650
+F 0 "#PWR0120" H 2150 1500 50  0001 C CNN
+F 1 "+5V" H 2165 1823 50  0000 C CNN
+F 2 "" H 2150 1650 50  0001 C CNN
+F 3 "" H 2150 1650 50  0001 C CNN
+	1    2150 1650
 	1    0    0    -1  
 $EndComp
-NoConn ~ 8850 3000
-NoConn ~ 8850 3200
-NoConn ~ 8850 3300
 NoConn ~ 8850 3400
 NoConn ~ 8850 3600
 NoConn ~ 8850 3700
@@ -652,7 +546,6 @@ NoConn ~ 2100 6950
 NoConn ~ 2100 7350
 NoConn ~ 2100 7450
 NoConn ~ 2100 7550
-NoConn ~ 3000 6950
 Text GLabel 3000 7550 2    50   Input ~ 0
 Motion
 $Comp
@@ -945,30 +838,6 @@ Text GLabel 1100 1350 2    50   Input ~ 0
 IN_D-
 Text GLabel 1100 1250 2    50   Input ~ 0
 IN_D+
-Wire Wire Line
-	4300 7450 4300 7500
-$Comp
-L power:GND #PWR0128
-U 1 1 6022D61E
-P 4300 7500
-F 0 "#PWR0128" H 4300 7250 50  0001 C CNN
-F 1 "GND" H 4305 7327 50  0000 C CNN
-F 2 "" H 4300 7500 50  0001 C CNN
-F 3 "" H 4300 7500 50  0001 C CNN
-	1    4300 7500
-	1    0    0    -1  
-$EndComp
-$Comp
-L LED:IR26-21C_L110_TR8 D1
-U 1 1 601E5474
-P 4300 7300
-F 0 "D1" H 4293 7517 50  0000 C CNN
-F 1 "Indicator LED" H 4293 7426 50  0000 C CNN
-F 2 "LED_SMD:LED_1206_3216Metric" H 4300 7500 50  0001 C CNN
-F 3 "http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf" H 4300 7300 50  0001 C CNN
-	1    4300 7300
-	0    1    -1   0   
-$EndComp
 Wire Wire Line
 	2200 800  2350 800 
 Connection ~ 2200 800 
@@ -1051,71 +920,9 @@ Wire Notes Line
 	2050 700  2050 450 
 Wire Notes Line
 	6550 700  6550 450 
-Wire Wire Line
-	4700 7450 4700 7500
-$Comp
-L power:GND #PWR0141
-U 1 1 602BC440
-P 4700 7500
-F 0 "#PWR0141" H 4700 7250 50  0001 C CNN
-F 1 "GND" H 4705 7327 50  0000 C CNN
-F 2 "" H 4700 7500 50  0001 C CNN
-F 3 "" H 4700 7500 50  0001 C CNN
-	1    4700 7500
-	1    0    0    -1  
-$EndComp
-$Comp
-L LED:IR26-21C_L110_TR8 D2
-U 1 1 602BC446
-P 4700 7300
-F 0 "D2" H 4693 7517 50  0000 C CNN
-F 1 "Indicator LED" H 4693 7426 50  0000 C CNN
-F 2 "LED_SMD:LED_1206_3216Metric" H 4700 7500 50  0001 C CNN
-F 3 "http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf" H 4700 7300 50  0001 C CNN
-	1    4700 7300
-	0    1    -1   0   
-$EndComp
-Wire Wire Line
-	5100 7450 5100 7500
-$Comp
-L power:GND #PWR0142
-U 1 1 602C3060
-P 5100 7500
-F 0 "#PWR0142" H 5100 7250 50  0001 C CNN
-F 1 "GND" H 5105 7327 50  0000 C CNN
-F 2 "" H 5100 7500 50  0001 C CNN
-F 3 "" H 5100 7500 50  0001 C CNN
-	1    5100 7500
-	1    0    0    -1  
-$EndComp
-$Comp
-L LED:IR26-21C_L110_TR8 D3
-U 1 1 602C3066
-P 5100 7300
-F 0 "D3" H 5093 7517 50  0000 C CNN
-F 1 "Indicator LED" H 5093 7426 50  0000 C CNN
-F 2 "LED_SMD:LED_1206_3216Metric" H 5100 7500 50  0001 C CNN
-F 3 "http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf" H 5100 7300 50  0001 C CNN
-	1    5100 7300
-	0    1    -1   0   
-$EndComp
-Connection ~ 3850 1450
-Wire Notes Line
-	5400 5500 5400 7800
+Connection ~ 3200 1450
 Wire Notes Line
 	6950 5500 6950 7800
-Text Notes 4100 6400 0    98   ~ 0
-LEDS
-Text Notes 5450 5700 0    98   ~ 0
-SWD
-Wire Notes Line
-	4500 6200 4500 6450
-Wire Notes Line
-	5400 5750 5800 5750
-Wire Notes Line
-	5800 5750 5800 5500
-Wire Notes Line
-	4050 6450 4500 6450
 Wire Notes Line
 	5000 700  6550 700 
 Wire Notes Line
@@ -1128,28 +935,17 @@ Wire Notes Line
 	9500 2050 11250 2050
 Wire Notes Line
 	11250 2300 9500 2300
-$Comp
-L Connector:TestPoint TP2
-U 1 1 6018AFCC
-P 3850 1450
-F 0 "TP2" V 3804 1638 50  0000 L CNN
-F 1 "1.9V" V 3895 1638 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4050 1450 50  0001 C CNN
-F 3 "~" H 4050 1450 50  0001 C CNN
-	1    3850 1450
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
-	3850 1450 4400 1450
+	3200 1450 3750 1450
 $Comp
 L power:VDD #PWR0125
 U 1 1 602B4447
-P 4400 1450
-F 0 "#PWR0125" H 4400 1300 50  0001 C CNN
-F 1 "VDD" H 4415 1623 50  0000 C CNN
-F 2 "" H 4400 1450 50  0001 C CNN
-F 3 "" H 4400 1450 50  0001 C CNN
-	1    4400 1450
+P 3750 1450
+F 0 "#PWR0125" H 3750 1300 50  0001 C CNN
+F 1 "VDD" H 3765 1623 50  0000 C CNN
+F 2 "" H 3750 1450 50  0001 C CNN
+F 3 "" H 3750 1450 50  0001 C CNN
+	1    3750 1450
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1163,25 +959,8 @@ F 3 "" H 3500 750 50  0001 C CNN
 	1    3500 750 
 	1    0    0    -1  
 $EndComp
-Connection ~ 4400 1450
+Connection ~ 3750 1450
 Connection ~ 3500 800 
-Wire Wire Line
-	4300 7050 4300 7150
-Wire Wire Line
-	4700 7050 4700 7150
-Wire Wire Line
-	5100 7050 5100 7150
-$Comp
-L Device:R R1
-U 1 1 601EB13E
-P 4300 6900
-F 0 "R1" V 4093 6900 50  0000 C CNN
-F 1 "1.5k" V 4184 6900 50  0000 C CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 4230 6900 50  0001 C CNN
-F 3 "~" H 4300 6900 50  0001 C CNN
-	1    4300 6900
-	-1   0    0    1   
-$EndComp
 $Comp
 L Device:C_Small C9
 U 1 1 600E34A0
@@ -1193,17 +972,6 @@ F 3 "~" H 8650 1100 50  0001 C CNN
 	1    8650 1100
 	1    0    0    -1  
 $EndComp
-$Comp
-L Connector:TestPoint TP6
-U 1 1 6019C4CF
-P 7950 950
-F 0 "TP6" H 8008 1068 50  0000 L CNN
-F 1 "TestPoint" H 8008 977 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 8150 950 50  0001 C CNN
-F 3 "~" H 8150 950 50  0001 C CNN
-	1    7950 950 
-	0    -1   -1   0   
-$EndComp
 Wire Wire Line
 	7950 950  8050 950 
 Connection ~ 8050 950 
@@ -1223,146 +991,39 @@ Wire Wire Line
 Connection ~ 8450 950 
 Connection ~ 9900 1250
 Wire Wire Line
-	9900 1250 9900 1300
+	10150 1250 10150 1300
 $Comp
 L power:GND #PWR0105
 U 1 1 600DD8A0
-P 9900 1300
-F 0 "#PWR0105" H 9900 1050 50  0001 C CNN
-F 1 "GND" H 9905 1127 50  0000 C CNN
-F 2 "" H 9900 1300 50  0001 C CNN
-F 3 "" H 9900 1300 50  0001 C CNN
-	1    9900 1300
+P 10150 1300
+F 0 "#PWR0105" H 10150 1050 50  0001 C CNN
+F 1 "GND" H 10155 1127 50  0000 C CNN
+F 2 "" H 10150 1300 50  0001 C CNN
+F 3 "" H 10150 1300 50  0001 C CNN
+	1    10150 1300
 	1    0    0    -1  
 $EndComp
 Connection ~ 9900 950 
 $Comp
 L power:+3.3V #PWR0106
 U 1 1 60108874
-P 9900 950
-F 0 "#PWR0106" H 9900 800 50  0001 C CNN
-F 1 "+3.3V" H 9915 1123 50  0000 C CNN
-F 2 "" H 9900 950 50  0001 C CNN
-F 3 "" H 9900 950 50  0001 C CNN
-	1    9900 950 
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:+5V #PWR0143
-U 1 1 6016DDF7
-P 4300 6700
-F 0 "#PWR0143" H 4300 6550 50  0001 C CNN
-F 1 "+5V" H 4315 6873 50  0000 C CNN
-F 2 "" H 4300 6700 50  0001 C CNN
-F 3 "" H 4300 6700 50  0001 C CNN
-	1    4300 6700
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R5
-U 1 1 601752BE
-P 4700 6900
-F 0 "R5" V 4493 6900 50  0000 C CNN
-F 1 "820" V 4584 6900 50  0000 C CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 4630 6900 50  0001 C CNN
-F 3 "~" H 4700 6900 50  0001 C CNN
-	1    4700 6900
-	-1   0    0    1   
-$EndComp
-$Comp
-L Device:R R6
-U 1 1 6018FB9B
-P 5100 6900
-F 0 "R6" V 4893 6900 50  0000 C CNN
-F 1 "47" V 4984 6900 50  0000 C CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 5030 6900 50  0001 C CNN
-F 3 "~" H 5100 6900 50  0001 C CNN
-	1    5100 6900
-	-1   0    0    1   
-$EndComp
-$Comp
-L power:+3.3V #PWR0144
-U 1 1 601A3403
-P 4700 6700
-F 0 "#PWR0144" H 4700 6550 50  0001 C CNN
-F 1 "+3.3V" H 4715 6873 50  0000 C CNN
-F 2 "" H 4700 6700 50  0001 C CNN
-F 3 "" H 4700 6700 50  0001 C CNN
-	1    4700 6700
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:VDD #PWR0145
-U 1 1 601A96AE
-P 5100 6700
-F 0 "#PWR0145" H 5100 6550 50  0001 C CNN
-F 1 "VDD" H 5115 6873 50  0000 C CNN
-F 2 "" H 5100 6700 50  0001 C CNN
-F 3 "" H 5100 6700 50  0001 C CNN
-	1    5100 6700
+P 10150 900
+F 0 "#PWR0106" H 10150 750 50  0001 C CNN
+F 1 "+3.3V" H 10165 1073 50  0000 C CNN
+F 2 "" H 10150 900 50  0001 C CNN
+F 3 "" H 10150 900 50  0001 C CNN
+	1    10150 900 
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	4300 6700 4300 6750
-Wire Wire Line
-	4700 6750 4700 6700
-Wire Wire Line
-	5100 6750 5100 6700
-Text GLabel 6150 6650 0    50   Output ~ 0
-SWCLK
-Text GLabel 6150 6250 0    50   Output ~ 0
-SWO
-Wire Wire Line
-	6200 6650 6150 6650
-Wire Wire Line
-	5850 6550 6200 6550
-Wire Wire Line
-	6200 6450 6150 6450
-Wire Wire Line
-	6200 6350 6150 6350
-Wire Wire Line
-	6200 6250 6150 6250
-Text GLabel 6150 6450 0    50   BiDi ~ 0
-SWDIO
-Text GLabel 6150 6350 0    50   Input ~ 0
-NRST
-Wire Wire Line
-	6100 6750 6100 6800
-Wire Wire Line
-	6200 6750 6100 6750
-$Comp
-L power:+3.3V #PWR0110
-U 1 1 601C0A0E
-P 6100 6800
-F 0 "#PWR0110" H 6100 6650 50  0001 C CNN
-F 1 "+3.3V" H 6115 6973 50  0000 C CNN
-F 2 "" H 6100 6800 50  0001 C CNN
-F 3 "" H 6100 6800 50  0001 C CNN
-	1    6100 6800
-	-1   0    0    1   
-$EndComp
-$Comp
-L Connector:Conn_01x06_Male J2
-U 1 1 60081960
-P 6400 6550
-F 0 "J2" H 6372 6432 50  0000 R CNN
-F 1 "SWD" H 6372 6523 50  0000 R CNN
-F 2 "Connector_PinHeader_2.00mm:PinHeader_1x06_P2.00mm_Vertical" H 6400 6550 50  0001 C CNN
-F 3 "~" H 6400 6550 50  0001 C CNN
-	1    6400 6550
-	-1   0    0    1   
-$EndComp
-Wire Wire Line
-	10150 2650 10150 2700
 $Comp
 L Connector:TestPoint TP7
 U 1 1 601B3570
-P 10150 2650
-F 0 "TP7" H 10208 2768 50  0000 L CNN
-F 1 "TestPoint" H 10208 2677 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 10350 2650 50  0001 C CNN
-F 3 "~" H 10350 2650 50  0001 C CNN
-	1    10150 2650
+P 10150 2700
+F 0 "TP7" H 10208 2818 50  0000 L CNN
+F 1 "NRST" H 10208 2727 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 10350 2700 50  0001 C CNN
+F 3 "~" H 10350 2700 50  0001 C CNN
+	1    10150 2700
 	1    0    0    -1  
 $EndComp
 Connection ~ 10150 2700
@@ -1426,12 +1087,6 @@ Text GLabel 10050 2700 0    50   Input ~ 0
 NRST
 Text GLabel 7450 3500 0    50   Input ~ 0
 Motion
-Connection ~ 6850 2600
-Connection ~ 6850 2700
-Wire Wire Line
-	6850 2700 7450 2700
-Wire Wire Line
-	7450 2600 6850 2600
 Wire Wire Line
 	2450 5350 2450 5400
 $Comp
@@ -1470,13 +1125,6 @@ F 3 "https://static6.arrow.com/aropdfconversion/dc75757ae45a88e5f69bdce3f2a651a5
 	1    2650 800 
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	2950 800  3000 800 
-Wire Wire Line
-	3000 800  3000 850 
-Connection ~ 3000 800 
-Wire Wire Line
-	3000 800  3500 800 
 Text Notes 500  650  0    98   ~ 0
 POWER MANAGEMENT
 Text Notes 2250 3050 0    98   ~ 0
@@ -1504,94 +1152,23 @@ F 3 "~" H 2450 5650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0146
-U 1 1 604B382A
-P 5800 4850
-F 0 "#PWR0146" H 5800 4600 50  0001 C CNN
-F 1 "GND" H 5805 4677 50  0000 C CNN
-F 2 "" H 5800 4850 50  0001 C CNN
-F 3 "" H 5800 4850 50  0001 C CNN
-	1    5800 4850
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R20
-U 1 1 604B639F
-P 6100 4900
-F 0 "R20" H 6170 4946 50  0000 L CNN
-F 1 "5k" H 6170 4855 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 6030 4900 50  0001 C CNN
-F 3 "~" H 6100 4900 50  0001 C CNN
-	1    6100 4900
-	0    1    1    0   
-$EndComp
-$Comp
 L Device:R R19
 U 1 1 604C1473
-P 5500 4900
-F 0 "R19" H 5570 4946 50  0000 L CNN
-F 1 "5k" H 5570 4855 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 5430 4900 50  0001 C CNN
-F 3 "~" H 5500 4900 50  0001 C CNN
-	1    5500 4900
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	5900 4800 5900 4900
-Wire Wire Line
-	5900 4900 5950 4900
-Wire Wire Line
-	5800 4800 5800 4850
-Wire Wire Line
-	5650 4900 5700 4900
-Wire Wire Line
-	5700 4900 5700 4800
-$Comp
-L Device:Rotary_Encoder_Switch SW8
-U 1 1 604FC53D
-P 5800 4500
-F 0 "SW8" H 5800 4867 50  0000 C CNN
-F 1 "Rotary_Encoder_Switch" H 5800 4776 50  0000 C CNN
-F 2 "" H 5650 4660 50  0001 C CNN
-F 3 "~" H 5800 4760 50  0001 C CNN
-	1    5800 4500
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Connector:TestPoint TP15
-U 1 1 60524636
-P 5900 4900
-F 0 "TP15" V 5946 5088 50  0000 L CNN
-F 1 "TestPoint" V 5855 5088 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 6100 4900 50  0001 C CNN
-F 3 "~" H 6100 4900 50  0001 C CNN
-	1    5900 4900
-	1    0    0    1   
-$EndComp
-$Comp
-L Connector:TestPoint TP14
-U 1 1 6052FEC3
-P 5700 4900
-F 0 "TP14" V 5746 5088 50  0000 L CNN
-F 1 "TestPoint" V 5655 5088 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 5900 4900 50  0001 C CNN
-F 3 "~" H 5900 4900 50  0001 C CNN
-	1    5700 4900
-	1    0    0    1   
+P 5700 3950
+F 0 "R19" H 5770 3996 50  0000 L CNN
+F 1 "10k" H 5770 3905 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 5630 3950 50  0001 C CNN
+F 3 "~" H 5700 3950 50  0001 C CNN
+	1    5700 3950
+	-1   0    0    -1  
 $EndComp
-Wire Wire Line
-	5350 4900 5300 4900
-Wire Wire Line
-	6300 4900 6250 4900
-Connection ~ 5700 4900
-Connection ~ 5900 4900
 $Comp
 L Device:R R12
 U 1 1 60601B5A
 P 2700 5400
 F 0 "R12" H 2770 5446 50  0000 L CNN
 F 1 "150" H 2770 5355 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 2630 5400 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 2630 5400 50  0001 C CNN
 F 3 "~" H 2700 5400 50  0001 C CNN
 	1    2700 5400
 	0    1    1    0   
@@ -1606,7 +1183,7 @@ U 1 1 6061918A
 P 2900 5200
 F 0 "R14" H 2970 5246 50  0000 L CNN
 F 1 "10k" H 2970 5155 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 2830 5200 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 2830 5200 50  0001 C CNN
 F 3 "~" H 2900 5200 50  0001 C CNN
 	1    2900 5200
 	1    0    0    -1  
@@ -1695,7 +1272,7 @@ U 1 1 606C1CF9
 P 2700 3900
 F 0 "R11" H 2770 3946 50  0000 L CNN
 F 1 "150" H 2770 3855 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 2630 3900 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 2630 3900 50  0001 C CNN
 F 3 "~" H 2700 3900 50  0001 C CNN
 	1    2700 3900
 	0    1    1    0   
@@ -1710,7 +1287,7 @@ U 1 1 606C1D01
 P 2900 3700
 F 0 "R13" H 2970 3746 50  0000 L CNN
 F 1 "10k" H 2970 3655 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 2830 3700 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 2830 3700 50  0001 C CNN
 F 3 "~" H 2900 3700 50  0001 C CNN
 	1    2900 3700
 	1    0    0    -1  
@@ -1799,7 +1376,7 @@ U 1 1 606CDF27
 P 4200 5400
 F 0 "R16" H 4270 5446 50  0000 L CNN
 F 1 "150" H 4270 5355 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 4130 5400 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 4130 5400 50  0001 C CNN
 F 3 "~" H 4200 5400 50  0001 C CNN
 	1    4200 5400
 	0    1    1    0   
@@ -1814,7 +1391,7 @@ U 1 1 606CDF2F
 P 4400 5200
 F 0 "R18" H 4470 5246 50  0000 L CNN
 F 1 "10k" H 4470 5155 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 4330 5200 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 4330 5200 50  0001 C CNN
 F 3 "~" H 4400 5200 50  0001 C CNN
 	1    4400 5200
 	1    0    0    -1  
@@ -1903,7 +1480,7 @@ U 1 1 606DD8F6
 P 4200 3900
 F 0 "R15" H 4270 3946 50  0000 L CNN
 F 1 "150" H 4270 3855 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 4130 3900 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 4130 3900 50  0001 C CNN
 F 3 "~" H 4200 3900 50  0001 C CNN
 	1    4200 3900
 	0    1    1    0   
@@ -1918,7 +1495,7 @@ U 1 1 606DD8FE
 P 4400 3700
 F 0 "R17" H 4470 3746 50  0000 L CNN
 F 1 "10k" H 4470 3655 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 4330 3700 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 4330 3700 50  0001 C CNN
 F 3 "~" H 4400 3700 50  0001 C CNN
 	1    4400 3700
 	1    0    0    -1  
@@ -2007,7 +1584,7 @@ U 1 1 606EC1E0
 P 1200 5400
 F 0 "R8" H 1270 5446 50  0000 L CNN
 F 1 "150" H 1270 5355 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 1130 5400 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 1130 5400 50  0001 C CNN
 F 3 "~" H 1200 5400 50  0001 C CNN
 	1    1200 5400
 	0    1    1    0   
@@ -2022,7 +1599,7 @@ U 1 1 606EC1E8
 P 1400 5200
 F 0 "R10" H 1470 5246 50  0000 L CNN
 F 1 "10k" H 1470 5155 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 1330 5200 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 1330 5200 50  0001 C CNN
 F 3 "~" H 1400 5200 50  0001 C CNN
 	1    1400 5200
 	1    0    0    -1  
@@ -2111,7 +1688,7 @@ U 1 1 606FEE8C
 P 1200 3900
 F 0 "R7" H 1270 3946 50  0000 L CNN
 F 1 "150" H 1270 3855 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 1130 3900 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 1130 3900 50  0001 C CNN
 F 3 "~" H 1200 3900 50  0001 C CNN
 	1    1200 3900
 	0    1    1    0   
@@ -2126,7 +1703,7 @@ U 1 1 606FEE94
 P 1400 3700
 F 0 "R9" H 1470 3746 50  0000 L CNN
 F 1 "10k" H 1470 3655 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 1330 3700 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 1330 3700 50  0001 C CNN
 F 3 "~" H 1400 3700 50  0001 C CNN
 	1    1400 3700
 	1    0    0    -1  
@@ -2175,21 +1752,18 @@ forward
 Text GLabel 3850 5400 0    39   Input ~ 0
 backward
 Wire Wire Line
-	6700 4650 6700 4700
+	6000 1200 6000 1150
 $Comp
 L Connector:TestPoint TP16
 U 1 1 60824766
-P 6700 4650
-F 0 "TP16" H 6758 4768 50  0000 L CNN
-F 1 "TestPoint" H 6758 4677 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 6900 4650 50  0001 C CNN
-F 3 "~" H 6900 4650 50  0001 C CNN
-	1    6700 4650
-	1    0    0    -1  
+P 6000 1200
+F 0 "TP16" H 6058 1318 50  0000 L CNN
+F 1 "wheel_click" H 6058 1227 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 6200 1200 50  0001 C CNN
+F 3 "~" H 6200 1200 50  0001 C CNN
+	1    6000 1200
+	1    0    0    1   
 $EndComp
-Connection ~ 6700 4700
-Wire Wire Line
-	6700 4700 6600 4700
 $Comp
 L Switch:SW_Push SW9
 U 1 1 6082476E
@@ -2213,29 +1787,16 @@ F 3 "" H 7150 5250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C28
-U 1 1 6082477B
-P 6700 4950
-F 0 "C28" H 6792 4996 50  0000 L CNN
-F 1 "100n" H 6792 4905 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 6700 4950 50  0001 C CNN
-F 3 "~" H 6700 4950 50  0001 C CNN
-	1    6700 4950
-	1    0    0    -1  
-$EndComp
-$Comp
 L Device:R R21
 U 1 1 60824781
 P 6950 4700
 F 0 "R21" H 7020 4746 50  0000 L CNN
 F 1 "?" H 7020 4655 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 6880 4700 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 6880 4700 50  0001 C CNN
 F 3 "~" H 6950 4700 50  0001 C CNN
 	1    6950 4700
 	0    1    1    0   
 $EndComp
-Wire Wire Line
-	6700 4700 6800 4700
 Wire Wire Line
 	7100 4700 7150 4700
 $Comp
@@ -2244,7 +1805,7 @@ U 1 1 60824789
 P 7150 4500
 F 0 "R22" H 7220 4546 50  0000 L CNN
 F 1 "?" H 7220 4455 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 7080 4500 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 7080 4500 50  0001 C CNN
 F 3 "~" H 7150 4500 50  0001 C CNN
 	1    7150 4500
 	1    0    0    -1  
@@ -2256,8 +1817,6 @@ Wire Wire Line
 Connection ~ 7150 4700
 Wire Wire Line
 	6700 5050 6700 5200
-Wire Wire Line
-	6700 4700 6700 4850
 $Comp
 L power:+3.3V #PWR0162
 U 1 1 60824794
@@ -2288,24 +1847,10 @@ Wire Notes Line
 	7350 4800 7550 4800
 Wire Notes Line
 	7550 4800 7550 5500
-Wire Notes Line
-	5000 3300 7100 3300
-Text GLabel 6600 4700 0    39   Input ~ 0
-wheel_click
-Text Notes 5000 3450 0    98   ~ 0
-SCROLL WHEEL AND BUTTON
-Wire Notes Line
-	5000 3500 7100 3500
-Wire Notes Line
-	4050 6200 4050 7800
-Wire Notes Line
-	450  6200 5400 6200
 Wire Notes Line
 	450  3100 5000 3100
 Wire Notes Line
 	1900 3100 1900 6200
-Wire Notes Line
-	3450 6200 3450 3100
 Text Notes 3450 3200 0    59   ~ 0
 Forwards / Backwards
 Wire Notes Line
@@ -2314,29 +1859,6 @@ Text Notes 1900 3200 0    59   ~ 0
 Sense up / down
 Text Notes 500  3200 0    59   ~ 0
 Left / right click
-$Comp
-L MCU_ST_STM32F4:STM32F411RETx U4
-U 1 1 60055F5F
-P 8150 3000
-F 0 "U4" H 8150 1111 50  0000 C CNN
-F 1 "STM32F411RETx" H 8150 1020 50  0000 C CNN
-F 2 "Package_QFP:LQFP-64_10x10mm_P0.5mm" H 7550 1300 50  0001 R CNN
-F 3 "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00115249.pdf" H 8150 3000 50  0001 C CNN
-	1    8150 3000
-	1    0    0    -1  
-$EndComp
-Text GLabel 8900 1500 2    39   Input ~ 0
-left_click
-Text GLabel 8900 1600 2    39   Input ~ 0
-right_click
-Text GLabel 8900 1700 2    39   Input ~ 0
-sense_up
-Text GLabel 8900 1800 2    39   Input ~ 0
-sense_down
-Text GLabel 8900 1900 2    39   Input ~ 0
-forward
-Text GLabel 8900 2000 2    39   Input ~ 0
-backward
 Text GLabel 8900 2100 2    39   Input ~ 0
 wheel_click
 Wire Wire Line
@@ -2353,36 +1875,6 @@ Wire Wire Line
 	8900 2000 8850 2000
 Wire Wire Line
 	8900 2100 8850 2100
-$Comp
-L power:GND #PWR0148
-U 1 1 60D58ED6
-P 6300 4900
-F 0 "#PWR0148" H 6300 4650 50  0001 C CNN
-F 1 "GND" H 6305 4727 50  0000 C CNN
-F 2 "" H 6300 4900 50  0001 C CNN
-F 3 "" H 6300 4900 50  0001 C CNN
-	1    6300 4900
-	0    -1   -1   0   
-$EndComp
-$Comp
-L power:GND #PWR0163
-U 1 1 60DA0789
-P 5700 4150
-F 0 "#PWR0163" H 5700 3900 50  0001 C CNN
-F 1 "GND" H 5705 3977 50  0000 C CNN
-F 2 "" H 5700 4150 50  0001 C CNN
-F 3 "" H 5700 4150 50  0001 C CNN
-	1    5700 4150
-	-1   0    0    1   
-$EndComp
-Wire Wire Line
-	5700 4200 5700 4150
-Text GLabel 6350 4150 2    39   Input ~ 0
-Scroll_wheel
-Wire Wire Line
-	5900 4150 5900 4200
-Text GLabel 8900 2200 2    39   Input ~ 0
-Scroll_wheel
 Wire Wire Line
 	9400 1250 9650 1250
 Wire Wire Line
@@ -2396,68 +1888,13 @@ Wire Wire Line
 Connection ~ 8900 950 
 Wire Wire Line
 	8900 950  8650 950 
-$Comp
-L Device:R R23
-U 1 1 60EF44BA
-P 6100 4150
-F 0 "R23" H 6170 4196 50  0000 L CNN
-F 1 "5k" H 6170 4105 50  0000 L CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 6030 4150 50  0001 C CNN
-F 3 "~" H 6100 4150 50  0001 C CNN
-	1    6100 4150
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	5950 4150 5900 4150
-$Comp
-L Device:C_Small C29
-U 1 1 60F2BC33
-P 6300 4300
-F 0 "C29" H 6392 4346 50  0000 L CNN
-F 1 "100n" H 6392 4255 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 6300 4300 50  0001 C CNN
-F 3 "~" H 6300 4300 50  0001 C CNN
-	1    6300 4300
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	6350 4150 6300 4150
-Wire Wire Line
-	6300 4200 6300 4150
-Connection ~ 6300 4150
-Wire Wire Line
-	6300 4150 6250 4150
-Wire Wire Line
-	6300 4400 6300 4450
-$Comp
-L power:GND #PWR0164
-U 1 1 60F8A4C9
-P 6300 4450
-F 0 "#PWR0164" H 6300 4200 50  0001 C CNN
-F 1 "GND" H 6305 4277 50  0000 C CNN
-F 2 "" H 6300 4450 50  0001 C CNN
-F 3 "" H 6300 4450 50  0001 C CNN
-	1    6300 4450
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:+3.3V #PWR0147
-U 1 1 60FB5238
-P 5300 4900
-F 0 "#PWR0147" H 5300 4750 50  0001 C CNN
-F 1 "+3.3V" H 5315 5073 50  0000 C CNN
-F 2 "" H 5300 4900 50  0001 C CNN
-F 3 "" H 5300 4900 50  0001 C CNN
-	1    5300 4900
-	0    -1   -1   0   
-$EndComp
 Wire Wire Line
 	8000 6350 8050 6350
 $Comp
-L power:GND #PWR?
+L power:GND #PWR0165
 U 1 1 60FE96AD
 P 8050 6350
-F 0 "#PWR?" H 8050 6100 50  0001 C CNN
+F 0 "#PWR0165" H 8050 6100 50  0001 C CNN
 F 1 "GND" H 8055 6177 50  0000 C CNN
 F 2 "" H 8050 6350 50  0001 C CNN
 F 3 "" H 8050 6350 50  0001 C CNN
@@ -2465,10 +1902,10 @@ F 3 "" H 8050 6350 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L LED:IR26-21C_L110_TR8 D?
+L LED:IR26-21C_L110_TR8 D4
 U 1 1 60FE96B3
 P 7850 6350
-F 0 "D?" H 7843 6567 50  0000 C CNN
+F 0 "D4" H 7843 6567 50  0000 C CNN
 F 1 "Indicator LED" H 7843 6476 50  0000 C CNN
 F 2 "LED_SMD:LED_1206_3216Metric" H 7850 6550 50  0001 C CNN
 F 3 "http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf" H 7850 6350 50  0001 C CNN
@@ -2478,12 +1915,12 @@ $EndComp
 Wire Wire Line
 	7600 6350 7700 6350
 $Comp
-L Device:R R?
+L Device:R R24
 U 1 1 60FE96BA
 P 7450 6350
-F 0 "R?" V 7243 6350 50  0000 C CNN
+F 0 "R24" V 7243 6350 50  0000 C CNN
 F 1 "820" V 7334 6350 50  0000 C CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 7380 6350 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 7380 6350 50  0001 C CNN
 F 3 "~" H 7450 6350 50  0001 C CNN
 	1    7450 6350
 	0    1    1    0   
@@ -2493,10 +1930,10 @@ Wire Wire Line
 Wire Wire Line
 	9400 6350 9450 6350
 $Comp
-L power:GND #PWR?
+L power:GND #PWR0166
 U 1 1 610016A9
 P 9450 6350
-F 0 "#PWR?" H 9450 6100 50  0001 C CNN
+F 0 "#PWR0166" H 9450 6100 50  0001 C CNN
 F 1 "GND" H 9455 6177 50  0000 C CNN
 F 2 "" H 9450 6350 50  0001 C CNN
 F 3 "" H 9450 6350 50  0001 C CNN
@@ -2504,10 +1941,10 @@ F 3 "" H 9450 6350 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L LED:IR26-21C_L110_TR8 D?
+L LED:IR26-21C_L110_TR8 D5
 U 1 1 610016AF
 P 9250 6350
-F 0 "D?" H 9243 6567 50  0000 C CNN
+F 0 "D5" H 9243 6567 50  0000 C CNN
 F 1 "Indicator LED" H 9243 6476 50  0000 C CNN
 F 2 "LED_SMD:LED_1206_3216Metric" H 9250 6550 50  0001 C CNN
 F 3 "http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf" H 9250 6350 50  0001 C CNN
@@ -2517,12 +1954,12 @@ $EndComp
 Wire Wire Line
 	9000 6350 9100 6350
 $Comp
-L Device:R R?
+L Device:R R25
 U 1 1 610016B6
 P 8850 6350
-F 0 "R?" V 8643 6350 50  0000 C CNN
+F 0 "R25" V 8643 6350 50  0000 C CNN
 F 1 "820" V 8734 6350 50  0000 C CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 8780 6350 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 8780 6350 50  0001 C CNN
 F 3 "~" H 8850 6350 50  0001 C CNN
 	1    8850 6350
 	0    1    1    0   
@@ -2532,10 +1969,10 @@ Wire Wire Line
 Wire Wire Line
 	10900 6350 10950 6350
 $Comp
-L power:GND #PWR?
+L power:GND #PWR0167
 U 1 1 61017340
 P 10950 6350
-F 0 "#PWR?" H 10950 6100 50  0001 C CNN
+F 0 "#PWR0167" H 10950 6100 50  0001 C CNN
 F 1 "GND" H 10955 6177 50  0000 C CNN
 F 2 "" H 10950 6350 50  0001 C CNN
 F 3 "" H 10950 6350 50  0001 C CNN
@@ -2543,10 +1980,10 @@ F 3 "" H 10950 6350 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L LED:IR26-21C_L110_TR8 D?
+L LED:IR26-21C_L110_TR8 D6
 U 1 1 61017346
 P 10750 6350
-F 0 "D?" H 10743 6567 50  0000 C CNN
+F 0 "D6" H 10743 6567 50  0000 C CNN
 F 1 "Indicator LED" H 10743 6476 50  0000 C CNN
 F 2 "LED_SMD:LED_1206_3216Metric" H 10750 6550 50  0001 C CNN
 F 3 "http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf" H 10750 6350 50  0001 C CNN
@@ -2556,12 +1993,12 @@ $EndComp
 Wire Wire Line
 	10500 6350 10600 6350
 $Comp
-L Device:R R?
+L Device:R R26
 U 1 1 6101734D
 P 10350 6350
-F 0 "R?" V 10143 6350 50  0000 C CNN
+F 0 "R26" V 10143 6350 50  0000 C CNN
 F 1 "820" V 10234 6350 50  0000 C CNN
-F 2 "Resistor_SMD:R_0815_2038Metric_Pad1.20x4.05mm_HandSolder" V 10280 6350 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 10280 6350 50  0001 C CNN
 F 3 "~" H 10350 6350 50  0001 C CNN
 	1    10350 6350
 	0    1    1    0   
@@ -2602,11 +2039,11 @@ Wire Wire Line
 	8450 950  8450 1300
 Wire Wire Line
 	8150 950  8150 1300
-Text GLabel 8900 2300 2    39   Input ~ 0
+Text GLabel 8900 2200 2    39   Input ~ 0
 RED
-Text GLabel 8900 2400 2    39   Input ~ 0
+Text GLabel 8900 2300 2    39   Input ~ 0
 GREEN
-Text GLabel 8900 2500 2    39   Input ~ 0
+Text GLabel 8900 2400 2    39   Input ~ 0
 BLUE
 Wire Wire Line
 	8900 2300 8850 2300
@@ -2614,4 +2051,1054 @@ Wire Wire Line
 	8850 2400 8900 2400
 Wire Wire Line
 	8900 2500 8850 2500
+$Comp
+L Connector:Conn_01x06_Male J2
+U 1 1 60081960
+P 6550 5900
+F 0 "J2" H 6522 5782 50  0000 R CNN
+F 1 "SWD" H 6522 5873 50  0000 R CNN
+F 2 "Connector_PinHeader_2.00mm:PinHeader_1x06_P2.00mm_Vertical" H 6550 5900 50  0001 C CNN
+F 3 "~" H 6550 5900 50  0001 C CNN
+	1    6550 5900
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:+3.3V #PWR0110
+U 1 1 601C0A0E
+P 6250 6100
+F 0 "#PWR0110" H 6250 5950 50  0001 C CNN
+F 1 "+3.3V" H 6265 6273 50  0000 C CNN
+F 2 "" H 6250 6100 50  0001 C CNN
+F 3 "" H 6250 6100 50  0001 C CNN
+	1    6250 6100
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	6350 6100 6250 6100
+Text GLabel 6300 5700 0    50   Input ~ 0
+NRST
+Text GLabel 6300 5800 0    50   BiDi ~ 0
+SWDIO
+Wire Wire Line
+	6350 5600 6300 5600
+Wire Wire Line
+	6350 5700 6300 5700
+Wire Wire Line
+	6350 5800 6300 5800
+Wire Wire Line
+	6000 5900 6350 5900
+Wire Wire Line
+	6350 6000 6300 6000
+Text GLabel 6300 5600 0    50   Output ~ 0
+SWO
+Text GLabel 6300 6000 0    50   Output ~ 0
+SWCLK
+$Comp
+L power:GND #PWR0111
+U 1 1 601CE119
+P 6000 5900
+F 0 "#PWR0111" H 6000 5650 50  0001 C CNN
+F 1 "GND" H 6005 5727 50  0000 C CNN
+F 2 "" H 6000 5900 50  0001 C CNN
+F 3 "" H 6000 5900 50  0001 C CNN
+	1    6000 5900
+	0    1    1    0   
+$EndComp
+Wire Notes Line
+	4950 6450 5400 6450
+Text Notes 5000 6400 0    98   ~ 0
+LEDS
+Wire Wire Line
+	6250 6600 6200 6600
+Wire Wire Line
+	6250 7050 6200 7050
+Wire Wire Line
+	6250 7550 6200 7550
+Wire Wire Line
+	5850 7550 5900 7550
+Connection ~ 5850 7550
+Wire Wire Line
+	5850 7750 5550 7750
+Wire Wire Line
+	5850 7550 5850 7750
+Wire Wire Line
+	5550 7750 5550 7700
+$Comp
+L Jumper:Jumper_3_Bridged12 JP4
+U 1 1 6075715F
+P 5550 7550
+F 0 "JP4" V 5596 7617 50  0000 L CNN
+F 1 "DFU" V 5505 7617 50  0000 L CNN
+F 2 "Connector:FanPinHeader_1x03_P2.54mm_Vertical" H 5550 7550 50  0001 C CNN
+F 3 "~" H 5550 7550 50  0001 C CNN
+	1    5550 7550
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	5300 7550 5250 7550
+Wire Wire Line
+	5800 7550 5850 7550
+$Comp
+L Device:R R6
+U 1 1 60757151
+P 6050 7550
+F 0 "R6" H 6120 7596 50  0000 L CNN
+F 1 "1.5k" H 6120 7505 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 5980 7550 50  0001 C CNN
+F 3 "~" H 6050 7550 50  0001 C CNN
+	1    6050 7550
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	5850 6600 5900 6600
+Connection ~ 5850 6600
+Wire Wire Line
+	5850 6800 5550 6800
+Wire Wire Line
+	5850 6600 5850 6800
+Wire Wire Line
+	5550 6800 5550 6750
+$Comp
+L Jumper:Jumper_3_Bridged12 JP2
+U 1 1 6074062D
+P 5550 6600
+F 0 "JP2" V 5596 6667 50  0000 L CNN
+F 1 "DFU" V 5505 6667 50  0000 L CNN
+F 2 "Connector:FanPinHeader_1x03_P2.54mm_Vertical" H 5550 6600 50  0001 C CNN
+F 3 "~" H 5550 6600 50  0001 C CNN
+	1    5550 6600
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	5300 6600 5250 6600
+Wire Wire Line
+	5800 6600 5850 6600
+$Comp
+L Device:R R1
+U 1 1 6074061F
+P 6050 6600
+F 0 "R1" H 6120 6646 50  0000 L CNN
+F 1 "47" H 6120 6555 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 5980 6600 50  0001 C CNN
+F 3 "~" H 6050 6600 50  0001 C CNN
+	1    6050 6600
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	5850 7050 5900 7050
+Connection ~ 5850 7050
+Wire Wire Line
+	5850 7250 5550 7250
+Wire Wire Line
+	5850 7050 5850 7250
+Wire Wire Line
+	5550 7250 5550 7200
+$Comp
+L Jumper:Jumper_3_Bridged12 JP3
+U 1 1 606D1383
+P 5550 7050
+F 0 "JP3" V 5596 7117 50  0000 L CNN
+F 1 "DFU" V 5505 7117 50  0000 L CNN
+F 2 "Connector:FanPinHeader_1x03_P2.54mm_Vertical" H 5550 7050 50  0001 C CNN
+F 3 "~" H 5550 7050 50  0001 C CNN
+	1    5550 7050
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	5300 7050 5250 7050
+Wire Wire Line
+	5800 7050 5850 7050
+$Comp
+L power:+3.3V #PWR0144
+U 1 1 606D137A
+P 5250 7050
+F 0 "#PWR0144" H 5250 6900 50  0001 C CNN
+F 1 "+3.3V" H 5265 7223 50  0000 C CNN
+F 2 "" H 5250 7050 50  0001 C CNN
+F 3 "" H 5250 7050 50  0001 C CNN
+	1    5250 7050
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Device:R R5
+U 1 1 606D1373
+P 6050 7050
+F 0 "R5" H 6120 7096 50  0000 L CNN
+F 1 "820" H 6120 7005 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 5980 7050 50  0001 C CNN
+F 3 "~" H 6050 7050 50  0001 C CNN
+	1    6050 7050
+	0    -1   -1   0   
+$EndComp
+$Comp
+L power:+5V #PWR0143
+U 1 1 6016DDF7
+P 5250 7550
+F 0 "#PWR0143" H 5250 7400 50  0001 C CNN
+F 1 "+5V" H 5265 7723 50  0000 C CNN
+F 2 "" H 5250 7550 50  0001 C CNN
+F 3 "" H 5250 7550 50  0001 C CNN
+	1    5250 7550
+	0    -1   -1   0   
+$EndComp
+$Comp
+L LED:IR26-21C_L110_TR8 D1
+U 1 1 601E5474
+P 6400 7550
+F 0 "D1" H 6393 7767 50  0000 C CNN
+F 1 "Indicator LED" H 6393 7676 50  0000 C CNN
+F 2 "LED_SMD:LED_1206_3216Metric" H 6400 7750 50  0001 C CNN
+F 3 "http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf" H 6400 7550 50  0001 C CNN
+	1    6400 7550
+	-1   0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0128
+U 1 1 6022D61E
+P 6600 7550
+F 0 "#PWR0128" H 6600 7300 50  0001 C CNN
+F 1 "GND" H 6605 7377 50  0000 C CNN
+F 2 "" H 6600 7550 50  0001 C CNN
+F 3 "" H 6600 7550 50  0001 C CNN
+	1    6600 7550
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	6550 7550 6600 7550
+$Comp
+L power:VDD #PWR0145
+U 1 1 601A96AE
+P 5250 6600
+F 0 "#PWR0145" H 5250 6450 50  0001 C CNN
+F 1 "VDD" H 5265 6773 50  0000 C CNN
+F 2 "" H 5250 6600 50  0001 C CNN
+F 3 "" H 5250 6600 50  0001 C CNN
+	1    5250 6600
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	6550 6600 6600 6600
+$Comp
+L power:GND #PWR0142
+U 1 1 602C3060
+P 6600 6600
+F 0 "#PWR0142" H 6600 6350 50  0001 C CNN
+F 1 "GND" H 6605 6427 50  0000 C CNN
+F 2 "" H 6600 6600 50  0001 C CNN
+F 3 "" H 6600 6600 50  0001 C CNN
+	1    6600 6600
+	0    -1   -1   0   
+$EndComp
+$Comp
+L LED:IR26-21C_L110_TR8 D3
+U 1 1 602C3066
+P 6400 6600
+F 0 "D3" H 6393 6817 50  0000 C CNN
+F 1 "Indicator LED" H 6393 6726 50  0000 C CNN
+F 2 "LED_SMD:LED_1206_3216Metric" H 6400 6800 50  0001 C CNN
+F 3 "http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf" H 6400 6600 50  0001 C CNN
+	1    6400 6600
+	-1   0    0    -1  
+$EndComp
+$Comp
+L LED:IR26-21C_L110_TR8 D2
+U 1 1 602BC446
+P 6400 7050
+F 0 "D2" H 6393 7267 50  0000 C CNN
+F 1 "Indicator LED" H 6393 7176 50  0000 C CNN
+F 2 "LED_SMD:LED_1206_3216Metric" H 6400 7250 50  0001 C CNN
+F 3 "http://www.everlight.com/file/ProductFile/IR26-21C-L110-TR8.pdf" H 6400 7050 50  0001 C CNN
+	1    6400 7050
+	-1   0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0141
+U 1 1 602BC440
+P 6600 7050
+F 0 "#PWR0141" H 6600 6800 50  0001 C CNN
+F 1 "GND" H 6605 6877 50  0000 C CNN
+F 2 "" H 6600 7050 50  0001 C CNN
+F 3 "" H 6600 7050 50  0001 C CNN
+	1    6600 7050
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	6550 7050 6600 7050
+$Comp
+L Device:C_Small C32
+U 1 1 609B8D57
+P 10150 1100
+F 0 "C32" H 10242 1146 50  0000 L CNN
+F 1 "4.7u" H 10242 1055 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 10150 1100 50  0001 C CNN
+F 3 "~" H 10150 1100 50  0001 C CNN
+	1    10150 1100
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9900 1250 10150 1250
+Wire Wire Line
+	10150 1250 10150 1200
+Wire Wire Line
+	10150 1000 10150 950 
+Wire Wire Line
+	10150 950  9900 950 
+Connection ~ 10150 1250
+Wire Wire Line
+	10150 900  10150 950 
+Connection ~ 10150 950 
+$Comp
+L Device:R R27
+U 1 1 60A8200B
+P 3200 6650
+F 0 "R27" H 3270 6696 50  0000 L CNN
+F 1 "47" H 3270 6605 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 3130 6650 50  0001 C CNN
+F 3 "~" H 3200 6650 50  0001 C CNN
+	1    3200 6650
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Device:C_Small C30
+U 1 1 60A989CD
+P 3400 6800
+F 0 "C30" H 3492 6846 50  0000 L CNN
+F 1 "10u" H 3492 6755 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 3400 6800 50  0001 C CNN
+F 3 "~" H 3400 6800 50  0001 C CNN
+	1    3400 6800
+	1    0    0    1   
+$EndComp
+$Comp
+L Device:C_Small C31
+U 1 1 60A989D3
+P 3700 6800
+F 0 "C31" H 3792 6846 50  0000 L CNN
+F 1 "100n" H 3792 6755 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 3700 6800 50  0001 C CNN
+F 3 "~" H 3700 6800 50  0001 C CNN
+	1    3700 6800
+	1    0    0    1   
+$EndComp
+Wire Notes Line
+	6100 6200 6100 6350
+Wire Notes Line
+	6100 6350 6950 6350
+Wire Notes Line
+	450  6200 6100 6200
+Wire Notes Line
+	4950 6200 4950 7800
+Wire Notes Line
+	3450 3100 3450 6200
+$Comp
+L power:VDD #PWR0168
+U 1 1 60C829FC
+P 3750 6650
+F 0 "#PWR0168" H 3750 6500 50  0001 C CNN
+F 1 "VDD" H 3765 6823 50  0000 C CNN
+F 2 "" H 3750 6650 50  0001 C CNN
+F 3 "" H 3750 6650 50  0001 C CNN
+	1    3750 6650
+	0    1    1    0   
+$EndComp
+$Comp
+L power:GND #PWR0169
+U 1 1 60C99D3E
+P 3700 6950
+F 0 "#PWR0169" H 3700 6700 50  0001 C CNN
+F 1 "GND" H 3705 6777 50  0000 C CNN
+F 2 "" H 3700 6950 50  0001 C CNN
+F 3 "" H 3700 6950 50  0001 C CNN
+	1    3700 6950
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0170
+U 1 1 60CAF940
+P 3400 6950
+F 0 "#PWR0170" H 3400 6700 50  0001 C CNN
+F 1 "GND" H 3405 6777 50  0000 C CNN
+F 2 "" H 3400 6950 50  0001 C CNN
+F 3 "" H 3400 6950 50  0001 C CNN
+	1    3400 6950
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3700 6900 3700 6950
+Wire Wire Line
+	3400 6900 3400 6950
+Wire Wire Line
+	3350 6650 3400 6650
+Wire Wire Line
+	3400 6650 3400 6700
+Wire Wire Line
+	3050 6950 3000 6950
+Wire Wire Line
+	3400 6650 3700 6650
+Connection ~ 3400 6650
+Wire Wire Line
+	3700 6650 3700 6700
+Connection ~ 3700 6650
+Wire Wire Line
+	3700 6650 3750 6650
+$Comp
+L Device:R R28
+U 1 1 60D695E4
+P 3600 7250
+F 0 "R28" H 3670 7296 50  0000 L CNN
+F 1 "10k" H 3670 7205 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 3530 7250 50  0001 C CNN
+F 3 "~" H 3600 7250 50  0001 C CNN
+	1    3600 7250
+	0    1    1    0   
+$EndComp
+$Comp
+L power:+3.3V #PWR0171
+U 1 1 60D98A0F
+P 3800 7250
+F 0 "#PWR0171" H 3800 7100 50  0001 C CNN
+F 1 "+3.3V" H 3815 7423 50  0000 C CNN
+F 2 "" H 3800 7250 50  0001 C CNN
+F 3 "" H 3800 7250 50  0001 C CNN
+	1    3800 7250
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	3050 6650 3050 6950
+Wire Wire Line
+	3450 7250 3400 7250
+Wire Wire Line
+	3800 7250 3750 7250
+Wire Wire Line
+	3400 7250 3400 7350
+Text GLabel 4400 6500 3    50   Output ~ 0
+NCS
+$Comp
+L Connector:TestPoint TP20
+U 1 1 60EFB280
+P 4400 6450
+F 0 "TP20" H 4458 6568 50  0000 L CNN
+F 1 "NCS" H 4458 6477 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4600 6450 50  0001 C CNN
+F 3 "~" H 4600 6450 50  0001 C CNN
+	1    4400 6450
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP2
+U 1 1 60F2BC56
+P 4100 6450
+F 0 "TP2" H 4158 6568 50  0000 L CNN
+F 1 "MOSI" H 4158 6477 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4300 6450 50  0001 C CNN
+F 3 "~" H 4300 6450 50  0001 C CNN
+	1    4100 6450
+	1    0    0    -1  
+$EndComp
+Text GLabel 4100 6500 3    50   Output ~ 0
+MOSI
+Wire Wire Line
+	3000 7250 3400 7250
+Connection ~ 3400 7250
+Text GLabel 4650 6500 3    50   Output ~ 0
+MISO
+Text GLabel 4100 7000 3    50   Output ~ 0
+SCK
+Text GLabel 4350 7000 3    50   Input ~ 0
+Motion
+$Comp
+L Connector:TestPoint TP3
+U 1 1 6107F83F
+P 4100 6950
+F 0 "TP3" H 4158 7068 50  0000 L CNN
+F 1 "SCK" H 4158 6977 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4300 6950 50  0001 C CNN
+F 3 "~" H 4300 6950 50  0001 C CNN
+	1    4100 6950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP18
+U 1 1 610979A7
+P 4350 6950
+F 0 "TP18" H 4408 7068 50  0000 L CNN
+F 1 "Motion" H 4408 6977 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4550 6950 50  0001 C CNN
+F 3 "~" H 4550 6950 50  0001 C CNN
+	1    4350 6950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP24
+U 1 1 610AFC53
+P 4650 6450
+F 0 "TP24" H 4708 6568 50  0000 L CNN
+F 1 "MISO" H 4708 6477 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4850 6450 50  0001 C CNN
+F 3 "~" H 4850 6450 50  0001 C CNN
+	1    4650 6450
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4100 6450 4100 6500
+Wire Wire Line
+	4400 6450 4400 6500
+Wire Wire Line
+	4650 6450 4650 6500
+Wire Wire Line
+	4350 6950 4350 7000
+Wire Wire Line
+	4100 6950 4100 7000
+$Comp
+L power:GND #PWR0172
+U 1 1 612236F5
+P 4700 7000
+F 0 "#PWR0172" H 4700 6750 50  0001 C CNN
+F 1 "GND" H 4705 6827 50  0000 C CNN
+F 2 "" H 4700 7000 50  0001 C CNN
+F 3 "" H 4700 7000 50  0001 C CNN
+	1    4700 7000
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP25
+U 1 1 6123CCCE
+P 4700 6950
+F 0 "TP25" H 4758 7068 50  0000 L CNN
+F 1 "GRD" H 4758 6977 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4900 6950 50  0001 C CNN
+F 3 "~" H 4900 6950 50  0001 C CNN
+	1    4700 6950
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4700 6950 4700 7000
+Wire Notes Line
+	5000 5750 5400 5750
+Wire Notes Line
+	5400 5750 5400 5500
+Text Notes 5050 5700 0    98   ~ 0
+SWD
+Wire Notes Line
+	5000 450  5000 6200
+Wire Notes Line
+	5400 6450 5400 6200
+Wire Wire Line
+	2950 800  3500 800 
+$Comp
+L Connector:TestPoint TP1
+U 1 1 613BA215
+P 3900 850
+F 0 "TP1" H 3958 968 50  0000 L CNN
+F 1 "5V" H 3958 877 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4100 850 50  0001 C CNN
+F 3 "~" H 4100 850 50  0001 C CNN
+	1    3900 850 
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+5V #PWR0173
+U 1 1 613D4F39
+P 3900 900
+F 0 "#PWR0173" H 3900 750 50  0001 C CNN
+F 1 "+5V" H 3915 1073 50  0000 C CNN
+F 2 "" H 3900 900 50  0001 C CNN
+F 3 "" H 3900 900 50  0001 C CNN
+	1    3900 900 
+	-1   0    0    1   
+$EndComp
+$Comp
+L Connector:TestPoint TP6
+U 1 1 613EF1B1
+P 4150 850
+F 0 "TP6" H 4208 968 50  0000 L CNN
+F 1 "3.3V" H 4208 877 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4350 850 50  0001 C CNN
+F 3 "~" H 4350 850 50  0001 C CNN
+	1    4150 850 
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0174
+U 1 1 6140845F
+P 4150 900
+F 0 "#PWR0174" H 4150 750 50  0001 C CNN
+F 1 "+3.3V" H 4165 1073 50  0000 C CNN
+F 2 "" H 4150 900 50  0001 C CNN
+F 3 "" H 4150 900 50  0001 C CNN
+	1    4150 900 
+	-1   0    0    1   
+$EndComp
+$Comp
+L Connector:TestPoint TP19
+U 1 1 61439D6C
+P 4400 850
+F 0 "TP19" H 4458 968 50  0000 L CNN
+F 1 "VDD" H 4458 877 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4600 850 50  0001 C CNN
+F 3 "~" H 4600 850 50  0001 C CNN
+	1    4400 850 
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:VDD #PWR0175
+U 1 1 6145321C
+P 4400 900
+F 0 "#PWR0175" H 4400 750 50  0001 C CNN
+F 1 "VDD" H 4415 1073 50  0000 C CNN
+F 2 "" H 4400 900 50  0001 C CNN
+F 3 "" H 4400 900 50  0001 C CNN
+	1    4400 900 
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:GND #PWR0176
+U 1 1 6146C4E5
+P 4650 900
+F 0 "#PWR0176" H 4650 650 50  0001 C CNN
+F 1 "GND" H 4655 727 50  0000 C CNN
+F 2 "" H 4650 900 50  0001 C CNN
+F 3 "" H 4650 900 50  0001 C CNN
+	1    4650 900 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP21
+U 1 1 614855F6
+P 4650 850
+F 0 "TP21" H 4708 968 50  0000 L CNN
+F 1 "GND" H 4708 877 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4850 850 50  0001 C CNN
+F 3 "~" H 4850 850 50  0001 C CNN
+	1    4650 850 
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4650 850  4650 900 
+Wire Wire Line
+	4400 850  4400 900 
+Wire Wire Line
+	4150 850  4150 900 
+Wire Wire Line
+	3900 850  3900 900 
+$Comp
+L Connector:TestPoint TP27
+U 1 1 615BA919
+P 5400 1200
+F 0 "TP27" H 5458 1318 50  0000 L CNN
+F 1 "MCO2" H 5458 1227 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 5600 1200 50  0001 C CNN
+F 3 "~" H 5600 1200 50  0001 C CNN
+	1    5400 1200
+	1    0    0    1   
+$EndComp
+Text GLabel 8900 3200 2    50   Input ~ 0
+MCO1
+Text GLabel 8900 3300 2    50   Input ~ 0
+MCO2
+Wire Wire Line
+	8850 3200 8900 3200
+Wire Wire Line
+	8850 3300 8900 3300
+Text GLabel 5100 1150 1    50   Input ~ 0
+MCO1
+Text GLabel 5400 1150 1    50   Input ~ 0
+MCO2
+$Comp
+L Connector:TestPoint TP26
+U 1 1 615A1620
+P 5100 1200
+F 0 "TP26" H 5158 1318 50  0000 L CNN
+F 1 "MCO1" H 5158 1227 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 5300 1200 50  0001 C CNN
+F 3 "~" H 5300 1200 50  0001 C CNN
+	1    5100 1200
+	1    0    0    1   
+$EndComp
+$Comp
+L power:GND #PWR0177
+U 1 1 617B1488
+P 5700 1150
+F 0 "#PWR0177" H 5700 900 50  0001 C CNN
+F 1 "GND" H 5705 977 50  0000 C CNN
+F 2 "" H 5700 1150 50  0001 C CNN
+F 3 "" H 5700 1150 50  0001 C CNN
+	1    5700 1150
+	1    0    0    1   
+$EndComp
+$Comp
+L Connector:TestPoint TP28
+U 1 1 617B148E
+P 5700 1200
+F 0 "TP28" H 5758 1318 50  0000 L CNN
+F 1 "GND" H 5758 1227 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 5900 1200 50  0001 C CNN
+F 3 "~" H 5900 1200 50  0001 C CNN
+	1    5700 1200
+	1    0    0    1   
+$EndComp
+Wire Wire Line
+	5700 1200 5700 1150
+Wire Wire Line
+	5400 1150 5400 1200
+Wire Wire Line
+	5100 1150 5100 1200
+Text GLabel 6000 1150 1    39   Input ~ 0
+wheel_click
+$Comp
+L Connector:TestPoint TP29
+U 1 1 618F0AAF
+P 6500 1200
+F 0 "TP29" H 6558 1318 50  0000 L CNN
+F 1 "Scroll_a" H 6558 1227 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 6700 1200 50  0001 C CNN
+F 3 "~" H 6700 1200 50  0001 C CNN
+	1    6500 1200
+	1    0    0    1   
+$EndComp
+Wire Wire Line
+	6500 1150 6500 1200
+Wire Wire Line
+	6800 2700 7450 2700
+Wire Wire Line
+	6800 2600 7450 2600
+Wire Wire Line
+	7450 1900 7300 1900
+$Comp
+L MCU_ST_STM32F4:STM32F411RETx U4
+U 1 1 60055F5F
+P 8150 3000
+F 0 "U4" H 8150 1111 50  0000 C CNN
+F 1 "STM32F411RETx" H 8150 1020 50  0000 C CNN
+F 2 "Package_QFP:LQFP-64_10x10mm_P0.5mm" H 7550 1300 50  0001 R CNN
+F 3 "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00115249.pdf" H 8150 3000 50  0001 C CNN
+	1    8150 3000
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP30
+U 1 1 619AB575
+P 10300 4200
+F 0 "TP30" H 10358 4318 50  0000 L CNN
+F 1 "BOOT0" H 10358 4227 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 10500 4200 50  0001 C CNN
+F 3 "~" H 10500 4200 50  0001 C CNN
+	1    10300 4200
+	1    0    0    -1  
+$EndComp
+$Comp
+L Jumper:Jumper_3_Bridged12 JP1
+U 1 1 6015F930
+P 10500 4200
+F 0 "JP1" V 10546 4267 50  0000 L CNN
+F 1 "DFU" V 10455 4267 50  0000 L CNN
+F 2 "Connector:FanPinHeader_1x03_P2.54mm_Vertical" H 10500 4200 50  0001 C CNN
+F 3 "~" H 10500 4200 50  0001 C CNN
+	1    10500 4200
+	0    1    -1   0   
+$EndComp
+Text GLabel 8900 2000 2    39   Input ~ 0
+backward
+Text GLabel 8900 1900 2    39   Input ~ 0
+forward
+Text GLabel 8900 1800 2    39   Input ~ 0
+sense_down
+Text GLabel 8900 1700 2    39   Input ~ 0
+sense_up
+Text GLabel 8900 1600 2    39   Input ~ 0
+right_click
+Text GLabel 8900 1500 2    39   Input ~ 0
+left_click
+Text GLabel 4650 1850 3    50   Output ~ 0
+OUT_D-
+Text GLabel 4650 2500 3    50   Output ~ 0
+OUT_D+
+Text GLabel 4350 1850 3    50   Input ~ 0
+IN_D-
+Text GLabel 4350 2500 3    50   Input ~ 0
+IN_D+
+$Comp
+L Connector:TestPoint TP17
+U 1 1 61C7C487
+P 4350 2450
+F 0 "TP17" H 4408 2568 50  0000 L CNN
+F 1 "in_D+" H 4408 2477 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4550 2450 50  0001 C CNN
+F 3 "~" H 4550 2450 50  0001 C CNN
+	1    4350 2450
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP23
+U 1 1 61CAF95D
+P 4650 2450
+F 0 "TP23" H 4708 2568 50  0000 L CNN
+F 1 "out_D+" H 4708 2477 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4850 2450 50  0001 C CNN
+F 3 "~" H 4850 2450 50  0001 C CNN
+	1    4650 2450
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP8
+U 1 1 61CC914B
+P 4350 1800
+F 0 "TP8" H 4408 1918 50  0000 L CNN
+F 1 "in_D-" H 4408 1827 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4550 1800 50  0001 C CNN
+F 3 "~" H 4550 1800 50  0001 C CNN
+	1    4350 1800
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint TP22
+U 1 1 61CE2BBC
+P 4650 1800
+F 0 "TP22" H 4708 1918 50  0000 L CNN
+F 1 "out_D-" H 4708 1827 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 4850 1800 50  0001 C CNN
+F 3 "~" H 4850 1800 50  0001 C CNN
+	1    4650 1800
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4350 1850 4350 1800
+Wire Wire Line
+	4650 1850 4650 1800
+Wire Wire Line
+	4350 2500 4350 2450
+Wire Wire Line
+	4650 2500 4650 2450
+Wire Wire Line
+	5700 3800 5700 3750
+Text GLabel 5850 4100 1    50   Input ~ 0
+Scroll_a
+Wire Wire Line
+	8900 2700 8850 2700
+Text GLabel 8900 2900 2    50   Input ~ 0
+Scroll_a
+Text GLabel 8900 3000 2    50   Input ~ 0
+Scroll_b
+Wire Wire Line
+	8900 2900 8850 2900
+Wire Wire Line
+	8900 3000 8850 3000
+$Comp
+L power:GND #PWR0179
+U 1 1 624B3DA7
+P 5400 4150
+F 0 "#PWR0179" H 5400 3900 50  0001 C CNN
+F 1 "GND" H 5405 3977 50  0000 C CNN
+F 2 "" H 5400 4150 50  0001 C CNN
+F 3 "" H 5400 4150 50  0001 C CNN
+	1    5400 4150
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	5450 4150 5400 4150
+$Comp
+L power:+3.3V #PWR0180
+U 1 1 62523590
+P 5700 3750
+F 0 "#PWR0180" H 5700 3600 50  0001 C CNN
+F 1 "+3.3V" H 5715 3923 50  0000 C CNN
+F 2 "" H 5700 3750 50  0001 C CNN
+F 3 "" H 5700 3750 50  0001 C CNN
+	1    5700 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C_Small C33
+U 1 1 624984FF
+P 5550 4150
+F 0 "C33" H 5642 4196 50  0000 L CNN
+F 1 "100n" H 5642 4105 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 5550 4150 50  0001 C CNN
+F 3 "~" H 5550 4150 50  0001 C CNN
+	1    5550 4150
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	5700 4150 5700 4100
+Wire Wire Line
+	5700 4150 5650 4150
+Connection ~ 5700 4150
+Wire Wire Line
+	5850 4100 5850 4150
+Wire Wire Line
+	5850 4150 5700 4150
+$Comp
+L power:GND #PWR0181
+U 1 1 626C35AF
+P 5400 4600
+F 0 "#PWR0181" H 5400 4350 50  0001 C CNN
+F 1 "GND" H 5405 4427 50  0000 C CNN
+F 2 "" H 5400 4600 50  0001 C CNN
+F 3 "" H 5400 4600 50  0001 C CNN
+	1    5400 4600
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	5450 4600 5400 4600
+$Comp
+L Device:C_Small C34
+U 1 1 626C35B6
+P 5550 4600
+F 0 "C34" H 5642 4646 50  0000 L CNN
+F 1 "100n" H 5642 4555 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 5550 4600 50  0001 C CNN
+F 3 "~" H 5550 4600 50  0001 C CNN
+	1    5550 4600
+	0    1    -1   0   
+$EndComp
+$Comp
+L Device:R R20
+U 1 1 626E168D
+P 5700 4800
+F 0 "R20" H 5770 4846 50  0000 L CNN
+F 1 "10k" H 5770 4755 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 5630 4800 50  0001 C CNN
+F 3 "~" H 5700 4800 50  0001 C CNN
+	1    5700 4800
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5700 4950 5700 5000
+$Comp
+L power:+3.3V #PWR0182
+U 1 1 626E1695
+P 5700 5000
+F 0 "#PWR0182" H 5700 4850 50  0001 C CNN
+F 1 "+3.3V" H 5715 5173 50  0000 C CNN
+F 2 "" H 5700 5000 50  0001 C CNN
+F 3 "" H 5700 5000 50  0001 C CNN
+	1    5700 5000
+	-1   0    0    1   
+$EndComp
+Text GLabel 5850 4650 3    50   Input ~ 0
+Scroll_b
+Wire Wire Line
+	5850 4650 5850 4600
+Wire Wire Line
+	5850 4600 5700 4600
+Wire Wire Line
+	5700 4650 5700 4600
+Connection ~ 5700 4600
+Wire Wire Line
+	5700 4600 5650 4600
+$Comp
+L Connector:TestPoint TP?
+U 1 1 628DBFFB
+P 6900 1200
+F 0 "TP?" H 6958 1318 50  0000 L CNN
+F 1 "Scroll_b" H 6958 1227 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 7100 1200 50  0001 C CNN
+F 3 "~" H 7100 1200 50  0001 C CNN
+	1    6900 1200
+	1    0    0    1   
+$EndComp
+Wire Wire Line
+	6900 1150 6900 1200
+Text GLabel 6500 1150 1    50   Input ~ 0
+Scroll_a
+Connection ~ 5850 4600
+Connection ~ 5850 4150
+Connection ~ 6050 2400
+Wire Wire Line
+	6050 2400 6800 2400
+Wire Wire Line
+	5750 2400 6050 2400
+Wire Wire Line
+	6000 4600 5850 4600
+Wire Wire Line
+	6000 4450 6000 4600
+Wire Wire Line
+	6000 4150 5850 4150
+Wire Wire Line
+	6000 4250 6000 4150
+Wire Wire Line
+	5950 4350 6000 4350
+$Comp
+L power:GND #PWR0178
+U 1 1 62097B1A
+P 5950 4350
+F 0 "#PWR0178" H 5950 4100 50  0001 C CNN
+F 1 "GND" H 5955 4177 50  0000 C CNN
+F 2 "" H 5950 4350 50  0001 C CNN
+F 3 "" H 5950 4350 50  0001 C CNN
+	1    5950 4350
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:Rotary_Encoder SW10
+U 1 1 61F68259
+P 6300 4350
+F 0 "SW10" H 6530 4396 50  0000 L CNN
+F 1 "Rotary_Encoder" H 6530 4305 50  0000 L CNN
+F 2 "Custom:PEC12R-2120F-N0012" H 6150 4510 50  0001 C CNN
+F 3 "~" H 6300 4610 50  0001 C CNN
+	1    6300 4350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6050 2850 6050 2900
+Wire Notes Line
+	5000 3500 7100 3500
+Text Notes 5000 3450 0    98   ~ 0
+SCROLL WHEEL AND BUTTON
+Text GLabel 6600 4700 0    39   Input ~ 0
+wheel_click
+Wire Notes Line
+	5000 3300 7100 3300
+Wire Wire Line
+	6700 4700 6700 4850
+Wire Wire Line
+	6700 4700 6800 4700
+$Comp
+L Device:C_Small C28
+U 1 1 6082477B
+P 6700 4950
+F 0 "C28" H 6792 4996 50  0000 L CNN
+F 1 "100n" H 6792 4905 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 6700 4950 50  0001 C CNN
+F 3 "~" H 6700 4950 50  0001 C CNN
+	1    6700 4950
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6700 4700 6600 4700
+Connection ~ 6700 4700
+$Comp
+L Connector:TestPoint TP4
+U 1 1 601AABDA
+P 6050 2900
+F 0 "TP4" H 6108 3018 50  0000 L CNN
+F 1 "TestPoint" H 6108 2927 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 6250 2900 50  0001 C CNN
+F 3 "~" H 6250 2900 50  0001 C CNN
+	1    6050 2900
+	-1   0    0    1   
+$EndComp
+Connection ~ 6050 2850
+Wire Wire Line
+	6800 2850 6050 2850
+Wire Wire Line
+	6050 2400 6050 2500
+Wire Wire Line
+	6050 2800 6050 2850
+Wire Wire Line
+	5750 2850 6050 2850
+$Comp
+L Device:Crystal Y1
+U 1 1 600CDE48
+P 6050 2650
+F 0 "Y1" H 6050 2918 50  0000 C CNN
+F 1 "16Mhz" H 6050 2827 50  0000 C CNN
+F 2 "Crystal:Crystal_SMD_0603-2Pin_6.0x3.5mm_HandSoldering" H 6050 2650 50  0001 C CNN
+F 3 "~" H 6050 2650 50  0001 C CNN
+	1    6050 2650
+	0    1    1    0   
+$EndComp
+Text GLabel 6900 1150 1    50   Input ~ 0
+Scroll_b
 $EndSCHEMATC
diff --git a/KiCAD model/fp-info-cache b/KiCAD model/fp-info-cache
index 5aeabdcab9b06e841cca6916d48b1e025b4bbf3f..f8ea4f86ee19900d8cf4627e7e7d0bbe2f956877 100644
--- a/KiCAD model/fp-info-cache	
+++ b/KiCAD model/fp-info-cache	
@@ -1,4 +1,4 @@
-19082540199368451
+19084154471345551
 Battery
 BatteryHolder_Bulgin_BX0036_1xC
 Bulgin Battery Holder, BX0036, Battery Type C (https://www.bulgin.com/products/pub/media/bulgin/data/Battery_holders.pdf)
@@ -300,13 +300,6 @@ battery CR-3032 coin cell vertical
 0
 2
 2
-Battery
-PMW3389
-
-
-0
-16
-16
 Button_Switch_Keyboard
 SW_Cherry_MX_1.00u_PCB
 Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf
@@ -48775,6 +48768,20 @@ THT ceramic resonator filter DSS6
 0
 3
 3
+Custom
+PEC12R-2120F-N0012
+
+
+0
+0
+0
+Custom
+PMW3389
+
+
+0
+16
+16
 Diode_SMD
 D_0201_0603Metric
 Diode SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator