Fixed bug for knife

HARD/Knife/eagle.epf

@@ -1,5 +1,5 @@
 [Eagle]
-Version="07 02 00"
+Version="07 07 00"
 Platform="Linux"
 Serial="62191E841E-LSR-WLM-1EL"
 Globals="Globals"
@@ -7,377 +7,13 @@ Desktop="Desktop"
 
 [Globals]
 AutoSaveProject=1
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/19inch.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/40xx.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/41xx.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/45xx.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/74ac-logic.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/74ttl-din.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/74xx-eu.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/74xx-little-de.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/74xx-little-us.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/74xx-us.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/751xx.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/IQD-Frequency-Products.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/advanced-test-technologies.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/agilent-technologies.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/allegro.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/altera-cyclone-II.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/altera-cyclone-III.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/altera-stratix-iv.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/altera.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/am29-memory.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/amd-mach.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/amd.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/amis.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/analog-devices.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/aplus.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/ase.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/atmel.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/austriamicrosystems.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/avago.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/axis.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/battery.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/belton-engineering.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/burr-brown.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/busbar.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/buzzer.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/c-trimm.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/california-micro-devices.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/capacitor-wima.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/chipcard-siemens.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/cirrus-logic.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-3m.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-4ucon.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-amp-champ.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-amp-micromatch.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-amp-mt.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-amp-mt6.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-amp-quick.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-amp-te.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-amp.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-amphenol.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-avx.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-berg.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-bosch.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-chipcard-iso7816.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-coax.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-commcon.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-conrad.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-cpci.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-cui.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-cypressindustries.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-deutsch.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-dil.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-ebyelectro.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-elco.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-erni.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-faston.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-fci.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-friwo.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-garry.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-harting-h.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-harting-ml.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-harting-v.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-harting.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-hirose.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-hirschmann.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-jack.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-jae.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-jst.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-kycon.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-kyocera-elco.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-lemo.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-leotronics.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-lsta.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-lstb.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-lumberg.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-ml.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-molex.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-neutrik_ag.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-omron.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-panasonic.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-panduit.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-pc.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-pc104.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-phoenix-254.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-phoenix-3.81.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-phoenix-350.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-phoenix-500.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-phoenix-508.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-phoenix-762.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-phoenix-me_max.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-phoenix-mkds_5.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-phoenix-smkdsp.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-ptr500.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-pulse.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-rib.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-samtec.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-shallin.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-shiua-chyuan.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-stewart.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-stocko.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-subd.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-sullinselectronics.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-thomas-betts.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-tyco.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-tycoelectronics.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-vg.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-wago-500.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-wago-508.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-wago.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-wago255.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-weidmueller-sl35.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-wenzhou-yihua.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-xmultiple.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/con-yamaichi.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/crystal.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/csr.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/cypress.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/davicom.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/dc-dc-converter.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/dimensions.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/diode.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/discrete.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/display-hp.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/display-kingbright.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/display-lcd.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/docu-dummy.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/eagle-ltspice.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/ecl.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/em-microelectronic.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/etx-board.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/exar.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/fairchild-semic.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/farnell.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/fiber-optic-hp.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/fiber-optic-siemens.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/fifo.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/flexipanel.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/fox-electronics.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/frames.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/freescale.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/ftdichip.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/fujitsu.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/fuse.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/gennum.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/halo-electronics.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/heatsink.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/holes.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/holtek.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/ic-package.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/inductor-coilcraft.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/inductor-neosid.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/inductor-nkl.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/inductors.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/infineon-tricore.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/infineon.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/intersil-techwell.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/intersil.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/ir.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/isd.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/johanson-technology.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/jump-0r-smd.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/jumper.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/lantronix.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/lattice.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/lc-filter.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/led-7-segment.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/led-citizen-electronics.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/led-lumiled.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/led.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/lem.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/linear-technology.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/linear.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/linx.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/logo.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/lprs.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/lsi-computer-systems.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/lumiled.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/marks.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/matt led.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/matt.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/maxim.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/maxstream.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/melexis.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/memory-hitachi.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/memory-idt.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/memory-micron.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/memory-motorola-dram.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/memory-nec.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/memory-samsung.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/memory-sram.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/memory.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/mems.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/micrel.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/micro-cyrod.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/micro-fujitsu.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/micro-harris.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/micro-hitachi.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/micro-infineon.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/micro-intel.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/micro-mc68000.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/micro-motorola.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/micro-philips.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/micro-renesas.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/micro-samsung.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/micro-siemens.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/microchip.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/micron.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/micronas.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/microphon.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/microwave.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/midori-sensor.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/minicircuits.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/mitsubishi-semiconductor.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/motorola-sensor-driver.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/murata-filter.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/murata-sensor.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/nanotec.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/national-instruments.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/national-semiconductor.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/nec-lqfp100-pack.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/nec.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/nrj-semiconductor.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/omnivision.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/on-semiconductor.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/opto-honeywell-3000.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/opto-honeywell-4000.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/opto-honeywell.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/opto-micro-linear.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/opto-trans-siemens.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/opto-transmittter-hp.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/opto-vishay.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/optocoupler.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/pal.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/philips-semiconductors.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/photo-elements.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/piher.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/pinhead.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/plcc-socket.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/pld-intel.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/plxtech.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/pot-vitrohm.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/pot-xicor.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/pot.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/ptc-ntc.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/quantum-research-group.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/rcl.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/recom-international.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/rectifier.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/ref-packages-longpad.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/ref-packages.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/relay.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/renesas.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/resistor-bourns.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/resistor-dil.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/resistor-net.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/resistor-power.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/resistor-ruf.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/resistor-shunt.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/resistor-sil.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/resistor.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/rf-micro-devices.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/rf-solutions.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/rohm.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/roundsolutions.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/semicon-smd-ipc.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/sensor-comus-group.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/sensor-heraeus.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/sensor-infratec.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/sharp.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/silabs.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/sim-technology.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/sipex.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/smd-ipc.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/smd-special.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/solomon-systech.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/solpad.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/speaker.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/special-drill.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/special.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/st-microelectronics.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/stm32f0.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/stm32xx.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/supertex.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/supply1.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/supply2.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/switch-alps.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/switch-coto.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/switch-dil.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/switch-misc.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/switch-omron.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/switch-raychem.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/switch-reed.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/switch.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/telcom.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/telecontrolli.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/telefunken.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/testpad.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/texas-sn55-sn75.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/texas.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/toshiba.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/traco-electronic.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/trafo-bei.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/trafo-hammondmfg.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/trafo-siemens.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/trafo-xicon.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/trafo.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/transformer-pulse.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/transistor-fet.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/transistor-neu-to92.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/transistor-npn.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/transistor-pnp.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/transistor-power.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/transistor-small-signal.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/transistor.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/triac.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/trimble.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/tripas.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/u-blox.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/uln-udn.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/v-reg-micrel.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/v-reg.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/varistor.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/wafer-scale-psd.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/wirepad.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/xicor.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/xilinx-virtex-v5.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/xilinx-xc18v.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/xilinx-xc9.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/xilinx-xcv.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/zetex.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/zilog.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-elektro-zeichnungsrahmen.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-elektromechanische-antriebe.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-halbleiter.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-klemmen.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-kondensatoren.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-lampen-signalisation.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-messfuehler.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-messinstrumente.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-motoren.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-motorschutzschalter.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-schalter.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-schuetze-relais.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-sicherungen.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-sps.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-spulen-transformatoren.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-steckverbinder.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-stromversorgungselemente.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/e-symbole.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/elektro/eib-busch-jaeger.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/element14/International_Rectifier_By_element14_Batch_1.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/element14/irf.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/element14/irf-2.lbr"
-UsedLibrary="/home/lusius/eagle-7.2.0/lbr/element14/we-transistor.lbr"
 
 [Win_1]
 Type="Control Panel"
-Loc="0 0 1917 1197"
-State=2
+Loc="3840 0 5757 1045"
+State=1
 Number=0
 
 [Desktop]
-Screen="3840 1200"
+Screen="5760 1080"
 Window="Win_1"

HARD/Knife/m_knife.b#1

@@ -96,12 +96,12 @@
 <wire x1="67.935" y1="-1.27" x2="67.935" y2="17.27" width="0" layer="20"/>
 <wire x1="67.935" y1="17.27" x2="7.62" y2="17.27" width="0" layer="20"/>
 <circle x="46.99" y="11.43" radius="0.3175" width="0.254" layer="1"/>
-<text x="7.62" y="15.875" size="1.27" layer="1">FTL</text>
+<text x="8.255" y="17.78" size="1.27" layer="1">FTL</text>
 <wire x1="7.62" y1="17.27" x2="7.62" y2="-1.27" width="0" layer="20"/>
 <wire x1="7.62" y1="17.27" x2="7.62" y2="19.685" width="0" layer="20"/>
 <wire x1="7.62" y1="19.685" x2="67.945" y2="19.685" width="0" layer="20"/>
 <wire x1="67.945" y1="19.685" x2="67.945" y2="17.145" width="0" layer="20"/>
-<text x="10.795" y="17.78" size="1.27" layer="20">КОНТРОЛЛЕР В НОЖИК v1 СТАБИЛИЗАТОР - LD1117 SOT223</text>
+<text x="13.335" y="17.78" size="1.27" layer="20">КОНТРОЛЛЕР В НОЖИК v1 СТАБИЛИЗАТОР - LD1117 SOT223</text>
 <circle x="48.26" y="13.335" radius="0.429" width="0.258" layer="116"/>
 <circle x="45.72" y="13.335" radius="0.429" width="0.258" layer="116"/>
 <circle x="17.78" y="1.27" radius="0.429" width="0.258" layer="116"/>

HARD/Knife/m_knife.b#2

@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="25" unitdist="mil" unit="mil" style="lines" multiple="1" display="yes" altdistance="0.025" altunitdist="inch" altunit="inch"/>
+<grid distance="25" unitdist="mil" unit="mm" style="lines" multiple="1" display="yes" altdistance="0.025" altunitdist="inch" altunit="inch"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
@@ -79,7 +79,7 @@
 <layer number="101" name="Patch_Top" color="12" fill="4" visible="no" active="yes"/>
 <layer number="102" name="Vscore" color="7" fill="1" visible="no" active="yes"/>
 <layer number="104" name="Name" color="7" fill="1" visible="no" active="yes"/>
-<layer number="116" name="Patch_BOT" color="9" fill="4" visible="no" active="yes"/>
+<layer number="116" name="centerDrill" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="121" name="_tsilk" color="7" fill="1" visible="no" active="yes"/>
 <layer number="122" name="_bsilk" color="7" fill="1" visible="no" active="yes"/>
 <layer number="151" name="HeatSink" color="7" fill="1" visible="no" active="yes"/>
@@ -95,9 +95,24 @@
 <wire x1="7.62" y1="-1.27" x2="67.935" y2="-1.27" width="0" layer="20"/>
 <wire x1="67.935" y1="-1.27" x2="67.935" y2="17.27" width="0" layer="20"/>
 <wire x1="67.935" y1="17.27" x2="7.62" y2="17.27" width="0" layer="20"/>
-<wire x1="7.62" y1="17.27" x2="7.62" y2="-1.27" width="0" layer="20"/>
 <circle x="46.99" y="11.43" radius="0.3175" width="0.254" layer="1"/>
 <text x="7.62" y="15.875" size="1.27" layer="1">FTL</text>
+<wire x1="7.62" y1="17.27" x2="7.62" y2="-1.27" width="0" layer="20"/>
+<wire x1="7.62" y1="17.27" x2="7.62" y2="19.685" width="0" layer="20"/>
+<wire x1="7.62" y1="19.685" x2="67.945" y2="19.685" width="0" layer="20"/>
+<wire x1="67.945" y1="19.685" x2="67.945" y2="17.145" width="0" layer="20"/>
+<text x="10.795" y="17.78" size="1.27" layer="20">КОНТРОЛЛЕР В НОЖИК v1 СТАБИЛИЗАТОР - LD1117 SOT223</text>
+<circle x="48.26" y="13.335" radius="0.429" width="0.258" layer="116"/>
+<circle x="45.72" y="13.335" radius="0.429" width="0.258" layer="116"/>
+<circle x="17.78" y="1.27" radius="0.429" width="0.258" layer="116"/>
+<circle x="15.24" y="1.27" radius="0.429" width="0.258" layer="116"/>
+<circle x="12.7" y="1.27" radius="0.429" width="0.258" layer="116"/>
+<circle x="10.16" y="1.27" radius="0.429" width="0.258" layer="116"/>
+<circle x="41.91" y="12.7" radius="0.429" width="0.258" layer="116"/>
+<circle x="41.91" y="10.16" radius="0.429" width="0.258" layer="116"/>
+<circle x="50.8" y="13.335" radius="0.429" width="0.258" layer="116"/>
+<circle x="53.34" y="13.335" radius="0.429" width="0.258" layer="116"/>
+<circle x="55.88" y="13.335" radius="0.429" width="0.258" layer="116"/>
 </plain>
 <libraries>
 <library name="rcl">

HARD/Knife/m_knife.b#3

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<<<<<<< HEAD
 <eagle version="7.7.0">
-=======
-<eagle version="7.2.0">
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <drawing>
 <settings>
 <setting alwaysvectorfont="no"/>
@@ -32,17 +28,10 @@
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
-<<<<<<< HEAD
 <layer number="21" name="tPlace" color="7" fill="1" visible="no" active="yes"/>
 <layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
 <layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
 <layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
-=======
-<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
@@ -57,36 +46,20 @@
 <layer number="36" name="bGlue" color="7" fill="5" visible="no" active="yes"/>
 <layer number="37" name="tTest" color="7" fill="1" visible="no" active="yes"/>
 <layer number="38" name="bTest" color="7" fill="1" visible="no" active="yes"/>
-<<<<<<< HEAD
 <layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="yes"/>
 <layer number="40" name="bKeepout" color="1" fill="11" visible="no" active="yes"/>
 <layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="yes"/>
 <layer number="42" name="bRestrict" color="1" fill="10" visible="no" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="yes"/>
-=======
-<layer number="39" name="tKeepout" color="4" fill="11" visible="yes" active="yes"/>
-<layer number="40" name="bKeepout" color="1" fill="11" visible="yes" active="yes"/>
-<layer number="41" name="tRestrict" color="4" fill="10" visible="yes" active="yes"/>
-<layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
-<layer number="43" name="vRestrict" color="2" fill="10" visible="yes" active="yes"/>
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
 <layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
-<<<<<<< HEAD
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
 <layer number="49" name="Reference" color="7" fill="1" visible="no" active="yes"/>
 <layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
 <layer number="51" name="tDocu" color="7" fill="1" visible="no" active="yes"/>
 <layer number="52" name="bDocu" color="7" fill="1" visible="no" active="yes"/>
-=======
-<layer number="48" name="Document" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="49" name="Reference" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="yes"/>
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
 <layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
@@ -119,7 +92,6 @@
 </layers>
 <board>
 <plain>
-<<<<<<< HEAD
 <wire x1="7.62" y1="-1.27" x2="67.935" y2="-1.27" width="0" layer="20"/>
 <wire x1="67.935" y1="-1.27" x2="67.935" y2="17.27" width="0" layer="20"/>
 <wire x1="67.935" y1="17.27" x2="7.62" y2="17.27" width="0" layer="20"/>
@@ -1265,14 +1237,6 @@ Source: http://www.onsemi.co.jp .. LM137M-D.PDF</description>
 </package>
 </packages>
 </library>
-=======
-<wire x1="0" y1="0" x2="80" y2="0" width="0" layer="20"/>
-<wire x1="80" y1="0" x2="80" y2="16" width="0" layer="20"/>
-<wire x1="80" y1="16" x2="0" y2="16" width="0" layer="20"/>
-<wire x1="0" y1="16" x2="0" y2="0" width="0" layer="20"/>
-</plain>
-<libraries>
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <library name="pinhead">
 <description>&lt;b&gt;Pin Header Connectors&lt;/b&gt;&lt;p&gt;
 &lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
@@ -1301,42 +1265,6 @@ Source: http://www.onsemi.co.jp .. LM137M-D.PDF</description>
 <rectangle x1="-1.524" y1="-0.254" x2="-1.016" y2="0.254" layer="51"/>
 <rectangle x1="1.016" y1="-0.254" x2="1.524" y2="0.254" layer="51"/>
 </package>
-<<<<<<< HEAD
-=======
-<package name="1X03">
-<description>&lt;b&gt;PIN HEADER&lt;/b&gt;</description>
-<wire x1="-3.175" y1="1.27" x2="-1.905" y2="1.27" width="0.1524" layer="21"/>
-<wire x1="-1.905" y1="1.27" x2="-1.27" y2="0.635" width="0.1524" layer="21"/>
-<wire x1="-1.27" y1="0.635" x2="-1.27" y2="-0.635" width="0.1524" layer="21"/>
-<wire x1="-1.27" y1="-0.635" x2="-1.905" y2="-1.27" width="0.1524" layer="21"/>
-<wire x1="-1.27" y1="0.635" x2="-0.635" y2="1.27" width="0.1524" layer="21"/>
-<wire x1="-0.635" y1="1.27" x2="0.635" y2="1.27" width="0.1524" layer="21"/>
-<wire x1="0.635" y1="1.27" x2="1.27" y2="0.635" width="0.1524" layer="21"/>
-<wire x1="1.27" y1="0.635" x2="1.27" y2="-0.635" width="0.1524" layer="21"/>
-<wire x1="1.27" y1="-0.635" x2="0.635" y2="-1.27" width="0.1524" layer="21"/>
-<wire x1="0.635" y1="-1.27" x2="-0.635" y2="-1.27" width="0.1524" layer="21"/>
-<wire x1="-0.635" y1="-1.27" x2="-1.27" y2="-0.635" width="0.1524" layer="21"/>
-<wire x1="-3.81" y1="0.635" x2="-3.81" y2="-0.635" width="0.1524" layer="21"/>
-<wire x1="-3.175" y1="1.27" x2="-3.81" y2="0.635" width="0.1524" layer="21"/>
-<wire x1="-3.81" y1="-0.635" x2="-3.175" y2="-1.27" width="0.1524" layer="21"/>
-<wire x1="-1.905" y1="-1.27" x2="-3.175" y2="-1.27" width="0.1524" layer="21"/>
-<wire x1="1.27" y1="0.635" x2="1.905" y2="1.27" width="0.1524" layer="21"/>
-<wire x1="1.905" y1="1.27" x2="3.175" y2="1.27" width="0.1524" layer="21"/>
-<wire x1="3.175" y1="1.27" x2="3.81" y2="0.635" width="0.1524" layer="21"/>
-<wire x1="3.81" y1="0.635" x2="3.81" y2="-0.635" width="0.1524" layer="21"/>
-<wire x1="3.81" y1="-0.635" x2="3.175" y2="-1.27" width="0.1524" layer="21"/>
-<wire x1="3.175" y1="-1.27" x2="1.905" y2="-1.27" width="0.1524" layer="21"/>
-<wire x1="1.905" y1="-1.27" x2="1.27" y2="-0.635" width="0.1524" layer="21"/>
-<pad name="1" x="-2.54" y="0" drill="1.016" shape="long" rot="R90"/>
-<pad name="2" x="0" y="0" drill="1.016" shape="long" rot="R90"/>
-<pad name="3" x="2.54" y="0" drill="1.016" shape="long" rot="R90"/>
-<text x="-3.8862" y="1.8288" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="-3.81" y="-3.175" size="1.27" layer="27">&gt;VALUE</text>
-<rectangle x1="-0.254" y1="-0.254" x2="0.254" y2="0.254" layer="51"/>
-<rectangle x1="-2.794" y1="-0.254" x2="-2.286" y2="0.254" layer="51"/>
-<rectangle x1="2.286" y1="-0.254" x2="2.794" y2="0.254" layer="51"/>
-</package>
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <package name="1X04">
 <description>&lt;b&gt;PIN HEADER&lt;/b&gt;</description>
 <wire x1="0" y1="0.635" x2="0.635" y2="1.27" width="0.1524" layer="21"/>
@@ -1379,7 +1307,6 @@ Source: http://www.onsemi.co.jp .. LM137M-D.PDF</description>
 <rectangle x1="-4.064" y1="-0.254" x2="-3.556" y2="0.254" layer="51"/>
 <rectangle x1="3.556" y1="-0.254" x2="4.064" y2="0.254" layer="51"/>
 </package>
-<<<<<<< HEAD
 <package name="1X03">
 <description>&lt;b&gt;PIN HEADER&lt;/b&gt;</description>
 <wire x1="-3.175" y1="1.27" x2="-1.905" y2="1.27" width="0.1524" layer="21"/>
@@ -1413,8 +1340,6 @@ Source: http://www.onsemi.co.jp .. LM137M-D.PDF</description>
 <rectangle x1="-2.794" y1="-0.254" x2="-2.286" y2="0.254" layer="51"/>
 <rectangle x1="2.286" y1="-0.254" x2="2.794" y2="0.254" layer="51"/>
 </package>
-=======
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 </packages>
 </library>
 <library name="resistor">
@@ -2487,41 +2412,6 @@ for trimmer refence see : &lt;u&gt;www.electrospec-inc.com/cross_references/trim
 &lt;/table&gt;
 &lt;/BODY&gt;&lt;/HTML&gt;</description>
 <packages>
-<<<<<<< HEAD
-=======
-<package name="SMC_D">
-<description>&lt;b&gt;Chip Capacitor &lt;/b&gt; Polar tantalum capacitors with solid electrolyte&lt;p&gt;
-Siemens Matsushita Components B 45 194, B 45 197, B 45 198&lt;br&gt;
-Source: www.farnell.com/datasheets/247.pdf</description>
-<wire x1="-3.5" y1="2.1" x2="3.5" y2="2.1" width="0.1016" layer="51"/>
-<wire x1="3.5" y1="2.1" x2="3.5" y2="-2.1" width="0.1016" layer="51"/>
-<wire x1="3.5" y1="-2.1" x2="-3.5" y2="-2.1" width="0.1016" layer="51"/>
-<wire x1="-3.5" y1="-2.1" x2="-3.5" y2="2.1" width="0.1016" layer="51"/>
-<smd name="+" x="-3.15" y="0" dx="2.4" dy="2.8" layer="1"/>
-<smd name="-" x="3.15" y="0" dx="2.4" dy="2.8" layer="1" rot="R180"/>
-<text x="-2.54" y="2.54" size="1.016" layer="25">&gt;NAME</text>
-<text x="-2.54" y="-3.81" size="1.016" layer="27">&gt;VALUE</text>
-<rectangle x1="-3.65" y1="-1.2" x2="-3.45" y2="1.2" layer="51"/>
-<rectangle x1="3.45" y1="-1.2" x2="3.65" y2="1.2" layer="51" rot="R180"/>
-<rectangle x1="-3.5" y1="-2.1" x2="-2.4" y2="2.1" layer="51"/>
-</package>
-<package name="C1206">
-<description>&lt;b&gt;CAPACITOR&lt;/b&gt;</description>
-<wire x1="-2.473" y1="0.983" x2="2.473" y2="0.983" width="0.0508" layer="39"/>
-<wire x1="2.473" y1="-0.983" x2="-2.473" y2="-0.983" width="0.0508" layer="39"/>
-<wire x1="-2.473" y1="-0.983" x2="-2.473" y2="0.983" width="0.0508" layer="39"/>
-<wire x1="2.473" y1="0.983" x2="2.473" y2="-0.983" width="0.0508" layer="39"/>
-<wire x1="-0.965" y1="0.787" x2="0.965" y2="0.787" width="0.1016" layer="51"/>
-<wire x1="-0.965" y1="-0.787" x2="0.965" y2="-0.787" width="0.1016" layer="51"/>
-<smd name="1" x="-1.4" y="0" dx="1.6" dy="1.8" layer="1"/>
-<smd name="2" x="1.4" y="0" dx="1.6" dy="1.8" layer="1"/>
-<text x="-1.27" y="1.27" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.27" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
-<rectangle x1="-1.7018" y1="-0.8509" x2="-0.9517" y2="0.8491" layer="51"/>
-<rectangle x1="0.9517" y1="-0.8491" x2="1.7018" y2="0.8509" layer="51"/>
-<rectangle x1="-0.1999" y1="-0.4001" x2="0.1999" y2="0.4001" layer="35"/>
-</package>
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <package name="R1206">
 <description>&lt;b&gt;RESISTOR&lt;/b&gt;</description>
 <wire x1="0.9525" y1="-0.8128" x2="-0.9652" y2="-0.8128" width="0.1524" layer="51"/>
@@ -2540,48 +2430,6 @@ Source: www.farnell.com/datasheets/247.pdf</description>
 </package>
 </packages>
 </library>
-<<<<<<< HEAD
-=======
-<library name="v-reg">
-<description>&lt;b&gt;Voltage Regulators&lt;/b&gt;&lt;p&gt;
-&lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
-<packages>
-<package name="SOT223">
-<description>&lt;b&gt;Small Outline Transistor 223&lt;/b&gt;&lt;p&gt;
-PLASTIC PACKAGE CASE 318E-04&lt;br&gt;
-Source: http://www.onsemi.co.jp .. LM137M-D.PDF</description>
-<wire x1="3.277" y1="1.778" x2="3.277" y2="-1.778" width="0.2032" layer="21"/>
-<wire x1="3.277" y1="-1.778" x2="-3.277" y2="-1.778" width="0.2032" layer="21"/>
-<wire x1="-3.277" y1="-1.778" x2="-3.277" y2="1.778" width="0.2032" layer="21"/>
-<wire x1="-3.277" y1="1.778" x2="3.277" y2="1.778" width="0.2032" layer="21"/>
-<wire x1="0" y1="-0.7" x2="0" y2="0.6" width="0.127" layer="48"/>
-<wire x1="0" y1="0.6" x2="-0.2" y2="0.2" width="0.127" layer="48"/>
-<wire x1="-0.2" y1="0.2" x2="0.2" y2="0.2" width="0.127" layer="48"/>
-<wire x1="0.2" y1="0.2" x2="0" y2="0.6" width="0.127" layer="48"/>
-<wire x1="0" y1="-0.7" x2="0.2" y2="-0.3" width="0.127" layer="48"/>
-<wire x1="0.2" y1="-0.3" x2="-0.2" y2="-0.3" width="0.127" layer="48"/>
-<wire x1="-0.2" y1="-0.3" x2="0" y2="-0.7" width="0.127" layer="48"/>
-<smd name="1" x="-2.3" y="-3.15" dx="1.5" dy="2" layer="1"/>
-<smd name="2" x="0" y="-3.15" dx="1.5" dy="2" layer="1"/>
-<smd name="3" x="2.3" y="-3.15" dx="1.5" dy="2" layer="1"/>
-<smd name="4" x="0" y="3.15" dx="3.8" dy="2" layer="1"/>
-<text x="-2.54" y="0.0508" size="1.27" layer="25">&gt;NAME</text>
-<text x="-2.54" y="-1.3208" size="1.27" layer="27">&gt;VALUE</text>
-<text x="0.4" y="0.4" size="0.254" layer="48">direction of pcb</text>
-<text x="0.4" y="-0.05" size="0.254" layer="48">transportation for</text>
-<text x="0.4" y="-0.5" size="0.254" layer="48">wavesoldering</text>
-<rectangle x1="-0.9271" y1="1.1303" x2="0.9271" y2="4.3307" layer="51" rot="R270"/>
-<rectangle x1="-0.9271" y1="-3.1623" x2="0.9271" y2="-2.2987" layer="51" rot="R270"/>
-<rectangle x1="-3.2385" y1="-3.1623" x2="-1.3843" y2="-2.2987" layer="51" rot="R270"/>
-<rectangle x1="1.3843" y1="-3.1623" x2="3.2385" y2="-2.2987" layer="51" rot="R270"/>
-<rectangle x1="-0.9271" y1="1.1303" x2="0.9271" y2="4.3307" layer="51" rot="R270"/>
-<rectangle x1="-0.9271" y1="-3.1623" x2="0.9271" y2="-2.2987" layer="51" rot="R270"/>
-<rectangle x1="-3.2385" y1="-3.1623" x2="-1.3843" y2="-2.2987" layer="51" rot="R270"/>
-<rectangle x1="1.3843" y1="-3.1623" x2="3.2385" y2="-2.2987" layer="51" rot="R270"/>
-</package>
-</packages>
-</library>
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <library name="stm32f0">
 <description>STM32F0x Microcontrollers</description>
 <packages>
@@ -2692,7 +2540,6 @@ design rules under a new name.</description>
 <param name="rvViaInner" value="0.25"/>
 <param name="rvMicroViaOuter" value="0.25"/>
 <param name="rvMicroViaInner" value="0.25"/>
-<<<<<<< HEAD
 <param name="rlMinPadTop" value="18mil"/>
 <param name="rlMaxPadTop" value="20mil"/>
 <param name="rlMinPadInner" value="18mil"/>
@@ -2706,21 +2553,6 @@ design rules under a new name.</description>
 <param name="rlMinMicroViaOuter" value="4mil"/>
 <param name="rlMaxMicroViaOuter" value="20mil"/>
 <param name="rlMinMicroViaInner" value="4mil"/>
-=======
-<param name="rlMinPadTop" value="20mil"/>
-<param name="rlMaxPadTop" value="25mil"/>
-<param name="rlMinPadInner" value="20mil"/>
-<param name="rlMaxPadInner" value="25mil"/>
-<param name="rlMinPadBottom" value="20mil"/>
-<param name="rlMaxPadBottom" value="25mil"/>
-<param name="rlMinViaOuter" value="18mil"/>
-<param name="rlMaxViaOuter" value="20mil"/>
-<param name="rlMinViaInner" value="18mil"/>
-<param name="rlMaxViaInner" value="20mil"/>
-<param name="rlMinMicroViaOuter" value="14mil"/>
-<param name="rlMaxMicroViaOuter" value="20mil"/>
-<param name="rlMinMicroViaInner" value="14mil"/>
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <param name="rlMaxMicroViaInner" value="20mil"/>
 <param name="psTop" value="1"/>
 <param name="psBottom" value="1"/>
@@ -2845,9 +2677,8 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<<<<<<< HEAD
-<element name="C1" library="rcl" package="SMC_D" value="100uF" x="13.335" y="13.335"/>
-<element name="C2" library="rcl" package="C1206" value="0.1uF" x="34.29" y="12.065" rot="R90"/>
+<element name="C1" library="rcl" package="SMC_D" value="" x="13.335" y="13.335"/>
+<element name="C2" library="rcl" package="C1206" value="" x="34.29" y="12.065" rot="R90"/>
 <element name="EDGE" library="testpad" package="TP20R" value="TPSQTP20R" x="20.955" y="6.35">
 <attribute name="TP_SIGNAL_NAME" value="" x="20.955" y="6.35" size="1.778" layer="27" display="off"/>
 </element>
@@ -2879,13 +2710,13 @@ design rules under a new name.</description>
 <element name="PIKE" library="testpad" package="TP20R" value="TPSQTP20R" x="20.955" y="9.525">
 <attribute name="TP_SIGNAL_NAME" value="" x="20.955" y="9.525" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R1" library="resistor" package="R1206" value="1k2" x="45.72" y="2.54"/>
-<element name="R2" library="resistor" package="R1206" value="1k2" x="31.75" y="12.065" rot="R90"/>
-<element name="R3" library="resistor" package="R1206" value="1k2" x="29.21" y="12.065" rot="R270"/>
-<element name="R4" library="resistor" package="R1206" value="1k2" x="58.42" y="9.525" rot="R90"/>
-<element name="R5" library="resistor" package="R1206" value="1k2" x="60.96" y="9.525" rot="R90"/>
-<element name="R7" library="resistor" package="R1206" value="1k2" x="25.4" y="12.7" rot="R270"/>
-<element name="R8" library="resistor" package="R1206" value="1k2" x="26.035" y="3.81" rot="R90"/>
+<element name="R1" library="resistor" package="R1206" value="" x="45.72" y="2.54"/>
+<element name="R2" library="resistor" package="R1206" value="" x="31.75" y="12.065" rot="R90"/>
+<element name="R3" library="resistor" package="R1206" value="" x="29.21" y="12.065" rot="R270"/>
+<element name="R4" library="resistor" package="R1206" value="" x="58.42" y="9.525" rot="R90"/>
+<element name="R5" library="resistor" package="R1206" value="" x="60.96" y="9.525" rot="R90"/>
+<element name="R7" library="resistor" package="R1206" value="" x="25.4" y="12.7" rot="R270"/>
+<element name="R8" library="resistor" package="R1206" value="" x="26.035" y="3.81" rot="R90"/>
 <element name="SPI_CK" library="testpad" package="TP20R" value="TPSQTP20R" x="55.245" y="2.54">
 <attribute name="TP_SIGNAL_NAME" value="" x="55.245" y="2.54" size="1.778" layer="27" display="off"/>
 </element>
@@ -2897,8 +2728,8 @@ design rules under a new name.</description>
 </element>
 <element name="SWD" library="pinhead" package="1X03" value="" x="53.34" y="13.335"/>
 <element name="U$1" library="stm32f0" package="TSSOP20" value="STM32F042FXPX" x="48.26" y="7.62" rot="R270"/>
-<element name="R9" library="resistor" package="R1206" value="1k2" x="38.1" y="12.065" rot="R270"/>
-<element name="R10" library="resistor" package="R1206" value="1k2" x="33.02" y="3.175" rot="R270"/>
+<element name="R9" library="resistor" package="R1206" value="" x="38.1" y="12.065" rot="R270"/>
+<element name="R10" library="resistor" package="R1206" value="" x="33.02" y="3.175" rot="R270"/>
 <element name="S/S" library="testpad" package="TP20R" value="TPSQTP20R" x="29.845" y="5.08">
 <attribute name="TP_SIGNAL_NAME" value="" x="29.845" y="5.08" size="1.778" layer="27" display="off"/>
 </element>
@@ -3142,188 +2973,14 @@ design rules under a new name.</description>
 <wire x1="33.02" y1="5.08" x2="33.02" y2="4.597" width="0.3048" layer="1"/>
 <wire x1="45.3422" y1="5.995" x2="33.02" y2="5.995" width="0.3048" layer="1"/>
 <wire x1="33.02" y1="5.995" x2="33.02" y2="4.597" width="0.3048" layer="1"/>
-=======
-<element name="BOOT" library="pinhead" package="1X02" value="" x="60.96" y="12.065"/>
-<element name="C1" library="resistor" package="SMC_D" value="" x="7.62" y="13.335"/>
-<element name="C2" library="resistor" package="C1206" value="" x="31.75" y="9.525"/>
-<element name="DATA" library="pinhead" package="1X03" value="" x="70.485" y="4.445" rot="R270"/>
-<element name="IC1" library="v-reg" package="SOT223" value="LD117AS25TR" x="12.065" y="3.175"/>
-<element name="PWR" library="pinhead" package="1X04" value="" x="5.715" y="7.62" rot="R90"/>
-<element name="R1" library="resistor" package="R1206" value="" x="66.04" y="4.445"/>
-<element name="R2" library="resistor" package="R1206" value="" x="66.04" y="1.905"/>
-<element name="R3" library="resistor" package="R1206" value="" x="69.215" y="14.605"/>
-<element name="R4" library="resistor" package="R1206" value="" x="31.75" y="12.7"/>
-<element name="R5" library="resistor" package="R1206" value="" x="39.37" y="12.065" rot="R180"/>
-<element name="R6" library="resistor" package="R1206" value="" x="39.37" y="7.62" rot="R180"/>
-<element name="RST" library="pinhead" package="1X02" value="" x="19.685" y="3.81" rot="R90"/>
-<element name="SENS" library="pinhead" package="1X03" value="" x="23.495" y="8.89" rot="R90"/>
-<element name="SPI" library="pinhead" package="1X04" value="" x="50.8" y="2.54" rot="R180"/>
-<element name="STR-STP" library="pinhead" package="1X02" value="" x="29.21" y="22.225"/>
-<element name="SWD" library="pinhead" package="1X03" value="" x="67.945" y="9.525" rot="R180"/>
-<element name="U$1" library="stm32f0" package="TSSOP20" value="STM32F042FXPX" x="47.625" y="10.16" rot="R270"/>
-<element name="LEDS" library="pinhead" package="1X04" value="" x="30.48" y="2.54"/>
-<element name="R7" library="resistor" package="R1206" value="" x="39.37" y="5.08"/>
-<element name="R8" library="resistor" package="R1206" value="" x="39.37" y="2.54"/>
-</elements>
-<signals>
-<signal name="N$1">
-<contactref element="IC1" pad="3"/>
-<contactref element="PWR" pad="2"/>
-<wire x1="5.715" y1="6.35" x2="14.365" y2="0.025" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$4">
-<contactref element="U$1" pad="19"/>
-<contactref element="SWD" pad="3"/>
-<wire x1="50.5428" y1="12.435" x2="65.405" y2="9.525" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$5">
-<contactref element="U$1" pad="20"/>
-<contactref element="SWD" pad="2"/>
-<wire x1="50.5428" y1="13.085" x2="67.945" y2="9.525" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$6">
-<contactref element="U$1" pad="13"/>
-<contactref element="SPI" pad="2"/>
-<wire x1="52.07" y1="2.54" x2="50.5428" y2="8.535" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$7">
-<contactref element="U$1" pad="12"/>
-<contactref element="SPI" pad="3"/>
-<wire x1="49.53" y1="2.54" x2="50.5428" y2="7.885" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$8">
-<contactref element="U$1" pad="11"/>
-<contactref element="SPI" pad="4"/>
-<wire x1="46.99" y1="2.54" x2="50.5428" y2="7.235" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$9">
-<contactref element="U$1" pad="17"/>
-<contactref element="R2" pad="1"/>
-<wire x1="50.5428" y1="11.135" x2="64.618" y2="1.905" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$10">
-<contactref element="U$1" pad="18"/>
-<contactref element="R1" pad="1"/>
-<wire x1="50.5428" y1="11.785" x2="64.618" y2="4.445" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$13">
-<contactref element="U$1" pad="5"/>
-<contactref element="U$1" pad="16"/>
-<contactref element="IC1" pad="4"/>
-<contactref element="C1" pad="+"/>
-<contactref element="BOOT" pad="2"/>
-<contactref element="R4" pad="1"/>
-<contactref element="STR-STP" pad="1"/>
-<wire x1="50.5428" y1="10.485" x2="44.7072" y2="10.485" width="0.3048" layer="1"/>
-<wire x1="50.5428" y1="10.485" x2="62.23" y2="12.065" width="0" layer="19" extent="1-1"/>
-<wire x1="30.328" y1="12.7" x2="44.7072" y2="10.485" width="0" layer="19" extent="1-1"/>
-<wire x1="27.94" y1="22.225" x2="30.328" y2="12.7" width="0" layer="19" extent="1-1"/>
-<wire x1="12.065" y1="6.325" x2="30.328" y2="12.7" width="0" layer="19" extent="1-1"/>
-<wire x1="4.47" y1="13.335" x2="12.065" y2="6.325" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$14">
-<contactref element="BOOT" pad="1"/>
-<contactref element="U$1" pad="1"/>
-<contactref element="R3" pad="1"/>
-<wire x1="59.69" y1="12.065" x2="67.793" y2="14.605" width="0" layer="19" extent="1-1"/>
-<wire x1="44.7072" y1="13.085" x2="59.69" y2="12.065" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$15">
-<contactref element="R4" pad="2"/>
-<contactref element="R5" pad="2"/>
-<contactref element="C2" pad="2"/>
-<contactref element="RST" pad="2"/>
-<wire x1="33.172" y1="12.7" x2="33.172" y2="9.547" width="0.3048" layer="1"/>
-<wire x1="33.172" y1="9.547" x2="33.15" y2="9.525" width="0.3048" layer="1"/>
-<wire x1="33.172" y1="12.7" x2="37.948" y2="12.065" width="0" layer="19" extent="1-1"/>
-<wire x1="19.685" y1="5.08" x2="33.15" y2="9.525" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$16">
-<contactref element="R5" pad="1"/>
-<contactref element="U$1" pad="4"/>
-<wire x1="40.792" y1="12.065" x2="44.7072" y2="11.135" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$19">
-<contactref element="U$1" pad="6"/>
-<contactref element="SENS" pad="3"/>
-<wire x1="23.495" y1="11.43" x2="44.7072" y2="9.835" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$3">
-<contactref element="R2" pad="2"/>
-<contactref element="DATA" pad="3"/>
-<wire x1="70.485" y1="1.905" x2="67.462" y2="1.905" width="0.3048" layer="1"/>
-</signal>
-<signal name="N$11">
-<contactref element="R1" pad="2"/>
-<contactref element="DATA" pad="2"/>
-<wire x1="70.485" y1="4.445" x2="67.462" y2="4.445" width="0.3048" layer="1"/>
-</signal>
-<signal name="N$12">
-<contactref element="PWR" pad="3"/>
-<contactref element="PWR" pad="4"/>
-<wire x1="5.715" y1="8.89" x2="5.715" y2="11.43" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$18">
-<contactref element="U$1" pad="8"/>
-<contactref element="STR-STP" pad="2"/>
-<contactref element="R6" pad="1"/>
-<wire x1="40.792" y1="7.62" x2="44.7072" y2="8.535" width="0" layer="19" extent="1-1"/>
-<wire x1="30.48" y1="22.225" x2="40.792" y2="7.62" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$20">
-<contactref element="LEDS" pad="2"/>
-<contactref element="R7" pad="1"/>
-<wire x1="29.21" y1="2.54" x2="37.948" y2="5.08" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$21">
-<contactref element="LEDS" pad="4"/>
-<contactref element="R8" pad="1"/>
-<wire x1="34.29" y1="2.54" x2="37.948" y2="2.54" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$22">
-<contactref element="R7" pad="2"/>
-<contactref element="U$1" pad="9"/>
-<wire x1="40.792" y1="5.08" x2="44.7072" y2="7.885" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$23">
-<contactref element="U$1" pad="10"/>
-<contactref element="R8" pad="2"/>
-<wire x1="40.792" y1="2.54" x2="44.7072" y2="7.235" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$17">
-<contactref element="U$1" pad="7"/>
-<contactref element="SENS" pad="2"/>
-<wire x1="23.495" y1="8.89" x2="44.7072" y2="9.185" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$24">
-<contactref element="LEDS" pad="3"/>
-<contactref element="LEDS" pad="1"/>
-<contactref element="R6" pad="2"/>
-<contactref element="PWR" pad="1"/>
-<contactref element="SENS" pad="1"/>
-<contactref element="SWD" pad="1"/>
-<contactref element="U$1" pad="15"/>
-<contactref element="C1" pad="-"/>
-<contactref element="IC1" pad="1"/>
-<contactref element="SPI" pad="1"/>
-<contactref element="RST" pad="1"/>
-<contactref element="R3" pad="2"/>
-<contactref element="DATA" pad="1"/>
-<contactref element="C2" pad="1"/>
-<wire x1="70.485" y1="9.525" x2="70.637" y2="14.605" width="0" layer="19" extent="1-1"/>
-<wire x1="70.485" y1="6.985" x2="70.485" y2="9.525" width="0" layer="19" extent="1-1"/>
-<wire x1="54.61" y1="2.54" x2="70.485" y2="6.985" width="0" layer="19" extent="1-1"/>
-<wire x1="50.5428" y1="9.835" x2="54.61" y2="2.54" width="0" layer="19" extent="1-1"/>
-<wire x1="37.948" y1="7.62" x2="50.5428" y2="9.835" width="0" layer="19" extent="1-1"/>
-<wire x1="30.35" y1="9.525" x2="37.948" y2="7.62" width="0" layer="19" extent="1-1"/>
-<wire x1="31.75" y1="2.54" x2="30.35" y2="9.525" width="0" layer="19" extent="1-1"/>
-<wire x1="26.67" y1="2.54" x2="31.75" y2="2.54" width="0" layer="19" extent="1-1"/>
-<wire x1="23.495" y1="6.35" x2="26.67" y2="2.54" width="0" layer="19" extent="1-1"/>
-<wire x1="19.685" y1="2.54" x2="23.495" y2="6.35" width="0" layer="19" extent="1-1"/>
-<wire x1="9.765" y1="0.025" x2="19.685" y2="2.54" width="0" layer="19" extent="1-1"/>
-<wire x1="5.715" y1="3.81" x2="9.765" y2="0.025" width="0" layer="19" extent="1-1"/>
-<wire x1="10.77" y1="13.335" x2="5.715" y2="3.81" width="0" layer="19" extent="1-1"/>
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
+<polygon width="0" layer="1" spacing="0.254" isolate="0.6096">
+<vertex x="7.62" y="17.145"/>
+<vertex x="67.945" y="17.145"/>
+<vertex x="67.945" y="-1.27"/>
+<vertex x="7.62" y="-1.27"/>
+</polygon>
 </signal>
 </signals>
 </board>

HARD/Knife/m_knife.b#4

@@ -37,20 +37,16 @@
 <layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
 <layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
 <layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
-<layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
-<layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
-<layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
 =======
 <layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="26" name="bNames" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="27" name="tValues" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="28" name="bValues" color="7" fill="1" visible="yes" active="yes"/>
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
+<layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
+<layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
+<layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
+<layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="29" name="tStop" color="7" fill="3" visible="no" active="yes"/>
 <layer number="30" name="bStop" color="7" fill="6" visible="no" active="yes"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="yes"/>
@@ -2850,8 +2846,8 @@ design rules under a new name.</description>
 </autorouter>
 <elements>
 <<<<<<< HEAD
-<element name="C1" library="rcl" package="SMC_D" value="" x="13.335" y="13.335"/>
-<element name="C2" library="rcl" package="C1206" value="" x="34.29" y="12.065" rot="R90"/>
+<element name="C1" library="rcl" package="SMC_D" value="100uF" x="13.335" y="13.335"/>
+<element name="C2" library="rcl" package="C1206" value="0.1uF" x="34.29" y="12.065" rot="R90"/>
 <element name="EDGE" library="testpad" package="TP20R" value="TPSQTP20R" x="20.955" y="6.35">
 <attribute name="TP_SIGNAL_NAME" value="" x="20.955" y="6.35" size="1.778" layer="27" display="off"/>
 </element>
@@ -2883,13 +2879,13 @@ design rules under a new name.</description>
 <element name="PIKE" library="testpad" package="TP20R" value="TPSQTP20R" x="20.955" y="9.525">
 <attribute name="TP_SIGNAL_NAME" value="" x="20.955" y="9.525" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R1" library="resistor" package="R1206" value="" x="45.72" y="2.54"/>
-<element name="R2" library="resistor" package="R1206" value="" x="31.75" y="12.065" rot="R90"/>
-<element name="R3" library="resistor" package="R1206" value="" x="29.21" y="12.065" rot="R270"/>
-<element name="R4" library="resistor" package="R1206" value="" x="58.42" y="9.525" rot="R90"/>
-<element name="R5" library="resistor" package="R1206" value="" x="60.96" y="9.525" rot="R90"/>
-<element name="R7" library="resistor" package="R1206" value="" x="25.4" y="12.7" rot="R270"/>
-<element name="R8" library="resistor" package="R1206" value="" x="26.035" y="3.81" rot="R90"/>
+<element name="R1" library="resistor" package="R1206" value="1k2" x="45.72" y="2.54"/>
+<element name="R2" library="resistor" package="R1206" value="1k2" x="31.75" y="12.065" rot="R90"/>
+<element name="R3" library="resistor" package="R1206" value="1k2" x="29.21" y="12.065" rot="R270"/>
+<element name="R4" library="resistor" package="R1206" value="1k2" x="58.42" y="9.525" rot="R90"/>
+<element name="R5" library="resistor" package="R1206" value="1k2" x="60.96" y="9.525" rot="R90"/>
+<element name="R7" library="resistor" package="R1206" value="1k2" x="25.4" y="12.7" rot="R270"/>
+<element name="R8" library="resistor" package="R1206" value="1k2" x="26.035" y="3.81" rot="R90"/>
 <element name="SPI_CK" library="testpad" package="TP20R" value="TPSQTP20R" x="55.245" y="2.54">
 <attribute name="TP_SIGNAL_NAME" value="" x="55.245" y="2.54" size="1.778" layer="27" display="off"/>
 </element>
@@ -2901,8 +2897,8 @@ design rules under a new name.</description>
 </element>
 <element name="SWD" library="pinhead" package="1X03" value="" x="53.34" y="13.335"/>
 <element name="U$1" library="stm32f0" package="TSSOP20" value="STM32F042FXPX" x="48.26" y="7.62" rot="R270"/>
-<element name="R9" library="resistor" package="R1206" value="" x="38.1" y="12.065" rot="R270"/>
-<element name="R10" library="resistor" package="R1206" value="" x="33.02" y="3.175" rot="R270"/>
+<element name="R9" library="resistor" package="R1206" value="1k2" x="38.1" y="12.065" rot="R270"/>
+<element name="R10" library="resistor" package="R1206" value="1k2" x="33.02" y="3.175" rot="R270"/>
 <element name="S/S" library="testpad" package="TP20R" value="TPSQTP20R" x="29.845" y="5.08">
 <attribute name="TP_SIGNAL_NAME" value="" x="29.845" y="5.08" size="1.778" layer="27" display="off"/>
 </element>
@@ -3147,27 +3143,27 @@ design rules under a new name.</description>
 <wire x1="45.3422" y1="5.995" x2="33.02" y2="5.995" width="0.3048" layer="1"/>
 <wire x1="33.02" y1="5.995" x2="33.02" y2="4.597" width="0.3048" layer="1"/>
 =======
-<element name="BOOT" library="pinhead" package="1X02" value="" x="36.83" y="20.955" rot="R180"/>
-<element name="C1" library="resistor" package="SMC_D" value="" x="19.05" y="9.525"/>
-<element name="C2" library="resistor" package="C1206" value="" x="20.955" y="14.605" rot="R180"/>
-<element name="DATA" library="pinhead" package="1X03" value="" x="64.77" y="4.445" rot="R270"/>
+<element name="BOOT" library="pinhead" package="1X02" value="" x="60.96" y="12.065"/>
+<element name="C1" library="resistor" package="SMC_D" value="" x="7.62" y="13.335"/>
+<element name="C2" library="resistor" package="C1206" value="" x="31.75" y="9.525"/>
+<element name="DATA" library="pinhead" package="1X03" value="" x="70.485" y="4.445" rot="R270"/>
 <element name="IC1" library="v-reg" package="SOT223" value="LD117AS25TR" x="12.065" y="3.175"/>
 <element name="PWR" library="pinhead" package="1X04" value="" x="5.715" y="7.62" rot="R90"/>
-<element name="R1" library="resistor" package="R1206" value="" x="59.69" y="6.985"/>
-<element name="R2" library="resistor" package="R1206" value="" x="59.69" y="3.175"/>
-<element name="R3" library="resistor" package="R1206" value="" x="13.97" y="21.59" rot="R180"/>
-<element name="R4" library="resistor" package="R1206" value="" x="27.305" y="23.495"/>
-<element name="R5" library="resistor" package="R1206" value="" x="44.45" y="22.225" rot="R180"/>
-<element name="R6" library="resistor" package="R1206" value="" x="22.225" y="0" rot="R90"/>
-<element name="RST" library="pinhead" package="1X02" value="" x="43.815" y="-7.62" rot="R90"/>
-<element name="SENS" library="pinhead" package="1X03" value="" x="33.655" y="10.795"/>
+<element name="R1" library="resistor" package="R1206" value="" x="66.04" y="4.445"/>
+<element name="R2" library="resistor" package="R1206" value="" x="66.04" y="1.905"/>
+<element name="R3" library="resistor" package="R1206" value="" x="69.215" y="14.605"/>
+<element name="R4" library="resistor" package="R1206" value="" x="31.75" y="12.7"/>
+<element name="R5" library="resistor" package="R1206" value="" x="39.37" y="12.065" rot="R180"/>
+<element name="R6" library="resistor" package="R1206" value="" x="39.37" y="7.62" rot="R180"/>
+<element name="RST" library="pinhead" package="1X02" value="" x="19.685" y="3.81" rot="R90"/>
+<element name="SENS" library="pinhead" package="1X03" value="" x="23.495" y="8.89" rot="R90"/>
 <element name="SPI" library="pinhead" package="1X04" value="" x="50.8" y="2.54" rot="R180"/>
-<element name="STR-STP" library="pinhead" package="1X02" value="" x="34.29" y="6.985"/>
-<element name="SWD" library="pinhead" package="1X03" value="" x="64.77" y="12.065" rot="R270"/>
-<element name="U$1" library="stm32f0" package="TSSOP20" value="STM32F042FXPX" x="46.99" y="10.16" rot="R270"/>
-<element name="SPI1" library="pinhead" package="1X04" value="" x="32.385" y="2.54"/>
-<element name="R7" library="resistor" package="R1206" value="" x="40.64" y="5.08"/>
-<element name="R8" library="resistor" package="R1206" value="" x="40.64" y="1.905"/>
+<element name="STR-STP" library="pinhead" package="1X02" value="" x="29.21" y="22.225"/>
+<element name="SWD" library="pinhead" package="1X03" value="" x="67.945" y="9.525" rot="R180"/>
+<element name="U$1" library="stm32f0" package="TSSOP20" value="STM32F042FXPX" x="47.625" y="10.16" rot="R270"/>
+<element name="LEDS" library="pinhead" package="1X04" value="" x="30.48" y="2.54"/>
+<element name="R7" library="resistor" package="R1206" value="" x="39.37" y="5.08"/>
+<element name="R8" library="resistor" package="R1206" value="" x="39.37" y="2.54"/>
 </elements>
 <signals>
 <signal name="N$1">
@@ -3175,102 +3171,40 @@ design rules under a new name.</description>
 <contactref element="PWR" pad="2"/>
 <wire x1="5.715" y1="6.35" x2="14.365" y2="0.025" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="N$2">
-<contactref element="IC1" pad="1"/>
-<contactref element="C1" pad="-"/>
-<contactref element="SWD" pad="1"/>
-<contactref element="SPI" pad="1"/>
-<contactref element="R3" pad="2"/>
-<contactref element="C2" pad="1"/>
-<contactref element="RST" pad="1"/>
-<contactref element="SENS" pad="1"/>
-<contactref element="U$1" pad="15"/>
-<contactref element="DATA" pad="1"/>
-<contactref element="PWR" pad="1"/>
-<contactref element="R6" pad="2"/>
-<wire x1="54.61" y1="2.54" x2="57.15" y2="0" width="0.3048" layer="1"/>
-<wire x1="57.15" y1="0" x2="67.31" y2="0" width="0.3048" layer="1"/>
-<wire x1="67.31" y1="0" x2="67.945" y2="0.635" width="0.3048" layer="1"/>
-<wire x1="67.945" y1="0.635" x2="67.945" y2="6.35" width="0.3048" layer="1"/>
-<wire x1="67.945" y1="6.35" x2="67.31" y2="6.985" width="0.3048" layer="1"/>
-<wire x1="67.31" y1="6.985" x2="64.77" y2="6.985" width="0.3048" layer="1"/>
-<wire x1="64.77" y1="14.605" x2="67.31" y2="14.605" width="0.3048" layer="1"/>
-<wire x1="67.31" y1="14.605" x2="67.945" y2="13.97" width="0.3048" layer="1"/>
-<wire x1="67.945" y1="13.97" x2="67.945" y2="6.35" width="0.3048" layer="1"/>
-<wire x1="54.61" y1="2.54" x2="54.61" y2="9.525" width="0.3048" layer="1"/>
-<wire x1="54.61" y1="9.525" x2="54.3" y2="9.835" width="0.3048" layer="1"/>
-<wire x1="54.3" y1="9.835" x2="49.9078" y2="9.835" width="0.3048" layer="1"/>
-<contactref element="SPI1" pad="3"/>
-<contactref element="SPI1" pad="1"/>
-<wire x1="43.815" y1="-8.89" x2="54.61" y2="2.54" width="0" layer="19" extent="1-1"/>
-<wire x1="33.655" y1="2.54" x2="43.815" y2="-8.89" width="0" layer="19" extent="1-1"/>
-<wire x1="28.575" y1="2.54" x2="33.655" y2="2.54" width="0" layer="19" extent="1-1"/>
-<wire x1="22.225" y1="1.422" x2="28.575" y2="2.54" width="0" layer="19" extent="1-1"/>
-<wire x1="22.2" y1="9.525" x2="22.225" y2="1.422" width="0" layer="19" extent="1-1"/>
-<wire x1="22.355" y1="14.605" x2="22.2" y2="9.525" width="0" layer="19" extent="1-1"/>
-<wire x1="31.115" y1="10.795" x2="22.355" y2="14.605" width="0" layer="19" extent="1-1"/>
-<wire x1="12.548" y1="21.59" x2="22.355" y2="14.605" width="0" layer="19" extent="1-1"/>
-<wire x1="9.765" y1="0.025" x2="22.2" y2="9.525" width="0" layer="19" extent="1-1"/>
-<wire x1="5.715" y1="3.81" x2="9.765" y2="0.025" width="0" layer="19" extent="1-1"/>
-</signal>
 <signal name="N$4">
 <contactref element="U$1" pad="19"/>
 <contactref element="SWD" pad="3"/>
-<wire x1="64.77" y1="9.525" x2="60.325" y2="9.525" width="0.3048" layer="1"/>
-<wire x1="60.325" y1="9.525" x2="57.415" y2="12.435" width="0.3048" layer="1"/>
-<wire x1="57.415" y1="12.435" x2="49.9078" y2="12.435" width="0.3048" layer="1"/>
+<wire x1="50.5428" y1="12.435" x2="65.405" y2="9.525" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$5">
 <contactref element="U$1" pad="20"/>
 <contactref element="SWD" pad="2"/>
-<wire x1="64.77" y1="12.065" x2="59.055" y2="12.065" width="0.3048" layer="1"/>
-<wire x1="59.055" y1="12.065" x2="58.035" y2="13.085" width="0.3048" layer="1"/>
-<wire x1="58.035" y1="13.085" x2="49.9078" y2="13.085" width="0.3048" layer="1"/>
+<wire x1="50.5428" y1="13.085" x2="67.945" y2="9.525" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$6">
 <contactref element="U$1" pad="13"/>
 <contactref element="SPI" pad="2"/>
-<wire x1="52.07" y1="2.54" x2="52.07" y2="3.81" width="0.3048" layer="1"/>
-<wire x1="52.07" y1="3.81" x2="53.34" y2="5.08" width="0.3048" layer="1"/>
-<wire x1="53.34" y1="5.08" x2="53.34" y2="8.255" width="0.3048" layer="1"/>
-<wire x1="53.34" y1="8.255" x2="53.06" y2="8.535" width="0.3048" layer="1"/>
-<wire x1="53.06" y1="8.535" x2="49.9078" y2="8.535" width="0.3048" layer="1"/>
+<wire x1="52.07" y1="2.54" x2="50.5428" y2="8.535" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$7">
 <contactref element="U$1" pad="12"/>
 <contactref element="SPI" pad="3"/>
-<wire x1="49.53" y1="2.54" x2="49.53" y2="4.445" width="0.3048" layer="1"/>
-<wire x1="49.53" y1="4.445" x2="50.165" y2="5.08" width="0.3048" layer="1"/>
-<wire x1="50.165" y1="5.08" x2="51.435" y2="5.08" width="0.3048" layer="1"/>
-<wire x1="51.435" y1="5.08" x2="52.07" y2="5.715" width="0.3048" layer="1"/>
-<wire x1="52.07" y1="5.715" x2="52.07" y2="7.62" width="0.3048" layer="1"/>
-<wire x1="52.07" y1="7.62" x2="51.805" y2="7.885" width="0.3048" layer="1"/>
-<wire x1="51.805" y1="7.885" x2="49.9078" y2="7.885" width="0.3048" layer="1"/>
+<wire x1="49.53" y1="2.54" x2="50.5428" y2="7.885" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$8">
 <contactref element="U$1" pad="11"/>
 <contactref element="SPI" pad="4"/>
-<wire x1="46.99" y1="2.54" x2="47.625" y2="3.175" width="0.3048" layer="1"/>
-<wire x1="47.625" y1="3.175" x2="47.625" y2="6.35" width="0.3048" layer="1"/>
-<wire x1="47.625" y1="6.35" x2="48.51" y2="7.235" width="0.3048" layer="1"/>
-<wire x1="48.51" y1="7.235" x2="49.9078" y2="7.235" width="0.3048" layer="1"/>
+<wire x1="46.99" y1="2.54" x2="50.5428" y2="7.235" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$9">
 <contactref element="U$1" pad="17"/>
 <contactref element="R2" pad="1"/>
-<wire x1="58.268" y1="3.175" x2="57.15" y2="3.023" width="0.3048" layer="1"/>
-<wire x1="57.15" y1="3.023" x2="57.15" y2="3.81" width="0.3048" layer="1"/>
-<wire x1="57.15" y1="3.81" x2="55.88" y2="5.08" width="0.3048" layer="1"/>
-<wire x1="55.88" y1="5.08" x2="55.88" y2="9.525" width="0.3048" layer="1"/>
-<wire x1="55.88" y1="9.525" x2="54.27" y2="11.135" width="0.3048" layer="1"/>
-<wire x1="54.27" y1="11.135" x2="49.9078" y2="11.135" width="0.3048" layer="1"/>
+<wire x1="50.5428" y1="11.135" x2="64.618" y2="1.905" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$10">
 <contactref element="U$1" pad="18"/>
 <contactref element="R1" pad="1"/>
-<wire x1="58.268" y1="6.985" x2="58.268" y2="10.312" width="0.3048" layer="1"/>
-<wire x1="58.268" y1="10.312" x2="56.795" y2="11.785" width="0.3048" layer="1"/>
-<wire x1="56.795" y1="11.785" x2="49.9078" y2="11.785" width="0.3048" layer="1"/>
+<wire x1="50.5428" y1="11.785" x2="64.618" y2="4.445" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$13">
 <contactref element="U$1" pad="5"/>
@@ -3280,54 +3214,49 @@ design rules under a new name.</description>
 <contactref element="BOOT" pad="2"/>
 <contactref element="R4" pad="1"/>
 <contactref element="STR-STP" pad="1"/>
-<wire x1="49.9078" y1="10.485" x2="44.0722" y2="10.485" width="0.3048" layer="1"/>
-<wire x1="25.883" y1="23.495" x2="35.56" y2="20.955" width="0" layer="19" extent="1-1"/>
-<wire x1="33.02" y1="6.985" x2="35.56" y2="20.955" width="0" layer="19" extent="1-1"/>
-<wire x1="44.0722" y1="10.485" x2="33.02" y2="6.985" width="0" layer="19" extent="1-1"/>
-<wire x1="15.9" y1="9.525" x2="25.883" y2="23.495" width="0" layer="19" extent="1-1"/>
-<wire x1="12.065" y1="6.325" x2="15.9" y2="9.525" width="0" layer="19" extent="1-1"/>
+<wire x1="50.5428" y1="10.485" x2="44.7072" y2="10.485" width="0.3048" layer="1"/>
+<wire x1="50.5428" y1="10.485" x2="62.23" y2="12.065" width="0" layer="19" extent="1-1"/>
+<wire x1="30.328" y1="12.7" x2="44.7072" y2="10.485" width="0" layer="19" extent="1-1"/>
+<wire x1="27.94" y1="22.225" x2="30.328" y2="12.7" width="0" layer="19" extent="1-1"/>
+<wire x1="12.065" y1="6.325" x2="30.328" y2="12.7" width="0" layer="19" extent="1-1"/>
+<wire x1="4.47" y1="13.335" x2="12.065" y2="6.325" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$14">
 <contactref element="BOOT" pad="1"/>
 <contactref element="U$1" pad="1"/>
 <contactref element="R3" pad="1"/>
-<wire x1="15.392" y1="21.59" x2="38.1" y2="20.955" width="0" layer="19" extent="1-1"/>
-<wire x1="44.0722" y1="13.085" x2="38.1" y2="20.955" width="0" layer="19" extent="1-1"/>
+<wire x1="59.69" y1="12.065" x2="67.793" y2="14.605" width="0" layer="19" extent="1-1"/>
+<wire x1="44.7072" y1="13.085" x2="59.69" y2="12.065" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$15">
 <contactref element="R4" pad="2"/>
 <contactref element="R5" pad="2"/>
 <contactref element="C2" pad="2"/>
 <contactref element="RST" pad="2"/>
-<wire x1="28.727" y1="23.495" x2="43.028" y2="22.225" width="0" layer="19" extent="1-1"/>
-<wire x1="19.555" y1="14.605" x2="28.727" y2="23.495" width="0" layer="19" extent="1-1"/>
-<wire x1="43.815" y1="-6.35" x2="43.028" y2="22.225" width="0" layer="19" extent="1-1"/>
+<wire x1="33.172" y1="12.7" x2="33.172" y2="9.547" width="0.3048" layer="1"/>
+<wire x1="33.172" y1="9.547" x2="33.15" y2="9.525" width="0.3048" layer="1"/>
+<wire x1="33.172" y1="12.7" x2="37.948" y2="12.065" width="0" layer="19" extent="1-1"/>
+<wire x1="19.685" y1="5.08" x2="33.15" y2="9.525" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$16">
 <contactref element="R5" pad="1"/>
 <contactref element="U$1" pad="4"/>
-<wire x1="44.0722" y1="11.135" x2="45.872" y2="22.225" width="0" layer="19" extent="1-1"/>
+<wire x1="40.792" y1="12.065" x2="44.7072" y2="11.135" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$19">
 <contactref element="U$1" pad="6"/>
 <contactref element="SENS" pad="3"/>
-<wire x1="36.195" y1="10.795" x2="41.91" y2="10.795" width="0.3048" layer="1"/>
-<wire x1="41.91" y1="10.795" x2="41.91" y2="9.835" width="0.3048" layer="1"/>
-<wire x1="41.91" y1="9.835" x2="44.0722" y2="9.835" width="0.3048" layer="1"/>
+<wire x1="23.495" y1="11.43" x2="44.7072" y2="9.835" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$3">
 <contactref element="R2" pad="2"/>
 <contactref element="DATA" pad="3"/>
-<wire x1="61.112" y1="3.175" x2="62.382" y2="1.905" width="0.3048" layer="1"/>
-<wire x1="62.382" y1="1.905" x2="64.77" y2="1.905" width="0.3048" layer="1"/>
+<wire x1="70.485" y1="1.905" x2="67.462" y2="1.905" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$11">
 <contactref element="R1" pad="2"/>
 <contactref element="DATA" pad="2"/>
-<wire x1="61.112" y1="6.985" x2="61.112" y2="5.563" width="0.3048" layer="1"/>
-<wire x1="61.112" y1="5.563" x2="61.595" y2="5.08" width="0.3048" layer="1"/>
-<wire x1="61.595" y1="5.08" x2="64.135" y2="5.08" width="0.3048" layer="1"/>
-<wire x1="64.135" y1="5.08" x2="64.77" y2="4.445" width="0.3048" layer="1"/>
+<wire x1="70.485" y1="4.445" x2="67.462" y2="4.445" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$12">
 <contactref element="PWR" pad="3"/>
@@ -3338,48 +3267,62 @@ design rules under a new name.</description>
 <contactref element="U$1" pad="8"/>
 <contactref element="STR-STP" pad="2"/>
 <contactref element="R6" pad="1"/>
-<wire x1="22.225" y1="-1.422" x2="35.56" y2="6.985" width="0" layer="19" extent="1-1"/>
-<wire x1="35.56" y1="6.985" x2="40.64" y2="6.985" width="0.3048" layer="1"/>
-<wire x1="40.64" y1="6.985" x2="40.64" y2="8.535" width="0.3048" layer="1"/>
-<wire x1="40.64" y1="8.535" x2="44.0722" y2="8.535" width="0.3048" layer="1"/>
+<wire x1="40.792" y1="7.62" x2="44.7072" y2="8.535" width="0" layer="19" extent="1-1"/>
+<wire x1="30.48" y1="22.225" x2="40.792" y2="7.62" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$20">
-<contactref element="SPI1" pad="2"/>
+<contactref element="LEDS" pad="2"/>
 <contactref element="R7" pad="1"/>
-<wire x1="39.218" y1="5.08" x2="32.385" y2="5.08" width="0.3048" layer="1"/>
-<wire x1="32.385" y1="5.08" x2="31.115" y2="3.81" width="0.3048" layer="1"/>
-<wire x1="31.115" y1="3.81" x2="31.115" y2="2.54" width="0.3048" layer="1"/>
+<wire x1="29.21" y1="2.54" x2="37.948" y2="5.08" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$21">
-<contactref element="SPI1" pad="4"/>
+<contactref element="LEDS" pad="4"/>
 <contactref element="R8" pad="1"/>
-<wire x1="39.218" y1="1.905" x2="38.583" y2="2.54" width="0.3048" layer="1"/>
-<wire x1="38.583" y1="2.54" x2="36.195" y2="2.54" width="0.3048" layer="1"/>
+<wire x1="34.29" y1="2.54" x2="37.948" y2="2.54" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$22">
 <contactref element="R7" pad="2"/>
 <contactref element="U$1" pad="9"/>
-<wire x1="42.062" y1="5.08" x2="42.545" y2="5.563" width="0.3048" layer="1"/>
-<wire x1="42.545" y1="5.563" x2="42.545" y2="7.62" width="0.3048" layer="1"/>
-<wire x1="42.545" y1="7.62" x2="42.81" y2="7.885" width="0.3048" layer="1"/>
-<wire x1="42.81" y1="7.885" x2="44.0722" y2="7.885" width="0.3048" layer="1"/>
+<wire x1="40.792" y1="5.08" x2="44.7072" y2="7.885" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$23">
 <contactref element="U$1" pad="10"/>
 <contactref element="R8" pad="2"/>
-<wire x1="42.062" y1="1.905" x2="45.085" y2="4.928" width="0.3048" layer="1"/>
-<wire x1="45.085" y1="4.928" x2="45.085" y2="6.985" width="0.3048" layer="1"/>
-<wire x1="45.085" y1="6.985" x2="44.835" y2="7.235" width="0.3048" layer="1"/>
-<wire x1="44.835" y1="7.235" x2="44.0722" y2="7.235" width="0.3048" layer="1"/>
+<wire x1="40.792" y1="2.54" x2="44.7072" y2="7.235" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$17">
 <contactref element="U$1" pad="7"/>
 <contactref element="SENS" pad="2"/>
-<wire x1="33.655" y1="10.795" x2="33.655" y2="10.16" width="0.3048" layer="1"/>
-<wire x1="33.655" y1="10.16" x2="34.29" y2="8.89" width="0.3048" layer="1"/>
-<wire x1="34.29" y1="8.89" x2="38.735" y2="8.89" width="0.3048" layer="1"/>
-<wire x1="38.735" y1="8.89" x2="38.735" y2="9.185" width="0.3048" layer="1"/>
-<wire x1="38.735" y1="9.185" x2="44.0722" y2="9.185" width="0.3048" layer="1"/>
+<wire x1="23.495" y1="8.89" x2="44.7072" y2="9.185" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$24">
+<contactref element="LEDS" pad="3"/>
+<contactref element="LEDS" pad="1"/>
+<contactref element="R6" pad="2"/>
+<contactref element="PWR" pad="1"/>
+<contactref element="SENS" pad="1"/>
+<contactref element="SWD" pad="1"/>
+<contactref element="U$1" pad="15"/>
+<contactref element="C1" pad="-"/>
+<contactref element="IC1" pad="1"/>
+<contactref element="SPI" pad="1"/>
+<contactref element="RST" pad="1"/>
+<contactref element="R3" pad="2"/>
+<contactref element="DATA" pad="1"/>
+<contactref element="C2" pad="1"/>
+<wire x1="70.485" y1="9.525" x2="70.637" y2="14.605" width="0" layer="19" extent="1-1"/>
+<wire x1="70.485" y1="6.985" x2="70.485" y2="9.525" width="0" layer="19" extent="1-1"/>
+<wire x1="54.61" y1="2.54" x2="70.485" y2="6.985" width="0" layer="19" extent="1-1"/>
+<wire x1="50.5428" y1="9.835" x2="54.61" y2="2.54" width="0" layer="19" extent="1-1"/>
+<wire x1="37.948" y1="7.62" x2="50.5428" y2="9.835" width="0" layer="19" extent="1-1"/>
+<wire x1="30.35" y1="9.525" x2="37.948" y2="7.62" width="0" layer="19" extent="1-1"/>
+<wire x1="31.75" y1="2.54" x2="30.35" y2="9.525" width="0" layer="19" extent="1-1"/>
+<wire x1="26.67" y1="2.54" x2="31.75" y2="2.54" width="0" layer="19" extent="1-1"/>
+<wire x1="23.495" y1="6.35" x2="26.67" y2="2.54" width="0" layer="19" extent="1-1"/>
+<wire x1="19.685" y1="2.54" x2="23.495" y2="6.35" width="0" layer="19" extent="1-1"/>
+<wire x1="9.765" y1="0.025" x2="19.685" y2="2.54" width="0" layer="19" extent="1-1"/>
+<wire x1="5.715" y1="3.81" x2="9.765" y2="0.025" width="0" layer="19" extent="1-1"/>
+<wire x1="10.77" y1="13.335" x2="5.715" y2="3.81" width="0" layer="19" extent="1-1"/>
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 </signal>
 </signals>

HARD/Knife/m_knife.b#5

@@ -129,6 +129,7 @@
 <wire x1="67.935" y1="17.27" x2="7.62" y2="17.27" width="0" layer="20"/>
 <wire x1="7.62" y1="17.27" x2="7.62" y2="-1.27" width="0" layer="20"/>
 <circle x="46.99" y="11.43" radius="0.3175" width="0.254" layer="1"/>
+<text x="7.62" y="15.875" size="1.27" layer="1">FTL</text>
 </plain>
 <libraries>
 <library name="rcl">
@@ -2652,11 +2653,7 @@ Source: http://www.onsemi.co.jp .. LM137M-D.PDF</description>
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
-<<<<<<< HEAD
 <designrules name="default *">
-=======
-<designrules name="default">
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <description language="de">&lt;b&gt;EAGLE Design Rules&lt;/b&gt;
 &lt;p&gt;
 Die Standard-Design-Rules sind so gewählt, dass sie für 
@@ -2705,13 +2702,6 @@ design rules under a new name.</description>
 <param name="rlMinPadInner" value="18mil"/>
 <param name="rlMaxPadInner" value="20mil"/>
 <param name="rlMinPadBottom" value="18mil"/>
-=======
-<param name="rlMinPadTop" value="10mil"/>
-<param name="rlMaxPadTop" value="20mil"/>
-<param name="rlMinPadInner" value="10mil"/>
-<param name="rlMaxPadInner" value="20mil"/>
-<param name="rlMinPadBottom" value="10mil"/>
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <param name="rlMaxPadBottom" value="20mil"/>
 <param name="rlMinViaOuter" value="8mil"/>
 <param name="rlMaxViaOuter" value="20mil"/>
@@ -2720,16 +2710,25 @@ design rules under a new name.</description>
 <param name="rlMinMicroViaOuter" value="4mil"/>
 <param name="rlMaxMicroViaOuter" value="20mil"/>
 <param name="rlMinMicroViaInner" value="4mil"/>
+=======
+<param name="rlMinPadTop" value="20mil"/>
+<param name="rlMaxPadTop" value="25mil"/>
+<param name="rlMinPadInner" value="20mil"/>
+<param name="rlMaxPadInner" value="25mil"/>
+<param name="rlMinPadBottom" value="20mil"/>
+<param name="rlMaxPadBottom" value="25mil"/>
+<param name="rlMinViaOuter" value="18mil"/>
+<param name="rlMaxViaOuter" value="20mil"/>
+<param name="rlMinViaInner" value="18mil"/>
+<param name="rlMaxViaInner" value="20mil"/>
+<param name="rlMinMicroViaOuter" value="14mil"/>
+<param name="rlMaxMicroViaOuter" value="20mil"/>
+<param name="rlMinMicroViaInner" value="14mil"/>
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <param name="rlMaxMicroViaInner" value="20mil"/>
-<<<<<<< HEAD
 <param name="psTop" value="1"/>
 <param name="psBottom" value="1"/>
 <param name="psFirst" value="1"/>
-=======
-<param name="psTop" value="-1"/>
-<param name="psBottom" value="-1"/>
-<param name="psFirst" value="-1"/>
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <param name="psElongationLong" value="100"/>
 <param name="psElongationOffset" value="100"/>
 <param name="mvStopFrame" value="1"/>
@@ -3148,31 +3147,33 @@ design rules under a new name.</description>
 <wire x1="45.3422" y1="5.995" x2="33.02" y2="5.995" width="0.3048" layer="1"/>
 <wire x1="33.02" y1="5.995" x2="33.02" y2="4.597" width="0.3048" layer="1"/>
 =======
-<element name="BOOT" library="pinhead" package="1X02" value="" x="33.02" y="5.08"/>
-<element name="C1" library="resistor" package="SMC_D" value="" x="-17.78" y="16.51"/>
-<element name="C2" library="resistor" package="C1206" value="" x="57.15" y="36.83"/>
-<element name="DATA" library="pinhead" package="1X03" value="" x="63.5" y="8.89" rot="R270"/>
-<element name="IC1" library="v-reg" package="SOT223" value="LD117AS25TR" x="-33.02" y="5.08"/>
-<element name="PWR" library="pinhead" package="1X04" value="" x="-27.94" y="16.51"/>
-<element name="LEDS" library="pinhead" package="1X03" value="" x="-17.78" y="29.21"/>
-<element name="R1" library="resistor" package="R1206" value="" x="57.15" y="10.16"/>
-<element name="R2" library="resistor" package="R1206" value="" x="57.15" y="6.35"/>
-<element name="R3" library="resistor" package="R1206" value="" x="3.81" y="30.48"/>
-<element name="R4" library="resistor" package="R1206" value="" x="1.27" y="21.59"/>
-<element name="R5" library="resistor" package="R1206" value="" x="45.72" y="24.13"/>
-<element name="R6" library="resistor" package="R1206" value="" x="-30.48" y="40.64"/>
-<element name="RST" library="pinhead" package="1X02" value="" x="-22.86" y="35.56"/>
-<element name="SENS" library="pinhead" package="1X03" value="" x="-26.67" y="29.21"/>
-<element name="SPI" library="pinhead" package="1X04" value="" x="59.69" y="2.54" rot="R180"/>
-<element name="STR-STP" library="pinhead" package="1X02" value="" x="-30.48" y="22.86"/>
-<element name="SWD" library="pinhead" package="1X03" value="" x="58.42" y="13.97"/>
+<element name="BOOT" library="pinhead" package="1X02" value="" x="36.83" y="20.955" rot="R180"/>
+<element name="C1" library="resistor" package="SMC_D" value="" x="19.05" y="9.525"/>
+<element name="C2" library="resistor" package="C1206" value="" x="20.955" y="14.605" rot="R180"/>
+<element name="DATA" library="pinhead" package="1X03" value="" x="64.77" y="4.445" rot="R270"/>
+<element name="IC1" library="v-reg" package="SOT223" value="LD117AS25TR" x="12.065" y="3.175"/>
+<element name="PWR" library="pinhead" package="1X04" value="" x="5.715" y="7.62" rot="R90"/>
+<element name="R1" library="resistor" package="R1206" value="" x="59.69" y="6.985"/>
+<element name="R2" library="resistor" package="R1206" value="" x="59.69" y="3.175"/>
+<element name="R3" library="resistor" package="R1206" value="" x="13.97" y="21.59" rot="R180"/>
+<element name="R4" library="resistor" package="R1206" value="" x="27.305" y="23.495"/>
+<element name="R5" library="resistor" package="R1206" value="" x="44.45" y="22.225" rot="R180"/>
+<element name="R6" library="resistor" package="R1206" value="" x="22.225" y="0" rot="R90"/>
+<element name="RST" library="pinhead" package="1X02" value="" x="43.815" y="-7.62" rot="R90"/>
+<element name="SENS" library="pinhead" package="1X03" value="" x="33.655" y="10.795"/>
+<element name="SPI" library="pinhead" package="1X04" value="" x="50.8" y="2.54" rot="R180"/>
+<element name="STR-STP" library="pinhead" package="1X02" value="" x="34.29" y="6.985"/>
+<element name="SWD" library="pinhead" package="1X03" value="" x="64.77" y="12.065" rot="R270"/>
 <element name="U$1" library="stm32f0" package="TSSOP20" value="STM32F042FXPX" x="46.99" y="10.16" rot="R270"/>
+<element name="SPI1" library="pinhead" package="1X04" value="" x="32.385" y="2.54"/>
+<element name="R7" library="resistor" package="R1206" value="" x="40.64" y="5.08"/>
+<element name="R8" library="resistor" package="R1206" value="" x="40.64" y="1.905"/>
 </elements>
 <signals>
 <signal name="N$1">
 <contactref element="IC1" pad="3"/>
 <contactref element="PWR" pad="2"/>
-<wire x1="-29.21" y1="16.51" x2="-30.72" y2="1.93" width="0" layer="19" extent="1-1"/>
+<wire x1="5.715" y1="6.35" x2="14.365" y2="0.025" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$2">
 <contactref element="IC1" pad="1"/>
@@ -3186,57 +3187,90 @@ design rules under a new name.</description>
 <contactref element="U$1" pad="15"/>
 <contactref element="DATA" pad="1"/>
 <contactref element="PWR" pad="1"/>
-<contactref element="LEDS" pad="1"/>
 <contactref element="R6" pad="2"/>
-<wire x1="55.88" y1="13.97" x2="55.75" y2="36.83" width="0" layer="19" extent="1-1"/>
-<wire x1="49.9078" y1="9.835" x2="55.88" y2="13.97" width="0" layer="19" extent="1-1"/>
-<wire x1="63.5" y1="2.54" x2="55.88" y2="13.97" width="0" layer="19" extent="1-1"/>
-<wire x1="63.5" y1="11.43" x2="63.5" y2="2.54" width="0" layer="19" extent="1-1"/>
-<wire x1="5.232" y1="30.48" x2="49.9078" y2="9.835" width="0" layer="19" extent="1-1"/>
-<wire x1="-14.63" y1="16.51" x2="5.232" y2="30.48" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.32" y1="29.21" x2="-14.63" y2="16.51" width="0" layer="19" extent="1-1"/>
-<wire x1="-24.13" y1="35.56" x2="-20.32" y2="29.21" width="0" layer="19" extent="1-1"/>
-<wire x1="-29.058" y1="40.64" x2="-24.13" y2="35.56" width="0" layer="19" extent="1-1"/>
-<wire x1="-29.21" y1="29.21" x2="-24.13" y2="35.56" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.75" y1="16.51" x2="-29.21" y2="29.21" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.32" y1="1.93" x2="-31.75" y2="16.51" width="0" layer="19" extent="1-1"/>
+<wire x1="54.61" y1="2.54" x2="57.15" y2="0" width="0.3048" layer="1"/>
+<wire x1="57.15" y1="0" x2="67.31" y2="0" width="0.3048" layer="1"/>
+<wire x1="67.31" y1="0" x2="67.945" y2="0.635" width="0.3048" layer="1"/>
+<wire x1="67.945" y1="0.635" x2="67.945" y2="6.35" width="0.3048" layer="1"/>
+<wire x1="67.945" y1="6.35" x2="67.31" y2="6.985" width="0.3048" layer="1"/>
+<wire x1="67.31" y1="6.985" x2="64.77" y2="6.985" width="0.3048" layer="1"/>
+<wire x1="64.77" y1="14.605" x2="67.31" y2="14.605" width="0.3048" layer="1"/>
+<wire x1="67.31" y1="14.605" x2="67.945" y2="13.97" width="0.3048" layer="1"/>
+<wire x1="67.945" y1="13.97" x2="67.945" y2="6.35" width="0.3048" layer="1"/>
+<wire x1="54.61" y1="2.54" x2="54.61" y2="9.525" width="0.3048" layer="1"/>
+<wire x1="54.61" y1="9.525" x2="54.3" y2="9.835" width="0.3048" layer="1"/>
+<wire x1="54.3" y1="9.835" x2="49.9078" y2="9.835" width="0.3048" layer="1"/>
+<contactref element="SPI1" pad="3"/>
+<contactref element="SPI1" pad="1"/>
+<wire x1="43.815" y1="-8.89" x2="54.61" y2="2.54" width="0" layer="19" extent="1-1"/>
+<wire x1="33.655" y1="2.54" x2="43.815" y2="-8.89" width="0" layer="19" extent="1-1"/>
+<wire x1="28.575" y1="2.54" x2="33.655" y2="2.54" width="0" layer="19" extent="1-1"/>
+<wire x1="22.225" y1="1.422" x2="28.575" y2="2.54" width="0" layer="19" extent="1-1"/>
+<wire x1="22.2" y1="9.525" x2="22.225" y2="1.422" width="0" layer="19" extent="1-1"/>
+<wire x1="22.355" y1="14.605" x2="22.2" y2="9.525" width="0" layer="19" extent="1-1"/>
+<wire x1="31.115" y1="10.795" x2="22.355" y2="14.605" width="0" layer="19" extent="1-1"/>
+<wire x1="12.548" y1="21.59" x2="22.355" y2="14.605" width="0" layer="19" extent="1-1"/>
+<wire x1="9.765" y1="0.025" x2="22.2" y2="9.525" width="0" layer="19" extent="1-1"/>
+<wire x1="5.715" y1="3.81" x2="9.765" y2="0.025" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$4">
 <contactref element="U$1" pad="19"/>
 <contactref element="SWD" pad="3"/>
-<wire x1="49.9078" y1="12.435" x2="60.96" y2="13.97" width="0" layer="19" extent="1-1"/>
+<wire x1="64.77" y1="9.525" x2="60.325" y2="9.525" width="0.3048" layer="1"/>
+<wire x1="60.325" y1="9.525" x2="57.415" y2="12.435" width="0.3048" layer="1"/>
+<wire x1="57.415" y1="12.435" x2="49.9078" y2="12.435" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$5">
 <contactref element="U$1" pad="20"/>
 <contactref element="SWD" pad="2"/>
-<wire x1="49.9078" y1="13.085" x2="58.42" y2="13.97" width="0" layer="19" extent="1-1"/>
+<wire x1="64.77" y1="12.065" x2="59.055" y2="12.065" width="0.3048" layer="1"/>
+<wire x1="59.055" y1="12.065" x2="58.035" y2="13.085" width="0.3048" layer="1"/>
+<wire x1="58.035" y1="13.085" x2="49.9078" y2="13.085" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$6">
 <contactref element="U$1" pad="13"/>
 <contactref element="SPI" pad="2"/>
-<wire x1="49.9078" y1="8.535" x2="60.96" y2="2.54" width="0" layer="19" extent="1-1"/>
+<wire x1="52.07" y1="2.54" x2="52.07" y2="3.81" width="0.3048" layer="1"/>
+<wire x1="52.07" y1="3.81" x2="53.34" y2="5.08" width="0.3048" layer="1"/>
+<wire x1="53.34" y1="5.08" x2="53.34" y2="8.255" width="0.3048" layer="1"/>
+<wire x1="53.34" y1="8.255" x2="53.06" y2="8.535" width="0.3048" layer="1"/>
+<wire x1="53.06" y1="8.535" x2="49.9078" y2="8.535" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$7">
 <contactref element="U$1" pad="12"/>
 <contactref element="SPI" pad="3"/>
-<wire x1="49.9078" y1="7.885" x2="58.42" y2="2.54" width="0" layer="19" extent="1-1"/>
+<wire x1="49.53" y1="2.54" x2="49.53" y2="4.445" width="0.3048" layer="1"/>
+<wire x1="49.53" y1="4.445" x2="50.165" y2="5.08" width="0.3048" layer="1"/>
+<wire x1="50.165" y1="5.08" x2="51.435" y2="5.08" width="0.3048" layer="1"/>
+<wire x1="51.435" y1="5.08" x2="52.07" y2="5.715" width="0.3048" layer="1"/>
+<wire x1="52.07" y1="5.715" x2="52.07" y2="7.62" width="0.3048" layer="1"/>
+<wire x1="52.07" y1="7.62" x2="51.805" y2="7.885" width="0.3048" layer="1"/>
+<wire x1="51.805" y1="7.885" x2="49.9078" y2="7.885" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$8">
 <contactref element="U$1" pad="11"/>
 <contactref element="SPI" pad="4"/>
-<wire x1="49.9078" y1="7.235" x2="55.88" y2="2.54" width="0" layer="19" extent="1-1"/>
+<wire x1="46.99" y1="2.54" x2="47.625" y2="3.175" width="0.3048" layer="1"/>
+<wire x1="47.625" y1="3.175" x2="47.625" y2="6.35" width="0.3048" layer="1"/>
+<wire x1="47.625" y1="6.35" x2="48.51" y2="7.235" width="0.3048" layer="1"/>
+<wire x1="48.51" y1="7.235" x2="49.9078" y2="7.235" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$9">
 <contactref element="U$1" pad="17"/>
 <contactref element="R2" pad="1"/>
-<wire x1="55.728" y1="6.35" x2="50.943" y2="11.135" width="0.3048" layer="1"/>
-<wire x1="50.943" y1="11.135" x2="49.9078" y2="11.135" width="0.3048" layer="1"/>
+<wire x1="58.268" y1="3.175" x2="57.15" y2="3.023" width="0.3048" layer="1"/>
+<wire x1="57.15" y1="3.023" x2="57.15" y2="3.81" width="0.3048" layer="1"/>
+<wire x1="57.15" y1="3.81" x2="55.88" y2="5.08" width="0.3048" layer="1"/>
+<wire x1="55.88" y1="5.08" x2="55.88" y2="9.525" width="0.3048" layer="1"/>
+<wire x1="55.88" y1="9.525" x2="54.27" y2="11.135" width="0.3048" layer="1"/>
+<wire x1="54.27" y1="11.135" x2="49.9078" y2="11.135" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="U$1" pad="18"/>
 <contactref element="R1" pad="1"/>
-<wire x1="55.728" y1="10.16" x2="54.103" y2="11.785" width="0.3048" layer="1"/>
-<wire x1="54.103" y1="11.785" x2="49.9078" y2="11.785" width="0.3048" layer="1"/>
+<wire x1="58.268" y1="6.985" x2="58.268" y2="10.312" width="0.3048" layer="1"/>
+<wire x1="58.268" y1="10.312" x2="56.795" y2="11.785" width="0.3048" layer="1"/>
+<wire x1="56.795" y1="11.785" x2="49.9078" y2="11.785" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$13">
 <contactref element="U$1" pad="5"/>
@@ -3246,77 +3280,106 @@ design rules under a new name.</description>
 <contactref element="BOOT" pad="2"/>
 <contactref element="R4" pad="1"/>
 <contactref element="STR-STP" pad="1"/>
-<wire x1="44.0722" y1="10.485" x2="49.9078" y2="10.485" width="0" layer="19" extent="1-1"/>
-<wire x1="34.29" y1="5.08" x2="44.0722" y2="10.485" width="0" layer="19" extent="1-1"/>
-<wire x1="-0.152" y1="21.59" x2="34.29" y2="5.08" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.93" y1="16.51" x2="-0.152" y2="21.59" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.75" y1="22.86" x2="-20.93" y2="16.51" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.02" y1="8.23" x2="-20.93" y2="16.51" width="0" layer="19" extent="1-1"/>
+<wire x1="49.9078" y1="10.485" x2="44.0722" y2="10.485" width="0.3048" layer="1"/>
+<wire x1="25.883" y1="23.495" x2="35.56" y2="20.955" width="0" layer="19" extent="1-1"/>
+<wire x1="33.02" y1="6.985" x2="35.56" y2="20.955" width="0" layer="19" extent="1-1"/>
+<wire x1="44.0722" y1="10.485" x2="33.02" y2="6.985" width="0" layer="19" extent="1-1"/>
+<wire x1="15.9" y1="9.525" x2="25.883" y2="23.495" width="0" layer="19" extent="1-1"/>
+<wire x1="12.065" y1="6.325" x2="15.9" y2="9.525" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$14">
 <contactref element="BOOT" pad="1"/>
 <contactref element="U$1" pad="1"/>
 <contactref element="R3" pad="1"/>
-<wire x1="31.75" y1="5.08" x2="44.0722" y2="13.085" width="0" layer="19" extent="1-1"/>
-<wire x1="2.388" y1="30.48" x2="31.75" y2="5.08" width="0" layer="19" extent="1-1"/>
+<wire x1="15.392" y1="21.59" x2="38.1" y2="20.955" width="0" layer="19" extent="1-1"/>
+<wire x1="44.0722" y1="13.085" x2="38.1" y2="20.955" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$15">
 <contactref element="R4" pad="2"/>
 <contactref element="R5" pad="2"/>
 <contactref element="C2" pad="2"/>
 <contactref element="RST" pad="2"/>
-<wire x1="47.142" y1="24.13" x2="58.55" y2="36.83" width="0" layer="19" extent="1-1"/>
-<wire x1="2.692" y1="21.59" x2="47.142" y2="24.13" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="35.56" x2="2.692" y2="21.59" width="0" layer="19" extent="1-1"/>
+<wire x1="28.727" y1="23.495" x2="43.028" y2="22.225" width="0" layer="19" extent="1-1"/>
+<wire x1="19.555" y1="14.605" x2="28.727" y2="23.495" width="0" layer="19" extent="1-1"/>
+<wire x1="43.815" y1="-6.35" x2="43.028" y2="22.225" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$16">
 <contactref element="R5" pad="1"/>
 <contactref element="U$1" pad="4"/>
-<wire x1="44.0722" y1="11.135" x2="44.298" y2="24.13" width="0" layer="19" extent="1-1"/>
+<wire x1="44.0722" y1="11.135" x2="45.872" y2="22.225" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$19">
-<contactref element="SENS" pad="2"/>
 <contactref element="U$1" pad="6"/>
-<wire x1="-26.67" y1="29.21" x2="44.0722" y2="9.835" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$17">
 <contactref element="SENS" pad="3"/>
-<contactref element="U$1" pad="7"/>
-<wire x1="-24.13" y1="29.21" x2="44.0722" y2="9.185" width="0" layer="19" extent="1-1"/>
+<wire x1="36.195" y1="10.795" x2="41.91" y2="10.795" width="0.3048" layer="1"/>
+<wire x1="41.91" y1="10.795" x2="41.91" y2="9.835" width="0.3048" layer="1"/>
+<wire x1="41.91" y1="9.835" x2="44.0722" y2="9.835" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="R2" pad="2"/>
 <contactref element="DATA" pad="3"/>
-<wire x1="63.5" y1="6.35" x2="58.572" y2="6.35" width="0.4064" layer="1"/>
+<wire x1="61.112" y1="3.175" x2="62.382" y2="1.905" width="0.3048" layer="1"/>
+<wire x1="62.382" y1="1.905" x2="64.77" y2="1.905" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$11">
 <contactref element="R1" pad="2"/>
 <contactref element="DATA" pad="2"/>
-<wire x1="63.5" y1="8.89" x2="60.96" y2="8.89" width="0.4064" layer="1"/>
-<wire x1="60.96" y1="8.89" x2="60.96" y2="10.16" width="0.4064" layer="1"/>
-<wire x1="60.96" y1="10.16" x2="58.572" y2="10.16" width="0.4064" layer="1"/>
+<wire x1="61.112" y1="6.985" x2="61.112" y2="5.563" width="0.3048" layer="1"/>
+<wire x1="61.112" y1="5.563" x2="61.595" y2="5.08" width="0.3048" layer="1"/>
+<wire x1="61.595" y1="5.08" x2="64.135" y2="5.08" width="0.3048" layer="1"/>
+<wire x1="64.135" y1="5.08" x2="64.77" y2="4.445" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$12">
 <contactref element="PWR" pad="3"/>
 <contactref element="PWR" pad="4"/>
-<wire x1="-24.13" y1="16.51" x2="-26.67" y2="16.51" width="0" layer="19" extent="1-1"/>
+<wire x1="5.715" y1="8.89" x2="5.715" y2="11.43" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$18">
 <contactref element="U$1" pad="8"/>
 <contactref element="STR-STP" pad="2"/>
 <contactref element="R6" pad="1"/>
-<wire x1="-29.21" y1="22.86" x2="44.0722" y2="8.535" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.902" y1="40.64" x2="-29.21" y2="22.86" width="0" layer="19" extent="1-1"/>
+<wire x1="22.225" y1="-1.422" x2="35.56" y2="6.985" width="0" layer="19" extent="1-1"/>
+<wire x1="35.56" y1="6.985" x2="40.64" y2="6.985" width="0.3048" layer="1"/>
+<wire x1="40.64" y1="6.985" x2="40.64" y2="8.535" width="0.3048" layer="1"/>
+<wire x1="40.64" y1="8.535" x2="44.0722" y2="8.535" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$20">
-<contactref element="U$1" pad="9"/>
-<contactref element="LEDS" pad="2"/>
-<wire x1="-17.78" y1="29.21" x2="44.0722" y2="7.885" width="0" layer="19" extent="1-1"/>
+<contactref element="SPI1" pad="2"/>
+<contactref element="R7" pad="1"/>
+<wire x1="39.218" y1="5.08" x2="32.385" y2="5.08" width="0.3048" layer="1"/>
+<wire x1="32.385" y1="5.08" x2="31.115" y2="3.81" width="0.3048" layer="1"/>
+<wire x1="31.115" y1="3.81" x2="31.115" y2="2.54" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$21">
+<contactref element="SPI1" pad="4"/>
+<contactref element="R8" pad="1"/>
+<wire x1="39.218" y1="1.905" x2="38.583" y2="2.54" width="0.3048" layer="1"/>
+<wire x1="38.583" y1="2.54" x2="36.195" y2="2.54" width="0.3048" layer="1"/>
+</signal>
+<signal name="N$22">
+<contactref element="R7" pad="2"/>
+<contactref element="U$1" pad="9"/>
+<wire x1="42.062" y1="5.08" x2="42.545" y2="5.563" width="0.3048" layer="1"/>
+<wire x1="42.545" y1="5.563" x2="42.545" y2="7.62" width="0.3048" layer="1"/>
+<wire x1="42.545" y1="7.62" x2="42.81" y2="7.885" width="0.3048" layer="1"/>
+<wire x1="42.81" y1="7.885" x2="44.0722" y2="7.885" width="0.3048" layer="1"/>
+</signal>
+<signal name="N$23">
 <contactref element="U$1" pad="10"/>
-<contactref element="LEDS" pad="3"/>
-<wire x1="-15.24" y1="29.21" x2="44.0722" y2="7.235" width="0" layer="19" extent="1-1"/>
+<contactref element="R8" pad="2"/>
+<wire x1="42.062" y1="1.905" x2="45.085" y2="4.928" width="0.3048" layer="1"/>
+<wire x1="45.085" y1="4.928" x2="45.085" y2="6.985" width="0.3048" layer="1"/>
+<wire x1="45.085" y1="6.985" x2="44.835" y2="7.235" width="0.3048" layer="1"/>
+<wire x1="44.835" y1="7.235" x2="44.0722" y2="7.235" width="0.3048" layer="1"/>
+</signal>
+<signal name="N$17">
+<contactref element="U$1" pad="7"/>
+<contactref element="SENS" pad="2"/>
+<wire x1="33.655" y1="10.795" x2="33.655" y2="10.16" width="0.3048" layer="1"/>
+<wire x1="33.655" y1="10.16" x2="34.29" y2="8.89" width="0.3048" layer="1"/>
+<wire x1="34.29" y1="8.89" x2="38.735" y2="8.89" width="0.3048" layer="1"/>
+<wire x1="38.735" y1="8.89" x2="38.735" y2="9.185" width="0.3048" layer="1"/>
+<wire x1="38.735" y1="9.185" x2="44.0722" y2="9.185" width="0.3048" layer="1"/>
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 </signal>
 </signals>

HARD/Knife/m_knife.b#6

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
+<<<<<<< HEAD
 <eagle version="7.7.0">
+=======
+<eagle version="7.2.0">
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <drawing>
 <settings>
 <setting alwaysvectorfont="no"/>
@@ -28,14 +32,25 @@
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<<<<<<< HEAD
+<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="yes"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
 <layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
+=======
+<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="26" name="bNames" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="27" name="tValues" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="28" name="bValues" color="7" fill="1" visible="yes" active="yes"/>
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <layer number="29" name="tStop" color="7" fill="3" visible="no" active="yes"/>
 <layer number="30" name="bStop" color="7" fill="6" visible="no" active="yes"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="yes"/>
@@ -46,20 +61,36 @@
 <layer number="36" name="bGlue" color="7" fill="5" visible="no" active="yes"/>
 <layer number="37" name="tTest" color="7" fill="1" visible="no" active="yes"/>
 <layer number="38" name="bTest" color="7" fill="1" visible="no" active="yes"/>
+<<<<<<< HEAD
+<layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="yes"/>
+<layer number="40" name="bKeepout" color="1" fill="11" visible="no" active="yes"/>
+<layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="yes"/>
+<layer number="42" name="bRestrict" color="1" fill="10" visible="no" active="yes"/>
+<layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="yes"/>
+=======
 <layer number="39" name="tKeepout" color="4" fill="11" visible="yes" active="yes"/>
 <layer number="40" name="bKeepout" color="1" fill="11" visible="yes" active="yes"/>
 <layer number="41" name="tRestrict" color="4" fill="10" visible="yes" active="yes"/>
 <layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="yes" active="yes"/>
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
 <layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
+<<<<<<< HEAD
+<layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
+<layer number="49" name="Reference" color="7" fill="1" visible="no" active="yes"/>
+<layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="yes"/>
+<layer number="52" name="bDocu" color="7" fill="1" visible="no" active="yes"/>
+=======
 <layer number="48" name="Document" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="49" name="Reference" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
 <layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="yes"/>
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
 <layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
@@ -92,10 +123,12 @@
 </layers>
 <board>
 <plain>
+<<<<<<< HEAD
 <wire x1="7.62" y1="-1.27" x2="67.935" y2="-1.27" width="0" layer="20"/>
 <wire x1="67.935" y1="-1.27" x2="67.935" y2="17.27" width="0" layer="20"/>
 <wire x1="67.935" y1="17.27" x2="7.62" y2="17.27" width="0" layer="20"/>
 <wire x1="7.62" y1="17.27" x2="7.62" y2="-1.27" width="0" layer="20"/>
+<circle x="46.99" y="11.43" radius="0.3175" width="0.254" layer="1"/>
 </plain>
 <libraries>
 <library name="rcl">
@@ -1235,6 +1268,14 @@ Source: http://www.onsemi.co.jp .. LM137M-D.PDF</description>
 </package>
 </packages>
 </library>
+=======
+<wire x1="0" y1="0" x2="80" y2="0" width="0" layer="20"/>
+<wire x1="80" y1="0" x2="80" y2="16" width="0" layer="20"/>
+<wire x1="80" y1="16" x2="0" y2="16" width="0" layer="20"/>
+<wire x1="0" y1="16" x2="0" y2="0" width="0" layer="20"/>
+</plain>
+<libraries>
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <library name="pinhead">
 <description>&lt;b&gt;Pin Header Connectors&lt;/b&gt;&lt;p&gt;
 &lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
@@ -1263,6 +1304,42 @@ Source: http://www.onsemi.co.jp .. LM137M-D.PDF</description>
 <rectangle x1="-1.524" y1="-0.254" x2="-1.016" y2="0.254" layer="51"/>
 <rectangle x1="1.016" y1="-0.254" x2="1.524" y2="0.254" layer="51"/>
 </package>
+<<<<<<< HEAD
+=======
+<package name="1X03">
+<description>&lt;b&gt;PIN HEADER&lt;/b&gt;</description>
+<wire x1="-3.175" y1="1.27" x2="-1.905" y2="1.27" width="0.1524" layer="21"/>
+<wire x1="-1.905" y1="1.27" x2="-1.27" y2="0.635" width="0.1524" layer="21"/>
+<wire x1="-1.27" y1="0.635" x2="-1.27" y2="-0.635" width="0.1524" layer="21"/>
+<wire x1="-1.27" y1="-0.635" x2="-1.905" y2="-1.27" width="0.1524" layer="21"/>
+<wire x1="-1.27" y1="0.635" x2="-0.635" y2="1.27" width="0.1524" layer="21"/>
+<wire x1="-0.635" y1="1.27" x2="0.635" y2="1.27" width="0.1524" layer="21"/>
+<wire x1="0.635" y1="1.27" x2="1.27" y2="0.635" width="0.1524" layer="21"/>
+<wire x1="1.27" y1="0.635" x2="1.27" y2="-0.635" width="0.1524" layer="21"/>
+<wire x1="1.27" y1="-0.635" x2="0.635" y2="-1.27" width="0.1524" layer="21"/>
+<wire x1="0.635" y1="-1.27" x2="-0.635" y2="-1.27" width="0.1524" layer="21"/>
+<wire x1="-0.635" y1="-1.27" x2="-1.27" y2="-0.635" width="0.1524" layer="21"/>
+<wire x1="-3.81" y1="0.635" x2="-3.81" y2="-0.635" width="0.1524" layer="21"/>
+<wire x1="-3.175" y1="1.27" x2="-3.81" y2="0.635" width="0.1524" layer="21"/>
+<wire x1="-3.81" y1="-0.635" x2="-3.175" y2="-1.27" width="0.1524" layer="21"/>
+<wire x1="-1.905" y1="-1.27" x2="-3.175" y2="-1.27" width="0.1524" layer="21"/>
+<wire x1="1.27" y1="0.635" x2="1.905" y2="1.27" width="0.1524" layer="21"/>
+<wire x1="1.905" y1="1.27" x2="3.175" y2="1.27" width="0.1524" layer="21"/>
+<wire x1="3.175" y1="1.27" x2="3.81" y2="0.635" width="0.1524" layer="21"/>
+<wire x1="3.81" y1="0.635" x2="3.81" y2="-0.635" width="0.1524" layer="21"/>
+<wire x1="3.81" y1="-0.635" x2="3.175" y2="-1.27" width="0.1524" layer="21"/>
+<wire x1="3.175" y1="-1.27" x2="1.905" y2="-1.27" width="0.1524" layer="21"/>
+<wire x1="1.905" y1="-1.27" x2="1.27" y2="-0.635" width="0.1524" layer="21"/>
+<pad name="1" x="-2.54" y="0" drill="1.016" shape="long" rot="R90"/>
+<pad name="2" x="0" y="0" drill="1.016" shape="long" rot="R90"/>
+<pad name="3" x="2.54" y="0" drill="1.016" shape="long" rot="R90"/>
+<text x="-3.8862" y="1.8288" size="1.27" layer="25" ratio="10">&gt;NAME</text>
+<text x="-3.81" y="-3.175" size="1.27" layer="27">&gt;VALUE</text>
+<rectangle x1="-0.254" y1="-0.254" x2="0.254" y2="0.254" layer="51"/>
+<rectangle x1="-2.794" y1="-0.254" x2="-2.286" y2="0.254" layer="51"/>
+<rectangle x1="2.286" y1="-0.254" x2="2.794" y2="0.254" layer="51"/>
+</package>
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <package name="1X04">
 <description>&lt;b&gt;PIN HEADER&lt;/b&gt;</description>
 <wire x1="0" y1="0.635" x2="0.635" y2="1.27" width="0.1524" layer="21"/>
@@ -1305,6 +1382,7 @@ Source: http://www.onsemi.co.jp .. LM137M-D.PDF</description>
 <rectangle x1="-4.064" y1="-0.254" x2="-3.556" y2="0.254" layer="51"/>
 <rectangle x1="3.556" y1="-0.254" x2="4.064" y2="0.254" layer="51"/>
 </package>
+<<<<<<< HEAD
 <package name="1X03">
 <description>&lt;b&gt;PIN HEADER&lt;/b&gt;</description>
 <wire x1="-3.175" y1="1.27" x2="-1.905" y2="1.27" width="0.1524" layer="21"/>
@@ -1338,6 +1416,8 @@ Source: http://www.onsemi.co.jp .. LM137M-D.PDF</description>
 <rectangle x1="-2.794" y1="-0.254" x2="-2.286" y2="0.254" layer="51"/>
 <rectangle x1="2.286" y1="-0.254" x2="2.794" y2="0.254" layer="51"/>
 </package>
+=======
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 </packages>
 </library>
 <library name="resistor">
@@ -2410,6 +2490,41 @@ for trimmer refence see : &lt;u&gt;www.electrospec-inc.com/cross_references/trim
 &lt;/table&gt;
 &lt;/BODY&gt;&lt;/HTML&gt;</description>
 <packages>
+<<<<<<< HEAD
+=======
+<package name="SMC_D">
+<description>&lt;b&gt;Chip Capacitor &lt;/b&gt; Polar tantalum capacitors with solid electrolyte&lt;p&gt;
+Siemens Matsushita Components B 45 194, B 45 197, B 45 198&lt;br&gt;
+Source: www.farnell.com/datasheets/247.pdf</description>
+<wire x1="-3.5" y1="2.1" x2="3.5" y2="2.1" width="0.1016" layer="51"/>
+<wire x1="3.5" y1="2.1" x2="3.5" y2="-2.1" width="0.1016" layer="51"/>
+<wire x1="3.5" y1="-2.1" x2="-3.5" y2="-2.1" width="0.1016" layer="51"/>
+<wire x1="-3.5" y1="-2.1" x2="-3.5" y2="2.1" width="0.1016" layer="51"/>
+<smd name="+" x="-3.15" y="0" dx="2.4" dy="2.8" layer="1"/>
+<smd name="-" x="3.15" y="0" dx="2.4" dy="2.8" layer="1" rot="R180"/>
+<text x="-2.54" y="2.54" size="1.016" layer="25">&gt;NAME</text>
+<text x="-2.54" y="-3.81" size="1.016" layer="27">&gt;VALUE</text>
+<rectangle x1="-3.65" y1="-1.2" x2="-3.45" y2="1.2" layer="51"/>
+<rectangle x1="3.45" y1="-1.2" x2="3.65" y2="1.2" layer="51" rot="R180"/>
+<rectangle x1="-3.5" y1="-2.1" x2="-2.4" y2="2.1" layer="51"/>
+</package>
+<package name="C1206">
+<description>&lt;b&gt;CAPACITOR&lt;/b&gt;</description>
+<wire x1="-2.473" y1="0.983" x2="2.473" y2="0.983" width="0.0508" layer="39"/>
+<wire x1="2.473" y1="-0.983" x2="-2.473" y2="-0.983" width="0.0508" layer="39"/>
+<wire x1="-2.473" y1="-0.983" x2="-2.473" y2="0.983" width="0.0508" layer="39"/>
+<wire x1="2.473" y1="0.983" x2="2.473" y2="-0.983" width="0.0508" layer="39"/>
+<wire x1="-0.965" y1="0.787" x2="0.965" y2="0.787" width="0.1016" layer="51"/>
+<wire x1="-0.965" y1="-0.787" x2="0.965" y2="-0.787" width="0.1016" layer="51"/>
+<smd name="1" x="-1.4" y="0" dx="1.6" dy="1.8" layer="1"/>
+<smd name="2" x="1.4" y="0" dx="1.6" dy="1.8" layer="1"/>
+<text x="-1.27" y="1.27" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.27" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
+<rectangle x1="-1.7018" y1="-0.8509" x2="-0.9517" y2="0.8491" layer="51"/>
+<rectangle x1="0.9517" y1="-0.8491" x2="1.7018" y2="0.8509" layer="51"/>
+<rectangle x1="-0.1999" y1="-0.4001" x2="0.1999" y2="0.4001" layer="35"/>
+</package>
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <package name="R1206">
 <description>&lt;b&gt;RESISTOR&lt;/b&gt;</description>
 <wire x1="0.9525" y1="-0.8128" x2="-0.9652" y2="-0.8128" width="0.1524" layer="51"/>
@@ -2428,6 +2543,48 @@ for trimmer refence see : &lt;u&gt;www.electrospec-inc.com/cross_references/trim
 </package>
 </packages>
 </library>
+<<<<<<< HEAD
+=======
+<library name="v-reg">
+<description>&lt;b&gt;Voltage Regulators&lt;/b&gt;&lt;p&gt;
+&lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
+<packages>
+<package name="SOT223">
+<description>&lt;b&gt;Small Outline Transistor 223&lt;/b&gt;&lt;p&gt;
+PLASTIC PACKAGE CASE 318E-04&lt;br&gt;
+Source: http://www.onsemi.co.jp .. LM137M-D.PDF</description>
+<wire x1="3.277" y1="1.778" x2="3.277" y2="-1.778" width="0.2032" layer="21"/>
+<wire x1="3.277" y1="-1.778" x2="-3.277" y2="-1.778" width="0.2032" layer="21"/>
+<wire x1="-3.277" y1="-1.778" x2="-3.277" y2="1.778" width="0.2032" layer="21"/>
+<wire x1="-3.277" y1="1.778" x2="3.277" y2="1.778" width="0.2032" layer="21"/>
+<wire x1="0" y1="-0.7" x2="0" y2="0.6" width="0.127" layer="48"/>
+<wire x1="0" y1="0.6" x2="-0.2" y2="0.2" width="0.127" layer="48"/>
+<wire x1="-0.2" y1="0.2" x2="0.2" y2="0.2" width="0.127" layer="48"/>
+<wire x1="0.2" y1="0.2" x2="0" y2="0.6" width="0.127" layer="48"/>
+<wire x1="0" y1="-0.7" x2="0.2" y2="-0.3" width="0.127" layer="48"/>
+<wire x1="0.2" y1="-0.3" x2="-0.2" y2="-0.3" width="0.127" layer="48"/>
+<wire x1="-0.2" y1="-0.3" x2="0" y2="-0.7" width="0.127" layer="48"/>
+<smd name="1" x="-2.3" y="-3.15" dx="1.5" dy="2" layer="1"/>
+<smd name="2" x="0" y="-3.15" dx="1.5" dy="2" layer="1"/>
+<smd name="3" x="2.3" y="-3.15" dx="1.5" dy="2" layer="1"/>
+<smd name="4" x="0" y="3.15" dx="3.8" dy="2" layer="1"/>
+<text x="-2.54" y="0.0508" size="1.27" layer="25">&gt;NAME</text>
+<text x="-2.54" y="-1.3208" size="1.27" layer="27">&gt;VALUE</text>
+<text x="0.4" y="0.4" size="0.254" layer="48">direction of pcb</text>
+<text x="0.4" y="-0.05" size="0.254" layer="48">transportation for</text>
+<text x="0.4" y="-0.5" size="0.254" layer="48">wavesoldering</text>
+<rectangle x1="-0.9271" y1="1.1303" x2="0.9271" y2="4.3307" layer="51" rot="R270"/>
+<rectangle x1="-0.9271" y1="-3.1623" x2="0.9271" y2="-2.2987" layer="51" rot="R270"/>
+<rectangle x1="-3.2385" y1="-3.1623" x2="-1.3843" y2="-2.2987" layer="51" rot="R270"/>
+<rectangle x1="1.3843" y1="-3.1623" x2="3.2385" y2="-2.2987" layer="51" rot="R270"/>
+<rectangle x1="-0.9271" y1="1.1303" x2="0.9271" y2="4.3307" layer="51" rot="R270"/>
+<rectangle x1="-0.9271" y1="-3.1623" x2="0.9271" y2="-2.2987" layer="51" rot="R270"/>
+<rectangle x1="-3.2385" y1="-3.1623" x2="-1.3843" y2="-2.2987" layer="51" rot="R270"/>
+<rectangle x1="1.3843" y1="-3.1623" x2="3.2385" y2="-2.2987" layer="51" rot="R270"/>
+</package>
+</packages>
+</library>
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <library name="stm32f0">
 <description>STM32F0x Microcontrollers</description>
 <packages>
@@ -2495,7 +2652,11 @@ for trimmer refence see : &lt;u&gt;www.electrospec-inc.com/cross_references/trim
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
+<<<<<<< HEAD
 <designrules name="default *">
+=======
+<designrules name="default">
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <description language="de">&lt;b&gt;EAGLE Design Rules&lt;/b&gt;
 &lt;p&gt;
 Die Standard-Design-Rules sind so gewählt, dass sie für 
@@ -2538,11 +2699,19 @@ design rules under a new name.</description>
 <param name="rvViaInner" value="0.25"/>
 <param name="rvMicroViaOuter" value="0.25"/>
 <param name="rvMicroViaInner" value="0.25"/>
+<<<<<<< HEAD
 <param name="rlMinPadTop" value="18mil"/>
 <param name="rlMaxPadTop" value="20mil"/>
 <param name="rlMinPadInner" value="18mil"/>
 <param name="rlMaxPadInner" value="20mil"/>
 <param name="rlMinPadBottom" value="18mil"/>
+=======
+<param name="rlMinPadTop" value="10mil"/>
+<param name="rlMaxPadTop" value="20mil"/>
+<param name="rlMinPadInner" value="10mil"/>
+<param name="rlMaxPadInner" value="20mil"/>
+<param name="rlMinPadBottom" value="10mil"/>
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <param name="rlMaxPadBottom" value="20mil"/>
 <param name="rlMinViaOuter" value="8mil"/>
 <param name="rlMaxViaOuter" value="20mil"/>
@@ -2552,9 +2721,15 @@ design rules under a new name.</description>
 <param name="rlMaxMicroViaOuter" value="20mil"/>
 <param name="rlMinMicroViaInner" value="4mil"/>
 <param name="rlMaxMicroViaInner" value="20mil"/>
+<<<<<<< HEAD
 <param name="psTop" value="1"/>
 <param name="psBottom" value="1"/>
 <param name="psFirst" value="1"/>
+=======
+<param name="psTop" value="-1"/>
+<param name="psBottom" value="-1"/>
+<param name="psFirst" value="-1"/>
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <param name="psElongationLong" value="100"/>
 <param name="psElongationOffset" value="100"/>
 <param name="mvStopFrame" value="1"/>
@@ -2675,6 +2850,7 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
+<<<<<<< HEAD
 <element name="C1" library="rcl" package="SMC_D" value="" x="13.335" y="13.335"/>
 <element name="C2" library="rcl" package="C1206" value="" x="34.29" y="12.065" rot="R90"/>
 <element name="EDGE" library="testpad" package="TP20R" value="TPSQTP20R" x="20.955" y="6.35">
@@ -2848,10 +3024,9 @@ design rules under a new name.</description>
 <contactref element="PWR" pad="2"/>
 <contactref element="IC1" pad="3"/>
 <wire x1="15.24" y1="1.27" x2="15.24" y2="2.54" width="0.4064" layer="1"/>
-<wire x1="15.24" y1="2.54" x2="13.335" y2="4.445" width="0.4064" layer="1"/>
-<wire x1="13.335" y1="4.445" x2="13.335" y2="8.255" width="0.4064" layer="1"/>
-<wire x1="13.335" y1="8.255" x2="13.97" y2="8.89" width="0.4064" layer="1"/>
-<wire x1="13.97" y1="8.89" x2="16.09" y2="8.89" width="0.4064" layer="1"/>
+<wire x1="15.24" y1="2.54" x2="14.605" y2="3.81" width="0.4064" layer="1"/>
+<wire x1="14.605" y1="3.81" x2="14.605" y2="8.89" width="0.4064" layer="1"/>
+<wire x1="14.605" y1="8.89" x2="16.09" y2="8.89" width="0.4064" layer="1"/>
 <wire x1="16.09" y1="8.89" x2="16.485" y2="9.285" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$17">
@@ -2972,6 +3147,177 @@ design rules under a new name.</description>
 <wire x1="33.02" y1="5.08" x2="33.02" y2="4.597" width="0.3048" layer="1"/>
 <wire x1="45.3422" y1="5.995" x2="33.02" y2="5.995" width="0.3048" layer="1"/>
 <wire x1="33.02" y1="5.995" x2="33.02" y2="4.597" width="0.3048" layer="1"/>
+=======
+<element name="BOOT" library="pinhead" package="1X02" value="" x="33.02" y="5.08"/>
+<element name="C1" library="resistor" package="SMC_D" value="" x="-17.78" y="16.51"/>
+<element name="C2" library="resistor" package="C1206" value="" x="57.15" y="36.83"/>
+<element name="DATA" library="pinhead" package="1X03" value="" x="63.5" y="8.89" rot="R270"/>
+<element name="IC1" library="v-reg" package="SOT223" value="LD117AS25TR" x="-33.02" y="5.08"/>
+<element name="PWR" library="pinhead" package="1X04" value="" x="-27.94" y="16.51"/>
+<element name="LEDS" library="pinhead" package="1X03" value="" x="-17.78" y="29.21"/>
+<element name="R1" library="resistor" package="R1206" value="" x="57.15" y="10.16"/>
+<element name="R2" library="resistor" package="R1206" value="" x="57.15" y="6.35"/>
+<element name="R3" library="resistor" package="R1206" value="" x="3.81" y="30.48"/>
+<element name="R4" library="resistor" package="R1206" value="" x="1.27" y="21.59"/>
+<element name="R5" library="resistor" package="R1206" value="" x="45.72" y="24.13"/>
+<element name="R6" library="resistor" package="R1206" value="" x="-30.48" y="40.64"/>
+<element name="RST" library="pinhead" package="1X02" value="" x="-22.86" y="35.56"/>
+<element name="SENS" library="pinhead" package="1X03" value="" x="-26.67" y="29.21"/>
+<element name="SPI" library="pinhead" package="1X04" value="" x="59.69" y="2.54" rot="R180"/>
+<element name="STR-STP" library="pinhead" package="1X02" value="" x="-30.48" y="22.86"/>
+<element name="SWD" library="pinhead" package="1X03" value="" x="58.42" y="13.97"/>
+<element name="U$1" library="stm32f0" package="TSSOP20" value="STM32F042FXPX" x="46.99" y="10.16" rot="R270"/>
+</elements>
+<signals>
+<signal name="N$1">
+<contactref element="IC1" pad="3"/>
+<contactref element="PWR" pad="2"/>
+<wire x1="-29.21" y1="16.51" x2="-30.72" y2="1.93" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$2">
+<contactref element="IC1" pad="1"/>
+<contactref element="C1" pad="-"/>
+<contactref element="SWD" pad="1"/>
+<contactref element="SPI" pad="1"/>
+<contactref element="R3" pad="2"/>
+<contactref element="C2" pad="1"/>
+<contactref element="RST" pad="1"/>
+<contactref element="SENS" pad="1"/>
+<contactref element="U$1" pad="15"/>
+<contactref element="DATA" pad="1"/>
+<contactref element="PWR" pad="1"/>
+<contactref element="LEDS" pad="1"/>
+<contactref element="R6" pad="2"/>
+<wire x1="55.88" y1="13.97" x2="55.75" y2="36.83" width="0" layer="19" extent="1-1"/>
+<wire x1="49.9078" y1="9.835" x2="55.88" y2="13.97" width="0" layer="19" extent="1-1"/>
+<wire x1="63.5" y1="2.54" x2="55.88" y2="13.97" width="0" layer="19" extent="1-1"/>
+<wire x1="63.5" y1="11.43" x2="63.5" y2="2.54" width="0" layer="19" extent="1-1"/>
+<wire x1="5.232" y1="30.48" x2="49.9078" y2="9.835" width="0" layer="19" extent="1-1"/>
+<wire x1="-14.63" y1="16.51" x2="5.232" y2="30.48" width="0" layer="19" extent="1-1"/>
+<wire x1="-20.32" y1="29.21" x2="-14.63" y2="16.51" width="0" layer="19" extent="1-1"/>
+<wire x1="-24.13" y1="35.56" x2="-20.32" y2="29.21" width="0" layer="19" extent="1-1"/>
+<wire x1="-29.058" y1="40.64" x2="-24.13" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="-29.21" y1="29.21" x2="-24.13" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="-31.75" y1="16.51" x2="-29.21" y2="29.21" width="0" layer="19" extent="1-1"/>
+<wire x1="-35.32" y1="1.93" x2="-31.75" y2="16.51" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$4">
+<contactref element="U$1" pad="19"/>
+<contactref element="SWD" pad="3"/>
+<wire x1="49.9078" y1="12.435" x2="60.96" y2="13.97" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$5">
+<contactref element="U$1" pad="20"/>
+<contactref element="SWD" pad="2"/>
+<wire x1="49.9078" y1="13.085" x2="58.42" y2="13.97" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$6">
+<contactref element="U$1" pad="13"/>
+<contactref element="SPI" pad="2"/>
+<wire x1="49.9078" y1="8.535" x2="60.96" y2="2.54" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$7">
+<contactref element="U$1" pad="12"/>
+<contactref element="SPI" pad="3"/>
+<wire x1="49.9078" y1="7.885" x2="58.42" y2="2.54" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$8">
+<contactref element="U$1" pad="11"/>
+<contactref element="SPI" pad="4"/>
+<wire x1="49.9078" y1="7.235" x2="55.88" y2="2.54" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$9">
+<contactref element="U$1" pad="17"/>
+<contactref element="R2" pad="1"/>
+<wire x1="55.728" y1="6.35" x2="50.943" y2="11.135" width="0.3048" layer="1"/>
+<wire x1="50.943" y1="11.135" x2="49.9078" y2="11.135" width="0.3048" layer="1"/>
+</signal>
+<signal name="N$10">
+<contactref element="U$1" pad="18"/>
+<contactref element="R1" pad="1"/>
+<wire x1="55.728" y1="10.16" x2="54.103" y2="11.785" width="0.3048" layer="1"/>
+<wire x1="54.103" y1="11.785" x2="49.9078" y2="11.785" width="0.3048" layer="1"/>
+</signal>
+<signal name="N$13">
+<contactref element="U$1" pad="5"/>
+<contactref element="U$1" pad="16"/>
+<contactref element="IC1" pad="4"/>
+<contactref element="C1" pad="+"/>
+<contactref element="BOOT" pad="2"/>
+<contactref element="R4" pad="1"/>
+<contactref element="STR-STP" pad="1"/>
+<wire x1="44.0722" y1="10.485" x2="49.9078" y2="10.485" width="0" layer="19" extent="1-1"/>
+<wire x1="34.29" y1="5.08" x2="44.0722" y2="10.485" width="0" layer="19" extent="1-1"/>
+<wire x1="-0.152" y1="21.59" x2="34.29" y2="5.08" width="0" layer="19" extent="1-1"/>
+<wire x1="-20.93" y1="16.51" x2="-0.152" y2="21.59" width="0" layer="19" extent="1-1"/>
+<wire x1="-31.75" y1="22.86" x2="-20.93" y2="16.51" width="0" layer="19" extent="1-1"/>
+<wire x1="-33.02" y1="8.23" x2="-20.93" y2="16.51" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$14">
+<contactref element="BOOT" pad="1"/>
+<contactref element="U$1" pad="1"/>
+<contactref element="R3" pad="1"/>
+<wire x1="31.75" y1="5.08" x2="44.0722" y2="13.085" width="0" layer="19" extent="1-1"/>
+<wire x1="2.388" y1="30.48" x2="31.75" y2="5.08" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$15">
+<contactref element="R4" pad="2"/>
+<contactref element="R5" pad="2"/>
+<contactref element="C2" pad="2"/>
+<contactref element="RST" pad="2"/>
+<wire x1="47.142" y1="24.13" x2="58.55" y2="36.83" width="0" layer="19" extent="1-1"/>
+<wire x1="2.692" y1="21.59" x2="47.142" y2="24.13" width="0" layer="19" extent="1-1"/>
+<wire x1="-21.59" y1="35.56" x2="2.692" y2="21.59" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$16">
+<contactref element="R5" pad="1"/>
+<contactref element="U$1" pad="4"/>
+<wire x1="44.0722" y1="11.135" x2="44.298" y2="24.13" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$19">
+<contactref element="SENS" pad="2"/>
+<contactref element="U$1" pad="6"/>
+<wire x1="-26.67" y1="29.21" x2="44.0722" y2="9.835" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$17">
+<contactref element="SENS" pad="3"/>
+<contactref element="U$1" pad="7"/>
+<wire x1="-24.13" y1="29.21" x2="44.0722" y2="9.185" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$3">
+<contactref element="R2" pad="2"/>
+<contactref element="DATA" pad="3"/>
+<wire x1="63.5" y1="6.35" x2="58.572" y2="6.35" width="0.4064" layer="1"/>
+</signal>
+<signal name="N$11">
+<contactref element="R1" pad="2"/>
+<contactref element="DATA" pad="2"/>
+<wire x1="63.5" y1="8.89" x2="60.96" y2="8.89" width="0.4064" layer="1"/>
+<wire x1="60.96" y1="8.89" x2="60.96" y2="10.16" width="0.4064" layer="1"/>
+<wire x1="60.96" y1="10.16" x2="58.572" y2="10.16" width="0.4064" layer="1"/>
+</signal>
+<signal name="N$12">
+<contactref element="PWR" pad="3"/>
+<contactref element="PWR" pad="4"/>
+<wire x1="-24.13" y1="16.51" x2="-26.67" y2="16.51" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$18">
+<contactref element="U$1" pad="8"/>
+<contactref element="STR-STP" pad="2"/>
+<contactref element="R6" pad="1"/>
+<wire x1="-29.21" y1="22.86" x2="44.0722" y2="8.535" width="0" layer="19" extent="1-1"/>
+<wire x1="-31.902" y1="40.64" x2="-29.21" y2="22.86" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$20">
+<contactref element="U$1" pad="9"/>
+<contactref element="LEDS" pad="2"/>
+<wire x1="-17.78" y1="29.21" x2="44.0722" y2="7.885" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$21">
+<contactref element="U$1" pad="10"/>
+<contactref element="LEDS" pad="3"/>
+<wire x1="-15.24" y1="29.21" x2="44.0722" y2="7.235" width="0" layer="19" extent="1-1"/>
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 </signal>
 </signals>
 </board>

HARD/Knife/m_knife.b#7

@@ -92,12 +92,10 @@
 </layers>
 <board>
 <plain>
-<wire x1="7.62" y1="-1.27" x2="69.84" y2="-1.27" width="0" layer="20"/>
-<wire x1="69.84" y1="-1.27" x2="69.84" y2="17.905" width="0" layer="20"/>
-<wire x1="69.84" y1="17.905" x2="7.62" y2="17.905" width="0" layer="20"/>
-<wire x1="7.62" y1="17.905" x2="7.62" y2="-1.27" width="0" layer="20"/>
-<dimension x1="7.62" y1="17.905" x2="7.62" y2="-1.27" x3="5.08" y3="8.3175" textsize="1.778" layer="1"/>
-<dimension x1="7.62" y1="-1.27" x2="69.84" y2="-1.27" x3="38.73" y3="-5.08" textsize="1.778" layer="1"/>
+<wire x1="7.62" y1="-1.27" x2="67.935" y2="-1.27" width="0" layer="20"/>
+<wire x1="67.935" y1="-1.27" x2="67.935" y2="17.27" width="0" layer="20"/>
+<wire x1="67.935" y1="17.27" x2="7.62" y2="17.27" width="0" layer="20"/>
+<wire x1="7.62" y1="17.27" x2="7.62" y2="-1.27" width="0" layer="20"/>
 </plain>
 <libraries>
 <library name="rcl">
@@ -2685,27 +2683,27 @@ design rules under a new name.</description>
 <element name="GND_L" library="testpad" package="TP20R" value="TPSQTP20R" x="36.83" y="3.175">
 <attribute name="TP_SIGNAL_NAME" value="" x="36.83" y="3.175" size="1.778" layer="27" display="off"/>
 </element>
-<element name="GND_NUM" library="testpad" package="TP20R" value="TPSQTP20R" x="64.77" y="6.35">
-<attribute name="TP_SIGNAL_NAME" value="" x="64.77" y="6.35" size="1.778" layer="27" display="off"/>
+<element name="GND_NUM" library="testpad" package="TP20R" value="TPSQTP20R" x="64.135" y="6.35">
+<attribute name="TP_SIGNAL_NAME" value="" x="64.135" y="6.35" size="1.778" layer="27" display="off"/>
 </element>
 <element name="GND_S" library="testpad" package="TP20R" value="TPSQTP20R" x="20.955" y="12.7">
 <attribute name="TP_SIGNAL_NAME" value="" x="20.955" y="12.7" size="1.778" layer="27" display="off"/>
 </element>
-<element name="GND_SPI" library="testpad" package="TP20R" value="TPSQTP20R" x="64.77" y="3.175">
-<attribute name="TP_SIGNAL_NAME" value="" x="64.77" y="3.175" size="1.778" layer="27" display="off"/>
+<element name="GND_SPI" library="testpad" package="TP20R" value="TPSQTP20R" x="64.135" y="3.175">
+<attribute name="TP_SIGNAL_NAME" value="" x="64.135" y="3.175" size="1.778" layer="27" display="off"/>
 </element>
 <element name="IC1" library="v-reg" package="SOT223" value="LD117AS12TR" x="13.335" y="6.985" rot="R90"/>
-<element name="RST" library="pinhead" package="1X02" value="" x="41.91" y="12.065" rot="R270"/>
-<element name="BOOT" library="pinhead" package="1X02" value="" x="46.99" y="13.97" rot="R180"/>
+<element name="RST" library="pinhead" package="1X02" value="" x="41.91" y="11.43" rot="R270"/>
+<element name="BOOT" library="pinhead" package="1X02" value="" x="46.99" y="13.335" rot="R180"/>
 <element name="PWR" library="pinhead" package="1X04" value="" x="13.97" y="1.27" rot="R180"/>
 <element name="LED_STAT" library="testpad" package="TP20R" value="TPSQTP20R" x="40.005" y="3.175">
 <attribute name="TP_SIGNAL_NAME" value="" x="40.005" y="3.175" size="1.778" layer="27" display="off"/>
 </element>
-<element name="NUM" library="testpad" package="TP20R" value="TPSQTP20R" x="64.77" y="11.43">
-<attribute name="TP_SIGNAL_NAME" value="" x="64.77" y="11.43" size="1.778" layer="27" display="off"/>
+<element name="NUM" library="testpad" package="TP20R" value="TPSQTP20R" x="64.135" y="11.43">
+<attribute name="TP_SIGNAL_NAME" value="" x="64.135" y="11.43" size="1.778" layer="27" display="off"/>
 </element>
-<element name="NUM_R" library="testpad" package="TP20R" value="TPSQTP20R" x="64.77" y="8.89">
-<attribute name="TP_SIGNAL_NAME" value="" x="64.77" y="8.89" size="1.778" layer="27" display="off"/>
+<element name="NUM_R" library="testpad" package="TP20R" value="TPSQTP20R" x="64.135" y="8.89">
+<attribute name="TP_SIGNAL_NAME" value="" x="64.135" y="8.89" size="1.778" layer="27" display="off"/>
 </element>
 <element name="PIKE" library="testpad" package="TP20R" value="TPSQTP20R" x="20.955" y="9.525">
 <attribute name="TP_SIGNAL_NAME" value="" x="20.955" y="9.525" size="1.778" layer="27" display="off"/>
@@ -2713,8 +2711,8 @@ design rules under a new name.</description>
 <element name="R1" library="resistor" package="R1206" value="" x="45.72" y="2.54"/>
 <element name="R2" library="resistor" package="R1206" value="" x="31.75" y="12.065" rot="R90"/>
 <element name="R3" library="resistor" package="R1206" value="" x="29.21" y="12.065" rot="R270"/>
-<element name="R4" library="resistor" package="R1206" value="" x="59.055" y="9.525" rot="R90"/>
-<element name="R5" library="resistor" package="R1206" value="" x="61.595" y="9.525" rot="R90"/>
+<element name="R4" library="resistor" package="R1206" value="" x="58.42" y="9.525" rot="R90"/>
+<element name="R5" library="resistor" package="R1206" value="" x="60.96" y="9.525" rot="R90"/>
 <element name="R7" library="resistor" package="R1206" value="" x="25.4" y="12.7" rot="R270"/>
 <element name="R8" library="resistor" package="R1206" value="" x="26.035" y="3.81" rot="R90"/>
 <element name="SPI_CK" library="testpad" package="TP20R" value="TPSQTP20R" x="55.245" y="2.54">
@@ -2726,7 +2724,7 @@ design rules under a new name.</description>
 <element name="SPI_MOSI" library="testpad" package="TP20R" value="TPSQTP20R" x="61.595" y="2.54">
 <attribute name="TP_SIGNAL_NAME" value="" x="61.595" y="2.54" size="1.778" layer="27" display="off"/>
 </element>
-<element name="SWD" library="pinhead" package="1X03" value="" x="55.245" y="13.97"/>
+<element name="SWD" library="pinhead" package="1X03" value="" x="53.34" y="13.335"/>
 <element name="U$1" library="stm32f0" package="TSSOP20" value="STM32F042FXPX" x="48.26" y="7.62" rot="R270"/>
 <element name="R9" library="resistor" package="R1206" value="" x="38.1" y="12.065" rot="R270"/>
 <element name="R10" library="resistor" package="R1206" value="" x="33.02" y="3.175" rot="R270"/>
@@ -2767,7 +2765,7 @@ design rules under a new name.</description>
 <contactref element="R2" pad="1"/>
 <wire x1="31.75" y1="8.595" x2="41.91" y2="8.595" width="0.3048" layer="1"/>
 <wire x1="41.91" y1="8.595" x2="45.3422" y2="8.595" width="0.3048" layer="1"/>
-<wire x1="41.91" y1="10.795" x2="41.91" y2="8.595" width="0.3048" layer="1"/>
+<wire x1="41.91" y1="10.16" x2="41.91" y2="8.595" width="0.3048" layer="1"/>
 <wire x1="31.75" y1="10.643" x2="31.75" y2="8.595" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$12">
@@ -2775,11 +2773,11 @@ design rules under a new name.</description>
 <contactref element="U$1" pad="1"/>
 <contactref element="R9" pad="1"/>
 <wire x1="45.3422" y1="10.545" x2="45.3422" y2="13.97" width="0.3048" layer="1"/>
-<wire x1="45.3422" y1="13.97" x2="45.72" y2="13.97" width="0.3048" layer="1"/>
-<wire x1="38.1" y1="13.487" x2="38.1" y2="15.24" width="0.3048" layer="1"/>
-<wire x1="38.1" y1="15.24" x2="45.085" y2="15.24" width="0.3048" layer="1"/>
-<wire x1="45.085" y1="15.24" x2="45.085" y2="13.97" width="0.3048" layer="1"/>
-<wire x1="45.085" y1="13.97" x2="45.72" y2="13.97" width="0.3048" layer="1"/>
+<wire x1="45.3422" y1="13.97" x2="45.72" y2="13.335" width="0.3048" layer="1"/>
+<wire x1="38.1" y1="13.487" x2="38.1" y2="14.605" width="0.3048" layer="1"/>
+<wire x1="38.1" y1="14.605" x2="45.085" y2="14.605" width="0.3048" layer="1"/>
+<wire x1="45.085" y1="14.605" x2="45.085" y2="13.97" width="0.3048" layer="1"/>
+<wire x1="45.085" y1="13.97" x2="45.72" y2="13.335" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="U$1" pad="9"/>
@@ -2807,9 +2805,9 @@ design rules under a new name.</description>
 <contactref element="C2" pad="1"/>
 <contactref element="R10" pad="2"/>
 <contactref element="R9" pad="2"/>
-<wire x1="41.91" y1="13.335" x2="40.005" y2="13.335" width="0.3048" layer="1"/>
+<wire x1="41.91" y1="12.7" x2="40.005" y2="12.7" width="0.3048" layer="1"/>
 <wire x1="38.1" y1="10.643" x2="40.005" y2="10.643" width="0.3048" layer="1"/>
-<wire x1="40.005" y1="10.643" x2="40.005" y2="13.335" width="0.3048" layer="1"/>
+<wire x1="40.005" y1="10.643" x2="40.005" y2="12.7" width="0.3048" layer="1"/>
 <wire x1="34.29" y1="10.665" x2="36.195" y2="10.665" width="0.3048" layer="1"/>
 <wire x1="36.195" y1="10.665" x2="38.1" y2="10.665" width="0.3048" layer="1"/>
 <wire x1="38.1" y1="10.665" x2="38.1" y2="10.643" width="0.3048" layer="1"/>
@@ -2825,21 +2823,21 @@ design rules under a new name.</description>
 <wire x1="19.05" y1="1.27" x2="19.05" y2="0" width="0.4064" layer="1"/>
 <wire x1="19.05" y1="0" x2="33.02" y2="0" width="0.4064" layer="1"/>
 <wire x1="17.78" y1="1.27" x2="19.05" y2="1.27" width="0.4064" layer="1"/>
-<wire x1="64.77" y1="3.175" x2="64.77" y2="0" width="0.4064" layer="1"/>
-<wire x1="64.77" y1="0" x2="36.83" y2="0" width="0.4064" layer="1"/>
+<wire x1="64.135" y1="3.175" x2="64.135" y2="0" width="0.4064" layer="1"/>
+<wire x1="64.135" y1="0" x2="36.83" y2="0" width="0.4064" layer="1"/>
 <wire x1="36.83" y1="0" x2="33.02" y2="0" width="0.4064" layer="1"/>
-<wire x1="64.77" y1="6.35" x2="64.77" y2="4.445" width="0.4064" layer="1"/>
-<wire x1="64.77" y1="4.445" x2="64.77" y2="3.175" width="0.4064" layer="1"/>
+<wire x1="64.135" y1="6.35" x2="64.135" y2="4.445" width="0.4064" layer="1"/>
+<wire x1="64.135" y1="4.445" x2="64.135" y2="3.175" width="0.4064" layer="1"/>
 <wire x1="36.83" y1="3.175" x2="36.83" y2="0" width="0.4064" layer="1"/>
-<wire x1="52.705" y1="16.51" x2="36.195" y2="16.51" width="0.4064" layer="1"/>
-<wire x1="36.195" y1="16.51" x2="36.195" y2="10.665" width="0.4064" layer="1"/>
-<wire x1="52.705" y1="13.97" x2="52.705" y2="16.51" width="0.4064" layer="1"/>
-<wire x1="52.705" y1="16.51" x2="67.31" y2="16.51" width="0.4064" layer="1"/>
-<wire x1="67.31" y1="16.51" x2="67.31" y2="4.445" width="0.4064" layer="1"/>
-<wire x1="67.31" y1="4.445" x2="64.77" y2="4.445" width="0.4064" layer="1"/>
-<wire x1="55.245" y1="5.715" x2="62.865" y2="5.715" width="0.3048" layer="1"/>
-<wire x1="62.865" y1="5.715" x2="62.865" y2="4.445" width="0.3048" layer="1"/>
-<wire x1="62.865" y1="4.445" x2="64.77" y2="4.445" width="0.3048" layer="1"/>
+<wire x1="50.8" y1="15.875" x2="36.195" y2="15.875" width="0.4064" layer="1"/>
+<wire x1="36.195" y1="15.875" x2="36.195" y2="10.665" width="0.4064" layer="1"/>
+<wire x1="50.8" y1="13.335" x2="50.8" y2="15.875" width="0.4064" layer="1"/>
+<wire x1="50.8" y1="15.875" x2="66.675" y2="15.875" width="0.4064" layer="1"/>
+<wire x1="66.675" y1="15.875" x2="66.675" y2="4.445" width="0.4064" layer="1"/>
+<wire x1="66.675" y1="4.445" x2="64.135" y2="4.445" width="0.4064" layer="1"/>
+<wire x1="55.245" y1="5.715" x2="62.23" y2="5.715" width="0.3048" layer="1"/>
+<wire x1="62.23" y1="5.715" x2="62.23" y2="4.445" width="0.3048" layer="1"/>
+<wire x1="62.23" y1="4.445" x2="64.135" y2="4.445" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$15">
 <contactref element="PWR" pad="4"/>
@@ -2867,7 +2865,7 @@ design rules under a new name.</description>
 <wire x1="51.1778" y1="7.945" x2="48.585" y2="7.945" width="0.3048" layer="1"/>
 <wire x1="48.585" y1="7.945" x2="48.26" y2="7.62" width="0.3048" layer="1" curve="90"/>
 <contactref element="BOOT" pad="1"/>
-<wire x1="48.26" y1="13.97" x2="48.26" y2="7.945" width="0.3048" layer="1"/>
+<wire x1="48.26" y1="13.335" x2="48.26" y2="7.945" width="0.3048" layer="1"/>
 <wire x1="48.26" y1="7.945" x2="48.585" y2="7.945" width="0.3048" layer="1"/>
 <contactref element="+S/S" pad="TP"/>
 <wire x1="45.3422" y1="7.945" x2="29.21" y2="7.945" width="0.3048" layer="1"/>
@@ -2889,17 +2887,16 @@ design rules under a new name.</description>
 <signal name="N$19">
 <contactref element="U$1" pad="20"/>
 <contactref element="SWD" pad="2"/>
-<wire x1="51.1778" y1="10.545" x2="54.995" y2="10.545" width="0.3048" layer="1"/>
-<wire x1="54.995" y1="10.545" x2="55.245" y2="10.795" width="0.3048" layer="1"/>
-<wire x1="55.245" y1="10.795" x2="55.245" y2="13.97" width="0.3048" layer="1"/>
+<wire x1="51.1778" y1="10.545" x2="53.09" y2="10.545" width="0.3048" layer="1"/>
+<wire x1="53.09" y1="10.545" x2="53.34" y2="10.795" width="0.3048" layer="1"/>
+<wire x1="53.34" y1="10.795" x2="53.34" y2="13.335" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$20">
 <contactref element="U$1" pad="19"/>
 <contactref element="SWD" pad="3"/>
 <wire x1="51.1778" y1="9.895" x2="56.515" y2="9.895" width="0.3048" layer="1"/>
-<wire x1="56.515" y1="9.895" x2="56.515" y2="12.065" width="0.3048" layer="1"/>
-<wire x1="56.515" y1="12.065" x2="57.785" y2="13.335" width="0.3048" layer="1"/>
-<wire x1="57.785" y1="13.335" x2="57.785" y2="13.97" width="0.3048" layer="1"/>
+<wire x1="56.515" y1="9.895" x2="56.515" y2="13.335" width="0.3048" layer="1"/>
+<wire x1="56.515" y1="13.335" x2="55.88" y2="13.335" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$21">
 <contactref element="C2" pad="2"/>
@@ -2912,34 +2909,34 @@ design rules under a new name.</description>
 <signal name="N$7">
 <contactref element="U$1" pad="18"/>
 <contactref element="R4" pad="1"/>
-<wire x1="51.1778" y1="9.245" x2="57.15" y2="9.245" width="0.3048" layer="1"/>
-<wire x1="57.15" y1="9.245" x2="57.15" y2="7.62" width="0.3048" layer="1"/>
-<wire x1="57.15" y1="7.62" x2="59.055" y2="7.62" width="0.3048" layer="1"/>
-<wire x1="59.055" y1="7.62" x2="59.055" y2="8.103" width="0.3048" layer="1"/>
+<wire x1="51.1778" y1="9.245" x2="56.515" y2="9.245" width="0.3048" layer="1"/>
+<wire x1="56.515" y1="9.245" x2="56.515" y2="7.62" width="0.3048" layer="1"/>
+<wire x1="56.515" y1="7.62" x2="59.055" y2="7.62" width="0.3048" layer="1"/>
+<wire x1="59.055" y1="7.62" x2="58.42" y2="8.103" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$9">
 <contactref element="NUM_R" pad="TP"/>
 <contactref element="R5" pad="2"/>
-<wire x1="61.595" y1="10.947" x2="62.865" y2="10.947" width="0.3048" layer="1"/>
-<wire x1="62.865" y1="10.947" x2="62.865" y2="9.525" width="0.3048" layer="1"/>
-<wire x1="62.865" y1="9.525" x2="64.77" y2="9.525" width="0.3048" layer="1"/>
-<wire x1="64.77" y1="9.525" x2="64.77" y2="8.89" width="0.3048" layer="1"/>
+<wire x1="60.96" y1="10.947" x2="62.23" y2="10.947" width="0.3048" layer="1"/>
+<wire x1="62.23" y1="10.947" x2="62.23" y2="9.525" width="0.3048" layer="1"/>
+<wire x1="62.23" y1="9.525" x2="64.135" y2="9.525" width="0.3048" layer="1"/>
+<wire x1="64.135" y1="9.525" x2="64.135" y2="8.89" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$18">
 <contactref element="NUM" pad="TP"/>
 <contactref element="R4" pad="2"/>
-<wire x1="59.055" y1="10.947" x2="59.69" y2="10.947" width="0.3048" layer="1"/>
-<wire x1="59.69" y1="10.947" x2="59.69" y2="12.7" width="0.3048" layer="1"/>
-<wire x1="59.69" y1="12.7" x2="64.77" y2="12.7" width="0.3048" layer="1"/>
-<wire x1="64.77" y1="12.7" x2="64.77" y2="11.43" width="0.3048" layer="1"/>
+<wire x1="58.42" y1="10.947" x2="59.055" y2="10.947" width="0.3048" layer="1"/>
+<wire x1="59.055" y1="10.947" x2="59.055" y2="12.7" width="0.3048" layer="1"/>
+<wire x1="59.055" y1="12.7" x2="64.135" y2="12.7" width="0.3048" layer="1"/>
+<wire x1="64.135" y1="12.7" x2="64.135" y2="11.43" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$22">
 <contactref element="U$1" pad="17"/>
 <contactref element="R5" pad="1"/>
 <wire x1="51.1778" y1="8.595" x2="55.88" y2="8.595" width="0.3048" layer="1"/>
 <wire x1="55.88" y1="8.595" x2="55.88" y2="6.35" width="0.3048" layer="1"/>
-<wire x1="55.88" y1="6.35" x2="61.595" y2="6.35" width="0.3048" layer="1"/>
-<wire x1="61.595" y1="6.35" x2="61.595" y2="8.103" width="0.3048" layer="1"/>
+<wire x1="55.88" y1="6.35" x2="60.96" y2="6.35" width="0.3048" layer="1"/>
+<wire x1="60.96" y1="6.35" x2="60.96" y2="8.103" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$1">
 <contactref element="U$1" pad="6"/>

HARD/Knife/m_knife.b#8

@@ -32,10 +32,10 @@
 <layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="26" name="bNames" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="27" name="tValues" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="28" name="bValues" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
+<layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
+<layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
+<layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="29" name="tStop" color="7" fill="3" visible="no" active="yes"/>
 <layer number="30" name="bStop" color="7" fill="6" visible="no" active="yes"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="yes"/>
@@ -92,12 +92,12 @@
 </layers>
 <board>
 <plain>
-<wire x1="0" y1="-0.635" x2="71.745" y2="-0.635" width="0" layer="20"/>
-<wire x1="71.745" y1="-0.635" x2="71.745" y2="17.27" width="0" layer="20"/>
-<wire x1="71.745" y1="17.27" x2="0" y2="17.27" width="0" layer="20"/>
-<wire x1="0" y1="17.27" x2="0" y2="-0.635" width="0" layer="20"/>
-<dimension x1="0" y1="17.27" x2="0" y2="-0.635" x3="-4.445" y3="8.3175" textsize="1.778" layer="20"/>
-<dimension x1="0" y1="-0.635" x2="71.745" y2="-0.635" x3="35.8725" y3="-4.445" textsize="1.778" layer="20"/>
+<wire x1="7.62" y1="-1.27" x2="69.84" y2="-1.27" width="0" layer="20"/>
+<wire x1="69.84" y1="-1.27" x2="69.84" y2="17.905" width="0" layer="20"/>
+<wire x1="69.84" y1="17.905" x2="7.62" y2="17.905" width="0" layer="20"/>
+<wire x1="7.62" y1="17.905" x2="7.62" y2="-1.27" width="0" layer="20"/>
+<dimension x1="7.62" y1="17.905" x2="7.62" y2="-1.27" x3="5.08" y3="8.3175" textsize="1.778" layer="1"/>
+<dimension x1="7.62" y1="-1.27" x2="69.84" y2="-1.27" x3="38.73" y3="-5.08" textsize="1.778" layer="1"/>
 </plain>
 <libraries>
 <library name="rcl">
@@ -2677,64 +2677,64 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="rcl" package="SMC_D" value="" x="13.335" y="11.43" rot="R270"/>
-<element name="C2" library="rcl" package="C1206" value="" x="30.48" y="12.7" rot="R180"/>
-<element name="EDGE" library="testpad" package="TP20R" value="TPSQTP20R" x="18.415" y="6.35">
-<attribute name="TP_SIGNAL_NAME" value="" x="18.415" y="6.35" size="1.778" layer="27" display="off"/>
+<element name="C1" library="rcl" package="SMC_D" value="" x="13.335" y="13.335"/>
+<element name="C2" library="rcl" package="C1206" value="" x="34.29" y="12.065" rot="R90"/>
+<element name="EDGE" library="testpad" package="TP20R" value="TPSQTP20R" x="20.955" y="6.35">
+<attribute name="TP_SIGNAL_NAME" value="" x="20.955" y="6.35" size="1.778" layer="27" display="off"/>
 </element>
 <element name="GND_L" library="testpad" package="TP20R" value="TPSQTP20R" x="36.83" y="3.175">
 <attribute name="TP_SIGNAL_NAME" value="" x="36.83" y="3.175" size="1.778" layer="27" display="off"/>
 </element>
-<element name="GND_NUM" library="testpad" package="TP20R" value="TPSQTP20R" x="67.945" y="8.255">
-<attribute name="TP_SIGNAL_NAME" value="" x="67.945" y="8.255" size="1.778" layer="27" display="off"/>
+<element name="GND_NUM" library="testpad" package="TP20R" value="TPSQTP20R" x="64.77" y="6.35">
+<attribute name="TP_SIGNAL_NAME" value="" x="64.77" y="6.35" size="1.778" layer="27" display="off"/>
 </element>
-<element name="GND_S" library="testpad" package="TP20R" value="TPSQTP20R" x="18.415" y="12.7">
-<attribute name="TP_SIGNAL_NAME" value="" x="18.415" y="12.7" size="1.778" layer="27" display="off"/>
+<element name="GND_S" library="testpad" package="TP20R" value="TPSQTP20R" x="20.955" y="12.7">
+<attribute name="TP_SIGNAL_NAME" value="" x="20.955" y="12.7" size="1.778" layer="27" display="off"/>
 </element>
 <element name="GND_SPI" library="testpad" package="TP20R" value="TPSQTP20R" x="64.77" y="3.175">
 <attribute name="TP_SIGNAL_NAME" value="" x="64.77" y="3.175" size="1.778" layer="27" display="off"/>
 </element>
-<element name="IC1" library="v-reg" package="SOT223" value="LD117AS12TR" x="5.08" y="10.16" rot="R90"/>
+<element name="IC1" library="v-reg" package="SOT223" value="LD117AS12TR" x="13.335" y="6.985" rot="R90"/>
 <element name="RST" library="pinhead" package="1X02" value="" x="41.91" y="12.065" rot="R270"/>
 <element name="BOOT" library="pinhead" package="1X02" value="" x="46.99" y="13.97" rot="R180"/>
-<element name="PWR" library="pinhead" package="1X04" value="" x="7.62" y="1.905" rot="R180"/>
+<element name="PWR" library="pinhead" package="1X04" value="" x="13.97" y="1.27" rot="R180"/>
 <element name="LED_STAT" library="testpad" package="TP20R" value="TPSQTP20R" x="40.005" y="3.175">
 <attribute name="TP_SIGNAL_NAME" value="" x="40.005" y="3.175" size="1.778" layer="27" display="off"/>
 </element>
-<element name="NUM" library="testpad" package="TP20R" value="TPSQTP20R" x="67.945" y="13.97">
-<attribute name="TP_SIGNAL_NAME" value="" x="67.945" y="13.97" size="1.778" layer="27" display="off"/>
+<element name="NUM" library="testpad" package="TP20R" value="TPSQTP20R" x="64.77" y="11.43">
+<attribute name="TP_SIGNAL_NAME" value="" x="64.77" y="11.43" size="1.778" layer="27" display="off"/>
 </element>
-<element name="NUM_R" library="testpad" package="TP20R" value="TPSQTP20R" x="67.945" y="11.43">
-<attribute name="TP_SIGNAL_NAME" value="" x="67.945" y="11.43" size="1.778" layer="27" display="off"/>
+<element name="NUM_R" library="testpad" package="TP20R" value="TPSQTP20R" x="64.77" y="8.89">
+<attribute name="TP_SIGNAL_NAME" value="" x="64.77" y="8.89" size="1.778" layer="27" display="off"/>
 </element>
-<element name="PIKE" library="testpad" package="TP20R" value="TPSQTP20R" x="18.415" y="9.525">
-<attribute name="TP_SIGNAL_NAME" value="" x="18.415" y="9.525" size="1.778" layer="27" display="off"/>
+<element name="PIKE" library="testpad" package="TP20R" value="TPSQTP20R" x="20.955" y="9.525">
+<attribute name="TP_SIGNAL_NAME" value="" x="20.955" y="9.525" size="1.778" layer="27" display="off"/>
 </element>
 <element name="R1" library="resistor" package="R1206" value="" x="45.72" y="2.54"/>
-<element name="R2" library="resistor" package="R1206" value="" x="30.48" y="10.16" rot="R180"/>
-<element name="R3" library="resistor" package="R1206" value="" x="23.495" y="13.335" rot="R180"/>
-<element name="R4" library="resistor" package="R1206" value="" x="62.865" y="13.335"/>
-<element name="R5" library="resistor" package="R1206" value="" x="62.865" y="10.795"/>
-<element name="R7" library="resistor" package="R1206" value="" x="22.86" y="9.525"/>
-<element name="R8" library="resistor" package="R1206" value="" x="22.86" y="6.985"/>
-<element name="SPI_CK" library="testpad" package="TP20R" value="TPSQTP20R" x="55.245" y="3.175">
-<attribute name="TP_SIGNAL_NAME" value="" x="55.245" y="3.175" size="1.778" layer="27" display="off"/>
+<element name="R2" library="resistor" package="R1206" value="" x="31.75" y="12.065" rot="R90"/>
+<element name="R3" library="resistor" package="R1206" value="" x="29.21" y="12.065" rot="R270"/>
+<element name="R4" library="resistor" package="R1206" value="" x="59.055" y="9.525" rot="R90"/>
+<element name="R5" library="resistor" package="R1206" value="" x="61.595" y="9.525" rot="R90"/>
+<element name="R7" library="resistor" package="R1206" value="" x="25.4" y="12.7" rot="R270"/>
+<element name="R8" library="resistor" package="R1206" value="" x="26.035" y="3.81" rot="R90"/>
+<element name="SPI_CK" library="testpad" package="TP20R" value="TPSQTP20R" x="55.245" y="2.54">
+<attribute name="TP_SIGNAL_NAME" value="" x="55.245" y="2.54" size="1.778" layer="27" display="off"/>
 </element>
-<element name="SPI_MISO" library="testpad" package="TP20R" value="TPSQTP20R" x="58.42" y="3.175">
-<attribute name="TP_SIGNAL_NAME" value="" x="58.42" y="3.175" size="1.778" layer="27" display="off"/>
+<element name="SPI_MISO" library="testpad" package="TP20R" value="TPSQTP20R" x="58.42" y="2.54">
+<attribute name="TP_SIGNAL_NAME" value="" x="58.42" y="2.54" size="1.778" layer="27" display="off"/>
 </element>
-<element name="SPI_MOSI" library="testpad" package="TP20R" value="TPSQTP20R" x="61.595" y="3.175">
-<attribute name="TP_SIGNAL_NAME" value="" x="61.595" y="3.175" size="1.778" layer="27" display="off"/>
+<element name="SPI_MOSI" library="testpad" package="TP20R" value="TPSQTP20R" x="61.595" y="2.54">
+<attribute name="TP_SIGNAL_NAME" value="" x="61.595" y="2.54" size="1.778" layer="27" display="off"/>
 </element>
 <element name="SWD" library="pinhead" package="1X03" value="" x="55.245" y="13.97"/>
 <element name="U$1" library="stm32f0" package="TSSOP20" value="STM32F042FXPX" x="48.26" y="7.62" rot="R270"/>
-<element name="R9" library="resistor" package="R1206" value="" x="36.195" y="12.7" rot="R180"/>
+<element name="R9" library="resistor" package="R1206" value="" x="38.1" y="12.065" rot="R270"/>
 <element name="R10" library="resistor" package="R1206" value="" x="33.02" y="3.175" rot="R270"/>
-<element name="S/S" library="testpad" package="TP20R" value="TPSQTP20R" x="29.845" y="3.175">
-<attribute name="TP_SIGNAL_NAME" value="" x="29.845" y="3.175" size="1.778" layer="27" display="off"/>
+<element name="S/S" library="testpad" package="TP20R" value="TPSQTP20R" x="29.845" y="5.08">
+<attribute name="TP_SIGNAL_NAME" value="" x="29.845" y="5.08" size="1.778" layer="27" display="off"/>
 </element>
-<element name="+S/S" library="testpad" package="TP20R" value="TPSQTP20R" x="26.67" y="3.175">
-<attribute name="TP_SIGNAL_NAME" value="" x="26.67" y="3.175" size="1.778" layer="27" display="off"/>
+<element name="+S/S" library="testpad" package="TP20R" value="TPSQTP20R" x="29.845" y="1.905">
+<attribute name="TP_SIGNAL_NAME" value="" x="29.845" y="1.905" size="1.778" layer="27" display="off"/>
 </element>
 </elements>
 <signals>
@@ -2742,29 +2742,33 @@ design rules under a new name.</description>
 <contactref element="U$1" pad="11"/>
 <contactref element="SPI_CK" pad="TP"/>
 <wire x1="51.1778" y1="4.695" x2="51.435" y2="4.695" width="0.3048" layer="1"/>
-<wire x1="51.435" y1="4.695" x2="51.435" y2="3.175" width="0.3048" layer="1"/>
-<wire x1="51.435" y1="3.175" x2="55.245" y2="3.175" width="0.3048" layer="1"/>
+<wire x1="51.435" y1="4.695" x2="51.435" y2="2.54" width="0.3048" layer="1"/>
+<wire x1="51.435" y1="2.54" x2="55.245" y2="2.54" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$5">
 <contactref element="U$1" pad="12"/>
 <contactref element="SPI_MISO" pad="TP"/>
-<wire x1="51.1778" y1="5.345" x2="58.42" y2="5.345" width="0.3048" layer="1"/>
-<wire x1="58.42" y1="5.345" x2="58.42" y2="3.175" width="0.3048" layer="1"/>
+<wire x1="51.1778" y1="5.345" x2="53.34" y2="5.345" width="0.3048" layer="1"/>
+<wire x1="53.34" y1="5.345" x2="53.34" y2="4.445" width="0.3048" layer="1"/>
+<wire x1="53.34" y1="4.445" x2="58.42" y2="4.445" width="0.3048" layer="1"/>
+<wire x1="58.42" y1="4.445" x2="58.42" y2="2.54" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$6">
 <contactref element="U$1" pad="13"/>
 <contactref element="SPI_MOSI" pad="TP"/>
-<wire x1="51.1778" y1="5.995" x2="61.595" y2="5.995" width="0.3048" layer="1"/>
-<wire x1="61.595" y1="5.995" x2="61.595" y2="3.175" width="0.3048" layer="1"/>
+<wire x1="51.1778" y1="5.995" x2="53.975" y2="5.995" width="0.3048" layer="1"/>
+<wire x1="53.975" y1="5.995" x2="53.975" y2="5.08" width="0.3048" layer="1"/>
+<wire x1="53.975" y1="5.08" x2="61.595" y2="5.08" width="0.3048" layer="1"/>
+<wire x1="61.595" y1="5.08" x2="61.595" y2="2.54" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$11">
 <contactref element="RST" pad="2"/>
 <contactref element="U$1" pad="4"/>
 <contactref element="R2" pad="1"/>
-<wire x1="31.902" y1="10.16" x2="31.902" y2="8.595" width="0.3048" layer="1"/>
-<wire x1="31.902" y1="8.595" x2="41.91" y2="8.595" width="0.3048" layer="1"/>
+<wire x1="31.75" y1="8.595" x2="41.91" y2="8.595" width="0.3048" layer="1"/>
 <wire x1="41.91" y1="8.595" x2="45.3422" y2="8.595" width="0.3048" layer="1"/>
 <wire x1="41.91" y1="10.795" x2="41.91" y2="8.595" width="0.3048" layer="1"/>
+<wire x1="31.75" y1="10.643" x2="31.75" y2="8.595" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$12">
 <contactref element="BOOT" pad="2"/>
@@ -2772,10 +2776,10 @@ design rules under a new name.</description>
 <contactref element="R9" pad="1"/>
 <wire x1="45.3422" y1="10.545" x2="45.3422" y2="13.97" width="0.3048" layer="1"/>
 <wire x1="45.3422" y1="13.97" x2="45.72" y2="13.97" width="0.3048" layer="1"/>
-<wire x1="37.617" y1="12.7" x2="37.617" y2="15.24" width="0.3048" layer="1"/>
-<wire x1="37.617" y1="15.24" x2="44.45" y2="15.24" width="0.3048" layer="1"/>
-<wire x1="44.45" y1="15.24" x2="44.45" y2="13.97" width="0.3048" layer="1"/>
-<wire x1="44.45" y1="13.97" x2="45.72" y2="13.97" width="0.3048" layer="1"/>
+<wire x1="38.1" y1="13.487" x2="38.1" y2="15.24" width="0.3048" layer="1"/>
+<wire x1="38.1" y1="15.24" x2="45.085" y2="15.24" width="0.3048" layer="1"/>
+<wire x1="45.085" y1="15.24" x2="45.085" y2="13.97" width="0.3048" layer="1"/>
+<wire x1="45.085" y1="13.97" x2="45.72" y2="13.97" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="U$1" pad="9"/>
@@ -2803,57 +2807,54 @@ design rules under a new name.</description>
 <contactref element="C2" pad="1"/>
 <contactref element="R10" pad="2"/>
 <contactref element="R9" pad="2"/>
-<wire x1="36.83" y1="3.175" x2="36.83" y2="0.635" width="0.3048" layer="1"/>
-<wire x1="36.83" y1="0.635" x2="48.895" y2="0.635" width="0.3048" layer="1"/>
-<wire x1="48.895" y1="0.635" x2="48.895" y2="1.27" width="0.3048" layer="1"/>
-<wire x1="48.895" y1="1.27" x2="48.895" y2="7.295" width="0.3048" layer="1"/>
-<wire x1="48.895" y1="7.295" x2="51.1778" y2="7.295" width="0.3048" layer="1"/>
-<wire x1="64.77" y1="3.175" x2="64.77" y2="1.27" width="0.3048" layer="1"/>
-<wire x1="64.77" y1="1.27" x2="48.895" y2="1.27" width="0.3048" layer="1"/>
-<wire x1="33.655" y1="0.635" x2="36.83" y2="0.635" width="0.3048" layer="1"/>
-<wire x1="18.415" y1="12.7" x2="17.145" y2="12.7" width="0.3048" layer="1"/>
-<wire x1="17.145" y1="12.7" x2="17.145" y2="11.43" width="0.3048" layer="1"/>
-<wire x1="17.145" y1="11.43" x2="13.335" y2="11.43" width="0.3048" layer="1"/>
-<wire x1="13.335" y1="11.43" x2="13.335" y2="8.28" width="0.3048" layer="1"/>
-<wire x1="67.945" y1="8.255" x2="67.945" y2="1.27" width="0.3048" layer="1"/>
-<wire x1="67.945" y1="1.27" x2="64.77" y2="1.27" width="0.3048" layer="1"/>
-<wire x1="31.88" y1="12.7" x2="34.773" y2="12.7" width="0.3048" layer="1"/>
-<wire x1="31.88" y1="12.7" x2="31.88" y2="15.875" width="0.3048" layer="1"/>
-<wire x1="31.88" y1="15.875" x2="52.705" y2="15.875" width="0.3048" layer="1"/>
-<wire x1="52.705" y1="15.875" x2="70.485" y2="15.875" width="0.3048" layer="1"/>
-<wire x1="70.485" y1="15.875" x2="70.485" y2="1.27" width="0.3048" layer="1"/>
-<wire x1="70.485" y1="1.27" x2="67.945" y2="1.27" width="0.3048" layer="1"/>
-<wire x1="52.705" y1="13.97" x2="52.705" y2="15.875" width="0.3048" layer="1"/>
 <wire x1="41.91" y1="13.335" x2="40.005" y2="13.335" width="0.3048" layer="1"/>
-<wire x1="40.005" y1="13.335" x2="40.005" y2="10.16" width="0.3048" layer="1"/>
-<wire x1="40.005" y1="10.16" x2="34.925" y2="10.16" width="0.3048" layer="1"/>
-<wire x1="34.925" y1="10.16" x2="34.925" y2="12.7" width="0.3048" layer="1"/>
-<wire x1="34.925" y1="12.7" x2="34.773" y2="12.7" width="0.3048" layer="1"/>
-<wire x1="33.02" y1="1.753" x2="33.655" y2="1.753" width="0.3048" layer="1"/>
-<wire x1="33.655" y1="1.753" x2="33.655" y2="0.635" width="0.3048" layer="1"/>
-<wire x1="33.655" y1="0.635" x2="22.225" y2="0.635" width="0.3048" layer="1"/>
-<wire x1="22.225" y1="0.635" x2="21.59" y2="0.635" width="0.3048" layer="1"/>
-<wire x1="8.23" y1="7.86" x2="11.43" y2="7.86" width="0.4064" layer="1"/>
-<wire x1="11.43" y1="7.86" x2="13.335" y2="7.86" width="0.4064" layer="1"/>
-<wire x1="13.335" y1="7.86" x2="13.335" y2="8.28" width="0.4064" layer="1"/>
-<wire x1="11.43" y1="1.905" x2="11.43" y2="7.86" width="0.4064" layer="1"/>
-<wire x1="13.335" y1="8.28" x2="13.335" y2="4.445" width="0.4064" layer="1"/>
-<wire x1="13.335" y1="4.445" x2="16.51" y2="4.445" width="0.4064" layer="1"/>
-<wire x1="16.51" y1="4.445" x2="16.51" y2="0.635" width="0.4064" layer="1"/>
-<wire x1="16.51" y1="0.635" x2="22.225" y2="0.635" width="0.4064" layer="1"/>
+<wire x1="38.1" y1="10.643" x2="40.005" y2="10.643" width="0.3048" layer="1"/>
+<wire x1="40.005" y1="10.643" x2="40.005" y2="13.335" width="0.3048" layer="1"/>
+<wire x1="34.29" y1="10.665" x2="36.195" y2="10.665" width="0.3048" layer="1"/>
+<wire x1="36.195" y1="10.665" x2="38.1" y2="10.665" width="0.3048" layer="1"/>
+<wire x1="38.1" y1="10.665" x2="38.1" y2="10.643" width="0.3048" layer="1"/>
+<wire x1="16.485" y1="4.685" x2="19.05" y2="4.685" width="0.4064" layer="1"/>
+<wire x1="19.05" y1="4.685" x2="19.05" y2="12.7" width="0.4064" layer="1"/>
+<wire x1="19.05" y1="12.7" x2="19.05" y2="13.335" width="0.4064" layer="1"/>
+<wire x1="19.05" y1="13.335" x2="16.485" y2="13.335" width="0.4064" layer="1"/>
+<wire x1="20.955" y1="12.7" x2="19.05" y2="12.7" width="0.4064" layer="1"/>
+<wire x1="51.1778" y1="7.295" x2="55.245" y2="7.295" width="0.3048" layer="1"/>
+<wire x1="55.245" y1="7.295" x2="55.245" y2="5.715" width="0.3048" layer="1"/>
+<wire x1="33.02" y1="0" x2="33.02" y2="1.753" width="0.4064" layer="1"/>
+<wire x1="19.05" y1="4.685" x2="19.05" y2="1.27" width="0.4064" layer="1"/>
+<wire x1="19.05" y1="1.27" x2="19.05" y2="0" width="0.4064" layer="1"/>
+<wire x1="19.05" y1="0" x2="33.02" y2="0" width="0.4064" layer="1"/>
+<wire x1="17.78" y1="1.27" x2="19.05" y2="1.27" width="0.4064" layer="1"/>
+<wire x1="64.77" y1="3.175" x2="64.77" y2="0" width="0.4064" layer="1"/>
+<wire x1="64.77" y1="0" x2="36.83" y2="0" width="0.4064" layer="1"/>
+<wire x1="36.83" y1="0" x2="33.02" y2="0" width="0.4064" layer="1"/>
+<wire x1="64.77" y1="6.35" x2="64.77" y2="4.445" width="0.4064" layer="1"/>
+<wire x1="64.77" y1="4.445" x2="64.77" y2="3.175" width="0.4064" layer="1"/>
+<wire x1="36.83" y1="3.175" x2="36.83" y2="0" width="0.4064" layer="1"/>
+<wire x1="52.705" y1="16.51" x2="36.195" y2="16.51" width="0.4064" layer="1"/>
+<wire x1="36.195" y1="16.51" x2="36.195" y2="10.665" width="0.4064" layer="1"/>
+<wire x1="52.705" y1="13.97" x2="52.705" y2="16.51" width="0.4064" layer="1"/>
+<wire x1="52.705" y1="16.51" x2="67.31" y2="16.51" width="0.4064" layer="1"/>
+<wire x1="67.31" y1="16.51" x2="67.31" y2="4.445" width="0.4064" layer="1"/>
+<wire x1="67.31" y1="4.445" x2="64.77" y2="4.445" width="0.4064" layer="1"/>
+<wire x1="55.245" y1="5.715" x2="62.865" y2="5.715" width="0.3048" layer="1"/>
+<wire x1="62.865" y1="5.715" x2="62.865" y2="4.445" width="0.3048" layer="1"/>
+<wire x1="62.865" y1="4.445" x2="64.77" y2="4.445" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$15">
 <contactref element="PWR" pad="4"/>
 <contactref element="PWR" pad="3"/>
-<wire x1="3.81" y1="1.905" x2="6.35" y2="1.905" width="0" layer="19" extent="1-1"/>
+<wire x1="10.16" y1="1.27" x2="12.7" y2="1.27" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$16">
 <contactref element="PWR" pad="2"/>
 <contactref element="IC1" pad="3"/>
-<wire x1="8.23" y1="12.46" x2="5.08" y2="12.46" width="0.4064" layer="1"/>
-<wire x1="5.08" y1="12.46" x2="5.08" y2="5.715" width="0.4064" layer="1"/>
-<wire x1="5.08" y1="5.715" x2="8.89" y2="5.715" width="0.4064" layer="1"/>
-<wire x1="8.89" y1="5.715" x2="8.89" y2="1.905" width="0.4064" layer="1"/>
+<wire x1="15.24" y1="1.27" x2="15.24" y2="2.54" width="0.4064" layer="1"/>
+<wire x1="15.24" y1="2.54" x2="13.335" y2="4.445" width="0.4064" layer="1"/>
+<wire x1="13.335" y1="4.445" x2="13.335" y2="8.255" width="0.4064" layer="1"/>
+<wire x1="13.335" y1="8.255" x2="13.97" y2="8.89" width="0.4064" layer="1"/>
+<wire x1="13.97" y1="8.89" x2="16.09" y2="8.89" width="0.4064" layer="1"/>
+<wire x1="16.09" y1="8.89" x2="16.485" y2="9.285" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="IC1" pad="4"/>
@@ -2869,20 +2870,21 @@ design rules under a new name.</description>
 <wire x1="48.26" y1="13.97" x2="48.26" y2="7.945" width="0.3048" layer="1"/>
 <wire x1="48.26" y1="7.945" x2="48.585" y2="7.945" width="0.3048" layer="1"/>
 <contactref element="+S/S" pad="TP"/>
-<wire x1="45.3422" y1="7.945" x2="27.305" y2="7.945" width="0.3048" layer="1"/>
-<wire x1="27.305" y1="7.945" x2="27.305" y2="11.43" width="0.3048" layer="1"/>
-<wire x1="27.305" y1="11.43" x2="22.86" y2="11.43" width="0.3048" layer="1"/>
-<wire x1="22.86" y1="11.43" x2="22.073" y2="11.43" width="0.3048" layer="1"/>
-<wire x1="22.073" y1="11.43" x2="20.32" y2="11.43" width="0.3048" layer="1"/>
-<wire x1="20.32" y1="11.43" x2="20.32" y2="14.605" width="0.3048" layer="1"/>
-<wire x1="20.32" y1="14.605" x2="11.43" y2="14.605" width="0.3048" layer="1"/>
-<wire x1="11.43" y1="14.605" x2="12.69978125" y2="14.5883375" width="0.3048" layer="1"/>
-<wire x1="12.69978125" y1="14.5883375" x2="13.335" y2="14.58" width="0.3048" layer="1"/>
-<wire x1="26.67" y1="3.175" x2="22.86" y2="3.175" width="0.3048" layer="1"/>
-<wire x1="22.86" y1="3.175" x2="22.86" y2="11.43" width="0.3048" layer="1"/>
-<wire x1="22.073" y1="13.335" x2="22.073" y2="11.43" width="0.3048" layer="1"/>
-<wire x1="1.93" y1="10.16" x2="1.93" y2="14.5883375" width="0.4064" layer="1"/>
-<wire x1="1.93" y1="14.5883375" x2="12.69978125" y2="14.5883375" width="0.4064" layer="1"/>
+<wire x1="45.3422" y1="7.945" x2="29.21" y2="7.945" width="0.3048" layer="1"/>
+<wire x1="29.21" y1="7.945" x2="27.305" y2="7.945" width="0.3048" layer="1"/>
+<wire x1="29.21" y1="10.643" x2="29.21" y2="7.945" width="0.3048" layer="1"/>
+<wire x1="27.305" y1="7.945" x2="27.305" y2="12.7" width="0.3048" layer="1"/>
+<wire x1="27.305" y1="12.7" x2="27.305" y2="15.875" width="0.3048" layer="1"/>
+<wire x1="27.305" y1="15.875" x2="22.225" y2="15.875" width="0.3048" layer="1"/>
+<wire x1="29.845" y1="1.905" x2="27.94" y2="1.905" width="0.3048" layer="1"/>
+<wire x1="27.94" y1="1.905" x2="27.94" y2="3.81" width="0.3048" layer="1"/>
+<wire x1="27.94" y1="3.81" x2="23.495" y2="3.81" width="0.3048" layer="1"/>
+<wire x1="23.495" y1="3.81" x2="23.495" y2="12.7" width="0.3048" layer="1"/>
+<wire x1="23.495" y1="12.7" x2="27.305" y2="12.7" width="0.3048" layer="1"/>
+<wire x1="10.185" y1="6.985" x2="10.185" y2="13.335" width="0.4064" layer="1"/>
+<wire x1="10.185" y1="13.335" x2="13.335" y2="13.335" width="0.4064" layer="1"/>
+<wire x1="13.335" y1="13.335" x2="13.335" y2="15.875" width="0.4064" layer="1"/>
+<wire x1="13.335" y1="15.875" x2="22.225" y2="15.875" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$19">
 <contactref element="U$1" pad="20"/>
@@ -2903,73 +2905,76 @@ design rules under a new name.</description>
 <contactref element="C2" pad="2"/>
 <contactref element="R3" pad="1"/>
 <contactref element="R2" pad="2"/>
-<wire x1="24.917" y1="13.335" x2="29.715" y2="13.335" width="0.3048" layer="1"/>
-<wire x1="29.715" y1="13.335" x2="29.08" y2="12.7" width="0.3048" layer="1"/>
-<wire x1="29.08" y1="12.7" x2="29.058" y2="12.065" width="0.3048" layer="1"/>
-<wire x1="29.058" y1="12.065" x2="29.058" y2="10.16" width="0.3048" layer="1"/>
+<wire x1="34.29" y1="13.465" x2="31.75" y2="13.465" width="0.3048" layer="1"/>
+<wire x1="31.75" y1="13.465" x2="31.75" y2="13.487" width="0.3048" layer="1"/>
+<wire x1="31.75" y1="13.487" x2="29.21" y2="13.487" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$7">
 <contactref element="U$1" pad="18"/>
 <contactref element="R4" pad="1"/>
-<wire x1="51.1778" y1="9.245" x2="57.785" y2="9.245" width="0.3048" layer="1"/>
-<wire x1="57.785" y1="9.245" x2="57.785" y2="10.795" width="0.3048" layer="1"/>
-<wire x1="57.785" y1="10.795" x2="60.325" y2="13.335" width="0.3048" layer="1"/>
-<wire x1="60.325" y1="13.335" x2="61.443" y2="13.335" width="0.3048" layer="1"/>
+<wire x1="51.1778" y1="9.245" x2="57.15" y2="9.245" width="0.3048" layer="1"/>
+<wire x1="57.15" y1="9.245" x2="57.15" y2="7.62" width="0.3048" layer="1"/>
+<wire x1="57.15" y1="7.62" x2="59.055" y2="7.62" width="0.3048" layer="1"/>
+<wire x1="59.055" y1="7.62" x2="59.055" y2="8.103" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$9">
 <contactref element="NUM_R" pad="TP"/>
 <contactref element="R5" pad="2"/>
-<wire x1="64.287" y1="10.795" x2="67.31" y2="10.795" width="0.3048" layer="1"/>
-<wire x1="67.31" y1="10.795" x2="67.945" y2="11.43" width="0.3048" layer="1"/>
+<wire x1="61.595" y1="10.947" x2="62.865" y2="10.947" width="0.3048" layer="1"/>
+<wire x1="62.865" y1="10.947" x2="62.865" y2="9.525" width="0.3048" layer="1"/>
+<wire x1="62.865" y1="9.525" x2="64.77" y2="9.525" width="0.3048" layer="1"/>
+<wire x1="64.77" y1="9.525" x2="64.77" y2="8.89" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$18">
 <contactref element="NUM" pad="TP"/>
 <contactref element="R4" pad="2"/>
-<wire x1="64.287" y1="13.335" x2="67.31" y2="13.335" width="0.3048" layer="1"/>
-<wire x1="67.31" y1="13.335" x2="67.945" y2="13.97" width="0.3048" layer="1"/>
+<wire x1="59.055" y1="10.947" x2="59.69" y2="10.947" width="0.3048" layer="1"/>
+<wire x1="59.69" y1="10.947" x2="59.69" y2="12.7" width="0.3048" layer="1"/>
+<wire x1="59.69" y1="12.7" x2="64.77" y2="12.7" width="0.3048" layer="1"/>
+<wire x1="64.77" y1="12.7" x2="64.77" y2="11.43" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$22">
 <contactref element="U$1" pad="17"/>
 <contactref element="R5" pad="1"/>
-<wire x1="51.1778" y1="8.595" x2="59.055" y2="8.595" width="0.3048" layer="1"/>
-<wire x1="59.055" y1="8.595" x2="59.055" y2="10.795" width="0.3048" layer="1"/>
-<wire x1="59.055" y1="10.795" x2="61.443" y2="10.795" width="0.3048" layer="1"/>
+<wire x1="51.1778" y1="8.595" x2="55.88" y2="8.595" width="0.3048" layer="1"/>
+<wire x1="55.88" y1="8.595" x2="55.88" y2="6.35" width="0.3048" layer="1"/>
+<wire x1="55.88" y1="6.35" x2="61.595" y2="6.35" width="0.3048" layer="1"/>
+<wire x1="61.595" y1="6.35" x2="61.595" y2="8.103" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$1">
 <contactref element="U$1" pad="6"/>
 <contactref element="R7" pad="2"/>
-<wire x1="45.3422" y1="7.295" x2="26.67" y2="7.295" width="0.3048" layer="1"/>
-<wire x1="26.67" y1="7.295" x2="26.67" y2="8.89" width="0.3048" layer="1"/>
-<wire x1="26.67" y1="8.89" x2="24.282" y2="8.89" width="0.3048" layer="1"/>
-<wire x1="24.282" y1="8.89" x2="24.282" y2="9.525" width="0.3048" layer="1"/>
+<wire x1="45.3422" y1="7.295" x2="25.4" y2="7.295" width="0.3048" layer="1"/>
+<wire x1="25.4" y1="7.295" x2="25.4" y2="11.278" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$2">
 <contactref element="U$1" pad="7"/>
 <contactref element="R8" pad="2"/>
 <wire x1="45.3422" y1="6.645" x2="26.035" y2="6.645" width="0.3048" layer="1"/>
-<wire x1="26.035" y1="6.645" x2="26.035" y2="6.985" width="0.3048" layer="1"/>
-<wire x1="26.035" y1="6.985" x2="24.282" y2="6.985" width="0.3048" layer="1"/>
+<wire x1="26.035" y1="6.645" x2="26.035" y2="5.232" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$24">
 <contactref element="PIKE" pad="TP"/>
 <contactref element="R7" pad="1"/>
-<wire x1="21.438" y1="9.525" x2="18.415" y2="9.525" width="0.3048" layer="1"/>
+<wire x1="20.955" y1="9.525" x2="22.86" y2="9.525" width="0.3048" layer="1"/>
+<wire x1="22.86" y1="9.525" x2="22.86" y2="13.97" width="0.3048" layer="1"/>
+<wire x1="22.86" y1="13.97" x2="25.4" y2="13.97" width="0.3048" layer="1"/>
+<wire x1="25.4" y1="13.97" x2="25.4" y2="14.122" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$25">
 <contactref element="EDGE" pad="TP"/>
 <contactref element="R8" pad="1"/>
-<wire x1="21.438" y1="6.985" x2="19.05" y2="6.985" width="0.3048" layer="1"/>
-<wire x1="19.05" y1="6.985" x2="18.415" y2="6.35" width="0.3048" layer="1"/>
+<wire x1="26.035" y1="2.388" x2="20.955" y2="2.388" width="0.3048" layer="1"/>
+<wire x1="20.955" y1="2.388" x2="20.955" y2="6.35" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="R10" pad="1"/>
 <contactref element="U$1" pad="8"/>
 <contactref element="S/S" pad="TP"/>
-<wire x1="32.385" y1="5.995" x2="45.3422" y2="5.995" width="0.3048" layer="1"/>
-<wire x1="33.02" y1="4.597" x2="32.385" y2="4.597" width="0.3048" layer="1"/>
-<wire x1="32.385" y1="4.597" x2="32.385" y2="5.995" width="0.3048" layer="1"/>
-<wire x1="32.385" y1="4.597" x2="29.845" y2="4.597" width="0.3048" layer="1"/>
-<wire x1="29.845" y1="4.597" x2="29.845" y2="3.175" width="0.3048" layer="1"/>
+<wire x1="29.845" y1="5.08" x2="33.02" y2="5.08" width="0.3048" layer="1"/>
+<wire x1="33.02" y1="5.08" x2="33.02" y2="4.597" width="0.3048" layer="1"/>
+<wire x1="45.3422" y1="5.995" x2="33.02" y2="5.995" width="0.3048" layer="1"/>
+<wire x1="33.02" y1="5.995" x2="33.02" y2="4.597" width="0.3048" layer="1"/>
 </signal>
 </signals>
 </board>

HARD/Knife/m_knife.b#9

@@ -2685,8 +2685,8 @@ design rules under a new name.</description>
 <element name="GND_L" library="testpad" package="TP20R" value="TPSQTP20R" x="36.83" y="3.175">
 <attribute name="TP_SIGNAL_NAME" value="" x="36.83" y="3.175" size="1.778" layer="27" display="off"/>
 </element>
-<element name="GND_NUM" library="testpad" package="TP20R" value="TPSQTP20R" x="67.945" y="5.715">
-<attribute name="TP_SIGNAL_NAME" value="" x="67.945" y="5.715" size="1.778" layer="27" display="off"/>
+<element name="GND_NUM" library="testpad" package="TP20R" value="TPSQTP20R" x="67.945" y="8.255">
+<attribute name="TP_SIGNAL_NAME" value="" x="67.945" y="8.255" size="1.778" layer="27" display="off"/>
 </element>
 <element name="GND_S" library="testpad" package="TP20R" value="TPSQTP20R" x="18.415" y="12.7">
 <attribute name="TP_SIGNAL_NAME" value="" x="18.415" y="12.7" size="1.778" layer="27" display="off"/>
@@ -2701,13 +2701,10 @@ design rules under a new name.</description>
 <element name="LED_STAT" library="testpad" package="TP20R" value="TPSQTP20R" x="40.005" y="3.175">
 <attribute name="TP_SIGNAL_NAME" value="" x="40.005" y="3.175" size="1.778" layer="27" display="off"/>
 </element>
-<element name="NUM_A" library="testpad" package="TP20R" value="TPSQTP20R" x="67.945" y="8.89">
-<attribute name="TP_SIGNAL_NAME" value="" x="67.945" y="8.89" size="1.778" layer="27" display="off"/>
-</element>
-<element name="NUM_B" library="testpad" package="TP20R" value="TPSQTP20R" x="67.945" y="13.97">
+<element name="NUM" library="testpad" package="TP20R" value="TPSQTP20R" x="67.945" y="13.97">
 <attribute name="TP_SIGNAL_NAME" value="" x="67.945" y="13.97" size="1.778" layer="27" display="off"/>
 </element>
-<element name="NUM_RST" library="testpad" package="TP20R" value="TPSQTP20R" x="67.945" y="11.43">
+<element name="NUM_R" library="testpad" package="TP20R" value="TPSQTP20R" x="67.945" y="11.43">
 <attribute name="TP_SIGNAL_NAME" value="" x="67.945" y="11.43" size="1.778" layer="27" display="off"/>
 </element>
 <element name="PIKE" library="testpad" package="TP20R" value="TPSQTP20R" x="18.415" y="9.525">
@@ -2718,7 +2715,6 @@ design rules under a new name.</description>
 <element name="R3" library="resistor" package="R1206" value="" x="23.495" y="13.335" rot="R180"/>
 <element name="R4" library="resistor" package="R1206" value="" x="62.865" y="13.335"/>
 <element name="R5" library="resistor" package="R1206" value="" x="62.865" y="10.795"/>
-<element name="R6" library="resistor" package="R1206" value="" x="62.865" y="8.255"/>
 <element name="R7" library="resistor" package="R1206" value="" x="22.86" y="9.525"/>
 <element name="R8" library="resistor" package="R1206" value="" x="22.86" y="6.985"/>
 <element name="SPI_CK" library="testpad" package="TP20R" value="TPSQTP20R" x="55.245" y="3.175">
@@ -2819,7 +2815,7 @@ design rules under a new name.</description>
 <wire x1="17.145" y1="12.7" x2="17.145" y2="11.43" width="0.3048" layer="1"/>
 <wire x1="17.145" y1="11.43" x2="13.335" y2="11.43" width="0.3048" layer="1"/>
 <wire x1="13.335" y1="11.43" x2="13.335" y2="8.28" width="0.3048" layer="1"/>
-<wire x1="67.945" y1="5.715" x2="67.945" y2="1.27" width="0.3048" layer="1"/>
+<wire x1="67.945" y1="8.255" x2="67.945" y2="1.27" width="0.3048" layer="1"/>
 <wire x1="67.945" y1="1.27" x2="64.77" y2="1.27" width="0.3048" layer="1"/>
 <wire x1="31.88" y1="12.7" x2="34.773" y2="12.7" width="0.3048" layer="1"/>
 <wire x1="31.88" y1="12.7" x2="31.88" y2="15.875" width="0.3048" layer="1"/>
@@ -2920,20 +2916,14 @@ design rules under a new name.</description>
 <wire x1="57.785" y1="10.795" x2="60.325" y2="13.335" width="0.3048" layer="1"/>
 <wire x1="60.325" y1="13.335" x2="61.443" y2="13.335" width="0.3048" layer="1"/>
 </signal>
-<signal name="N$8">
-<contactref element="NUM_A" pad="TP"/>
-<contactref element="R6" pad="2"/>
-<wire x1="64.287" y1="8.255" x2="67.31" y2="8.255" width="0.3048" layer="1"/>
-<wire x1="67.31" y1="8.255" x2="67.945" y2="8.89" width="0.3048" layer="1"/>
-</signal>
 <signal name="N$9">
-<contactref element="NUM_RST" pad="TP"/>
+<contactref element="NUM_R" pad="TP"/>
 <contactref element="R5" pad="2"/>
 <wire x1="64.287" y1="10.795" x2="67.31" y2="10.795" width="0.3048" layer="1"/>
 <wire x1="67.31" y1="10.795" x2="67.945" y2="11.43" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$18">
-<contactref element="NUM_B" pad="TP"/>
+<contactref element="NUM" pad="TP"/>
 <contactref element="R4" pad="2"/>
 <wire x1="64.287" y1="13.335" x2="67.31" y2="13.335" width="0.3048" layer="1"/>
 <wire x1="67.31" y1="13.335" x2="67.945" y2="13.97" width="0.3048" layer="1"/>
@@ -2945,13 +2935,6 @@ design rules under a new name.</description>
 <wire x1="59.055" y1="8.595" x2="59.055" y2="10.795" width="0.3048" layer="1"/>
 <wire x1="59.055" y1="10.795" x2="61.443" y2="10.795" width="0.3048" layer="1"/>
 </signal>
-<signal name="N$23">
-<contactref element="U$1" pad="14"/>
-<contactref element="R6" pad="1"/>
-<wire x1="51.1778" y1="6.645" x2="60.325" y2="6.645" width="0.3048" layer="1"/>
-<wire x1="60.325" y1="6.645" x2="60.325" y2="8.255" width="0.3048" layer="1"/>
-<wire x1="60.325" y1="8.255" x2="61.443" y2="8.255" width="0.3048" layer="1"/>
-</signal>
 <signal name="N$1">
 <contactref element="U$1" pad="6"/>
 <contactref element="R7" pad="2"/>

HARD/Knife/m_knife.brd

@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="25" unitdist="mil" unit="mm" style="lines" multiple="1" display="yes" altdistance="0.025" altunitdist="inch" altunit="inch"/>
+<grid distance="25" unitdist="mil" unit="mil" style="lines" multiple="1" display="yes" altdistance="0.025" altunitdist="inch" altunit="inch"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
@@ -30,8 +30,8 @@
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="21" name="tPlace" color="7" fill="1" visible="no" active="yes"/>
 <layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
@@ -104,10 +104,10 @@
 <text x="13.335" y="17.78" size="1.27" layer="20">КОНТРОЛЛЕР В НОЖИК v1 СТАБИЛИЗАТОР - LD1117 SOT223</text>
 <circle x="48.26" y="13.335" radius="0.429" width="0.258" layer="116"/>
 <circle x="45.72" y="13.335" radius="0.429" width="0.258" layer="116"/>
-<circle x="17.78" y="1.27" radius="0.429" width="0.258" layer="116"/>
-<circle x="15.24" y="1.27" radius="0.429" width="0.258" layer="116"/>
-<circle x="12.7" y="1.27" radius="0.429" width="0.258" layer="116"/>
-<circle x="10.16" y="1.27" radius="0.429" width="0.258" layer="116"/>
+<circle x="17.78" y="0.635" radius="0.429" width="0.258" layer="116"/>
+<circle x="15.24" y="0.635" radius="0.429" width="0.258" layer="116"/>
+<circle x="12.7" y="0.635" radius="0.429" width="0.258" layer="116"/>
+<circle x="10.16" y="0.635" radius="0.429" width="0.258" layer="116"/>
 <circle x="41.91" y="12.7" radius="0.429" width="0.258" layer="116"/>
 <circle x="41.91" y="10.16" radius="0.429" width="0.258" layer="116"/>
 <circle x="50.8" y="13.335" radius="0.429" width="0.258" layer="116"/>
@@ -2692,10 +2692,10 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="rcl" package="SMC_D" value="" x="13.335" y="13.335"/>
-<element name="C2" library="rcl" package="C1206" value="" x="34.29" y="12.065" rot="R90"/>
-<element name="EDGE" library="testpad" package="TP20R" value="TPSQTP20R" x="20.955" y="6.35">
-<attribute name="TP_SIGNAL_NAME" value="" x="20.955" y="6.35" size="1.778" layer="27" display="off"/>
+<element name="C1" library="rcl" package="SMC_D" value="100uF" x="13.335" y="11.43"/>
+<element name="C2" library="rcl" package="C1206" value="0.01uF" x="34.29" y="12.065" rot="R90"/>
+<element name="EDGE" library="testpad" package="TP20R" value="TPSQTP20R" x="20.955" y="5.08">
+<attribute name="TP_SIGNAL_NAME" value="" x="20.955" y="5.08" size="1.778" layer="27" display="off"/>
 </element>
 <element name="GND_L" library="testpad" package="TP20R" value="TPSQTP20R" x="36.83" y="3.175">
 <attribute name="TP_SIGNAL_NAME" value="" x="36.83" y="3.175" size="1.778" layer="27" display="off"/>
@@ -2703,16 +2703,16 @@ design rules under a new name.</description>
 <element name="GND_NUM" library="testpad" package="TP20R" value="TPSQTP20R" x="64.135" y="6.35">
 <attribute name="TP_SIGNAL_NAME" value="" x="64.135" y="6.35" size="1.778" layer="27" display="off"/>
 </element>
-<element name="GND_S" library="testpad" package="TP20R" value="TPSQTP20R" x="20.955" y="12.7">
-<attribute name="TP_SIGNAL_NAME" value="" x="20.955" y="12.7" size="1.778" layer="27" display="off"/>
+<element name="GND_S" library="testpad" package="TP20R" value="TPSQTP20R" x="20.955" y="11.43">
+<attribute name="TP_SIGNAL_NAME" value="" x="20.955" y="11.43" size="1.778" layer="27" display="off"/>
 </element>
 <element name="GND_SPI" library="testpad" package="TP20R" value="TPSQTP20R" x="64.135" y="3.175">
 <attribute name="TP_SIGNAL_NAME" value="" x="64.135" y="3.175" size="1.778" layer="27" display="off"/>
 </element>
-<element name="IC1" library="v-reg" package="SOT223" value="LD117AS12TR" x="13.335" y="6.985" rot="R90"/>
+<element name="IC1" library="v-reg" package="SOT223" value="LD117AS12TR" x="13.335" y="6.35" rot="R90"/>
 <element name="RST" library="pinhead" package="1X02" value="" x="41.91" y="11.43" rot="R270"/>
 <element name="BOOT" library="pinhead" package="1X02" value="" x="46.99" y="13.335" rot="R180"/>
-<element name="PWR" library="pinhead" package="1X04" value="" x="13.97" y="1.27" rot="R180"/>
+<element name="PWR" library="pinhead" package="1X04" value="" x="13.97" y="0.635" rot="R180"/>
 <element name="LED_STAT" library="testpad" package="TP20R" value="TPSQTP20R" x="40.005" y="3.175">
 <attribute name="TP_SIGNAL_NAME" value="" x="40.005" y="3.175" size="1.778" layer="27" display="off"/>
 </element>
@@ -2722,16 +2722,16 @@ design rules under a new name.</description>
 <element name="NUM_R" library="testpad" package="TP20R" value="TPSQTP20R" x="64.135" y="8.89">
 <attribute name="TP_SIGNAL_NAME" value="" x="64.135" y="8.89" size="1.778" layer="27" display="off"/>
 </element>
-<element name="PIKE" library="testpad" package="TP20R" value="TPSQTP20R" x="20.955" y="9.525">
-<attribute name="TP_SIGNAL_NAME" value="" x="20.955" y="9.525" size="1.778" layer="27" display="off"/>
+<element name="PIKE" library="testpad" package="TP20R" value="TPSQTP20R" x="20.955" y="8.255">
+<attribute name="TP_SIGNAL_NAME" value="" x="20.955" y="8.255" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R1" library="resistor" package="R1206" value="" x="45.72" y="2.54"/>
-<element name="R2" library="resistor" package="R1206" value="" x="31.75" y="12.065" rot="R90"/>
-<element name="R3" library="resistor" package="R1206" value="" x="29.21" y="12.065" rot="R270"/>
-<element name="R4" library="resistor" package="R1206" value="" x="58.42" y="9.525" rot="R90"/>
-<element name="R5" library="resistor" package="R1206" value="" x="60.96" y="9.525" rot="R90"/>
-<element name="R7" library="resistor" package="R1206" value="" x="25.4" y="12.7" rot="R270"/>
-<element name="R8" library="resistor" package="R1206" value="" x="26.035" y="3.81" rot="R90"/>
+<element name="R1" library="resistor" package="R1206" value="1.2K" x="45.72" y="2.54"/>
+<element name="R2" library="resistor" package="R1206" value="1.2K" x="31.75" y="12.065" rot="R90"/>
+<element name="R3" library="resistor" package="R1206" value="1.2K" x="29.21" y="12.065" rot="R270"/>
+<element name="R4" library="resistor" package="R1206" value="1.2K" x="58.42" y="9.525" rot="R90"/>
+<element name="R5" library="resistor" package="R1206" value="1.2K" x="60.96" y="9.525" rot="R90"/>
+<element name="R7" library="resistor" package="R1206" value="1.2K" x="25.4" y="12.7" rot="R270"/>
+<element name="R8" library="resistor" package="R1206" value="1.2K" x="26.035" y="3.81" rot="R90"/>
 <element name="SPI_CK" library="testpad" package="TP20R" value="TPSQTP20R" x="55.245" y="2.54">
 <attribute name="TP_SIGNAL_NAME" value="" x="55.245" y="2.54" size="1.778" layer="27" display="off"/>
 </element>
@@ -2743,7 +2743,7 @@ design rules under a new name.</description>
 </element>
 <element name="SWD" library="pinhead" package="1X03" value="" x="53.34" y="13.335"/>
 <element name="U$1" library="stm32f0" package="TSSOP20" value="STM32F042FXPX" x="48.26" y="7.62" rot="R270"/>
-<element name="R9" library="resistor" package="R1206" value="" x="38.1" y="12.065" rot="R270"/>
+<element name="R9" library="resistor" package="R1206" value="1.2K" x="38.1" y="12.065" rot="R270"/>
 <element name="R10" library="resistor" package="R1206" value="" x="33.02" y="3.175" rot="R270"/>
 <element name="S/S" library="testpad" package="TP20R" value="TPSQTP20R" x="29.845" y="5.08">
 <attribute name="TP_SIGNAL_NAME" value="" x="29.845" y="5.08" size="1.778" layer="27" display="off"/>
@@ -2751,6 +2751,8 @@ design rules under a new name.</description>
 <element name="+S/S" library="testpad" package="TP20R" value="TPSQTP20R" x="29.845" y="1.905">
 <attribute name="TP_SIGNAL_NAME" value="" x="29.845" y="1.905" size="1.778" layer="27" display="off"/>
 </element>
+<element name="R6" library="resistor" package="R1206" value="150k" x="22.225" y="1.905"/>
+<element name="R11" library="resistor" package="R1206" value="150k" x="19.685" y="13.97"/>
 </elements>
 <signals>
 <signal name="N$4">
@@ -2828,18 +2830,18 @@ design rules under a new name.</description>
 <wire x1="34.29" y1="10.665" x2="36.195" y2="10.665" width="0.3048" layer="1"/>
 <wire x1="36.195" y1="10.665" x2="38.1" y2="10.665" width="0.3048" layer="1"/>
 <wire x1="38.1" y1="10.665" x2="38.1" y2="10.643" width="0.3048" layer="1"/>
-<wire x1="16.485" y1="4.685" x2="19.05" y2="4.685" width="0.4064" layer="1"/>
-<wire x1="19.05" y1="4.685" x2="19.05" y2="12.7" width="0.4064" layer="1"/>
-<wire x1="19.05" y1="12.7" x2="19.05" y2="13.335" width="0.4064" layer="1"/>
-<wire x1="19.05" y1="13.335" x2="16.485" y2="13.335" width="0.4064" layer="1"/>
-<wire x1="20.955" y1="12.7" x2="19.05" y2="12.7" width="0.4064" layer="1"/>
+<wire x1="16.485" y1="4.05" x2="19.05" y2="4.05" width="0.4064" layer="1"/>
+<wire x1="19.05" y1="4.05" x2="19.05" y2="11.43" width="0.4064" layer="1"/>
+<wire x1="19.05" y1="11.43" x2="16.485" y2="11.43" width="0.4064" layer="1"/>
+<wire x1="20.955" y1="11.43" x2="19.05" y2="11.43" width="0.4064" layer="1"/>
 <wire x1="51.1778" y1="7.295" x2="55.245" y2="7.295" width="0.3048" layer="1"/>
 <wire x1="55.245" y1="7.295" x2="55.245" y2="5.715" width="0.3048" layer="1"/>
 <wire x1="33.02" y1="0" x2="33.02" y2="1.753" width="0.4064" layer="1"/>
-<wire x1="19.05" y1="4.685" x2="19.05" y2="1.27" width="0.4064" layer="1"/>
+<wire x1="19.05" y1="4.05" x2="19.05" y2="1.905" width="0.4064" layer="1"/>
+<wire x1="19.05" y1="1.905" x2="19.05" y2="1.27" width="0.4064" layer="1"/>
 <wire x1="19.05" y1="1.27" x2="19.05" y2="0" width="0.4064" layer="1"/>
 <wire x1="19.05" y1="0" x2="33.02" y2="0" width="0.4064" layer="1"/>
-<wire x1="17.78" y1="1.27" x2="19.05" y2="1.27" width="0.4064" layer="1"/>
+<wire x1="17.78" y1="0.635" x2="19.05" y2="1.27" width="0.4064" layer="1"/>
 <wire x1="64.135" y1="3.175" x2="64.135" y2="0" width="0.4064" layer="1"/>
 <wire x1="64.135" y1="0" x2="36.83" y2="0" width="0.4064" layer="1"/>
 <wire x1="36.83" y1="0" x2="33.02" y2="0" width="0.4064" layer="1"/>
@@ -2855,20 +2857,25 @@ design rules under a new name.</description>
 <wire x1="55.245" y1="5.715" x2="62.23" y2="5.715" width="0.3048" layer="1"/>
 <wire x1="62.23" y1="5.715" x2="62.23" y2="4.445" width="0.3048" layer="1"/>
 <wire x1="62.23" y1="4.445" x2="64.135" y2="4.445" width="0.3048" layer="1"/>
+<contactref element="R11" pad="1"/>
+<contactref element="R6" pad="1"/>
+<wire x1="20.803" y1="1.905" x2="19.05" y2="1.905" width="0.3048" layer="1"/>
+<wire x1="18.263" y1="13.97" x2="19.05" y2="14.605" width="0.3048" layer="1"/>
+<wire x1="19.05" y1="14.605" x2="19.05" y2="11.43" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$15">
 <contactref element="PWR" pad="4"/>
 <contactref element="PWR" pad="3"/>
-<wire x1="10.16" y1="1.27" x2="12.7" y2="1.27" width="0.4064" layer="1"/>
+<wire x1="10.16" y1="0.635" x2="12.7" y2="0.635" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$16">
 <contactref element="PWR" pad="2"/>
 <contactref element="IC1" pad="3"/>
-<wire x1="15.24" y1="1.27" x2="15.24" y2="2.54" width="0.4064" layer="1"/>
-<wire x1="15.24" y1="2.54" x2="14.605" y2="3.81" width="0.4064" layer="1"/>
-<wire x1="14.605" y1="3.81" x2="14.605" y2="8.89" width="0.4064" layer="1"/>
+<wire x1="15.24" y1="0.635" x2="15.24" y2="1.905" width="0.4064" layer="1"/>
+<wire x1="15.24" y1="1.905" x2="14.605" y2="3.175" width="0.4064" layer="1"/>
+<wire x1="14.605" y1="3.175" x2="14.605" y2="8.89" width="0.4064" layer="1"/>
 <wire x1="14.605" y1="8.89" x2="16.09" y2="8.89" width="0.4064" layer="1"/>
-<wire x1="16.09" y1="8.89" x2="16.485" y2="9.285" width="0.4064" layer="1"/>
+<wire x1="16.09" y1="8.89" x2="16.485" y2="8.65" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="IC1" pad="4"/>
@@ -2895,9 +2902,9 @@ design rules under a new name.</description>
 <wire x1="27.94" y1="3.81" x2="23.495" y2="3.81" width="0.3048" layer="1"/>
 <wire x1="23.495" y1="3.81" x2="23.495" y2="12.7" width="0.3048" layer="1"/>
 <wire x1="23.495" y1="12.7" x2="27.305" y2="12.7" width="0.3048" layer="1"/>
-<wire x1="10.185" y1="6.985" x2="10.185" y2="13.335" width="0.4064" layer="1"/>
-<wire x1="10.185" y1="13.335" x2="13.335" y2="13.335" width="0.4064" layer="1"/>
-<wire x1="13.335" y1="13.335" x2="13.335" y2="15.875" width="0.4064" layer="1"/>
+<wire x1="10.185" y1="6.35" x2="10.185" y2="11.43" width="0.4064" layer="1"/>
+<wire x1="10.185" y1="11.43" x2="13.335" y2="11.43" width="0.4064" layer="1"/>
+<wire x1="13.335" y1="11.43" x2="13.335" y2="15.875" width="0.4064" layer="1"/>
 <wire x1="13.335" y1="15.875" x2="22.225" y2="15.875" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$19">
@@ -2969,16 +2976,22 @@ design rules under a new name.</description>
 <signal name="N$24">
 <contactref element="PIKE" pad="TP"/>
 <contactref element="R7" pad="1"/>
-<wire x1="20.955" y1="9.525" x2="22.86" y2="9.525" width="0.3048" layer="1"/>
-<wire x1="22.86" y1="9.525" x2="22.86" y2="13.97" width="0.3048" layer="1"/>
+<wire x1="20.955" y1="8.255" x2="22.86" y2="8.255" width="0.3048" layer="1"/>
+<wire x1="22.86" y1="8.255" x2="22.86" y2="13.97" width="0.3048" layer="1"/>
 <wire x1="22.86" y1="13.97" x2="25.4" y2="13.97" width="0.3048" layer="1"/>
 <wire x1="25.4" y1="13.97" x2="25.4" y2="14.122" width="0.3048" layer="1"/>
+<contactref element="R11" pad="2"/>
+<wire x1="21.107" y1="13.97" x2="22.86" y2="13.97" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$25">
 <contactref element="EDGE" pad="TP"/>
 <contactref element="R8" pad="1"/>
-<wire x1="26.035" y1="2.388" x2="20.955" y2="2.388" width="0.3048" layer="1"/>
-<wire x1="20.955" y1="2.388" x2="20.955" y2="6.35" width="0.3048" layer="1"/>
+<contactref element="R6" pad="2"/>
+<wire x1="26.035" y1="2.388" x2="23.647" y2="2.388" width="0.3048" layer="1"/>
+<wire x1="23.647" y1="2.388" x2="23.647" y2="1.905" width="0.3048" layer="1"/>
+<wire x1="23.647" y1="2.388" x2="22.86" y2="2.388" width="0.3048" layer="1"/>
+<wire x1="22.86" y1="2.388" x2="22.86" y2="5.08" width="0.3048" layer="1"/>
+<wire x1="22.86" y1="5.08" x2="20.955" y2="5.08" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="R10" pad="1"/>

HARD/Knife/m_knife.s#2

@@ -18927,7 +18927,6 @@ Source: AVX .. aphvc.pdf</description>
 <device name="TT5D9" package="TT5D9">
 =======
 <device name="E2-5" package="E2-5">
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
 <connect gate="G$1" pin="+" pad="+"/>
 <connect gate="G$1" pin="-" pad="-"/>
@@ -18936,11 +18935,7 @@ Source: AVX .. aphvc.pdf</description>
 <technology name=""/>
 </technologies>
 </device>
-<<<<<<< HEAD
-<device name="TT5D9L" package="TT5D9L">
-=======
 <device name="E22-10AXIAL" package="E22-10">
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
 <connect gate="G$1" pin="+" pad="+"/>
 <connect gate="G$1" pin="-" pad="-"/>
@@ -18949,9 +18944,6 @@ Source: AVX .. aphvc.pdf</description>
 <technology name=""/>
 </technologies>
 </device>
-<<<<<<< HEAD
-<device name="ETR1" package="ETR1">
-=======
 <device name="E22-6AXIAL" package="E22-6">
 <connects>
 <connect gate="G$1" pin="+" pad="+"/>
@@ -19142,6 +19134,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <device name="E5-5" package="E5-5">
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
 <connect gate="G$1" pin="+" pad="+"/>
 <connect gate="G$1" pin="-" pad="-"/>
@@ -19150,7 +19143,11 @@ Source: AVX .. aphvc.pdf</description>
 <technology name=""/>
 </technologies>
 </device>
+<<<<<<< HEAD
+<device name="TT5D9L" package="TT5D9L">
+=======
 <device name="E5-6" package="E5-6">
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
 <connect gate="G$1" pin="+" pad="+"/>
 <connect gate="G$1" pin="-" pad="-"/>
@@ -19159,6 +19156,9 @@ Source: AVX .. aphvc.pdf</description>
 <technology name=""/>
 </technologies>
 </device>
+<<<<<<< HEAD
+<device name="ETR1" package="ETR1">
+=======
 <device name="E5-8.5" package="E5-8,5">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
@@ -22136,9 +22136,8 @@ Source: AVX .. aphvc.pdf</description>
 <part name="SPI_CK" library="testpad" deviceset="TPSQ" device="TP20R"/>
 <part name="SPI_MISO" library="testpad" deviceset="TPSQ" device="TP20R"/>
 <part name="SPI_MOSI" library="testpad" deviceset="TPSQ" device="TP20R"/>
-<part name="NUM_A" library="testpad" deviceset="TPSQ" device="TP20R"/>
-<part name="NUM_RST" library="testpad" deviceset="TPSQ" device="TP20R"/>
-<part name="NUM_B" library="testpad" deviceset="TPSQ" device="TP20R"/>
+<part name="NUM_R" library="testpad" deviceset="TPSQ" device="TP20R"/>
+<part name="NUM" library="testpad" deviceset="TPSQ" device="TP20R"/>
 <part name="RST" library="pinhead" deviceset="PINHD-1X2" device=""/>
 <part name="BOOT" library="pinhead" deviceset="PINHD-1X2" device=""/>
 <part name="R1" library="resistor" deviceset="R-EU_" device="R1206"/>
@@ -22155,7 +22154,6 @@ Source: AVX .. aphvc.pdf</description>
 <part name="C2" library="rcl" deviceset="C-US" device="C1206"/>
 <part name="R4" library="resistor" deviceset="R-EU_" device="R1206"/>
 <part name="R5" library="resistor" deviceset="R-EU_" device="R1206"/>
-<part name="R6" library="resistor" deviceset="R-EU_" device="R1206"/>
 <part name="R7" library="resistor" deviceset="R-EU_" device="R1206"/>
 <part name="R8" library="resistor" deviceset="R-EU_" device="R1206"/>
 <part name="R9" library="resistor" deviceset="R-EU_" device="R1206"/>
@@ -22166,7 +22164,6 @@ Source: AVX .. aphvc.pdf</description>
 <part name="BOOT" library="pinhead" deviceset="PINHD-1X2" device=""/>
 <part name="RST" library="pinhead" deviceset="PINHD-1X2" device=""/>
 <part name="SENS" library="pinhead" deviceset="PINHD-1X3" device=""/>
-<part name="LEDS" library="pinhead" deviceset="PINHD-1X3" device=""/>
 <part name="STR-STP" library="pinhead" deviceset="PINHD-1X2" device=""/>
 <part name="SWD" library="pinhead" deviceset="PINHD-1X3" device=""/>
 <part name="SPI" library="pinhead" deviceset="PINHD-1X4" device=""/>
@@ -22181,6 +22178,9 @@ Source: AVX .. aphvc.pdf</description>
 <part name="DATA" library="pinhead" deviceset="PINHD-1X3" device=""/>
 <part name="PWR" library="pinhead" deviceset="PINHD-1X4" device=""/>
 <part name="R6" library="resistor" deviceset="R-EU_" device="R1206"/>
+<part name="SPI1" library="pinhead" deviceset="PINHD-1X4" device=""/>
+<part name="R7" library="resistor" deviceset="R-EU_" device="R1206"/>
+<part name="R8" library="resistor" deviceset="R-EU_" device="R1206"/>
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 </parts>
 <sheets>
@@ -22196,9 +22196,8 @@ Source: AVX .. aphvc.pdf</description>
 <instance part="SPI_CK" gate="G$1" x="93.98" y="22.86" rot="R90"/>
 <instance part="SPI_MISO" gate="G$1" x="99.06" y="27.94" rot="R90"/>
 <instance part="SPI_MOSI" gate="G$1" x="104.14" y="33.02" rot="R90"/>
-<instance part="NUM_A" gate="G$1" x="134.62" y="38.1" rot="R90"/>
-<instance part="NUM_RST" gate="G$1" x="134.62" y="53.34" rot="R90"/>
-<instance part="NUM_B" gate="G$1" x="144.78" y="58.42" rot="R90"/>
+<instance part="NUM_R" gate="G$1" x="134.62" y="53.34" rot="R90"/>
+<instance part="NUM" gate="G$1" x="144.78" y="58.42" rot="R90"/>
 <instance part="RST" gate="G$1" x="17.78" y="55.88" rot="R180"/>
 <instance part="BOOT" gate="G$1" x="17.78" y="68.58" rot="R180"/>
 <instance part="R1" gate="G$1" x="40.64" y="27.94"/>
@@ -22215,7 +22214,6 @@ Source: AVX .. aphvc.pdf</description>
 <instance part="C2" gate="G$1" x="40.64" y="88.9"/>
 <instance part="R4" gate="G$1" x="137.16" y="58.42"/>
 <instance part="R5" gate="G$1" x="127" y="53.34"/>
-<instance part="R6" gate="G$1" x="127" y="38.1"/>
 <instance part="R7" gate="G$1" x="40.64" y="43.18"/>
 <instance part="R8" gate="G$1" x="40.64" y="38.1"/>
 <instance part="R9" gate="G$1" x="35.56" y="73.66" rot="R90"/>
@@ -22227,7 +22225,6 @@ Source: AVX .. aphvc.pdf</description>
 <instance part="BOOT" gate="G$1" x="45.72" y="60.96" rot="R180"/>
 <instance part="RST" gate="G$1" x="73.66" y="76.2" rot="MR0"/>
 <instance part="SENS" gate="A" x="27.94" y="30.48" rot="MR0"/>
-<instance part="LEDS" gate="A" x="27.94" y="5.08" rot="MR0"/>
 <instance part="STR-STP" gate="G$1" x="27.94" y="17.78" rot="MR0"/>
 <instance part="SWD" gate="A" x="127" y="58.42"/>
 <instance part="SPI" gate="A" x="129.54" y="15.24"/>
@@ -22242,6 +22239,9 @@ Source: AVX .. aphvc.pdf</description>
 <instance part="DATA" gate="A" x="147.32" y="45.72"/>
 <instance part="PWR" gate="A" x="35.56" y="99.06" rot="R180"/>
 <instance part="R6" gate="G$1" x="50.8" y="25.4" rot="R180"/>
+<instance part="SPI1" gate="A" x="27.94" y="5.08" rot="MR0"/>
+<instance part="R7" gate="G$1" x="53.34" y="17.78"/>
+<instance part="R8" gate="G$1" x="53.34" y="12.7"/>
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 </instances>
 <busses>
@@ -22252,18 +22252,104 @@ Source: AVX .. aphvc.pdf</description>
 <segment>
 <pinref part="U$1" gate="G$1" pin="PA5"/>
 <pinref part="SPI_CK" gate="G$1" pin="TP"/>
+=======
+<net name="N$1" class="0">
+<segment>
+<pinref part="IC1" gate="G$1" pin="IN"/>
+<wire x1="38.1" y1="96.52" x2="53.34" y2="96.52" width="0.1524" layer="91"/>
+<pinref part="PWR" gate="A" pin="2"/>
+</segment>
+</net>
+<net name="N$2" class="0">
+<segment>
+<wire x1="38.1" y1="93.98" x2="45.72" y2="93.98" width="0.1524" layer="91"/>
+<wire x1="45.72" y1="93.98" x2="45.72" y2="86.36" width="0.1524" layer="91"/>
+<pinref part="IC1" gate="G$1" pin="ADJ"/>
+<wire x1="45.72" y1="86.36" x2="58.42" y2="86.36" width="0.1524" layer="91"/>
+<wire x1="58.42" y1="86.36" x2="60.96" y2="86.36" width="0.1524" layer="91"/>
+<wire x1="60.96" y1="86.36" x2="60.96" y2="88.9" width="0.1524" layer="91"/>
+<pinref part="C1" gate="G$1" pin="-"/>
+<wire x1="60.96" y1="86.36" x2="81.28" y2="86.36" width="0.1524" layer="91"/>
+<wire x1="81.28" y1="86.36" x2="86.36" y2="86.36" width="0.1524" layer="91"/>
+<wire x1="86.36" y1="86.36" x2="86.36" y2="88.9" width="0.1524" layer="91"/>
+<junction x="60.96" y="86.36"/>
+<wire x1="86.36" y1="86.36" x2="114.3" y2="86.36" width="0.1524" layer="91"/>
+<wire x1="114.3" y1="86.36" x2="114.3" y2="60.96" width="0.1524" layer="91"/>
+<junction x="86.36" y="86.36"/>
+<pinref part="SWD" gate="A" pin="1"/>
+<wire x1="114.3" y1="60.96" x2="124.46" y2="60.96" width="0.1524" layer="91"/>
+<pinref part="SPI" gate="A" pin="1"/>
+<wire x1="114.3" y1="60.96" x2="114.3" y2="20.32" width="0.1524" layer="91"/>
+<wire x1="114.3" y1="20.32" x2="127" y2="20.32" width="0.1524" layer="91"/>
+<junction x="114.3" y="60.96"/>
+<wire x1="114.3" y1="86.36" x2="132.08" y2="86.36" width="0.1524" layer="91"/>
+<wire x1="132.08" y1="86.36" x2="132.08" y2="50.8" width="0.1524" layer="91"/>
+<junction x="114.3" y="86.36"/>
+<pinref part="R3" gate="G$1" pin="2"/>
+<wire x1="132.08" y1="50.8" x2="132.08" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="58.42" y1="73.66" x2="58.42" y2="86.36" width="0.1524" layer="91"/>
+<junction x="58.42" y="86.36"/>
+<pinref part="C2" gate="G$1" pin="1"/>
+<wire x1="86.36" y1="81.28" x2="86.36" y2="86.36" width="0.1524" layer="91"/>
+<pinref part="RST" gate="G$1" pin="1"/>
+<wire x1="76.2" y1="78.74" x2="81.28" y2="78.74" width="0.1524" layer="91"/>
+<wire x1="81.28" y1="78.74" x2="81.28" y2="86.36" width="0.1524" layer="91"/>
+<junction x="81.28" y="86.36"/>
+<pinref part="SENS" gate="A" pin="1"/>
+<wire x1="30.48" y1="33.02" x2="38.1" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="38.1" y1="33.02" x2="38.1" y2="83.82" width="0.1524" layer="91"/>
+<wire x1="38.1" y1="83.82" x2="45.72" y2="83.82" width="0.1524" layer="91"/>
+<wire x1="45.72" y1="83.82" x2="45.72" y2="86.36" width="0.1524" layer="91"/>
+<junction x="45.72" y="86.36"/>
+<pinref part="U$1" gate="G$1" pin="VSS"/>
+<wire x1="106.68" y1="33.02" x2="132.08" y2="33.02" width="0.1524" layer="91"/>
+<pinref part="DATA" gate="A" pin="1"/>
+<wire x1="144.78" y1="48.26" x2="139.7" y2="48.26" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="48.26" x2="139.7" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="50.8" x2="132.08" y2="50.8" width="0.1524" layer="91"/>
+<junction x="132.08" y="50.8"/>
+<pinref part="PWR" gate="A" pin="1"/>
+<junction x="38.1" y="33.02"/>
+<pinref part="R6" gate="G$1" pin="2"/>
+<wire x1="38.1" y1="25.4" x2="38.1" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="45.72" y1="25.4" x2="38.1" y2="25.4" width="0.1524" layer="91"/>
+<pinref part="SPI1" gate="A" pin="3"/>
+<wire x1="38.1" y1="25.4" x2="38.1" y2="10.16" width="0.1524" layer="91"/>
+<wire x1="38.1" y1="10.16" x2="38.1" y2="5.08" width="0.1524" layer="91"/>
+<wire x1="38.1" y1="5.08" x2="30.48" y2="5.08" width="0.1524" layer="91"/>
+<junction x="38.1" y="25.4"/>
+<pinref part="SPI1" gate="A" pin="1"/>
+<wire x1="30.48" y1="10.16" x2="38.1" y2="10.16" width="0.1524" layer="91"/>
+<junction x="38.1" y="10.16"/>
+</segment>
+</net>
+<net name="N$4" class="0">
+<segment>
+<pinref part="U$1" gate="G$1" pin="PA13"/>
+<wire x1="106.68" y1="53.34" x2="116.84" y2="53.34" width="0.1524" layer="91"/>
+<wire x1="116.84" y1="53.34" x2="116.84" y2="55.88" width="0.1524" layer="91"/>
+<pinref part="SWD" gate="A" pin="3"/>
+<wire x1="116.84" y1="55.88" x2="124.46" y2="55.88" width="0.1524" layer="91"/>
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 </segment>
 </net>
 <net name="N$5" class="0">
 <segment>
+<<<<<<< HEAD
 <pinref part="U$1" gate="G$1" pin="PA6"/>
 <pinref part="SPI_MISO" gate="G$1" pin="TP"/>
 <wire x1="96.52" y1="27.94" x2="91.44" y2="27.94" width="0.1524" layer="91"/>
+=======
+<pinref part="U$1" gate="G$1" pin="PA14"/>
+<pinref part="SWD" gate="A" pin="2"/>
+<wire x1="106.68" y1="58.42" x2="124.46" y2="58.42" width="0.1524" layer="91"/>
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 </segment>
 </net>
 <net name="N$6" class="0">
 <segment>
 <pinref part="U$1" gate="G$1" pin="PA7"/>
+<<<<<<< HEAD
 <pinref part="SPI_MOSI" gate="G$1" pin="TP"/>
 <wire x1="101.6" y1="33.02" x2="91.44" y2="33.02" width="0.1524" layer="91"/>
 </segment>
@@ -22411,200 +22497,7 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="33.02" y1="66.04" x2="33.02" y2="83.82" width="0.1524" layer="91"/>
 <junction x="33.02" y="83.82"/>
 <pinref part="+S/S" gate="G$1" pin="TP"/>
-</segment>
-</net>
-<net name="N$19" class="0">
-<segment>
-<pinref part="U$1" gate="G$1" pin="PA14"/>
-<pinref part="SWD" gate="A" pin="2"/>
-<wire x1="91.44" y1="68.58" x2="116.84" y2="68.58" width="0.1524" layer="91"/>
-</segment>
-</net>
-<net name="N$20" class="0">
-<segment>
-<pinref part="U$1" gate="G$1" pin="PA13"/>
-<wire x1="91.44" y1="63.5" x2="111.76" y2="63.5" width="0.1524" layer="91"/>
-<wire x1="111.76" y1="63.5" x2="111.76" y2="66.04" width="0.1524" layer="91"/>
-<pinref part="SWD" gate="A" pin="3"/>
-<wire x1="111.76" y1="66.04" x2="116.84" y2="66.04" width="0.1524" layer="91"/>
-</segment>
-</net>
-<net name="N$21" class="0">
-<segment>
-<pinref part="C2" gate="G$1" pin="2"/>
-<wire x1="40.64" y1="83.82" x2="40.64" y2="81.28" width="0.1524" layer="91"/>
-<wire x1="40.64" y1="81.28" x2="45.72" y2="81.28" width="0.1524" layer="91"/>
-<wire x1="45.72" y1="81.28" x2="45.72" y2="88.9" width="0.1524" layer="91"/>
-<pinref part="R3" gate="G$1" pin="1"/>
-<wire x1="45.72" y1="88.9" x2="50.8" y2="88.9" width="0.1524" layer="91"/>
-<wire x1="50.8" y1="88.9" x2="50.8" y2="96.52" width="0.1524" layer="91"/>
-<pinref part="R2" gate="G$1" pin="2"/>
-<wire x1="50.8" y1="88.9" x2="50.8" y2="86.36" width="0.1524" layer="91"/>
-<junction x="50.8" y="88.9"/>
-</segment>
-</net>
-<net name="N$7" class="0">
-<segment>
-<pinref part="U$1" gate="G$1" pin="PA10(PA12)"/>
-<pinref part="R4" gate="G$1" pin="1"/>
-<wire x1="132.08" y1="58.42" x2="91.44" y2="58.42" width="0.1524" layer="91"/>
-</segment>
-</net>
-<net name="N$8" class="0">
-<segment>
-<pinref part="NUM_A" gate="G$1" pin="TP"/>
-<pinref part="R6" gate="G$1" pin="2"/>
-</segment>
-</net>
-<net name="N$9" class="0">
-<segment>
-<pinref part="NUM_RST" gate="G$1" pin="TP"/>
-<pinref part="R5" gate="G$1" pin="2"/>
-</segment>
-</net>
-<net name="N$18" class="0">
-<segment>
-<pinref part="NUM_B" gate="G$1" pin="TP"/>
-<pinref part="R4" gate="G$1" pin="2"/>
-</segment>
-</net>
-<net name="N$22" class="0">
-<segment>
-<pinref part="U$1" gate="G$1" pin="PA9(PA11)"/>
-<pinref part="R5" gate="G$1" pin="1"/>
-<wire x1="91.44" y1="53.34" x2="121.92" y2="53.34" width="0.1524" layer="91"/>
-</segment>
-</net>
-<net name="N$23" class="0">
-<segment>
-<pinref part="U$1" gate="G$1" pin="PB1"/>
-<pinref part="R6" gate="G$1" pin="1"/>
-<wire x1="91.44" y1="38.1" x2="121.92" y2="38.1" width="0.1524" layer="91"/>
-</segment>
-</net>
-<net name="N$1" class="0">
-<segment>
-<pinref part="U$1" gate="G$1" pin="PA0"/>
-<pinref part="R7" gate="G$1" pin="2"/>
-</segment>
-</net>
-<net name="N$2" class="0">
-<segment>
-<pinref part="U$1" gate="G$1" pin="PA1"/>
-<pinref part="R8" gate="G$1" pin="2"/>
-</segment>
-</net>
-<net name="N$24" class="0">
-<segment>
-<pinref part="PIKE" gate="G$1" pin="TP"/>
-<pinref part="R7" gate="G$1" pin="1"/>
-<wire x1="12.7" y1="43.18" x2="35.56" y2="43.18" width="0.1524" layer="91"/>
-</segment>
-</net>
-<net name="N$25" class="0">
-<segment>
-<pinref part="EDGE" gate="G$1" pin="TP"/>
-<pinref part="R8" gate="G$1" pin="1"/>
-<wire x1="5.08" y1="38.1" x2="35.56" y2="38.1" width="0.1524" layer="91"/>
-</segment>
-</net>
-<net name="N$10" class="0">
-<segment>
-<wire x1="5.08" y1="17.78" x2="5.08" y2="30.48" width="0.1524" layer="91"/>
-<pinref part="R10" gate="G$1" pin="1"/>
-<wire x1="5.08" y1="30.48" x2="15.24" y2="30.48" width="0.1524" layer="91"/>
-<pinref part="U$1" gate="G$1" pin="PA2"/>
-<wire x1="15.24" y1="30.48" x2="20.32" y2="30.48" width="0.1524" layer="91"/>
-<wire x1="45.72" y1="33.02" x2="15.24" y2="33.02" width="0.1524" layer="91"/>
-<wire x1="15.24" y1="33.02" x2="15.24" y2="30.48" width="0.1524" layer="91"/>
-<junction x="15.24" y="30.48"/>
-<pinref part="S/S" gate="G$1" pin="TP"/>
 =======
-<net name="N$1" class="0">
-<segment>
-<pinref part="IC1" gate="G$1" pin="IN"/>
-<wire x1="38.1" y1="96.52" x2="53.34" y2="96.52" width="0.1524" layer="91"/>
-<pinref part="PWR" gate="A" pin="2"/>
-</segment>
-</net>
-<net name="N$2" class="0">
-<segment>
-<wire x1="38.1" y1="93.98" x2="45.72" y2="93.98" width="0.1524" layer="91"/>
-<wire x1="45.72" y1="93.98" x2="45.72" y2="86.36" width="0.1524" layer="91"/>
-<pinref part="IC1" gate="G$1" pin="ADJ"/>
-<wire x1="45.72" y1="86.36" x2="58.42" y2="86.36" width="0.1524" layer="91"/>
-<wire x1="58.42" y1="86.36" x2="60.96" y2="86.36" width="0.1524" layer="91"/>
-<wire x1="60.96" y1="86.36" x2="60.96" y2="88.9" width="0.1524" layer="91"/>
-<pinref part="C1" gate="G$1" pin="-"/>
-<wire x1="60.96" y1="86.36" x2="81.28" y2="86.36" width="0.1524" layer="91"/>
-<wire x1="81.28" y1="86.36" x2="86.36" y2="86.36" width="0.1524" layer="91"/>
-<wire x1="86.36" y1="86.36" x2="86.36" y2="88.9" width="0.1524" layer="91"/>
-<junction x="60.96" y="86.36"/>
-<wire x1="86.36" y1="86.36" x2="114.3" y2="86.36" width="0.1524" layer="91"/>
-<wire x1="114.3" y1="86.36" x2="114.3" y2="60.96" width="0.1524" layer="91"/>
-<junction x="86.36" y="86.36"/>
-<pinref part="SWD" gate="A" pin="1"/>
-<wire x1="114.3" y1="60.96" x2="124.46" y2="60.96" width="0.1524" layer="91"/>
-<pinref part="SPI" gate="A" pin="1"/>
-<wire x1="114.3" y1="60.96" x2="114.3" y2="20.32" width="0.1524" layer="91"/>
-<wire x1="114.3" y1="20.32" x2="127" y2="20.32" width="0.1524" layer="91"/>
-<junction x="114.3" y="60.96"/>
-<wire x1="114.3" y1="86.36" x2="132.08" y2="86.36" width="0.1524" layer="91"/>
-<wire x1="132.08" y1="86.36" x2="132.08" y2="50.8" width="0.1524" layer="91"/>
-<junction x="114.3" y="86.36"/>
-<pinref part="R3" gate="G$1" pin="2"/>
-<wire x1="132.08" y1="50.8" x2="132.08" y2="33.02" width="0.1524" layer="91"/>
-<wire x1="58.42" y1="73.66" x2="58.42" y2="86.36" width="0.1524" layer="91"/>
-<junction x="58.42" y="86.36"/>
-<pinref part="C2" gate="G$1" pin="1"/>
-<wire x1="86.36" y1="81.28" x2="86.36" y2="86.36" width="0.1524" layer="91"/>
-<pinref part="RST" gate="G$1" pin="1"/>
-<wire x1="76.2" y1="78.74" x2="81.28" y2="78.74" width="0.1524" layer="91"/>
-<wire x1="81.28" y1="78.74" x2="81.28" y2="86.36" width="0.1524" layer="91"/>
-<junction x="81.28" y="86.36"/>
-<pinref part="SENS" gate="A" pin="1"/>
-<wire x1="30.48" y1="33.02" x2="38.1" y2="33.02" width="0.1524" layer="91"/>
-<wire x1="38.1" y1="33.02" x2="38.1" y2="83.82" width="0.1524" layer="91"/>
-<wire x1="38.1" y1="83.82" x2="45.72" y2="83.82" width="0.1524" layer="91"/>
-<wire x1="45.72" y1="83.82" x2="45.72" y2="86.36" width="0.1524" layer="91"/>
-<junction x="45.72" y="86.36"/>
-<pinref part="U$1" gate="G$1" pin="VSS"/>
-<wire x1="106.68" y1="33.02" x2="132.08" y2="33.02" width="0.1524" layer="91"/>
-<pinref part="DATA" gate="A" pin="1"/>
-<wire x1="144.78" y1="48.26" x2="139.7" y2="48.26" width="0.1524" layer="91"/>
-<wire x1="139.7" y1="48.26" x2="139.7" y2="50.8" width="0.1524" layer="91"/>
-<wire x1="139.7" y1="50.8" x2="132.08" y2="50.8" width="0.1524" layer="91"/>
-<junction x="132.08" y="50.8"/>
-<pinref part="PWR" gate="A" pin="1"/>
-<junction x="38.1" y="33.02"/>
-<pinref part="LEDS" gate="A" pin="1"/>
-<wire x1="30.48" y1="7.62" x2="38.1" y2="7.62" width="0.1524" layer="91"/>
-<wire x1="38.1" y1="7.62" x2="38.1" y2="25.4" width="0.1524" layer="91"/>
-<pinref part="R6" gate="G$1" pin="2"/>
-<wire x1="38.1" y1="25.4" x2="38.1" y2="33.02" width="0.1524" layer="91"/>
-<wire x1="45.72" y1="25.4" x2="38.1" y2="25.4" width="0.1524" layer="91"/>
-<junction x="38.1" y="25.4"/>
-</segment>
-</net>
-<net name="N$4" class="0">
-<segment>
-<pinref part="U$1" gate="G$1" pin="PA13"/>
-<wire x1="106.68" y1="53.34" x2="116.84" y2="53.34" width="0.1524" layer="91"/>
-<wire x1="116.84" y1="53.34" x2="116.84" y2="55.88" width="0.1524" layer="91"/>
-<pinref part="SWD" gate="A" pin="3"/>
-<wire x1="116.84" y1="55.88" x2="124.46" y2="55.88" width="0.1524" layer="91"/>
-</segment>
-</net>
-<net name="N$5" class="0">
-<segment>
-<pinref part="U$1" gate="G$1" pin="PA14"/>
-<pinref part="SWD" gate="A" pin="2"/>
-<wire x1="106.68" y1="58.42" x2="124.46" y2="58.42" width="0.1524" layer="91"/>
-</segment>
-</net>
-<net name="N$6" class="0">
-<segment>
-<pinref part="U$1" gate="G$1" pin="PA7"/>
 <wire x1="106.68" y1="22.86" x2="111.76" y2="22.86" width="0.1524" layer="91"/>
 <wire x1="111.76" y1="22.86" x2="111.76" y2="17.78" width="0.1524" layer="91"/>
 <pinref part="SPI" gate="A" pin="2"/>
@@ -22715,22 +22608,57 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="R5" gate="G$1" pin="1"/>
 <pinref part="U$1" gate="G$1" pin="NRST"/>
 <wire x1="53.34" y1="43.18" x2="60.96" y2="43.18" width="0.1524" layer="91"/>
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 </segment>
 </net>
 <net name="N$19" class="0">
 <segment>
-<pinref part="SENS" gate="A" pin="2"/>
-<wire x1="30.48" y1="30.48" x2="58.42" y2="30.48" width="0.1524" layer="91"/>
-<wire x1="58.42" y1="30.48" x2="58.42" y2="33.02" width="0.1524" layer="91"/>
-<pinref part="U$1" gate="G$1" pin="PA0"/>
-<wire x1="58.42" y1="33.02" x2="60.96" y2="33.02" width="0.1524" layer="91"/>
+<<<<<<< HEAD
+<pinref part="U$1" gate="G$1" pin="PA14"/>
+<pinref part="SWD" gate="A" pin="2"/>
+<wire x1="91.44" y1="68.58" x2="116.84" y2="68.58" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="N$17" class="0">
+<net name="N$20" class="0">
 <segment>
+<pinref part="U$1" gate="G$1" pin="PA13"/>
+<wire x1="91.44" y1="63.5" x2="111.76" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="111.76" y1="63.5" x2="111.76" y2="66.04" width="0.1524" layer="91"/>
+<pinref part="SWD" gate="A" pin="3"/>
+<wire x1="111.76" y1="66.04" x2="116.84" y2="66.04" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$21" class="0">
+<segment>
+<pinref part="C2" gate="G$1" pin="2"/>
+<wire x1="40.64" y1="83.82" x2="40.64" y2="81.28" width="0.1524" layer="91"/>
+<wire x1="40.64" y1="81.28" x2="45.72" y2="81.28" width="0.1524" layer="91"/>
+<wire x1="45.72" y1="81.28" x2="45.72" y2="88.9" width="0.1524" layer="91"/>
+<pinref part="R3" gate="G$1" pin="1"/>
+<wire x1="45.72" y1="88.9" x2="50.8" y2="88.9" width="0.1524" layer="91"/>
+<wire x1="50.8" y1="88.9" x2="50.8" y2="96.52" width="0.1524" layer="91"/>
+<pinref part="R2" gate="G$1" pin="2"/>
+<wire x1="50.8" y1="88.9" x2="50.8" y2="86.36" width="0.1524" layer="91"/>
+<junction x="50.8" y="88.9"/>
+</segment>
+</net>
+<net name="N$7" class="0">
+<segment>
+<pinref part="U$1" gate="G$1" pin="PA10(PA12)"/>
+<pinref part="R4" gate="G$1" pin="1"/>
+<wire x1="132.08" y1="58.42" x2="91.44" y2="58.42" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$9" class="0">
+<segment>
+<pinref part="NUM_R" gate="G$1" pin="TP"/>
+<pinref part="R5" gate="G$1" pin="2"/>
+=======
+<pinref part="U$1" gate="G$1" pin="PA0"/>
+<wire x1="60.96" y1="33.02" x2="45.72" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="45.72" y1="33.02" x2="45.72" y2="27.94" width="0.1524" layer="91"/>
 <pinref part="SENS" gate="A" pin="3"/>
-<pinref part="U$1" gate="G$1" pin="PA1"/>
-<wire x1="30.48" y1="27.94" x2="60.96" y2="27.94" width="0.1524" layer="91"/>
+<wire x1="45.72" y1="27.94" x2="30.48" y2="27.94" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$3" class="0">
@@ -22756,10 +22684,61 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="PWR" gate="A" pin="4"/>
 <wire x1="45.72" y1="99.06" x2="45.72" y2="101.6" width="0.1524" layer="91"/>
 <wire x1="45.72" y1="101.6" x2="38.1" y2="101.6" width="0.1524" layer="91"/>
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 </segment>
 </net>
 <net name="N$18" class="0">
 <segment>
+<<<<<<< HEAD
+<pinref part="NUM" gate="G$1" pin="TP"/>
+<pinref part="R4" gate="G$1" pin="2"/>
+</segment>
+</net>
+<net name="N$22" class="0">
+<segment>
+<pinref part="U$1" gate="G$1" pin="PA9(PA11)"/>
+<pinref part="R5" gate="G$1" pin="1"/>
+<wire x1="91.44" y1="53.34" x2="121.92" y2="53.34" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$1" class="0">
+<segment>
+<pinref part="U$1" gate="G$1" pin="PA0"/>
+<pinref part="R7" gate="G$1" pin="2"/>
+</segment>
+</net>
+<net name="N$2" class="0">
+<segment>
+<pinref part="U$1" gate="G$1" pin="PA1"/>
+<pinref part="R8" gate="G$1" pin="2"/>
+</segment>
+</net>
+<net name="N$24" class="0">
+<segment>
+<pinref part="PIKE" gate="G$1" pin="TP"/>
+<pinref part="R7" gate="G$1" pin="1"/>
+<wire x1="12.7" y1="43.18" x2="35.56" y2="43.18" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$25" class="0">
+<segment>
+<pinref part="EDGE" gate="G$1" pin="TP"/>
+<pinref part="R8" gate="G$1" pin="1"/>
+<wire x1="5.08" y1="38.1" x2="35.56" y2="38.1" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$10" class="0">
+<segment>
+<wire x1="5.08" y1="17.78" x2="5.08" y2="30.48" width="0.1524" layer="91"/>
+<pinref part="R10" gate="G$1" pin="1"/>
+<wire x1="5.08" y1="30.48" x2="15.24" y2="30.48" width="0.1524" layer="91"/>
+<pinref part="U$1" gate="G$1" pin="PA2"/>
+<wire x1="15.24" y1="30.48" x2="20.32" y2="30.48" width="0.1524" layer="91"/>
+<wire x1="45.72" y1="33.02" x2="15.24" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="15.24" y1="33.02" x2="15.24" y2="30.48" width="0.1524" layer="91"/>
+<junction x="15.24" y="30.48"/>
+<pinref part="S/S" gate="G$1" pin="TP"/>
+=======
 <pinref part="U$1" gate="G$1" pin="PA2"/>
 <wire x1="60.96" y1="22.86" x2="58.42" y2="22.86" width="0.1524" layer="91"/>
 <pinref part="STR-STP" gate="G$1" pin="2"/>
@@ -22774,20 +22753,43 @@ Source: AVX .. aphvc.pdf</description>
 </net>
 <net name="N$20" class="0">
 <segment>
-<pinref part="U$1" gate="G$1" pin="PA3"/>
-<wire x1="60.96" y1="17.78" x2="43.18" y2="17.78" width="0.1524" layer="91"/>
-<wire x1="43.18" y1="17.78" x2="43.18" y2="5.08" width="0.1524" layer="91"/>
-<pinref part="LEDS" gate="A" pin="2"/>
-<wire x1="43.18" y1="5.08" x2="30.48" y2="5.08" width="0.1524" layer="91"/>
+<pinref part="SPI1" gate="A" pin="2"/>
+<wire x1="43.18" y1="17.78" x2="43.18" y2="7.62" width="0.1524" layer="91"/>
+<wire x1="43.18" y1="7.62" x2="30.48" y2="7.62" width="0.1524" layer="91"/>
+<pinref part="R7" gate="G$1" pin="1"/>
+<wire x1="43.18" y1="17.78" x2="48.26" y2="17.78" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$21" class="0">
 <segment>
-<pinref part="U$1" gate="G$1" pin="PA4"/>
-<wire x1="60.96" y1="12.7" x2="45.72" y2="12.7" width="0.1524" layer="91"/>
 <wire x1="45.72" y1="12.7" x2="45.72" y2="2.54" width="0.1524" layer="91"/>
-<pinref part="LEDS" gate="A" pin="3"/>
 <wire x1="45.72" y1="2.54" x2="30.48" y2="2.54" width="0.1524" layer="91"/>
+<pinref part="SPI1" gate="A" pin="4"/>
+<pinref part="R8" gate="G$1" pin="1"/>
+<wire x1="48.26" y1="12.7" x2="45.72" y2="12.7" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$22" class="0">
+<segment>
+<pinref part="R7" gate="G$1" pin="2"/>
+<pinref part="U$1" gate="G$1" pin="PA3"/>
+<wire x1="58.42" y1="17.78" x2="60.96" y2="17.78" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$23" class="0">
+<segment>
+<pinref part="U$1" gate="G$1" pin="PA4"/>
+<pinref part="R8" gate="G$1" pin="2"/>
+<wire x1="60.96" y1="12.7" x2="58.42" y2="12.7" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$17" class="0">
+<segment>
+<pinref part="U$1" gate="G$1" pin="PA1"/>
+<wire x1="60.96" y1="27.94" x2="55.88" y2="27.94" width="0.1524" layer="91"/>
+<wire x1="55.88" y1="27.94" x2="55.88" y2="30.48" width="0.1524" layer="91"/>
+<wire x1="55.88" y1="30.48" x2="30.48" y2="30.48" width="0.1524" layer="91"/>
+<pinref part="SENS" gate="A" pin="2"/>
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 </segment>
 </net>

HARD/Knife/m_knife.s#3

@@ -18633,7 +18633,6 @@ Source: AVX .. aphvc.pdf</description>
 </device>
 <device name="ETR2" package="ETR2">
 <connects>
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connect gate="G$1" pin="+" pad="+"/>
 <connect gate="G$1" pin="-" pad="-"/>
 </connects>
@@ -18641,12 +18640,9 @@ Source: AVX .. aphvc.pdf</description>
 <technology name=""/>
 </technologies>
 </device>
-<<<<<<< HEAD
-<device name="CT3528" package="CT3528">
-=======
 <device name="ETR3" package="ETR3">
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connect gate="G$1" pin="+" pad="+"/>
 <connect gate="G$1" pin="-" pad="-"/>
 </connects>
@@ -18655,7 +18651,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="CT6032" package="CT6032">
+<device name="CT3528" package="CT3528">
 =======
 <device name="ETR4" package="ETR4">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
@@ -18668,7 +18664,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="CT7343" package="CT7343">
+<device name="CT6032" package="CT6032">
 =======
 <device name="ETR5" package="ETR5">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
@@ -18681,7 +18677,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="B45181A" package="B45181A">
+<device name="CT7343" package="CT7343">
 =======
 <device name="P128-35" package="P128-35">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
@@ -18694,7 +18690,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="B45181B" package="B45181B">
+<device name="B45181A" package="B45181A">
 =======
 <device name="P128-40" package="P128-40">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
@@ -18707,7 +18703,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="B45181C" package="B45181C">
+<device name="B45181B" package="B45181B">
 =======
 <device name="P128-50" package="P128-50">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
@@ -18720,7 +18716,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="B45181D" package="B45181D">
+<device name="B45181C" package="B45181C">
 =======
 <device name="P128-60" package="P128-60">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
@@ -18733,7 +18729,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="TT2D4" package="TT2D4">
+<device name="B45181D" package="B45181D">
 =======
 <device name="TAP5-45" package="TAP5-45">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
@@ -18746,7 +18742,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="TT2D4L" package="TT2D4L">
+<device name="TT2D4" package="TT2D4">
 =======
 <device name="TAP5-50" package="TAP5-50">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
@@ -18759,7 +18755,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="TT2D5" package="TT2D5">
+<device name="TT2D4L" package="TT2D4L">
 =======
 <device name="TAP5-70" package="TAP5-70">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
@@ -18772,7 +18768,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="TT2D6" package="TT2D6">
+<device name="TT2D5" package="TT2D5">
 =======
 <device name="TAP5-60" package="TAP5-60">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
@@ -18785,7 +18781,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="TT2D6L" package="TT2D6L">
+<device name="TT2D6" package="TT2D6">
 =======
 <device name="TAP5-80" package="TAP5-80">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
@@ -18798,7 +18794,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="TT2D7L" package="TT2D7L">
+<device name="TT2D6L" package="TT2D6L">
 =======
 <device name="E1.8-4" package="E1,8-4">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
@@ -18811,7 +18807,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="TT2D7" package="TT2D7">
+<device name="TT2D7L" package="TT2D7L">
 =======
 <device name="E15-5AXIAL" package="E15-5">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
@@ -18824,7 +18820,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="TT5D10" package="TT5D10">
+<device name="TT2D7" package="TT2D7">
 =======
 <device name="E15-6AXIAL" package="E15-6">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
@@ -18837,7 +18833,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="TT5D11" package="TT5D11">
+<device name="TT5D10" package="TT5D10">
 =======
 <device name="E15-9AXIAL" package="E15-9">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
@@ -18850,7 +18846,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="TT5D11L" package="TT5D11L">
+<device name="TT5D11" package="TT5D11">
 =======
 <device name="E2.5-5V" package="E2,5-4R">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
@@ -18863,7 +18859,7 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="TT6D6" package="TT5D6">
+<device name="TT5D11L" package="TT5D11L">
 =======
 <device name="E2.5-5" package="E2,5-5">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
@@ -18876,9 +18872,10 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <<<<<<< HEAD
-<device name="TT5D6L" package="TT5D6L">
+<device name="TT6D6" package="TT5D6">
 =======
 <device name="E2.5-6" package="E2,5-6">
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
 <connect gate="G$1" pin="+" pad="+"/>
 <connect gate="G$1" pin="-" pad="-"/>
@@ -18887,7 +18884,11 @@ Source: AVX .. aphvc.pdf</description>
 <technology name=""/>
 </technologies>
 </device>
+<<<<<<< HEAD
+<device name="TT5D6L" package="TT5D6L">
+=======
 <device name="E2.5-7" package="E2,5-7">
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
 <connect gate="G$1" pin="+" pad="+"/>
 <connect gate="G$1" pin="-" pad="-"/>
@@ -18896,7 +18897,11 @@ Source: AVX .. aphvc.pdf</description>
 <technology name=""/>
 </technologies>
 </device>
+<<<<<<< HEAD
+<device name="TT5D7" package="TT5D7">
+=======
 <device name="E2.5-4V" package="E2,5RE">
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
 <connect gate="G$1" pin="+" pad="+"/>
 <connect gate="G$1" pin="-" pad="-"/>
@@ -18905,7 +18910,11 @@ Source: AVX .. aphvc.pdf</description>
 <technology name=""/>
 </technologies>
 </device>
+<<<<<<< HEAD
+<device name="TT5D7L" package="TT5D7L">
+=======
 <device name="E2-4" package="E2-4">
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
 <connect gate="G$1" pin="+" pad="+"/>
 <connect gate="G$1" pin="-" pad="-"/>
@@ -18914,7 +18923,11 @@ Source: AVX .. aphvc.pdf</description>
 <technology name=""/>
 </technologies>
 </device>
+<<<<<<< HEAD
+<device name="TT5D9" package="TT5D9">
+=======
 <device name="E2-5" package="E2-5">
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
 <connect gate="G$1" pin="+" pad="+"/>
 <connect gate="G$1" pin="-" pad="-"/>
@@ -18923,7 +18936,11 @@ Source: AVX .. aphvc.pdf</description>
 <technology name=""/>
 </technologies>
 </device>
+<<<<<<< HEAD
+<device name="TT5D9L" package="TT5D9L">
+=======
 <device name="E22-10AXIAL" package="E22-10">
+>>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
 <connect gate="G$1" pin="+" pad="+"/>
 <connect gate="G$1" pin="-" pad="-"/>
@@ -18932,6 +18949,9 @@ Source: AVX .. aphvc.pdf</description>
 <technology name=""/>
 </technologies>
 </device>
+<<<<<<< HEAD
+<device name="ETR1" package="ETR1">
+=======
 <device name="E22-6AXIAL" package="E22-6">
 <connects>
 <connect gate="G$1" pin="+" pad="+"/>
@@ -19095,7 +19115,6 @@ Source: AVX .. aphvc.pdf</description>
 </technologies>
 </device>
 <device name="E5-10.5" package="E5-10,5">
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
 <connect gate="G$1" pin="+" pad="+"/>
 <connect gate="G$1" pin="-" pad="-"/>
@@ -19104,11 +19123,7 @@ Source: AVX .. aphvc.pdf</description>
 <technology name=""/>
 </technologies>
 </device>
-<<<<<<< HEAD
-<device name="TT5D7" package="TT5D7">
-=======
 <device name="E5-13" package="E5-13">
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
 <connect gate="G$1" pin="+" pad="+"/>
 <connect gate="G$1" pin="-" pad="-"/>
@@ -19117,11 +19132,7 @@ Source: AVX .. aphvc.pdf</description>
 <technology name=""/>
 </technologies>
 </device>
-<<<<<<< HEAD
-<device name="TT5D7L" package="TT5D7L">
-=======
 <device name="E5-4" package="E5-4">
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
 <connect gate="G$1" pin="+" pad="+"/>
 <connect gate="G$1" pin="-" pad="-"/>
@@ -19130,11 +19141,7 @@ Source: AVX .. aphvc.pdf</description>
 <technology name=""/>
 </technologies>
 </device>
-<<<<<<< HEAD
-<device name="TT5D9" package="TT5D9">
-=======
 <device name="E5-5" package="E5-5">
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
 <connect gate="G$1" pin="+" pad="+"/>
 <connect gate="G$1" pin="-" pad="-"/>
@@ -19143,11 +19150,7 @@ Source: AVX .. aphvc.pdf</description>
 <technology name=""/>
 </technologies>
 </device>
-<<<<<<< HEAD
-<device name="TT5D9L" package="TT5D9L">
-=======
 <device name="E5-6" package="E5-6">
->>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
 <connect gate="G$1" pin="+" pad="+"/>
 <connect gate="G$1" pin="-" pad="-"/>
@@ -19156,9 +19159,6 @@ Source: AVX .. aphvc.pdf</description>
 <technology name=""/>
 </technologies>
 </device>
-<<<<<<< HEAD
-<device name="ETR1" package="ETR1">
-=======
 <device name="E5-8.5" package="E5-8,5">
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 <connects>
@@ -22139,7 +22139,6 @@ Source: AVX .. aphvc.pdf</description>
 <part name="NUM_A" library="testpad" deviceset="TPSQ" device="TP20R"/>
 <part name="NUM_RST" library="testpad" deviceset="TPSQ" device="TP20R"/>
 <part name="NUM_B" library="testpad" deviceset="TPSQ" device="TP20R"/>
-<part name="S/S" library="pinhead" deviceset="PINHD-1X2" device=""/>
 <part name="RST" library="pinhead" deviceset="PINHD-1X2" device=""/>
 <part name="BOOT" library="pinhead" deviceset="PINHD-1X2" device=""/>
 <part name="R1" library="resistor" deviceset="R-EU_" device="R1206"/>
@@ -22161,6 +22160,8 @@ Source: AVX .. aphvc.pdf</description>
 <part name="R8" library="resistor" deviceset="R-EU_" device="R1206"/>
 <part name="R9" library="resistor" deviceset="R-EU_" device="R1206"/>
 <part name="R10" library="resistor" deviceset="R-EU_" device="R1206"/>
+<part name="S/S" library="testpad" deviceset="TPSQ" device="TP20R"/>
+<part name="+S/S" library="testpad" deviceset="TPSQ" device="TP20R"/>
 =======
 <part name="BOOT" library="pinhead" deviceset="PINHD-1X2" device=""/>
 <part name="RST" library="pinhead" deviceset="PINHD-1X2" device=""/>
@@ -22178,7 +22179,7 @@ Source: AVX .. aphvc.pdf</description>
 <part name="R5" library="resistor" deviceset="R-EU_" device="R1206"/>
 <part name="C2" library="resistor" deviceset="C-EU" device="C1206"/>
 <part name="DATA" library="pinhead" deviceset="PINHD-1X3" device=""/>
-<part name="JP1" library="pinhead" deviceset="PINHD-1X4" device=""/>
+<part name="PWR" library="pinhead" deviceset="PINHD-1X4" device=""/>
 <part name="R6" library="resistor" deviceset="R-EU_" device="R1206"/>
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 </parts>
@@ -22198,7 +22199,6 @@ Source: AVX .. aphvc.pdf</description>
 <instance part="NUM_A" gate="G$1" x="134.62" y="38.1" rot="R90"/>
 <instance part="NUM_RST" gate="G$1" x="134.62" y="53.34" rot="R90"/>
 <instance part="NUM_B" gate="G$1" x="144.78" y="58.42" rot="R90"/>
-<instance part="S/S" gate="G$1" x="-10.16" y="27.94" rot="R180"/>
 <instance part="RST" gate="G$1" x="17.78" y="55.88" rot="R180"/>
 <instance part="BOOT" gate="G$1" x="17.78" y="68.58" rot="R180"/>
 <instance part="R1" gate="G$1" x="40.64" y="27.94"/>
@@ -22220,6 +22220,8 @@ Source: AVX .. aphvc.pdf</description>
 <instance part="R8" gate="G$1" x="40.64" y="38.1"/>
 <instance part="R9" gate="G$1" x="35.56" y="73.66" rot="R90"/>
 <instance part="R10" gate="G$1" x="25.4" y="30.48"/>
+<instance part="S/S" gate="G$1" x="5.08" y="15.24"/>
+<instance part="+S/S" gate="G$1" x="2.54" y="25.4"/>
 =======
 <instance part="U$1" gate="G$1" x="83.82" y="35.56"/>
 <instance part="BOOT" gate="G$1" x="45.72" y="60.96" rot="R180"/>
@@ -22238,7 +22240,7 @@ Source: AVX .. aphvc.pdf</description>
 <instance part="R5" gate="G$1" x="48.26" y="43.18" rot="R180"/>
 <instance part="C2" gate="G$1" x="86.36" y="78.74"/>
 <instance part="DATA" gate="A" x="147.32" y="45.72"/>
-<instance part="JP1" gate="A" x="35.56" y="99.06" rot="R180"/>
+<instance part="PWR" gate="A" x="35.56" y="99.06" rot="R180"/>
 <instance part="R6" gate="G$1" x="50.8" y="25.4" rot="R180"/>
 >>>>>>> 938293c99d3f069421df209f6cfb5012fe63c47e
 </instances>
@@ -22399,8 +22401,6 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="35.56" y1="96.52" x2="43.18" y2="96.52" width="0.1524" layer="91"/>
 <wire x1="43.18" y1="96.52" x2="43.18" y2="106.68" width="0.1524" layer="91"/>
 <junction x="43.18" y="106.68"/>
-<pinref part="S/S" gate="G$1" pin="2"/>
-<wire x1="-7.62" y1="27.94" x2="2.54" y2="27.94" width="0.1524" layer="91"/>
 <wire x1="2.54" y1="27.94" x2="2.54" y2="35.56" width="0.1524" layer="91"/>
 <wire x1="2.54" y1="35.56" x2="27.94" y2="35.56" width="0.1524" layer="91"/>
 <wire x1="27.94" y1="35.56" x2="27.94" y2="83.82" width="0.1524" layer="91"/>
@@ -22410,6 +22410,7 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="20.32" y1="66.04" x2="33.02" y2="66.04" width="0.1524" layer="91"/>
 <wire x1="33.02" y1="66.04" x2="33.02" y2="83.82" width="0.1524" layer="91"/>
 <junction x="33.02" y="83.82"/>
+<pinref part="+S/S" gate="G$1" pin="TP"/>
 </segment>
 </net>
 <net name="N$19" class="0">
@@ -22509,9 +22510,7 @@ Source: AVX .. aphvc.pdf</description>
 </net>
 <net name="N$10" class="0">
 <segment>
-<pinref part="S/S" gate="G$1" pin="1"/>
-<wire x1="-7.62" y1="25.4" x2="5.08" y2="25.4" width="0.1524" layer="91"/>
-<wire x1="5.08" y1="25.4" x2="5.08" y2="30.48" width="0.1524" layer="91"/>
+<wire x1="5.08" y1="17.78" x2="5.08" y2="30.48" width="0.1524" layer="91"/>
 <pinref part="R10" gate="G$1" pin="1"/>
 <wire x1="5.08" y1="30.48" x2="15.24" y2="30.48" width="0.1524" layer="91"/>
 <pinref part="U$1" gate="G$1" pin="PA2"/>
@@ -22519,12 +22518,13 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="45.72" y1="33.02" x2="15.24" y2="33.02" width="0.1524" layer="91"/>
 <wire x1="15.24" y1="33.02" x2="15.24" y2="30.48" width="0.1524" layer="91"/>
 <junction x="15.24" y="30.48"/>
+<pinref part="S/S" gate="G$1" pin="TP"/>
 =======
 <net name="N$1" class="0">
 <segment>
 <pinref part="IC1" gate="G$1" pin="IN"/>
 <wire x1="38.1" y1="96.52" x2="53.34" y2="96.52" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="2"/>
+<pinref part="PWR" gate="A" pin="2"/>
 </segment>
 </net>
 <net name="N$2" class="0">
@@ -22575,7 +22575,7 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="139.7" y1="48.26" x2="139.7" y2="50.8" width="0.1524" layer="91"/>
 <wire x1="139.7" y1="50.8" x2="132.08" y2="50.8" width="0.1524" layer="91"/>
 <junction x="132.08" y="50.8"/>
-<pinref part="JP1" gate="A" pin="1"/>
+<pinref part="PWR" gate="A" pin="1"/>
 <junction x="38.1" y="33.02"/>
 <pinref part="LEDS" gate="A" pin="1"/>
 <wire x1="30.48" y1="7.62" x2="38.1" y2="7.62" width="0.1524" layer="91"/>
@@ -22751,9 +22751,9 @@ Source: AVX .. aphvc.pdf</description>
 </net>
 <net name="N$12" class="0">
 <segment>
-<pinref part="JP1" gate="A" pin="3"/>
+<pinref part="PWR" gate="A" pin="3"/>
 <wire x1="38.1" y1="99.06" x2="45.72" y2="99.06" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="4"/>
+<pinref part="PWR" gate="A" pin="4"/>
 <wire x1="45.72" y1="99.06" x2="45.72" y2="101.6" width="0.1524" layer="91"/>
 <wire x1="45.72" y1="101.6" x2="38.1" y2="101.6" width="0.1524" layer="91"/>
 </segment>

HARD/Knife/m_knife.s#8

@@ -6,8 +6,55 @@
 <setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
+<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="yes" altdistance="0.01" altunitdist="inch" altunit="inch"/>
 <layers>
+<layer number="1" name="Top" color="4" fill="1" visible="no" active="no"/>
+<layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
+<layer number="3" name="Route3" color="4" fill="3" visible="no" active="no"/>
+<layer number="14" name="Route14" color="1" fill="6" visible="no" active="no"/>
+<layer number="15" name="Route15" color="4" fill="6" visible="no" active="no"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="no" active="no"/>
+<layer number="17" name="Pads" color="2" fill="1" visible="no" active="no"/>
+<layer number="18" name="Vias" color="2" fill="1" visible="no" active="no"/>
+<layer number="19" name="Unrouted" color="6" fill="1" visible="no" active="no"/>
+<layer number="20" name="Dimension" color="15" fill="1" visible="no" active="no"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="no"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="no" active="no"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="no"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="no"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="no" active="no"/>
+<layer number="26" name="bNames" color="7" fill="1" visible="no" active="no"/>
+<layer number="27" name="tValues" color="7" fill="1" visible="no" active="no"/>
+<layer number="28" name="bValues" color="7" fill="1" visible="no" active="no"/>
+<layer number="29" name="tStop" color="7" fill="3" visible="no" active="no"/>
+<layer number="30" name="bStop" color="7" fill="6" visible="no" active="no"/>
+<layer number="31" name="tCream" color="7" fill="4" visible="no" active="no"/>
+<layer number="32" name="bCream" color="7" fill="5" visible="no" active="no"/>
+<layer number="33" name="tFinish" color="6" fill="3" visible="no" active="no"/>
+<layer number="34" name="bFinish" color="6" fill="6" visible="no" active="no"/>
+<layer number="35" name="tGlue" color="7" fill="4" visible="no" active="no"/>
+<layer number="36" name="bGlue" color="7" fill="5" visible="no" active="no"/>
+<layer number="37" name="tTest" color="7" fill="1" visible="no" active="no"/>
+<layer number="38" name="bTest" color="7" fill="1" visible="no" active="no"/>
+<layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="no"/>
+<layer number="40" name="bKeepout" color="1" fill="11" visible="no" active="no"/>
+<layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="no"/>
+<layer number="42" name="bRestrict" color="1" fill="10" visible="no" active="no"/>
+<layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="no"/>
+<layer number="44" name="Drills" color="7" fill="1" visible="no" active="no"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="no" active="no"/>
+<layer number="46" name="Milling" color="3" fill="1" visible="no" active="no"/>
+<layer number="47" name="Measures" color="7" fill="1" visible="no" active="no"/>
+<layer number="48" name="Document" color="7" fill="1" visible="no" active="no"/>
+<layer number="49" name="Reference" color="7" fill="1" visible="no" active="no"/>
+<layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="no"/>
+<layer number="52" name="bDocu" color="7" fill="1" visible="no" active="no"/>
+<layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
+<layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
+<layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
+<layer number="57" name="tCAD" color="10" fill="1" visible="no" active="no"/>
+<layer number="58" name="bCAD" color="11" fill="1" visible="no" active="no"/>
 <layer number="90" name="Modules" color="5" fill="1" visible="yes" active="yes"/>
 <layer number="91" name="Nets" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="92" name="Busses" color="1" fill="1" visible="yes" active="yes"/>
@@ -17,9 +64,147 @@
 <layer number="96" name="Values" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="97" name="Info" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="98" name="Guide" color="6" fill="1" visible="yes" active="yes"/>
+<layer number="100" name="Muster" color="7" fill="1" visible="no" active="no"/>
+<layer number="101" name="Patch_Top" color="12" fill="4" visible="no" active="yes"/>
+<layer number="102" name="Vscore" color="7" fill="1" visible="no" active="yes"/>
+<layer number="104" name="Name" color="7" fill="1" visible="no" active="yes"/>
+<layer number="116" name="Patch_BOT" color="9" fill="4" visible="no" active="yes"/>
+<layer number="121" name="_tsilk" color="7" fill="1" visible="no" active="yes"/>
+<layer number="122" name="_bsilk" color="7" fill="1" visible="no" active="yes"/>
+<layer number="151" name="HeatSink" color="7" fill="1" visible="no" active="yes"/>
+<layer number="200" name="200bmp" color="1" fill="10" visible="no" active="no"/>
+<layer number="201" name="201bmp" color="2" fill="1" visible="no" active="no"/>
+<layer number="202" name="202bmp" color="3" fill="1" visible="no" active="no"/>
+<layer number="250" name="Descript" color="3" fill="1" visible="no" active="no"/>
+<layer number="251" name="SMDround" color="12" fill="11" visible="no" active="no"/>
+<layer number="254" name="cooling" color="7" fill="1" visible="no" active="yes"/>
 </layers>
 <schematic xreflabel="%F%N/%S.%C%R" xrefpart="/%S.%C%R">
 <libraries>
+<library name="stm32f0">
+<description>STM32F0x Microcontrollers</description>
+<packages>
+<package name="TSSOP20">
+<wire x1="-3.1646" y1="-2.2828" x2="3.1646" y2="-2.2828" width="0.1524" layer="21"/>
+<wire x1="3.1646" y1="2.2828" x2="3.1646" y2="-2.2828" width="0.1524" layer="21"/>
+<wire x1="3.1646" y1="2.2828" x2="-3.1646" y2="2.2828" width="0.1524" layer="21"/>
+<wire x1="-3.1646" y1="-2.2828" x2="-3.1646" y2="2.2828" width="0.1524" layer="21"/>
+<wire x1="-2.936" y1="-2.0542" x2="2.936" y2="-2.0542" width="0.0508" layer="21"/>
+<wire x1="2.936" y1="2.0542" x2="2.936" y2="-2.0542" width="0.0508" layer="21"/>
+<wire x1="2.936" y1="2.0542" x2="-2.936" y2="2.0542" width="0.0508" layer="21"/>
+<wire x1="-2.936" y1="-2.0542" x2="-2.936" y2="2.0542" width="0.0508" layer="21"/>
+<circle x="-2.2756" y="-1.2192" radius="0.4572" width="0.1524" layer="21"/>
+<smd name="1" x="-2.925" y="-2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="2" x="-2.275" y="-2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="3" x="-1.625" y="-2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="4" x="-0.975" y="-2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="5" x="-0.325" y="-2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="6" x="0.325" y="-2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="7" x="0.975" y="-2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="8" x="1.625" y="-2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="9" x="2.275" y="-2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="10" x="2.925" y="-2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="11" x="2.925" y="2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="12" x="2.275" y="2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="13" x="1.625" y="2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="14" x="0.975" y="2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="15" x="0.325" y="2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="16" x="-0.325" y="2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="17" x="-0.975" y="2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="18" x="-1.625" y="2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="19" x="-2.275" y="2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<smd name="20" x="-2.925" y="2.9178" dx="0.3048" dy="0.9906" layer="1"/>
+<text x="-3.5456" y="-2.0828" size="1.016" layer="25" ratio="10" rot="R90">&gt;NAME</text>
+<text x="4.5362" y="-2.0828" size="1.016" layer="27" ratio="10" rot="R90">&gt;VALUE</text>
+<rectangle x1="-3.0266" y1="-3.121" x2="-2.8234" y2="-2.2828" layer="51"/>
+<rectangle x1="-2.3766" y1="-3.121" x2="-2.1734" y2="-2.2828" layer="51"/>
+<rectangle x1="-1.7266" y1="-3.121" x2="-1.5234" y2="-2.2828" layer="51"/>
+<rectangle x1="-1.0766" y1="-3.121" x2="-0.8734" y2="-2.2828" layer="51"/>
+<rectangle x1="-0.4266" y1="-3.121" x2="-0.2234" y2="-2.2828" layer="51"/>
+<rectangle x1="0.2234" y1="-3.121" x2="0.4266" y2="-2.2828" layer="51"/>
+<rectangle x1="0.8734" y1="-3.121" x2="1.0766" y2="-2.2828" layer="51"/>
+<rectangle x1="1.5234" y1="-3.121" x2="1.7266" y2="-2.2828" layer="51"/>
+<rectangle x1="2.1734" y1="-3.121" x2="2.3766" y2="-2.2828" layer="51"/>
+<rectangle x1="2.8234" y1="-3.121" x2="3.0266" y2="-2.2828" layer="51"/>
+<rectangle x1="2.8234" y1="2.2828" x2="3.0266" y2="3.121" layer="51"/>
+<rectangle x1="2.1734" y1="2.2828" x2="2.3766" y2="3.121" layer="51"/>
+<rectangle x1="1.5234" y1="2.2828" x2="1.7266" y2="3.121" layer="51"/>
+<rectangle x1="0.8734" y1="2.2828" x2="1.0766" y2="3.121" layer="51"/>
+<rectangle x1="0.2234" y1="2.2828" x2="0.4266" y2="3.121" layer="51"/>
+<rectangle x1="-0.4266" y1="2.2828" x2="-0.2234" y2="3.121" layer="51"/>
+<rectangle x1="-1.0766" y1="2.2828" x2="-0.8734" y2="3.121" layer="51"/>
+<rectangle x1="-1.7266" y1="2.2828" x2="-1.5234" y2="3.121" layer="51"/>
+<rectangle x1="-2.3766" y1="2.2828" x2="-2.1734" y2="3.121" layer="51"/>
+<rectangle x1="-3.0266" y1="2.2828" x2="-2.8234" y2="3.121" layer="51"/>
+</package>
+</packages>
+<symbols>
+<symbol name="STM32F042FXPX">
+<wire x1="-17.78" y1="25.4" x2="17.78" y2="25.4" width="0.254" layer="94"/>
+<wire x1="17.78" y1="25.4" x2="17.78" y2="-25.4" width="0.254" layer="94"/>
+<wire x1="17.78" y1="-25.4" x2="-17.78" y2="-25.4" width="0.254" layer="94"/>
+<wire x1="-17.78" y1="-25.4" x2="-17.78" y2="25.4" width="0.254" layer="94"/>
+<text x="-17.78" y="27.94" size="1.778" layer="95">&gt;NAME</text>
+<text x="-17.78" y="-27.94" size="1.778" layer="96">&gt;VALUE</text>
+<pin name="PB8-BOOT0" x="-22.86" y="22.86" length="middle"/>
+<pin name="PF0-OSC_IN" x="-22.86" y="17.78" length="middle"/>
+<pin name="PF1-OSC_OUT" x="-22.86" y="12.7" length="middle"/>
+<pin name="NRST" x="-22.86" y="7.62" length="middle"/>
+<pin name="VDDA" x="-22.86" y="2.54" length="middle"/>
+<pin name="PA0" x="-22.86" y="-2.54" length="middle"/>
+<pin name="PA1" x="-22.86" y="-7.62" length="middle"/>
+<pin name="PA2" x="-22.86" y="-12.7" length="middle"/>
+<pin name="PA3" x="-22.86" y="-17.78" length="middle"/>
+<pin name="PA4" x="-22.86" y="-22.86" length="middle"/>
+<pin name="PA5" x="22.86" y="-22.86" length="middle" rot="R180"/>
+<pin name="PA6" x="22.86" y="-17.78" length="middle" rot="R180"/>
+<pin name="PA7" x="22.86" y="-12.7" length="middle" rot="R180"/>
+<pin name="PB1" x="22.86" y="-7.62" length="middle" rot="R180"/>
+<pin name="VSS" x="22.86" y="-2.54" length="middle" rot="R180"/>
+<pin name="VDD" x="22.86" y="2.54" length="middle" rot="R180"/>
+<pin name="PA9(PA11)" x="22.86" y="7.62" length="middle" rot="R180"/>
+<pin name="PA10(PA12)" x="22.86" y="12.7" length="middle" rot="R180"/>
+<pin name="PA13" x="22.86" y="17.78" length="middle" rot="R180"/>
+<pin name="PA14" x="22.86" y="22.86" length="middle" rot="R180"/>
+</symbol>
+</symbols>
+<devicesets>
+<deviceset name="STM32F042FXPX">
+<gates>
+<gate name="G$1" symbol="STM32F042FXPX" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="TSSOP20">
+<connects>
+<connect gate="G$1" pin="NRST" pad="4"/>
+<connect gate="G$1" pin="PA0" pad="6"/>
+<connect gate="G$1" pin="PA1" pad="7"/>
+<connect gate="G$1" pin="PA10(PA12)" pad="18"/>
+<connect gate="G$1" pin="PA13" pad="19"/>
+<connect gate="G$1" pin="PA14" pad="20"/>
+<connect gate="G$1" pin="PA2" pad="8"/>
+<connect gate="G$1" pin="PA3" pad="9"/>
+<connect gate="G$1" pin="PA4" pad="10"/>
+<connect gate="G$1" pin="PA5" pad="11"/>
+<connect gate="G$1" pin="PA6" pad="12"/>
+<connect gate="G$1" pin="PA7" pad="13"/>
+<connect gate="G$1" pin="PA9(PA11)" pad="17"/>
+<connect gate="G$1" pin="PB1" pad="14"/>
+<connect gate="G$1" pin="PB8-BOOT0" pad="1"/>
+<connect gate="G$1" pin="PF0-OSC_IN" pad="2"/>
+<connect gate="G$1" pin="PF1-OSC_OUT" pad="3"/>
+<connect gate="G$1" pin="VDD" pad="16"/>
+<connect gate="G$1" pin="VDDA" pad="5"/>
+<connect gate="G$1" pin="VSS" pad="15"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+</devicesets>
+</library>
 </libraries>
 <attributes>
 </attributes>
@@ -30,12 +215,14 @@
 </class>
 </classes>
 <parts>
+<part name="U$1" library="stm32f0" deviceset="STM32F042FXPX" device=""/>
 </parts>
 <sheets>
 <sheet>
 <plain>
 </plain>
 <instances>
+<instance part="U$1" gate="G$1" x="68.58" y="45.72"/>
 </instances>
 <busses>
 </busses>

HARD/Knife/m_knife.s#9

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE eagle SYSTEM "eagle.dtd">
+<eagle version="7.7.0">
+<drawing>
+<settings>
+<setting alwaysvectorfont="no"/>
+<setting verticaltext="up"/>
+</settings>
+<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
+<layers>
+<layer number="90" name="Modules" color="5" fill="1" visible="yes" active="yes"/>
+<layer number="91" name="Nets" color="2" fill="1" visible="yes" active="yes"/>
+<layer number="92" name="Busses" color="1" fill="1" visible="yes" active="yes"/>
+<layer number="93" name="Pins" color="2" fill="1" visible="no" active="yes"/>
+<layer number="94" name="Symbols" color="4" fill="1" visible="yes" active="yes"/>
+<layer number="95" name="Names" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="96" name="Values" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="97" name="Info" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="98" name="Guide" color="6" fill="1" visible="yes" active="yes"/>
+</layers>
+<schematic xreflabel="%F%N/%S.%C%R" xrefpart="/%S.%C%R">
+<libraries>
+</libraries>
+<attributes>
+</attributes>
+<variantdefs>
+</variantdefs>
+<classes>
+<class number="0" name="default" width="0" drill="0">
+</class>
+</classes>
+<parts>
+</parts>
+<sheets>
+<sheet>
+<plain>
+</plain>
+<instances>
+</instances>
+<busses>
+</busses>
+<nets>
+</nets>
+</sheet>
+</sheets>
+</schematic>
+</drawing>
+</eagle>

HARD/Knife/m_knife.sch

@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="yes" altdistance="0.01" altunitdist="inch" altunit="inch"/>
+<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="no" active="no"/>
 <layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
@@ -14663,26 +14663,28 @@ Source: AVX .. aphvc.pdf</description>
 <part name="NUM" library="testpad" deviceset="TPSQ" device="TP20R"/>
 <part name="RST" library="pinhead" deviceset="PINHD-1X2" device=""/>
 <part name="BOOT" library="pinhead" deviceset="PINHD-1X2" device=""/>
-<part name="R1" library="resistor" deviceset="R-EU_" device="R1206"/>
+<part name="R1" library="resistor" deviceset="R-EU_" device="R1206" value="1.2K"/>
 <part name="GND_NUM" library="testpad" deviceset="TPSQ" device="TP20R"/>
 <part name="GND_S" library="testpad" deviceset="TPSQ" device="TP20R"/>
 <part name="GND_L" library="testpad" deviceset="TPSQ" device="TP20R"/>
 <part name="GND_SPI" library="testpad" deviceset="TPSQ" device="TP20R"/>
 <part name="IC1" library="v-reg" deviceset="LD117A?*" device="S" technology="12TR"/>
-<part name="C1" library="rcl" deviceset="CPOL-EU" device="SMCD"/>
+<part name="C1" library="rcl" deviceset="CPOL-EU" device="SMCD" value="100uF"/>
 <part name="PWR" library="pinhead" deviceset="PINHD-1X4" device=""/>
 <part name="SWD" library="pinhead" deviceset="PINHD-1X3" device=""/>
-<part name="R2" library="resistor" deviceset="R-EU_" device="R1206"/>
-<part name="R3" library="resistor" deviceset="R-EU_" device="R1206"/>
-<part name="C2" library="rcl" deviceset="C-US" device="C1206"/>
-<part name="R4" library="resistor" deviceset="R-EU_" device="R1206"/>
-<part name="R5" library="resistor" deviceset="R-EU_" device="R1206"/>
-<part name="R7" library="resistor" deviceset="R-EU_" device="R1206"/>
-<part name="R8" library="resistor" deviceset="R-EU_" device="R1206"/>
-<part name="R9" library="resistor" deviceset="R-EU_" device="R1206"/>
+<part name="R2" library="resistor" deviceset="R-EU_" device="R1206" value="1.2K"/>
+<part name="R3" library="resistor" deviceset="R-EU_" device="R1206" value="1.2K"/>
+<part name="C2" library="rcl" deviceset="C-US" device="C1206" value="0.01uF"/>
+<part name="R4" library="resistor" deviceset="R-EU_" device="R1206" value="1.2K"/>
+<part name="R5" library="resistor" deviceset="R-EU_" device="R1206" value="1.2K"/>
+<part name="R7" library="resistor" deviceset="R-EU_" device="R1206" value="1.2K"/>
+<part name="R8" library="resistor" deviceset="R-EU_" device="R1206" value="1.2K"/>
+<part name="R9" library="resistor" deviceset="R-EU_" device="R1206" value="1.2K"/>
 <part name="R10" library="resistor" deviceset="R-EU_" device="R1206"/>
 <part name="S/S" library="testpad" deviceset="TPSQ" device="TP20R"/>
 <part name="+S/S" library="testpad" deviceset="TPSQ" device="TP20R"/>
+<part name="R6" library="resistor" deviceset="R-EU_" device="R1206" value="150k"/>
+<part name="R11" library="resistor" deviceset="R-EU_" device="R1206" value="150k"/>
 </parts>
 <sheets>
 <sheet>
@@ -14720,6 +14722,8 @@ Source: AVX .. aphvc.pdf</description>
 <instance part="R10" gate="G$1" x="25.4" y="30.48"/>
 <instance part="S/S" gate="G$1" x="5.08" y="15.24"/>
 <instance part="+S/S" gate="G$1" x="2.54" y="25.4"/>
+<instance part="R6" gate="G$1" x="25.4" y="40.64" rot="R180"/>
+<instance part="R11" gate="G$1" x="25.4" y="45.72" rot="R180"/>
 </instances>
 <busses>
 </busses>
@@ -14807,7 +14811,9 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="30.48" y1="17.78" x2="30.48" y2="30.48" width="0.1524" layer="91"/>
 <junction x="30.48" y="53.34"/>
 <pinref part="GND_L" gate="G$1" pin="TP"/>
-<wire x1="30.48" y1="30.48" x2="30.48" y2="53.34" width="0.1524" layer="91"/>
+<wire x1="30.48" y1="30.48" x2="30.48" y2="40.64" width="0.1524" layer="91"/>
+<wire x1="30.48" y1="40.64" x2="30.48" y2="45.72" width="0.1524" layer="91"/>
+<wire x1="30.48" y1="45.72" x2="30.48" y2="53.34" width="0.1524" layer="91"/>
 <wire x1="30.48" y1="17.78" x2="35.56" y2="17.78" width="0.1524" layer="91"/>
 <wire x1="35.56" y1="17.78" x2="35.56" y2="12.7" width="0.1524" layer="91"/>
 <pinref part="GND_S" gate="G$1" pin="TP"/>
@@ -14831,6 +14837,10 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="35.56" y1="78.74" x2="35.56" y2="81.28" width="0.1524" layer="91"/>
 <wire x1="35.56" y1="81.28" x2="30.48" y2="81.28" width="0.1524" layer="91"/>
 <junction x="30.48" y="81.28"/>
+<pinref part="R11" gate="G$1" pin="1"/>
+<junction x="30.48" y="45.72"/>
+<pinref part="R6" gate="G$1" pin="1"/>
+<junction x="30.48" y="40.64"/>
 </segment>
 </net>
 <net name="N$15" class="0">
@@ -14961,14 +14971,24 @@ Source: AVX .. aphvc.pdf</description>
 <segment>
 <pinref part="PIKE" gate="G$1" pin="TP"/>
 <pinref part="R7" gate="G$1" pin="1"/>
-<wire x1="12.7" y1="43.18" x2="35.56" y2="43.18" width="0.1524" layer="91"/>
+<wire x1="12.7" y1="43.18" x2="17.78" y2="43.18" width="0.1524" layer="91"/>
+<pinref part="R11" gate="G$1" pin="2"/>
+<wire x1="17.78" y1="43.18" x2="35.56" y2="43.18" width="0.1524" layer="91"/>
+<wire x1="20.32" y1="45.72" x2="17.78" y2="45.72" width="0.1524" layer="91"/>
+<wire x1="17.78" y1="45.72" x2="17.78" y2="43.18" width="0.1524" layer="91"/>
+<junction x="17.78" y="43.18"/>
 </segment>
 </net>
 <net name="N$25" class="0">
 <segment>
 <pinref part="EDGE" gate="G$1" pin="TP"/>
 <pinref part="R8" gate="G$1" pin="1"/>
-<wire x1="5.08" y1="38.1" x2="35.56" y2="38.1" width="0.1524" layer="91"/>
+<wire x1="5.08" y1="38.1" x2="17.78" y2="38.1" width="0.1524" layer="91"/>
+<pinref part="R6" gate="G$1" pin="2"/>
+<wire x1="17.78" y1="38.1" x2="35.56" y2="38.1" width="0.1524" layer="91"/>
+<wire x1="20.32" y1="40.64" x2="17.78" y2="40.64" width="0.1524" layer="91"/>
+<wire x1="17.78" y1="40.64" x2="17.78" y2="38.1" width="0.1524" layer="91"/>
+<junction x="17.78" y="38.1"/>
 </segment>
 </net>
 <net name="N$10" class="0">

SOFT/Knife/knife/knife.ioc

@@ -2,27 +2,20 @@
 File.Version=6
 KeepUserPlacement=false
 Mcu.Family=STM32F0
-Mcu.IP0=ADC
-Mcu.IP1=NVIC
-Mcu.IP2=RCC
-Mcu.IP3=SPI1
-Mcu.IP4=SYS
-Mcu.IPNb=5
+Mcu.IP0=NVIC
+Mcu.IP1=RCC
+Mcu.IP2=SYS
+Mcu.IPNb=3
 Mcu.Name=STM32F030F4Px
 Mcu.Package=TSSOP20
 Mcu.Pin0=PA0
 Mcu.Pin1=PA1
-Mcu.Pin10=PA14
-Mcu.Pin11=VP_SYS_VS_Systick
 Mcu.Pin2=PA2
 Mcu.Pin3=PA3
-Mcu.Pin4=PA5
-Mcu.Pin5=PA6
-Mcu.Pin6=PA7
-Mcu.Pin7=PA9
-Mcu.Pin8=PA10
-Mcu.Pin9=PA13
-Mcu.PinsNb=12
+Mcu.Pin4=PA13
+Mcu.Pin5=PA14
+Mcu.Pin6=VP_SYS_VS_Systick
+Mcu.PinsNb=7
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F030F4Px
@@ -33,42 +26,29 @@ NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false
 NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false
 NVIC.SVC_IRQn=true\:0\:0\:false\:false\:true\:false
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false
-PA0.GPIOParameters=GPIO_Label
-PA0.GPIO_Label=Pike_in
+PA0.GPIOParameters=GPIO_PuPd,GPIO_Label
+PA0.GPIO_Label=IN_PIKE
+PA0.GPIO_PuPd=GPIO_PULLDOWN
 PA0.Locked=true
-PA0.Mode=IN0
-PA0.Signal=ADC_IN0
-PA1.GPIOParameters=GPIO_Label
-PA1.GPIO_Label=Edge_in
+PA0.Signal=GPIO_Input
+PA1.GPIOParameters=GPIO_PuPd,GPIO_Label
+PA1.GPIO_Label=IN_EDGE
+PA1.GPIO_PuPd=GPIO_PULLDOWN
 PA1.Locked=true
-PA1.Mode=IN1
-PA1.Signal=ADC_IN1
-PA10.GPIOParameters=GPIO_Label
-PA10.GPIO_Label=LED_out_B
-PA10.Locked=true
-PA10.Signal=GPIO_Output
+PA1.Signal=GPIO_Input
 PA13.Mode=Serial_Wire
 PA13.Signal=SYS_SWDIO
 PA14.Mode=Serial_Wire
 PA14.Signal=SYS_SWCLK
-PA2.GPIOParameters=GPIO_Label
-PA2.GPIO_Label=START/STOP_IN
+PA2.GPIOParameters=GPIO_PuPd,GPIO_Label
+PA2.GPIO_Label=S/S
+PA2.GPIO_PuPd=GPIO_NOPULL
 PA2.Locked=true
 PA2.Signal=GPIO_Input
 PA3.GPIOParameters=GPIO_Label
-PA3.GPIO_Label=LED_STAT
+PA3.GPIO_Label=STAT_LED
 PA3.Locked=true
 PA3.Signal=GPIO_Output
-PA5.Mode=Full_Duplex_Master
-PA5.Signal=SPI1_SCK
-PA6.Mode=Full_Duplex_Master
-PA6.Signal=SPI1_MISO
-PA7.Mode=Full_Duplex_Master
-PA7.Signal=SPI1_MOSI
-PA9.GPIOParameters=GPIO_Label
-PA9.GPIO_Label=LED_RST
-PA9.Locked=true
-PA9.Signal=GPIO_Output
 PCC.Checker=false
 PCC.Line=STM32F0x0 Value Line
 PCC.MCU=STM32F030F4Px
@@ -97,22 +77,26 @@ ProjectManager.LibraryCopy=0
 ProjectManager.MainLocation=Src
 ProjectManager.PreviousToolchain=
 ProjectManager.ProjectBuild=false
-ProjectManager.ProjectFileName=knife.ioc
-ProjectManager.ProjectName=knife
+ProjectManager.ProjectFileName=Knife.ioc
+ProjectManager.ProjectName=Knife
 ProjectManager.StackSize=0x400
 ProjectManager.TargetToolchain=Makefile
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=false
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_ADC_Init-ADC-false-HAL-true,4-MX_SPI1_Init-SPI1-false-HAL-true
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false
+RCC.AHBFreq_Value=24000000
+RCC.APB1Freq_Value=24000000
+RCC.APB1TimFreq_Value=24000000
+RCC.FCLKCortexFreq_Value=24000000
 RCC.FamilyName=M
-RCC.IPParameters=FamilyName,PLLCLKFreq_Value,TimSysFreq_Value
-RCC.PLLCLKFreq_Value=8000000
-RCC.TimSysFreq_Value=8000000
-SPI1.CalculateBaudRate=4.0 MBits/s
-SPI1.Direction=SPI_DIRECTION_2LINES
-SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate
-SPI1.Mode=SPI_MODE_MASTER
-SPI1.VirtualType=VM_MASTER
+RCC.HCLKFreq_Value=24000000
+RCC.IPParameters=AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,PLLCLKFreq_Value,PLLMUL,SYSCLKFreq_VALUE,SYSCLKSource,TimSysFreq_Value,USART1Freq_Value
+RCC.PLLCLKFreq_Value=24000000
+RCC.PLLMUL=RCC_PLL_MUL6
+RCC.SYSCLKFreq_VALUE=24000000
+RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK
+RCC.TimSysFreq_Value=24000000
+RCC.USART1Freq_Value=24000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom

SOFT/Knife/.project

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Knife</name>
-	<comment />
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-		<nature>fr.ac6.mcu.ide.core.MCUProjectNature</nature>
-	</natures>
-	<linkedResources>
-		
-	</linkedResources>
-</projectDescription>