From fa53deb9d086766c5b852e39d2ca397a34f147bf Mon Sep 17 00:00:00 2001 From: Mark van Renswoude Date: Thu, 3 Jan 2019 23:16:44 +0100 Subject: [PATCH] Fixed #1: Unstable on/off positions Fixed #2: Unit sleeps when adjusting positions Fixed #3: No capacitor on input side of voltage regulator Fixed #4: Add 3rd potentiometer for speed setting? --- kicad/RailroadSwitch/RailroadSwitch.kicad_pcb | 974 ++++++++++++------ kicad/RailroadSwitch/RailroadSwitch.net | 92 +- kicad/RailroadSwitch/RailroadSwitch.sch | 444 ++++---- src/main.cpp | 104 +- 4 files changed, 1040 insertions(+), 574 deletions(-) diff --git a/kicad/RailroadSwitch/RailroadSwitch.kicad_pcb b/kicad/RailroadSwitch/RailroadSwitch.kicad_pcb index f97a7ff..1b8c584 100644 --- a/kicad/RailroadSwitch/RailroadSwitch.kicad_pcb +++ b/kicad/RailroadSwitch/RailroadSwitch.kicad_pcb @@ -3,10 +3,10 @@ (general (thickness 1.6) (drawings 4) - (tracks 61) + (tracks 101) (zones 0) - (modules 9) - (nets 9) + (modules 12) + (nets 10) ) (page A4) @@ -107,6 +107,7 @@ (net 6 "Net-(RV1-Pad2)") (net 7 "Net-(RV2-Pad2)") (net 8 "Net-(SW1-Pad1)") + (net 9 "Net-(RV3-Pad2)") (net_class Default "This is the default net class." (clearance 0.2) @@ -122,18 +123,19 @@ (add_net "Net-(R1-Pad2)") (add_net "Net-(RV1-Pad2)") (add_net "Net-(RV2-Pad2)") + (add_net "Net-(RV3-Pad2)") (add_net "Net-(SW1-Pad1)") ) - (module custom:TO-220-3_Horizontal_Reversed (layer B.Cu) (tedit 5C2BB86F) (tstamp 5C2BC4AF) - (at 133.858 85.852 270) + (module custom:TO-220-3_Horizontal_Reversed (layer B.Cu) (tedit 5C2BB86F) (tstamp 5C2E5ECD) + (at 169.418 63.246 180) (descr "TO-220-3, Horizontal, RM 2.54mm") (tags "TO-220-3 Horizontal RM 2.54mm") (path /5C2CDA60) - (fp_text reference U2 (at 2.54 -20.58 270) (layer B.SilkS) + (fp_text reference U2 (at 0.508 -20.32 180) (layer B.SilkS) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (fp_text value L7805 (at 2.54 1.9 270) (layer B.Fab) + (fp_text value L7805 (at 2.54 1.9 180) (layer B.Fab) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) (fp_circle (center 2.54 -16.66) (end 4.39 -16.66) (layer B.Fab) (width 0.1)) @@ -170,16 +172,16 @@ (fp_line (start 7.54 -19.46) (end 7.54 -13.06) (layer B.Fab) (width 0.1)) (fp_line (start -2.46 -19.46) (end 7.54 -19.46) (layer B.Fab) (width 0.1)) (fp_line (start -2.46 -13.06) (end -2.46 -19.46) (layer B.Fab) (width 0.1)) - (fp_text user %R (at 2.54 -20.58 270) (layer B.Fab) + (fp_text user %R (at 2.54 -20.58 180) (layer B.Fab) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (pad 3 thru_hole oval (at 5.08 0 270) (size 1.8 1.8) (drill 1) (layers *.Cu *.Mask) + (pad 3 thru_hole oval (at 5.08 0 180) (size 1.8 1.8) (drill 1) (layers *.Cu *.Mask) (net 2 +5V)) - (pad 2 thru_hole oval (at 2.54 0 270) (size 1.8 1.8) (drill 1) (layers *.Cu *.Mask) + (pad 2 thru_hole oval (at 2.54 0 180) (size 1.8 1.8) (drill 1) (layers *.Cu *.Mask) (net 1 GND)) - (pad 1 thru_hole rect (at 0 0 270) (size 1.8 1.8) (drill 1) (layers *.Cu *.Mask) + (pad 1 thru_hole rect (at 0 0 180) (size 1.8 1.8) (drill 1) (layers *.Cu *.Mask) (net 4 +12V)) - (pad 0 smd oval (at 2.54 -16.66 270) (size 3.5 3.5) (layers B.Cu B.Paste B.Mask)) + (pad 0 smd oval (at 2.54 -16.66 180) (size 3.5 3.5) (layers B.Cu B.Paste B.Mask)) (model ${KISYS3DMOD}/TO_SOT_Packages_THT.3dshapes/TO-220-3_Horizontal_Reversed.wrl (offset (xyz 2.539999961853027 0 0)) (scale (xyz 0.393701 0.393701 0.393701)) @@ -187,13 +189,13 @@ ) ) - (module Capacitors_SMD:C_1206 (layer F.Cu) (tedit 58AA84B8) (tstamp 5C2BC390) - (at 146.289763 93.427294) + (module Capacitors_SMD:C_1206 (layer F.Cu) (tedit 58AA84B8) (tstamp 5C2E5CC1) + (at 156.464 70.358) (descr "Capacitor SMD 1206, reflow soldering, AVX (see smccp.pdf)") (tags "capacitor 1206") (path /5C2C52A2) (attr smd) - (fp_text reference C1 (at -3.287763 0.806706) (layer F.SilkS) + (fp_text reference C1 (at 3.556 0.254) (layer F.SilkS) (effects (font (size 1 1) (thickness 0.15))) ) (fp_text value 100nF (at 0 2) (layer F.Fab) @@ -223,38 +225,241 @@ ) ) - (module Pin_Headers:Pin_Header_Straight_1x03_Pitch2.54mm (layer F.Cu) (tedit 59650532) (tstamp 5C2BC3A7) - (at 160.528 83.566 270) + (module Capacitors_SMD:C_1206 (layer F.Cu) (tedit 58AA84B8) (tstamp 5C2E5CD2) + (at 168.148 59.944 180) + (descr "Capacitor SMD 1206, reflow soldering, AVX (see smccp.pdf)") + (tags "capacitor 1206") + (path /5C2E5A00) + (attr smd) + (fp_text reference C2 (at -3.556 0 180) (layer F.SilkS) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_text value 22pF (at 0 2 180) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_text user %R (at 0 -1.75 180) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1)) + (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1)) + (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1)) + (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1)) + (fp_line (start 1 -1.02) (end -1 -1.02) (layer F.SilkS) (width 0.12)) + (fp_line (start -1 1.02) (end 1 1.02) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.25 -1.05) (end 2.25 -1.05) (layer F.CrtYd) (width 0.05)) + (fp_line (start -2.25 -1.05) (end -2.25 1.05) (layer F.CrtYd) (width 0.05)) + (fp_line (start 2.25 1.05) (end 2.25 -1.05) (layer F.CrtYd) (width 0.05)) + (fp_line (start 2.25 1.05) (end -2.25 1.05) (layer F.CrtYd) (width 0.05)) + (pad 1 smd rect (at -1.5 0 180) (size 1 1.6) (layers F.Cu F.Paste F.Mask) + (net 4 +12V)) + (pad 2 smd rect (at 1.5 0 180) (size 1 1.6) (layers F.Cu F.Paste F.Mask) + (net 1 GND)) + (model Capacitors_SMD.3dshapes/C_1206.wrl + (at (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (module Capacitors_ThroughHole:CP_Radial_D6.3mm_P2.50mm (layer B.Cu) (tedit 597BC7C2) (tstamp 5C2E5D67) + (at 137.922 68.834 90) + (descr "CP, Radial series, Radial, pin pitch=2.50mm, , diameter=6.3mm, Electrolytic Capacitor") + (tags "CP Radial series Radial pin pitch 2.50mm diameter 6.3mm Electrolytic Capacitor") + (path /5C2EF195) + (fp_text reference C3 (at 1.25 4.46 90) (layer B.SilkS) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (fp_text value 470uF (at 1.25 -4.46 90) (layer B.Fab) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (fp_text user %R (at 1.25 0 90) (layer B.Fab) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (fp_line (start 4.75 3.5) (end -2.25 3.5) (layer B.CrtYd) (width 0.05)) + (fp_line (start 4.75 -3.5) (end 4.75 3.5) (layer B.CrtYd) (width 0.05)) + (fp_line (start -2.25 -3.5) (end 4.75 -3.5) (layer B.CrtYd) (width 0.05)) + (fp_line (start -2.25 3.5) (end -2.25 -3.5) (layer B.CrtYd) (width 0.05)) + (fp_line (start -1.6 0.65) (end -1.6 -0.65) (layer B.SilkS) (width 0.12)) + (fp_line (start -2.2 0) (end -1 0) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.451 0.468) (end 4.451 -0.468) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.411 0.676) (end 4.411 -0.676) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.371 0.834) (end 4.371 -0.834) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.331 0.966) (end 4.331 -0.966) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.291 1.081) (end 4.291 -1.081) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.251 1.184) (end 4.251 -1.184) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.211 1.278) (end 4.211 -1.278) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.171 1.364) (end 4.171 -1.364) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.131 1.445) (end 4.131 -1.445) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.091 1.52) (end 4.091 -1.52) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.051 1.591) (end 4.051 -1.591) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.011 1.658) (end 4.011 -1.658) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.971 1.721) (end 3.971 -1.721) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.931 1.781) (end 3.931 -1.781) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.891 1.839) (end 3.891 -1.839) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.851 1.894) (end 3.851 -1.894) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.811 1.946) (end 3.811 -1.946) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.771 1.997) (end 3.771 -1.997) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.731 2.045) (end 3.731 -2.045) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.691 2.092) (end 3.691 -2.092) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.651 2.137) (end 3.651 -2.137) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.611 2.18) (end 3.611 -2.18) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.571 2.222) (end 3.571 -2.222) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.531 2.262) (end 3.531 -2.262) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.491 2.301) (end 3.491 -2.301) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.451 -0.98) (end 3.451 -2.339) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.451 2.339) (end 3.451 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.411 -0.98) (end 3.411 -2.375) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.411 2.375) (end 3.411 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.371 -0.98) (end 3.371 -2.411) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.371 2.411) (end 3.371 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.331 -0.98) (end 3.331 -2.445) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.331 2.445) (end 3.331 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.291 -0.98) (end 3.291 -2.478) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.291 2.478) (end 3.291 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.251 -0.98) (end 3.251 -2.51) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.251 2.51) (end 3.251 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.211 -0.98) (end 3.211 -2.54) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.211 2.54) (end 3.211 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.171 -0.98) (end 3.171 -2.57) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.171 2.57) (end 3.171 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.131 -0.98) (end 3.131 -2.599) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.131 2.599) (end 3.131 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.091 -0.98) (end 3.091 -2.627) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.091 2.627) (end 3.091 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.051 -0.98) (end 3.051 -2.654) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.051 2.654) (end 3.051 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.011 -0.98) (end 3.011 -2.681) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.011 2.681) (end 3.011 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.971 -0.98) (end 2.971 -2.706) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.971 2.706) (end 2.971 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.931 -0.98) (end 2.931 -2.731) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.931 2.731) (end 2.931 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.891 -0.98) (end 2.891 -2.755) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.891 2.755) (end 2.891 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.851 -0.98) (end 2.851 -2.778) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.851 2.778) (end 2.851 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.811 -0.98) (end 2.811 -2.8) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.811 2.8) (end 2.811 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.771 -0.98) (end 2.771 -2.822) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.771 2.822) (end 2.771 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.731 -0.98) (end 2.731 -2.843) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.731 2.843) (end 2.731 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.691 -0.98) (end 2.691 -2.863) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.691 2.863) (end 2.691 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.651 -0.98) (end 2.651 -2.882) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.651 2.882) (end 2.651 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.611 -0.98) (end 2.611 -2.901) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.611 2.901) (end 2.611 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.571 -0.98) (end 2.571 -2.919) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.571 2.919) (end 2.571 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.531 -0.98) (end 2.531 -2.937) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.531 2.937) (end 2.531 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.491 -0.98) (end 2.491 -2.954) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.491 2.954) (end 2.491 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.451 -0.98) (end 2.451 -2.97) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.451 2.97) (end 2.451 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.411 -0.98) (end 2.411 -2.986) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.411 2.986) (end 2.411 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.371 -0.98) (end 2.371 -3.001) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.371 3.001) (end 2.371 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.331 -0.98) (end 2.331 -3.015) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.331 3.015) (end 2.331 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.291 -0.98) (end 2.291 -3.029) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.291 3.029) (end 2.291 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.251 -0.98) (end 2.251 -3.042) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.251 3.042) (end 2.251 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.211 -0.98) (end 2.211 -3.055) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.211 3.055) (end 2.211 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.171 -0.98) (end 2.171 -3.067) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.171 3.067) (end 2.171 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.131 -0.98) (end 2.131 -3.079) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.131 3.079) (end 2.131 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.091 -0.98) (end 2.091 -3.09) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.091 3.09) (end 2.091 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.051 -0.98) (end 2.051 -3.1) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.051 3.1) (end 2.051 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.011 -0.98) (end 2.011 -3.11) (layer B.SilkS) (width 0.12)) + (fp_line (start 2.011 3.11) (end 2.011 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.971 -0.98) (end 1.971 -3.119) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.971 3.119) (end 1.971 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.93 -0.98) (end 1.93 -3.128) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.93 3.128) (end 1.93 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.89 -0.98) (end 1.89 -3.137) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.89 3.137) (end 1.89 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.85 -0.98) (end 1.85 -3.144) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.85 3.144) (end 1.85 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.81 -0.98) (end 1.81 -3.152) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.81 3.152) (end 1.81 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.77 -0.98) (end 1.77 -3.158) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.77 3.158) (end 1.77 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.73 -0.98) (end 1.73 -3.165) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.73 3.165) (end 1.73 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.69 -0.98) (end 1.69 -3.17) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.69 3.17) (end 1.69 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.65 -0.98) (end 1.65 -3.176) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.65 3.176) (end 1.65 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.61 -0.98) (end 1.61 -3.18) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.61 3.18) (end 1.61 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.57 -0.98) (end 1.57 -3.185) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.57 3.185) (end 1.57 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.53 -0.98) (end 1.53 -3.188) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.53 3.188) (end 1.53 0.98) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.49 3.192) (end 1.49 -3.192) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.45 3.194) (end 1.45 -3.194) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.41 3.197) (end 1.41 -3.197) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.37 3.198) (end 1.37 -3.198) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.33 3.2) (end 1.33 -3.2) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.29 3.2) (end 1.29 -3.2) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.25 3.2) (end 1.25 -3.2) (layer B.SilkS) (width 0.12)) + (fp_line (start -1.6 0.65) (end -1.6 -0.65) (layer B.Fab) (width 0.1)) + (fp_line (start -2.2 0) (end -1 0) (layer B.Fab) (width 0.1)) + (fp_circle (center 1.25 0) (end 4.4 0) (layer B.Fab) (width 0.1)) + (fp_arc (start 1.25 0) (end 4.267482 1.18) (angle -42.7) (layer B.SilkS) (width 0.12)) + (fp_arc (start 1.25 0) (end -1.767482 -1.18) (angle 137.3) (layer B.SilkS) (width 0.12)) + (fp_arc (start 1.25 0) (end -1.767482 1.18) (angle -137.3) (layer B.SilkS) (width 0.12)) + (pad 2 thru_hole circle (at 2.5 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (net 2 +5V)) + (pad 1 thru_hole rect (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (net 1 GND)) + (model ${KISYS3DMOD}/Capacitors_THT.3dshapes/CP_Radial_D6.3mm_P2.50mm.wrl + (at (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (module Pin_Headers:Pin_Header_Straight_1x03_Pitch2.54mm (layer B.Cu) (tedit 59650532) (tstamp 5C2E5D7E) + (at 136.144 60.198 270) (descr "Through hole straight pin header, 1x03, 2.54mm pitch, single row") (tags "Through hole pin header THT 1x03 2.54mm single row") (path /5C2CB61A) - (fp_text reference J1 (at 0 7.62 270) (layer F.SilkS) - (effects (font (size 1 1) (thickness 0.15))) + (fp_text reference J1 (at -2.54 -2.54) (layer B.SilkS) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (fp_text value Servo (at 0 7.41 270) (layer F.Fab) - (effects (font (size 1 1) (thickness 0.15))) + (fp_text value Servo (at 0 -7.41 270) (layer B.Fab) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (fp_text user %R (at 0 2.54) (layer F.Fab) - (effects (font (size 1 1) (thickness 0.15))) + (fp_text user %R (at 0 -2.54 180) (layer B.Fab) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05)) - (fp_line (start 1.8 6.85) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05)) - (fp_line (start -1.8 6.85) (end 1.8 6.85) (layer F.CrtYd) (width 0.05)) - (fp_line (start -1.8 -1.8) (end -1.8 6.85) (layer F.CrtYd) (width 0.05)) - (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12)) - (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12)) - (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12)) - (fp_line (start 1.33 1.27) (end 1.33 6.41) (layer F.SilkS) (width 0.12)) - (fp_line (start -1.33 1.27) (end -1.33 6.41) (layer F.SilkS) (width 0.12)) - (fp_line (start -1.33 6.41) (end 1.33 6.41) (layer F.SilkS) (width 0.12)) - (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1)) - (fp_line (start -1.27 6.35) (end -1.27 -0.635) (layer F.Fab) (width 0.1)) - (fp_line (start 1.27 6.35) (end -1.27 6.35) (layer F.Fab) (width 0.1)) - (fp_line (start 1.27 -1.27) (end 1.27 6.35) (layer F.Fab) (width 0.1)) - (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1)) - (pad 3 thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (fp_line (start 1.8 1.8) (end -1.8 1.8) (layer B.CrtYd) (width 0.05)) + (fp_line (start 1.8 -6.85) (end 1.8 1.8) (layer B.CrtYd) (width 0.05)) + (fp_line (start -1.8 -6.85) (end 1.8 -6.85) (layer B.CrtYd) (width 0.05)) + (fp_line (start -1.8 1.8) (end -1.8 -6.85) (layer B.CrtYd) (width 0.05)) + (fp_line (start -1.33 1.33) (end 0 1.33) (layer B.SilkS) (width 0.12)) + (fp_line (start -1.33 0) (end -1.33 1.33) (layer B.SilkS) (width 0.12)) + (fp_line (start -1.33 -1.27) (end 1.33 -1.27) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.33 -1.27) (end 1.33 -6.41) (layer B.SilkS) (width 0.12)) + (fp_line (start -1.33 -1.27) (end -1.33 -6.41) (layer B.SilkS) (width 0.12)) + (fp_line (start -1.33 -6.41) (end 1.33 -6.41) (layer B.SilkS) (width 0.12)) + (fp_line (start -1.27 0.635) (end -0.635 1.27) (layer B.Fab) (width 0.1)) + (fp_line (start -1.27 -6.35) (end -1.27 0.635) (layer B.Fab) (width 0.1)) + (fp_line (start 1.27 -6.35) (end -1.27 -6.35) (layer B.Fab) (width 0.1)) + (fp_line (start 1.27 1.27) (end 1.27 -6.35) (layer B.Fab) (width 0.1)) + (fp_line (start -0.635 1.27) (end 1.27 1.27) (layer B.Fab) (width 0.1)) + (pad 3 thru_hole oval (at 0 -5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (net 3 "Net-(J1-Pad3)")) - (pad 2 thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (pad 2 thru_hole oval (at 0 -2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (net 2 +5V)) (pad 1 thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (net 1 GND)) @@ -265,38 +470,38 @@ ) ) - (module Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm (layer F.Cu) (tedit 59650532) (tstamp 5C2BC3BD) - (at 139.7 83.566 270) + (module Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm (layer B.Cu) (tedit 59650532) (tstamp 5C2E5D94) + (at 155.194 60.198 270) (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row") (tags "Through hole pin header THT 1x02 2.54mm single row") (path /5C2CC12F) - (fp_text reference J2 (at 0 -2.33 270) (layer F.SilkS) - (effects (font (size 1 1) (thickness 0.15))) + (fp_text reference J2 (at -2.54 -1.27) (layer B.SilkS) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (fp_text value Power (at 0 4.87 270) (layer F.Fab) - (effects (font (size 1 1) (thickness 0.15))) + (fp_text value Power (at 0 -4.87 270) (layer B.Fab) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1)) - (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer F.Fab) (width 0.1)) - (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer F.Fab) (width 0.1)) - (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer F.Fab) (width 0.1)) - (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1)) - (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer F.SilkS) (width 0.12)) - (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer F.SilkS) (width 0.12)) - (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer F.SilkS) (width 0.12)) - (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12)) - (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12)) - (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12)) - (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer F.CrtYd) (width 0.05)) - (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer F.CrtYd) (width 0.05)) - (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05)) - (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05)) - (fp_text user %R (at 0 1.27) (layer F.Fab) - (effects (font (size 1 1) (thickness 0.15))) + (fp_line (start -0.635 1.27) (end 1.27 1.27) (layer B.Fab) (width 0.1)) + (fp_line (start 1.27 1.27) (end 1.27 -3.81) (layer B.Fab) (width 0.1)) + (fp_line (start 1.27 -3.81) (end -1.27 -3.81) (layer B.Fab) (width 0.1)) + (fp_line (start -1.27 -3.81) (end -1.27 0.635) (layer B.Fab) (width 0.1)) + (fp_line (start -1.27 0.635) (end -0.635 1.27) (layer B.Fab) (width 0.1)) + (fp_line (start -1.33 -3.87) (end 1.33 -3.87) (layer B.SilkS) (width 0.12)) + (fp_line (start -1.33 -1.27) (end -1.33 -3.87) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.33 -1.27) (end 1.33 -3.87) (layer B.SilkS) (width 0.12)) + (fp_line (start -1.33 -1.27) (end 1.33 -1.27) (layer B.SilkS) (width 0.12)) + (fp_line (start -1.33 0) (end -1.33 1.33) (layer B.SilkS) (width 0.12)) + (fp_line (start -1.33 1.33) (end 0 1.33) (layer B.SilkS) (width 0.12)) + (fp_line (start -1.8 1.8) (end -1.8 -4.35) (layer B.CrtYd) (width 0.05)) + (fp_line (start -1.8 -4.35) (end 1.8 -4.35) (layer B.CrtYd) (width 0.05)) + (fp_line (start 1.8 -4.35) (end 1.8 1.8) (layer B.CrtYd) (width 0.05)) + (fp_line (start 1.8 1.8) (end -1.8 1.8) (layer B.CrtYd) (width 0.05)) + (fp_text user %R (at 0 -1.27 180) (layer B.Fab) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) (pad 1 thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (net 1 GND)) - (pad 2 thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (pad 2 thru_hole oval (at 0 -2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (net 4 +12V)) (model ${KISYS3DMOD}/Pin_Headers.3dshapes/Pin_Header_Straight_1x02_Pitch2.54mm.wrl (at (xyz 0 0 0)) @@ -305,16 +510,16 @@ ) ) - (module Resistors_SMD:R_0603 (layer F.Cu) (tedit 58E0A804) (tstamp 5C2BC3CE) - (at 152.4 92.964 180) + (module Resistors_SMD:R_0603 (layer F.Cu) (tedit 58E0A804) (tstamp 5C2E5DA5) + (at 141.224 66.294) (descr "Resistor SMD 0603, reflow soldering, Vishay (see dcrcw.pdf)") (tags "resistor 0603") (path /5C2C5686) (attr smd) - (fp_text reference R1 (at -2.286 -0.508 180) (layer F.SilkS) + (fp_text reference R1 (at 0 -1.45) (layer F.SilkS) (effects (font (size 1 1) (thickness 0.15))) ) - (fp_text value 10k (at 0 1.5 180) (layer F.Fab) + (fp_text value 10k (at 0 1.5) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start 1.25 0.7) (end -1.25 0.7) (layer F.CrtYd) (width 0.05)) @@ -327,12 +532,12 @@ (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1)) (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1)) (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1)) - (fp_text user %R (at 0 0 180) (layer F.Fab) + (fp_text user %R (at 0 0) (layer F.Fab) (effects (font (size 0.4 0.4) (thickness 0.075))) ) - (pad 2 smd rect (at 0.75 0 180) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask) + (pad 2 smd rect (at 0.75 0) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask) (net 5 "Net-(R1-Pad2)")) - (pad 1 smd rect (at -0.75 0 180) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask) + (pad 1 smd rect (at -0.75 0) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask) (net 2 +5V)) (model ${KISYS3DMOD}/Resistors_SMD.3dshapes/R_0603.wrl (at (xyz 0 0 0)) @@ -341,86 +546,86 @@ ) ) - (module Potentiometers:Potentiometer_Triwood_RM-065 (layer F.Cu) (tedit 5882291E) (tstamp 5C2BC415) - (at 137.145763 87.585294 270) + (module Potentiometers:Potentiometer_Triwood_RM-065 (layer B.Cu) (tedit 5882291E) (tstamp 5C2E5DEC) + (at 159.766 81.026 180) (descr "Potentiometer, Trimmer, RM-065") (tags "Potentiometer Trimmer RM-065") (path /5C2C5AE5) - (fp_text reference RV1 (at 2.584706 -1.792237) (layer F.SilkS) - (effects (font (size 1 1) (thickness 0.15))) + (fp_text reference RV1 (at 2.54 1.778 90) (layer B.SilkS) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (fp_text value 10k (at 7.5 -2.5) (layer F.Fab) - (effects (font (size 1 1) (thickness 0.15))) + (fp_text value 10k (at 7.5 2.5 90) (layer B.Fab) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (fp_line (start 5.85 1.15) (end 5.85 1.4) (layer F.SilkS) (width 0.12)) - (fp_line (start 5.85 1.4) (end 5.6 1.4) (layer F.SilkS) (width 0.12)) - (fp_line (start 5.6 1.4) (end 5.6 1.65) (layer F.SilkS) (width 0.12)) - (fp_line (start 5.6 1.65) (end 4.35 1.65) (layer F.SilkS) (width 0.12)) - (fp_line (start 4.35 1.65) (end 4.35 1.4) (layer F.SilkS) (width 0.12)) - (fp_line (start 4.35 1.4) (end 0.7 1.4) (layer F.SilkS) (width 0.12)) - (fp_line (start 0.7 1.4) (end 0.7 1.65) (layer F.SilkS) (width 0.12)) - (fp_line (start 0.7 1.65) (end -0.6 1.65) (layer F.SilkS) (width 0.12)) - (fp_line (start -0.6 1.65) (end -0.6 1.4) (layer F.SilkS) (width 0.12)) - (fp_line (start -0.6 1.4) (end -0.9 1.4) (layer F.SilkS) (width 0.12)) - (fp_line (start -0.9 1.4) (end -0.9 1.15) (layer F.SilkS) (width 0.12)) - (fp_line (start 3.65 -5.9) (end 4.55 -5.9) (layer F.SilkS) (width 0.12)) - (fp_line (start 4.55 -5.9) (end 5.9 -4.4) (layer F.SilkS) (width 0.12)) - (fp_line (start 5.9 -4.4) (end 5.9 -1.1) (layer F.SilkS) (width 0.12)) - (fp_line (start -0.9 -1.1) (end -0.9 -4.45) (layer F.SilkS) (width 0.12)) - (fp_line (start -0.9 -4.45) (end 0.45 -5.9) (layer F.SilkS) (width 0.12)) - (fp_line (start 0.45 -5.9) (end 1.35 -5.9) (layer F.SilkS) (width 0.12)) - (fp_line (start 5.8 1.2) (end 5.8 -1.15) (layer F.Fab) (width 0.1)) - (fp_line (start -0.8 -1.1) (end -0.8 1.2) (layer F.Fab) (width 0.1)) - (fp_line (start 2.25 -2.88) (end 2.25 -3.64) (layer F.Fab) (width 0.1)) - (fp_line (start 2.75 -2.88) (end 2.75 -3.64) (layer F.Fab) (width 0.1)) - (fp_line (start -0.8 1.31) (end -0.8 1.18) (layer F.Fab) (width 0.1)) - (fp_line (start -0.8 -2.5) (end -0.8 -1.1) (layer F.Fab) (width 0.1)) - (fp_line (start 5.8 1.31) (end 5.8 1.18) (layer F.Fab) (width 0.1)) - (fp_line (start 5.8 -2.5) (end 5.8 -1.1) (layer F.Fab) (width 0.1)) - (fp_line (start 1.23 -0.47) (end 3.77 -0.47) (layer F.Fab) (width 0.1)) - (fp_line (start 4.53 -5.8) (end 3.64 -5.8) (layer F.Fab) (width 0.1)) - (fp_line (start 1.36 -5.8) (end 0.47 -5.8) (layer F.Fab) (width 0.1)) - (fp_line (start 4.15 -2.88) (end 4.66 -2.88) (layer F.Fab) (width 0.1)) - (fp_line (start 4.66 -2.88) (end 4.66 -2.12) (layer F.Fab) (width 0.1)) - (fp_line (start 4.66 -2.12) (end 4.15 -2.12) (layer F.Fab) (width 0.1)) - (fp_line (start 0.85 -2.88) (end 0.34 -2.88) (layer F.Fab) (width 0.1)) - (fp_line (start 0.34 -2.88) (end 0.34 -2.12) (layer F.Fab) (width 0.1)) - (fp_line (start 0.34 -2.12) (end 0.85 -2.12) (layer F.Fab) (width 0.1)) - (fp_line (start 3.01 -2.25) (end 4.15 -2.25) (layer F.Fab) (width 0.1)) - (fp_line (start 3.01 -2.75) (end 4.15 -2.75) (layer F.Fab) (width 0.1)) - (fp_line (start 1.99 -2.25) (end 0.85 -2.25) (layer F.Fab) (width 0.1)) - (fp_line (start 1.99 -2.75) (end 0.85 -2.75) (layer F.Fab) (width 0.1)) - (fp_line (start 2.75 -2.12) (end 2.75 -0.85) (layer F.Fab) (width 0.1)) - (fp_line (start 2.25 -2.12) (end 2.25 -0.85) (layer F.Fab) (width 0.1)) - (fp_line (start 1.99 -2.88) (end 1.99 -2.12) (layer F.Fab) (width 0.1)) - (fp_line (start 1.99 -2.12) (end 3.01 -2.12) (layer F.Fab) (width 0.1)) - (fp_line (start 3.01 -2.12) (end 3.01 -2.88) (layer F.Fab) (width 0.1)) - (fp_line (start 3.01 -2.88) (end 1.99 -2.88) (layer F.Fab) (width 0.1)) - (fp_line (start 0.47 -5.8) (end -0.8 -4.4) (layer F.Fab) (width 0.1)) - (fp_line (start -0.8 -4.4) (end -0.8 -2.5) (layer F.Fab) (width 0.1)) - (fp_line (start 4.53 -5.8) (end 5.8 -4.4) (layer F.Fab) (width 0.1)) - (fp_line (start 5.8 -4.4) (end 5.8 -2.5) (layer F.Fab) (width 0.1)) - (fp_line (start 5.55 1.31) (end 5.55 1.56) (layer F.Fab) (width 0.1)) - (fp_line (start 5.55 1.56) (end 4.4 1.56) (layer F.Fab) (width 0.1)) - (fp_line (start 4.4 1.56) (end 4.4 1.31) (layer F.Fab) (width 0.1)) - (fp_line (start -0.55 1.31) (end -0.55 1.56) (layer F.Fab) (width 0.1)) - (fp_line (start -0.55 1.56) (end 0.59 1.56) (layer F.Fab) (width 0.1)) - (fp_line (start 0.59 1.56) (end 0.59 1.31) (layer F.Fab) (width 0.1)) - (fp_line (start -0.8 1.31) (end 5.8 1.31) (layer F.Fab) (width 0.1)) - (fp_line (start -1.5 -6.54) (end 6.5 -6.54) (layer F.CrtYd) (width 0.05)) - (fp_line (start -1.5 -6.54) (end -1.5 1.81) (layer F.CrtYd) (width 0.05)) - (fp_line (start 6.5 1.81) (end 6.5 -6.54) (layer F.CrtYd) (width 0.05)) - (fp_line (start 6.5 1.81) (end -1.5 1.81) (layer F.CrtYd) (width 0.05)) - (fp_circle (center 2.5 -2.5) (end 4.7 -0.2) (layer F.Fab) (width 0.1)) - (fp_arc (start 2.5 -2.5) (end 4.15 -2.25) (angle 90) (layer F.Fab) (width 0.1)) - (fp_arc (start 2.5 -2.5) (end 2.63 -0.85) (angle 90) (layer F.Fab) (width 0.1)) - (fp_arc (start 2.5 -2.5) (end 3.39 -3.9) (angle 90) (layer F.Fab) (width 0.1)) - (fp_arc (start 2.5 -2.5) (end 1.1 -1.61) (angle 90) (layer F.Fab) (width 0.1)) - (pad 2 thru_hole circle (at 2.5 -5.04 270) (size 2.5 2.5) (drill 1.2) (layers *.Cu *.Mask) + (fp_line (start 5.85 -1.15) (end 5.85 -1.4) (layer B.SilkS) (width 0.12)) + (fp_line (start 5.85 -1.4) (end 5.6 -1.4) (layer B.SilkS) (width 0.12)) + (fp_line (start 5.6 -1.4) (end 5.6 -1.65) (layer B.SilkS) (width 0.12)) + (fp_line (start 5.6 -1.65) (end 4.35 -1.65) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.35 -1.65) (end 4.35 -1.4) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.35 -1.4) (end 0.7 -1.4) (layer B.SilkS) (width 0.12)) + (fp_line (start 0.7 -1.4) (end 0.7 -1.65) (layer B.SilkS) (width 0.12)) + (fp_line (start 0.7 -1.65) (end -0.6 -1.65) (layer B.SilkS) (width 0.12)) + (fp_line (start -0.6 -1.65) (end -0.6 -1.4) (layer B.SilkS) (width 0.12)) + (fp_line (start -0.6 -1.4) (end -0.9 -1.4) (layer B.SilkS) (width 0.12)) + (fp_line (start -0.9 -1.4) (end -0.9 -1.15) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.65 5.9) (end 4.55 5.9) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.55 5.9) (end 5.9 4.4) (layer B.SilkS) (width 0.12)) + (fp_line (start 5.9 4.4) (end 5.9 1.1) (layer B.SilkS) (width 0.12)) + (fp_line (start -0.9 1.1) (end -0.9 4.45) (layer B.SilkS) (width 0.12)) + (fp_line (start -0.9 4.45) (end 0.45 5.9) (layer B.SilkS) (width 0.12)) + (fp_line (start 0.45 5.9) (end 1.35 5.9) (layer B.SilkS) (width 0.12)) + (fp_line (start 5.8 -1.2) (end 5.8 1.15) (layer B.Fab) (width 0.1)) + (fp_line (start -0.8 1.1) (end -0.8 -1.2) (layer B.Fab) (width 0.1)) + (fp_line (start 2.25 2.88) (end 2.25 3.64) (layer B.Fab) (width 0.1)) + (fp_line (start 2.75 2.88) (end 2.75 3.64) (layer B.Fab) (width 0.1)) + (fp_line (start -0.8 -1.31) (end -0.8 -1.18) (layer B.Fab) (width 0.1)) + (fp_line (start -0.8 2.5) (end -0.8 1.1) (layer B.Fab) (width 0.1)) + (fp_line (start 5.8 -1.31) (end 5.8 -1.18) (layer B.Fab) (width 0.1)) + (fp_line (start 5.8 2.5) (end 5.8 1.1) (layer B.Fab) (width 0.1)) + (fp_line (start 1.23 0.47) (end 3.77 0.47) (layer B.Fab) (width 0.1)) + (fp_line (start 4.53 5.8) (end 3.64 5.8) (layer B.Fab) (width 0.1)) + (fp_line (start 1.36 5.8) (end 0.47 5.8) (layer B.Fab) (width 0.1)) + (fp_line (start 4.15 2.88) (end 4.66 2.88) (layer B.Fab) (width 0.1)) + (fp_line (start 4.66 2.88) (end 4.66 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 4.66 2.12) (end 4.15 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 0.85 2.88) (end 0.34 2.88) (layer B.Fab) (width 0.1)) + (fp_line (start 0.34 2.88) (end 0.34 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 0.34 2.12) (end 0.85 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 3.01 2.25) (end 4.15 2.25) (layer B.Fab) (width 0.1)) + (fp_line (start 3.01 2.75) (end 4.15 2.75) (layer B.Fab) (width 0.1)) + (fp_line (start 1.99 2.25) (end 0.85 2.25) (layer B.Fab) (width 0.1)) + (fp_line (start 1.99 2.75) (end 0.85 2.75) (layer B.Fab) (width 0.1)) + (fp_line (start 2.75 2.12) (end 2.75 0.85) (layer B.Fab) (width 0.1)) + (fp_line (start 2.25 2.12) (end 2.25 0.85) (layer B.Fab) (width 0.1)) + (fp_line (start 1.99 2.88) (end 1.99 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 1.99 2.12) (end 3.01 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 3.01 2.12) (end 3.01 2.88) (layer B.Fab) (width 0.1)) + (fp_line (start 3.01 2.88) (end 1.99 2.88) (layer B.Fab) (width 0.1)) + (fp_line (start 0.47 5.8) (end -0.8 4.4) (layer B.Fab) (width 0.1)) + (fp_line (start -0.8 4.4) (end -0.8 2.5) (layer B.Fab) (width 0.1)) + (fp_line (start 4.53 5.8) (end 5.8 4.4) (layer B.Fab) (width 0.1)) + (fp_line (start 5.8 4.4) (end 5.8 2.5) (layer B.Fab) (width 0.1)) + (fp_line (start 5.55 -1.31) (end 5.55 -1.56) (layer B.Fab) (width 0.1)) + (fp_line (start 5.55 -1.56) (end 4.4 -1.56) (layer B.Fab) (width 0.1)) + (fp_line (start 4.4 -1.56) (end 4.4 -1.31) (layer B.Fab) (width 0.1)) + (fp_line (start -0.55 -1.31) (end -0.55 -1.56) (layer B.Fab) (width 0.1)) + (fp_line (start -0.55 -1.56) (end 0.59 -1.56) (layer B.Fab) (width 0.1)) + (fp_line (start 0.59 -1.56) (end 0.59 -1.31) (layer B.Fab) (width 0.1)) + (fp_line (start -0.8 -1.31) (end 5.8 -1.31) (layer B.Fab) (width 0.1)) + (fp_line (start -1.5 6.54) (end 6.5 6.54) (layer B.CrtYd) (width 0.05)) + (fp_line (start -1.5 6.54) (end -1.5 -1.81) (layer B.CrtYd) (width 0.05)) + (fp_line (start 6.5 -1.81) (end 6.5 6.54) (layer B.CrtYd) (width 0.05)) + (fp_line (start 6.5 -1.81) (end -1.5 -1.81) (layer B.CrtYd) (width 0.05)) + (fp_circle (center 2.5 2.5) (end 4.7 0.2) (layer B.Fab) (width 0.1)) + (fp_arc (start 2.5 2.5) (end 4.15 2.25) (angle -90) (layer B.Fab) (width 0.1)) + (fp_arc (start 2.5 2.5) (end 2.63 0.85) (angle -90) (layer B.Fab) (width 0.1)) + (fp_arc (start 2.5 2.5) (end 3.39 3.9) (angle -90) (layer B.Fab) (width 0.1)) + (fp_arc (start 2.5 2.5) (end 1.1 1.61) (angle -90) (layer B.Fab) (width 0.1)) + (pad 2 thru_hole circle (at 2.5 5.04 180) (size 2.5 2.5) (drill 1.2) (layers *.Cu *.Mask) (net 6 "Net-(RV1-Pad2)")) - (pad 3 thru_hole circle (at 5 0 270) (size 2.5 2.5) (drill 1.2) (layers *.Cu *.Mask) + (pad 3 thru_hole circle (at 5 0 180) (size 2.5 2.5) (drill 1.2) (layers *.Cu *.Mask) (net 2 +5V)) - (pad 1 thru_hole circle (at 0 0 270) (size 2.5 2.5) (drill 1.2) (layers *.Cu *.Mask) + (pad 1 thru_hole circle (at 0 0 180) (size 2.5 2.5) (drill 1.2) (layers *.Cu *.Mask) (net 1 GND)) (model Potentiometers.3dshapes/Potentiometer_Triwood_RM-065.wrl (at (xyz 0 0 0)) @@ -429,86 +634,86 @@ ) ) - (module Potentiometers:Potentiometer_Triwood_RM-065 (layer F.Cu) (tedit 5882291E) (tstamp 5C2BC45C) - (at 160.513763 92.665294 90) + (module Potentiometers:Potentiometer_Triwood_RM-065 (layer B.Cu) (tedit 5882291E) (tstamp 5C2E5E33) + (at 150.368 81.026 180) (descr "Potentiometer, Trimmer, RM-065") (tags "Potentiometer Trimmer RM-065") (path /5C2C5A17) - (fp_text reference RV2 (at 2.495294 -1.763763 180) (layer F.SilkS) - (effects (font (size 1 1) (thickness 0.15))) + (fp_text reference RV2 (at 2.54 1.778 90) (layer B.SilkS) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (fp_text value 10k (at 7.5 -2.5 180) (layer F.Fab) - (effects (font (size 1 1) (thickness 0.15))) + (fp_text value 10k (at 7.5 2.5 90) (layer B.Fab) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (fp_arc (start 2.5 -2.5) (end 1.1 -1.61) (angle 90) (layer F.Fab) (width 0.1)) - (fp_arc (start 2.5 -2.5) (end 3.39 -3.9) (angle 90) (layer F.Fab) (width 0.1)) - (fp_arc (start 2.5 -2.5) (end 2.63 -0.85) (angle 90) (layer F.Fab) (width 0.1)) - (fp_arc (start 2.5 -2.5) (end 4.15 -2.25) (angle 90) (layer F.Fab) (width 0.1)) - (fp_circle (center 2.5 -2.5) (end 4.7 -0.2) (layer F.Fab) (width 0.1)) - (fp_line (start 6.5 1.81) (end -1.5 1.81) (layer F.CrtYd) (width 0.05)) - (fp_line (start 6.5 1.81) (end 6.5 -6.54) (layer F.CrtYd) (width 0.05)) - (fp_line (start -1.5 -6.54) (end -1.5 1.81) (layer F.CrtYd) (width 0.05)) - (fp_line (start -1.5 -6.54) (end 6.5 -6.54) (layer F.CrtYd) (width 0.05)) - (fp_line (start -0.8 1.31) (end 5.8 1.31) (layer F.Fab) (width 0.1)) - (fp_line (start 0.59 1.56) (end 0.59 1.31) (layer F.Fab) (width 0.1)) - (fp_line (start -0.55 1.56) (end 0.59 1.56) (layer F.Fab) (width 0.1)) - (fp_line (start -0.55 1.31) (end -0.55 1.56) (layer F.Fab) (width 0.1)) - (fp_line (start 4.4 1.56) (end 4.4 1.31) (layer F.Fab) (width 0.1)) - (fp_line (start 5.55 1.56) (end 4.4 1.56) (layer F.Fab) (width 0.1)) - (fp_line (start 5.55 1.31) (end 5.55 1.56) (layer F.Fab) (width 0.1)) - (fp_line (start 5.8 -4.4) (end 5.8 -2.5) (layer F.Fab) (width 0.1)) - (fp_line (start 4.53 -5.8) (end 5.8 -4.4) (layer F.Fab) (width 0.1)) - (fp_line (start -0.8 -4.4) (end -0.8 -2.5) (layer F.Fab) (width 0.1)) - (fp_line (start 0.47 -5.8) (end -0.8 -4.4) (layer F.Fab) (width 0.1)) - (fp_line (start 3.01 -2.88) (end 1.99 -2.88) (layer F.Fab) (width 0.1)) - (fp_line (start 3.01 -2.12) (end 3.01 -2.88) (layer F.Fab) (width 0.1)) - (fp_line (start 1.99 -2.12) (end 3.01 -2.12) (layer F.Fab) (width 0.1)) - (fp_line (start 1.99 -2.88) (end 1.99 -2.12) (layer F.Fab) (width 0.1)) - (fp_line (start 2.25 -2.12) (end 2.25 -0.85) (layer F.Fab) (width 0.1)) - (fp_line (start 2.75 -2.12) (end 2.75 -0.85) (layer F.Fab) (width 0.1)) - (fp_line (start 1.99 -2.75) (end 0.85 -2.75) (layer F.Fab) (width 0.1)) - (fp_line (start 1.99 -2.25) (end 0.85 -2.25) (layer F.Fab) (width 0.1)) - (fp_line (start 3.01 -2.75) (end 4.15 -2.75) (layer F.Fab) (width 0.1)) - (fp_line (start 3.01 -2.25) (end 4.15 -2.25) (layer F.Fab) (width 0.1)) - (fp_line (start 0.34 -2.12) (end 0.85 -2.12) (layer F.Fab) (width 0.1)) - (fp_line (start 0.34 -2.88) (end 0.34 -2.12) (layer F.Fab) (width 0.1)) - (fp_line (start 0.85 -2.88) (end 0.34 -2.88) (layer F.Fab) (width 0.1)) - (fp_line (start 4.66 -2.12) (end 4.15 -2.12) (layer F.Fab) (width 0.1)) - (fp_line (start 4.66 -2.88) (end 4.66 -2.12) (layer F.Fab) (width 0.1)) - (fp_line (start 4.15 -2.88) (end 4.66 -2.88) (layer F.Fab) (width 0.1)) - (fp_line (start 1.36 -5.8) (end 0.47 -5.8) (layer F.Fab) (width 0.1)) - (fp_line (start 4.53 -5.8) (end 3.64 -5.8) (layer F.Fab) (width 0.1)) - (fp_line (start 1.23 -0.47) (end 3.77 -0.47) (layer F.Fab) (width 0.1)) - (fp_line (start 5.8 -2.5) (end 5.8 -1.1) (layer F.Fab) (width 0.1)) - (fp_line (start 5.8 1.31) (end 5.8 1.18) (layer F.Fab) (width 0.1)) - (fp_line (start -0.8 -2.5) (end -0.8 -1.1) (layer F.Fab) (width 0.1)) - (fp_line (start -0.8 1.31) (end -0.8 1.18) (layer F.Fab) (width 0.1)) - (fp_line (start 2.75 -2.88) (end 2.75 -3.64) (layer F.Fab) (width 0.1)) - (fp_line (start 2.25 -2.88) (end 2.25 -3.64) (layer F.Fab) (width 0.1)) - (fp_line (start -0.8 -1.1) (end -0.8 1.2) (layer F.Fab) (width 0.1)) - (fp_line (start 5.8 1.2) (end 5.8 -1.15) (layer F.Fab) (width 0.1)) - (fp_line (start 0.45 -5.9) (end 1.35 -5.9) (layer F.SilkS) (width 0.12)) - (fp_line (start -0.9 -4.45) (end 0.45 -5.9) (layer F.SilkS) (width 0.12)) - (fp_line (start -0.9 -1.1) (end -0.9 -4.45) (layer F.SilkS) (width 0.12)) - (fp_line (start 5.9 -4.4) (end 5.9 -1.1) (layer F.SilkS) (width 0.12)) - (fp_line (start 4.55 -5.9) (end 5.9 -4.4) (layer F.SilkS) (width 0.12)) - (fp_line (start 3.65 -5.9) (end 4.55 -5.9) (layer F.SilkS) (width 0.12)) - (fp_line (start -0.9 1.4) (end -0.9 1.15) (layer F.SilkS) (width 0.12)) - (fp_line (start -0.6 1.4) (end -0.9 1.4) (layer F.SilkS) (width 0.12)) - (fp_line (start -0.6 1.65) (end -0.6 1.4) (layer F.SilkS) (width 0.12)) - (fp_line (start 0.7 1.65) (end -0.6 1.65) (layer F.SilkS) (width 0.12)) - (fp_line (start 0.7 1.4) (end 0.7 1.65) (layer F.SilkS) (width 0.12)) - (fp_line (start 4.35 1.4) (end 0.7 1.4) (layer F.SilkS) (width 0.12)) - (fp_line (start 4.35 1.65) (end 4.35 1.4) (layer F.SilkS) (width 0.12)) - (fp_line (start 5.6 1.65) (end 4.35 1.65) (layer F.SilkS) (width 0.12)) - (fp_line (start 5.6 1.4) (end 5.6 1.65) (layer F.SilkS) (width 0.12)) - (fp_line (start 5.85 1.4) (end 5.6 1.4) (layer F.SilkS) (width 0.12)) - (fp_line (start 5.85 1.15) (end 5.85 1.4) (layer F.SilkS) (width 0.12)) - (pad 1 thru_hole circle (at 0 0 90) (size 2.5 2.5) (drill 1.2) (layers *.Cu *.Mask) + (fp_arc (start 2.5 2.5) (end 1.1 1.61) (angle -90) (layer B.Fab) (width 0.1)) + (fp_arc (start 2.5 2.5) (end 3.39 3.9) (angle -90) (layer B.Fab) (width 0.1)) + (fp_arc (start 2.5 2.5) (end 2.63 0.85) (angle -90) (layer B.Fab) (width 0.1)) + (fp_arc (start 2.5 2.5) (end 4.15 2.25) (angle -90) (layer B.Fab) (width 0.1)) + (fp_circle (center 2.5 2.5) (end 4.7 0.2) (layer B.Fab) (width 0.1)) + (fp_line (start 6.5 -1.81) (end -1.5 -1.81) (layer B.CrtYd) (width 0.05)) + (fp_line (start 6.5 -1.81) (end 6.5 6.54) (layer B.CrtYd) (width 0.05)) + (fp_line (start -1.5 6.54) (end -1.5 -1.81) (layer B.CrtYd) (width 0.05)) + (fp_line (start -1.5 6.54) (end 6.5 6.54) (layer B.CrtYd) (width 0.05)) + (fp_line (start -0.8 -1.31) (end 5.8 -1.31) (layer B.Fab) (width 0.1)) + (fp_line (start 0.59 -1.56) (end 0.59 -1.31) (layer B.Fab) (width 0.1)) + (fp_line (start -0.55 -1.56) (end 0.59 -1.56) (layer B.Fab) (width 0.1)) + (fp_line (start -0.55 -1.31) (end -0.55 -1.56) (layer B.Fab) (width 0.1)) + (fp_line (start 4.4 -1.56) (end 4.4 -1.31) (layer B.Fab) (width 0.1)) + (fp_line (start 5.55 -1.56) (end 4.4 -1.56) (layer B.Fab) (width 0.1)) + (fp_line (start 5.55 -1.31) (end 5.55 -1.56) (layer B.Fab) (width 0.1)) + (fp_line (start 5.8 4.4) (end 5.8 2.5) (layer B.Fab) (width 0.1)) + (fp_line (start 4.53 5.8) (end 5.8 4.4) (layer B.Fab) (width 0.1)) + (fp_line (start -0.8 4.4) (end -0.8 2.5) (layer B.Fab) (width 0.1)) + (fp_line (start 0.47 5.8) (end -0.8 4.4) (layer B.Fab) (width 0.1)) + (fp_line (start 3.01 2.88) (end 1.99 2.88) (layer B.Fab) (width 0.1)) + (fp_line (start 3.01 2.12) (end 3.01 2.88) (layer B.Fab) (width 0.1)) + (fp_line (start 1.99 2.12) (end 3.01 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 1.99 2.88) (end 1.99 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 2.25 2.12) (end 2.25 0.85) (layer B.Fab) (width 0.1)) + (fp_line (start 2.75 2.12) (end 2.75 0.85) (layer B.Fab) (width 0.1)) + (fp_line (start 1.99 2.75) (end 0.85 2.75) (layer B.Fab) (width 0.1)) + (fp_line (start 1.99 2.25) (end 0.85 2.25) (layer B.Fab) (width 0.1)) + (fp_line (start 3.01 2.75) (end 4.15 2.75) (layer B.Fab) (width 0.1)) + (fp_line (start 3.01 2.25) (end 4.15 2.25) (layer B.Fab) (width 0.1)) + (fp_line (start 0.34 2.12) (end 0.85 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 0.34 2.88) (end 0.34 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 0.85 2.88) (end 0.34 2.88) (layer B.Fab) (width 0.1)) + (fp_line (start 4.66 2.12) (end 4.15 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 4.66 2.88) (end 4.66 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 4.15 2.88) (end 4.66 2.88) (layer B.Fab) (width 0.1)) + (fp_line (start 1.36 5.8) (end 0.47 5.8) (layer B.Fab) (width 0.1)) + (fp_line (start 4.53 5.8) (end 3.64 5.8) (layer B.Fab) (width 0.1)) + (fp_line (start 1.23 0.47) (end 3.77 0.47) (layer B.Fab) (width 0.1)) + (fp_line (start 5.8 2.5) (end 5.8 1.1) (layer B.Fab) (width 0.1)) + (fp_line (start 5.8 -1.31) (end 5.8 -1.18) (layer B.Fab) (width 0.1)) + (fp_line (start -0.8 2.5) (end -0.8 1.1) (layer B.Fab) (width 0.1)) + (fp_line (start -0.8 -1.31) (end -0.8 -1.18) (layer B.Fab) (width 0.1)) + (fp_line (start 2.75 2.88) (end 2.75 3.64) (layer B.Fab) (width 0.1)) + (fp_line (start 2.25 2.88) (end 2.25 3.64) (layer B.Fab) (width 0.1)) + (fp_line (start -0.8 1.1) (end -0.8 -1.2) (layer B.Fab) (width 0.1)) + (fp_line (start 5.8 -1.2) (end 5.8 1.15) (layer B.Fab) (width 0.1)) + (fp_line (start 0.45 5.9) (end 1.35 5.9) (layer B.SilkS) (width 0.12)) + (fp_line (start -0.9 4.45) (end 0.45 5.9) (layer B.SilkS) (width 0.12)) + (fp_line (start -0.9 1.1) (end -0.9 4.45) (layer B.SilkS) (width 0.12)) + (fp_line (start 5.9 4.4) (end 5.9 1.1) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.55 5.9) (end 5.9 4.4) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.65 5.9) (end 4.55 5.9) (layer B.SilkS) (width 0.12)) + (fp_line (start -0.9 -1.4) (end -0.9 -1.15) (layer B.SilkS) (width 0.12)) + (fp_line (start -0.6 -1.4) (end -0.9 -1.4) (layer B.SilkS) (width 0.12)) + (fp_line (start -0.6 -1.65) (end -0.6 -1.4) (layer B.SilkS) (width 0.12)) + (fp_line (start 0.7 -1.65) (end -0.6 -1.65) (layer B.SilkS) (width 0.12)) + (fp_line (start 0.7 -1.4) (end 0.7 -1.65) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.35 -1.4) (end 0.7 -1.4) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.35 -1.65) (end 4.35 -1.4) (layer B.SilkS) (width 0.12)) + (fp_line (start 5.6 -1.65) (end 4.35 -1.65) (layer B.SilkS) (width 0.12)) + (fp_line (start 5.6 -1.4) (end 5.6 -1.65) (layer B.SilkS) (width 0.12)) + (fp_line (start 5.85 -1.4) (end 5.6 -1.4) (layer B.SilkS) (width 0.12)) + (fp_line (start 5.85 -1.15) (end 5.85 -1.4) (layer B.SilkS) (width 0.12)) + (pad 1 thru_hole circle (at 0 0 180) (size 2.5 2.5) (drill 1.2) (layers *.Cu *.Mask) (net 1 GND)) - (pad 3 thru_hole circle (at 5 0 90) (size 2.5 2.5) (drill 1.2) (layers *.Cu *.Mask) + (pad 3 thru_hole circle (at 5 0 180) (size 2.5 2.5) (drill 1.2) (layers *.Cu *.Mask) (net 2 +5V)) - (pad 2 thru_hole circle (at 2.5 -5.04 90) (size 2.5 2.5) (drill 1.2) (layers *.Cu *.Mask) + (pad 2 thru_hole circle (at 2.5 5.04 180) (size 2.5 2.5) (drill 1.2) (layers *.Cu *.Mask) (net 7 "Net-(RV2-Pad2)")) (model Potentiometers.3dshapes/Potentiometer_Triwood_RM-065.wrl (at (xyz 0 0 0)) @@ -517,38 +722,126 @@ ) ) - (module Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm (layer F.Cu) (tedit 59650532) (tstamp 5C2BC472) - (at 150.114 83.566 270) + (module Potentiometers:Potentiometer_Triwood_RM-065 (layer B.Cu) (tedit 5882291E) (tstamp 5C2E5E7A) + (at 140.97 81.026 180) + (descr "Potentiometer, Trimmer, RM-065") + (tags "Potentiometer Trimmer RM-065") + (path /5C2EE588) + (fp_text reference RV3 (at 2.54 1.778 90) (layer B.SilkS) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (fp_text value 10k (at 7.5 2.5 90) (layer B.Fab) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) + (fp_arc (start 2.5 2.5) (end 1.1 1.61) (angle -90) (layer B.Fab) (width 0.1)) + (fp_arc (start 2.5 2.5) (end 3.39 3.9) (angle -90) (layer B.Fab) (width 0.1)) + (fp_arc (start 2.5 2.5) (end 2.63 0.85) (angle -90) (layer B.Fab) (width 0.1)) + (fp_arc (start 2.5 2.5) (end 4.15 2.25) (angle -90) (layer B.Fab) (width 0.1)) + (fp_circle (center 2.5 2.5) (end 4.7 0.2) (layer B.Fab) (width 0.1)) + (fp_line (start 6.5 -1.81) (end -1.5 -1.81) (layer B.CrtYd) (width 0.05)) + (fp_line (start 6.5 -1.81) (end 6.5 6.54) (layer B.CrtYd) (width 0.05)) + (fp_line (start -1.5 6.54) (end -1.5 -1.81) (layer B.CrtYd) (width 0.05)) + (fp_line (start -1.5 6.54) (end 6.5 6.54) (layer B.CrtYd) (width 0.05)) + (fp_line (start -0.8 -1.31) (end 5.8 -1.31) (layer B.Fab) (width 0.1)) + (fp_line (start 0.59 -1.56) (end 0.59 -1.31) (layer B.Fab) (width 0.1)) + (fp_line (start -0.55 -1.56) (end 0.59 -1.56) (layer B.Fab) (width 0.1)) + (fp_line (start -0.55 -1.31) (end -0.55 -1.56) (layer B.Fab) (width 0.1)) + (fp_line (start 4.4 -1.56) (end 4.4 -1.31) (layer B.Fab) (width 0.1)) + (fp_line (start 5.55 -1.56) (end 4.4 -1.56) (layer B.Fab) (width 0.1)) + (fp_line (start 5.55 -1.31) (end 5.55 -1.56) (layer B.Fab) (width 0.1)) + (fp_line (start 5.8 4.4) (end 5.8 2.5) (layer B.Fab) (width 0.1)) + (fp_line (start 4.53 5.8) (end 5.8 4.4) (layer B.Fab) (width 0.1)) + (fp_line (start -0.8 4.4) (end -0.8 2.5) (layer B.Fab) (width 0.1)) + (fp_line (start 0.47 5.8) (end -0.8 4.4) (layer B.Fab) (width 0.1)) + (fp_line (start 3.01 2.88) (end 1.99 2.88) (layer B.Fab) (width 0.1)) + (fp_line (start 3.01 2.12) (end 3.01 2.88) (layer B.Fab) (width 0.1)) + (fp_line (start 1.99 2.12) (end 3.01 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 1.99 2.88) (end 1.99 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 2.25 2.12) (end 2.25 0.85) (layer B.Fab) (width 0.1)) + (fp_line (start 2.75 2.12) (end 2.75 0.85) (layer B.Fab) (width 0.1)) + (fp_line (start 1.99 2.75) (end 0.85 2.75) (layer B.Fab) (width 0.1)) + (fp_line (start 1.99 2.25) (end 0.85 2.25) (layer B.Fab) (width 0.1)) + (fp_line (start 3.01 2.75) (end 4.15 2.75) (layer B.Fab) (width 0.1)) + (fp_line (start 3.01 2.25) (end 4.15 2.25) (layer B.Fab) (width 0.1)) + (fp_line (start 0.34 2.12) (end 0.85 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 0.34 2.88) (end 0.34 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 0.85 2.88) (end 0.34 2.88) (layer B.Fab) (width 0.1)) + (fp_line (start 4.66 2.12) (end 4.15 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 4.66 2.88) (end 4.66 2.12) (layer B.Fab) (width 0.1)) + (fp_line (start 4.15 2.88) (end 4.66 2.88) (layer B.Fab) (width 0.1)) + (fp_line (start 1.36 5.8) (end 0.47 5.8) (layer B.Fab) (width 0.1)) + (fp_line (start 4.53 5.8) (end 3.64 5.8) (layer B.Fab) (width 0.1)) + (fp_line (start 1.23 0.47) (end 3.77 0.47) (layer B.Fab) (width 0.1)) + (fp_line (start 5.8 2.5) (end 5.8 1.1) (layer B.Fab) (width 0.1)) + (fp_line (start 5.8 -1.31) (end 5.8 -1.18) (layer B.Fab) (width 0.1)) + (fp_line (start -0.8 2.5) (end -0.8 1.1) (layer B.Fab) (width 0.1)) + (fp_line (start -0.8 -1.31) (end -0.8 -1.18) (layer B.Fab) (width 0.1)) + (fp_line (start 2.75 2.88) (end 2.75 3.64) (layer B.Fab) (width 0.1)) + (fp_line (start 2.25 2.88) (end 2.25 3.64) (layer B.Fab) (width 0.1)) + (fp_line (start -0.8 1.1) (end -0.8 -1.2) (layer B.Fab) (width 0.1)) + (fp_line (start 5.8 -1.2) (end 5.8 1.15) (layer B.Fab) (width 0.1)) + (fp_line (start 0.45 5.9) (end 1.35 5.9) (layer B.SilkS) (width 0.12)) + (fp_line (start -0.9 4.45) (end 0.45 5.9) (layer B.SilkS) (width 0.12)) + (fp_line (start -0.9 1.1) (end -0.9 4.45) (layer B.SilkS) (width 0.12)) + (fp_line (start 5.9 4.4) (end 5.9 1.1) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.55 5.9) (end 5.9 4.4) (layer B.SilkS) (width 0.12)) + (fp_line (start 3.65 5.9) (end 4.55 5.9) (layer B.SilkS) (width 0.12)) + (fp_line (start -0.9 -1.4) (end -0.9 -1.15) (layer B.SilkS) (width 0.12)) + (fp_line (start -0.6 -1.4) (end -0.9 -1.4) (layer B.SilkS) (width 0.12)) + (fp_line (start -0.6 -1.65) (end -0.6 -1.4) (layer B.SilkS) (width 0.12)) + (fp_line (start 0.7 -1.65) (end -0.6 -1.65) (layer B.SilkS) (width 0.12)) + (fp_line (start 0.7 -1.4) (end 0.7 -1.65) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.35 -1.4) (end 0.7 -1.4) (layer B.SilkS) (width 0.12)) + (fp_line (start 4.35 -1.65) (end 4.35 -1.4) (layer B.SilkS) (width 0.12)) + (fp_line (start 5.6 -1.65) (end 4.35 -1.65) (layer B.SilkS) (width 0.12)) + (fp_line (start 5.6 -1.4) (end 5.6 -1.65) (layer B.SilkS) (width 0.12)) + (fp_line (start 5.85 -1.4) (end 5.6 -1.4) (layer B.SilkS) (width 0.12)) + (fp_line (start 5.85 -1.15) (end 5.85 -1.4) (layer B.SilkS) (width 0.12)) + (pad 1 thru_hole circle (at 0 0 180) (size 2.5 2.5) (drill 1.2) (layers *.Cu *.Mask) + (net 1 GND)) + (pad 3 thru_hole circle (at 5 0 180) (size 2.5 2.5) (drill 1.2) (layers *.Cu *.Mask) + (net 2 +5V)) + (pad 2 thru_hole circle (at 2.5 5.04 180) (size 2.5 2.5) (drill 1.2) (layers *.Cu *.Mask) + (net 9 "Net-(RV3-Pad2)")) + (model Potentiometers.3dshapes/Potentiometer_Triwood_RM-065.wrl + (at (xyz 0 0 0)) + (scale (xyz 4 4 4)) + (rotate (xyz 0 0 0)) + ) + ) + + (module Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm (layer B.Cu) (tedit 59650532) (tstamp 5C2E5E90) + (at 149.352 60.198 90) (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row") (tags "Through hole pin header THT 1x02 2.54mm single row") (path /5C2C5D71) - (fp_text reference SW1 (at 0 5.334 270) (layer F.SilkS) - (effects (font (size 1 1) (thickness 0.15))) + (fp_text reference SW1 (at 2.54 -1.27 180) (layer B.SilkS) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (fp_text value SW_SPST (at 0 4.87 270) (layer F.Fab) - (effects (font (size 1 1) (thickness 0.15))) + (fp_text value SW_SPST (at 0 -4.87 90) (layer B.Fab) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (fp_text user %R (at 0 1.27) (layer F.Fab) - (effects (font (size 1 1) (thickness 0.15))) + (fp_text user %R (at 0 -1.27) (layer B.Fab) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05)) - (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05)) - (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer F.CrtYd) (width 0.05)) - (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer F.CrtYd) (width 0.05)) - (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12)) - (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12)) - (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12)) - (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer F.SilkS) (width 0.12)) - (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer F.SilkS) (width 0.12)) - (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer F.SilkS) (width 0.12)) - (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1)) - (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer F.Fab) (width 0.1)) - (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer F.Fab) (width 0.1)) - (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer F.Fab) (width 0.1)) - (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1)) - (pad 2 thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (fp_line (start 1.8 1.8) (end -1.8 1.8) (layer B.CrtYd) (width 0.05)) + (fp_line (start 1.8 -4.35) (end 1.8 1.8) (layer B.CrtYd) (width 0.05)) + (fp_line (start -1.8 -4.35) (end 1.8 -4.35) (layer B.CrtYd) (width 0.05)) + (fp_line (start -1.8 1.8) (end -1.8 -4.35) (layer B.CrtYd) (width 0.05)) + (fp_line (start -1.33 1.33) (end 0 1.33) (layer B.SilkS) (width 0.12)) + (fp_line (start -1.33 0) (end -1.33 1.33) (layer B.SilkS) (width 0.12)) + (fp_line (start -1.33 -1.27) (end 1.33 -1.27) (layer B.SilkS) (width 0.12)) + (fp_line (start 1.33 -1.27) (end 1.33 -3.87) (layer B.SilkS) (width 0.12)) + (fp_line (start -1.33 -1.27) (end -1.33 -3.87) (layer B.SilkS) (width 0.12)) + (fp_line (start -1.33 -3.87) (end 1.33 -3.87) (layer B.SilkS) (width 0.12)) + (fp_line (start -1.27 0.635) (end -0.635 1.27) (layer B.Fab) (width 0.1)) + (fp_line (start -1.27 -3.81) (end -1.27 0.635) (layer B.Fab) (width 0.1)) + (fp_line (start 1.27 -3.81) (end -1.27 -3.81) (layer B.Fab) (width 0.1)) + (fp_line (start 1.27 1.27) (end 1.27 -3.81) (layer B.Fab) (width 0.1)) + (fp_line (start -0.635 1.27) (end 1.27 1.27) (layer B.Fab) (width 0.1)) + (pad 2 thru_hole oval (at 0 -2.54 90) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (net 1 GND)) - (pad 1 thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (pad 1 thru_hole rect (at 0 0 90) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (net 8 "Net-(SW1-Pad1)")) (model ${KISYS3DMOD}/Pin_Headers.3dshapes/Pin_Header_Straight_1x02_Pitch2.54mm.wrl (at (xyz 0 0 0)) @@ -557,16 +850,16 @@ ) ) - (module Housings_SOIC:SOIJ-8_5.3x5.3mm_Pitch1.27mm (layer F.Cu) (tedit 58CC8F64) (tstamp 5C2BC48F) - (at 148.829763 89.109294 180) + (module Housings_SOIC:SOIJ-8_5.3x5.3mm_Pitch1.27mm (layer F.Cu) (tedit 58CC8F64) (tstamp 5C2E5EAD) + (at 148.082 68.326) (descr "8-Lead Plastic Small Outline (SM) - Medium, 5.28 mm Body [SOIC] (see Microchip Packaging Specification 00000049BS.pdf)") (tags "SOIC 1.27") (path /5C2BB273) (attr smd) - (fp_text reference U1 (at -0.268237 -1.822706 180) (layer F.SilkS) + (fp_text reference U1 (at -1.016 -3.68) (layer F.SilkS) (effects (font (size 1 1) (thickness 0.15))) ) - (fp_text value ATtiny85 (at 0 3.68 180) (layer F.Fab) + (fp_text value ATtiny85 (at 0 3.68) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) (fp_line (start -2.75 -2.55) (end -4.5 -2.55) (layer F.SilkS) (width 0.15)) @@ -585,23 +878,24 @@ (fp_line (start 2.65 2.65) (end -2.65 2.65) (layer F.Fab) (width 0.15)) (fp_line (start 2.65 -2.65) (end 2.65 2.65) (layer F.Fab) (width 0.15)) (fp_line (start -1.65 -2.65) (end 2.65 -2.65) (layer F.Fab) (width 0.15)) - (fp_text user %R (at 0 0 180) (layer F.Fab) + (fp_text user %R (at 0 0) (layer F.Fab) (effects (font (size 1 1) (thickness 0.15))) ) - (pad 8 smd rect (at 3.65 -1.905 180) (size 1.7 0.65) (layers F.Cu F.Paste F.Mask) + (pad 8 smd rect (at 3.65 -1.905) (size 1.7 0.65) (layers F.Cu F.Paste F.Mask) (net 2 +5V)) - (pad 7 smd rect (at 3.65 -0.635 180) (size 1.7 0.65) (layers F.Cu F.Paste F.Mask) + (pad 7 smd rect (at 3.65 -0.635) (size 1.7 0.65) (layers F.Cu F.Paste F.Mask) (net 6 "Net-(RV1-Pad2)")) - (pad 6 smd rect (at 3.65 0.635 180) (size 1.7 0.65) (layers F.Cu F.Paste F.Mask) + (pad 6 smd rect (at 3.65 0.635) (size 1.7 0.65) (layers F.Cu F.Paste F.Mask) (net 8 "Net-(SW1-Pad1)")) - (pad 5 smd rect (at 3.65 1.905 180) (size 1.7 0.65) (layers F.Cu F.Paste F.Mask) + (pad 5 smd rect (at 3.65 1.905) (size 1.7 0.65) (layers F.Cu F.Paste F.Mask) (net 3 "Net-(J1-Pad3)")) - (pad 4 smd rect (at -3.65 1.905 180) (size 1.7 0.65) (layers F.Cu F.Paste F.Mask) + (pad 4 smd rect (at -3.65 1.905) (size 1.7 0.65) (layers F.Cu F.Paste F.Mask) (net 1 GND)) - (pad 3 smd rect (at -3.65 0.635 180) (size 1.7 0.65) (layers F.Cu F.Paste F.Mask) + (pad 3 smd rect (at -3.65 0.635) (size 1.7 0.65) (layers F.Cu F.Paste F.Mask) (net 7 "Net-(RV2-Pad2)")) - (pad 2 smd rect (at -3.65 -0.635 180) (size 1.7 0.65) (layers F.Cu F.Paste F.Mask)) - (pad 1 smd rect (at -3.65 -1.905 180) (size 1.7 0.65) (layers F.Cu F.Paste F.Mask) + (pad 2 smd rect (at -3.65 -0.635) (size 1.7 0.65) (layers F.Cu F.Paste F.Mask) + (net 9 "Net-(RV3-Pad2)")) + (pad 1 smd rect (at -3.65 -1.905) (size 1.7 0.65) (layers F.Cu F.Paste F.Mask) (net 5 "Net-(R1-Pad2)")) (model ${KISYS3DMOD}/Housings_SOIC.3dshapes/SOIJ-8_5.3x5.3mm_Pitch1.27mm.wrl (at (xyz 0 0 0)) @@ -610,71 +904,111 @@ ) ) - (gr_line (start 132.334 95.25) (end 132.334 81.534) (layer Edge.Cuts) (width 0.15)) - (gr_line (start 162.814 95.25) (end 132.334 95.25) (layer Edge.Cuts) (width 0.15)) - (gr_line (start 162.814 81.534) (end 162.814 95.25) (layer Edge.Cuts) (width 0.15)) - (gr_line (start 132.334 81.534) (end 162.814 81.534) (layer Edge.Cuts) (width 0.15)) + (gr_line (start 133.604 85.852) (end 133.604 54.864) (layer Edge.Cuts) (width 0.15)) + (gr_line (start 172.466 85.852) (end 133.604 85.852) (layer Edge.Cuts) (width 0.15)) + (gr_line (start 172.466 54.864) (end 172.466 85.852) (layer Edge.Cuts) (width 0.15)) + (gr_line (start 133.604 54.864) (end 172.466 54.864) (layer Edge.Cuts) (width 0.15)) - (segment (start 136.339057 88.392) (end 137.145763 87.585294) (width 0.5) (layer F.Cu) (net 1)) - (segment (start 133.858 88.392) (end 136.339057 88.392) (width 0.5) (layer F.Cu) (net 1)) - (segment (start 139.7 84.916) (end 139.7 83.566) (width 0.5) (layer F.Cu) (net 1)) - (segment (start 139.7 86.798823) (end 139.7 84.916) (width 0.5) (layer F.Cu) (net 1)) - (segment (start 138.913529 87.585294) (end 139.7 86.798823) (width 0.5) (layer F.Cu) (net 1)) - (segment (start 137.145763 87.585294) (end 138.913529 87.585294) (width 0.5) (layer F.Cu) (net 1)) - (segment (start 139.7 83.566) (end 147.574 83.566) (width 0.5) (layer F.Cu) (net 1)) - (segment (start 159.227999 82.265999) (end 160.528 83.566) (width 0.5) (layer F.Cu) (net 1)) - (segment (start 147.574 83.566) (end 148.874001 82.265999) (width 0.5) (layer F.Cu) (net 1)) - (segment (start 147.789763 92.327294) (end 147.789763 93.427294) (width 0.3) (layer F.Cu) (net 1) (status 1000000)) - (segment (start 147.789763 91.369294) (end 147.789763 92.327294) (width 0.3) (layer F.Cu) (net 1) (status 1000000)) - (segment (start 151.954763 87.204294) (end 147.789763 91.369294) (width 0.3) (layer F.Cu) (net 1) (status 1000000)) - (segment (start 152.479763 87.204294) (end 151.954763 87.204294) (width 0.3) (layer F.Cu) (net 1) (status 1000000)) - (segment (start 161.763762 91.415295) (end 160.513763 92.665294) (width 0.5) (layer F.Cu) (net 1)) - (segment (start 162.213764 90.965293) (end 161.763762 91.415295) (width 0.5) (layer F.Cu) (net 1)) - (segment (start 162.213764 83.901764) (end 162.213764 90.965293) (width 0.5) (layer F.Cu) (net 1)) - (segment (start 161.878 83.566) (end 162.213764 83.901764) (width 0.5) (layer F.Cu) (net 1)) - (segment (start 160.528 83.566) (end 161.878 83.566) (width 0.5) (layer F.Cu) (net 1)) - (segment (start 156.718 84.072002) (end 156.718 82.265999) (width 0.3) (layer F.Cu) (net 1)) - (segment (start 153.585708 87.204294) (end 156.718 84.072002) (width 0.3) (layer F.Cu) (net 1)) - (segment (start 152.479763 87.204294) (end 153.585708 87.204294) (width 0.3) (layer F.Cu) (net 1)) - (segment (start 148.874001 82.265999) (end 156.718 82.265999) (width 0.5) (layer F.Cu) (net 1)) - (segment (start 156.718 82.265999) (end 159.227999 82.265999) (width 0.5) (layer F.Cu) (net 1)) - (segment (start 135.511294 92.585294) (end 133.858 90.932) (width 0.5) (layer F.Cu) (net 2)) - (segment (start 137.145763 92.585294) (end 135.511294 92.585294) (width 0.5) (layer F.Cu) (net 2)) - (segment (start 137.987763 93.427294) (end 137.145763 92.585294) (width 0.5) (layer F.Cu) (net 2)) - (segment (start 144.789763 93.427294) (end 137.987763 93.427294) (width 0.5) (layer F.Cu) (net 2)) - (segment (start 157.988 85.139531) (end 160.513763 87.665294) (width 0.5) (layer F.Cu) (net 2)) - (segment (start 157.988 83.566) (end 157.988 85.139531) (width 0.5) (layer F.Cu) (net 2)) - (segment (start 144.789763 91.404294) (end 145.179763 91.014294) (width 0.5) (layer F.Cu) (net 2)) - (segment (start 144.789763 93.427294) (end 144.789763 91.404294) (width 0.5) (layer F.Cu) (net 2)) - (segment (start 160.513763 87.665294) (end 157.988 90.191057) (width 0.5) (layer F.Cu) (net 2)) - (segment (start 157.988 90.191057) (end 157.988 91.694) (width 0.5) (layer F.Cu) (net 2)) - (segment (start 144.789763 94.727294) (end 144.804469 94.742) (width 0.5) (layer F.Cu) (net 2)) - (segment (start 144.789763 93.427294) (end 144.789763 94.727294) (width 0.5) (layer F.Cu) (net 2)) - (segment (start 144.789763 94.727294) (end 152.385294 94.727294) (width 0.5) (layer F.Cu) (net 2)) - (segment (start 157.988 91.694) (end 154.954706 94.727294) (width 0.5) (layer F.Cu) (net 2)) - (segment (start 153.15 94.715294) (end 153.162 94.727294) (width 0.3) (layer F.Cu) (net 2)) - (segment (start 153.15 92.964) (end 153.15 94.715294) (width 0.3) (layer F.Cu) (net 2)) - (segment (start 154.954706 94.727294) (end 153.162 94.727294) (width 0.5) (layer F.Cu) (net 2)) - (segment (start 153.162 94.727294) (end 152.385294 94.727294) (width 0.5) (layer F.Cu) (net 2)) - (segment (start 150.607625 87.204294) (end 145.179763 87.204294) (width 0.3) (layer F.Cu) (net 3)) - (segment (start 155.448 83.566) (end 154.245919 83.566) (width 0.3) (layer F.Cu) (net 3)) - (segment (start 154.245919 83.566) (end 150.607625 87.204294) (width 0.3) (layer F.Cu) (net 3)) - (segment (start 135.957919 83.566) (end 137.16 83.566) (width 0.5) (layer F.Cu) (net 4)) - (segment (start 134.744 83.566) (end 135.957919 83.566) (width 0.5) (layer F.Cu) (net 4)) - (segment (start 133.858 84.452) (end 134.744 83.566) (width 0.5) (layer F.Cu) (net 4)) - (segment (start 133.858 85.852) (end 133.858 84.452) (width 0.5) (layer F.Cu) (net 4)) - (segment (start 151.65 91.844057) (end 152.479763 91.014294) (width 0.3) (layer F.Cu) (net 5)) - (segment (start 151.65 92.964) (end 151.65 91.844057) (width 0.3) (layer F.Cu) (net 5)) - (segment (start 142.526763 89.744294) (end 142.185763 90.085294) (width 0.3) (layer F.Cu) (net 6)) - (segment (start 145.179763 89.744294) (end 142.526763 89.744294) (width 0.3) (layer F.Cu) (net 6)) - (segment (start 153.782763 88.474294) (end 155.473763 90.165294) (width 0.3) (layer F.Cu) (net 7)) - (segment (start 152.479763 88.474294) (end 153.782763 88.474294) (width 0.3) (layer F.Cu) (net 7)) - (segment (start 144.029763 88.474294) (end 143.439469 87.884) (width 0.3) (layer F.Cu) (net 8)) - (segment (start 145.179763 88.474294) (end 144.029763 88.474294) (width 0.3) (layer F.Cu) (net 8)) - (segment (start 143.439469 87.884) (end 143.439469 86.430531) (width 0.3) (layer F.Cu) (net 8)) - (segment (start 143.439469 86.430531) (end 144.272 85.598) (width 0.3) (layer F.Cu) (net 8)) - (segment (start 150.114 84.716) (end 150.114 83.566) (width 0.3) (layer F.Cu) (net 8)) - (segment (start 149.232 85.598) (end 150.114 84.716) (width 0.3) (layer F.Cu) (net 8)) - (segment (start 144.272 85.598) (end 149.232 85.598) (width 0.3) (layer F.Cu) (net 8)) + (segment (start 136.144 61.548) (end 136.144 60.198) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 136.144 68.356) (end 136.144 61.548) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 136.622 68.834) (end 136.144 68.356) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 137.922 68.834) (end 136.622 68.834) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 159.766 81.026) (end 157.48 78.74) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 157.48 78.74) (end 152.654 78.74) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 152.654 78.74) (end 150.368 81.026) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 150.368 81.026) (end 148.082 78.74) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 143.256 78.74) (end 140.97 81.026) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 159.766 79.258234) (end 159.766 81.026) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 159.766 73.46) (end 159.766 79.258234) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 157.964 71.658) (end 159.766 73.46) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 157.964 70.358) (end 157.964 71.658) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 144.432 76.614) (end 146.558 78.74) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 144.432 70.231) (end 144.432 76.614) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 148.082 78.74) (end 146.558 78.74) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 146.558 78.74) (end 143.256 78.74) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 136.144 58.848) (end 137.842 57.15) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 136.144 60.198) (end 136.144 58.848) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 137.842 57.15) (end 145.288 57.15) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 146.812 58.674) (end 146.812 60.198) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 145.288 57.15) (end 146.812 58.674) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 146.812 58.674) (end 148.336 57.15) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 148.336 57.15) (end 153.67 57.15) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 155.194 58.674) (end 155.194 60.198) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 153.67 57.15) (end 155.194 58.674) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 166.648 63.016) (end 166.878 63.246) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 166.648 59.944) (end 166.648 63.016) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 155.194 61.548) (end 155.876 62.23) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 155.194 60.198) (end 155.194 61.548) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 155.876 62.23) (end 160.02 62.23) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 162.306 59.944) (end 166.648 59.944) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 160.02 62.23) (end 162.306 59.944) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 166.878 64.518792) (end 165.356792 66.04) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 166.878 63.246) (end 166.878 64.518792) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 165.356792 66.04) (end 159.258 66.04) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 157.964 67.334) (end 157.964 70.358) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 159.258 66.04) (end 157.964 67.334) (width 0.5) (layer F.Cu) (net 1)) + (segment (start 137.922 60.96) (end 138.684 60.198) (width 0.5) (layer F.Cu) (net 2)) + (segment (start 137.922 66.334) (end 137.922 60.96) (width 0.5) (layer F.Cu) (net 2)) + (segment (start 154.964 69.258) (end 154.964 70.358) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 154.964 68.503) (end 154.964 69.258) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 152.882 66.421) (end 154.964 68.503) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 151.732 66.421) (end 152.882 66.421) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 154.766 81.026) (end 152.48 83.312) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 147.654 83.312) (end 145.368 81.026) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 152.48 83.312) (end 147.654 83.312) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 145.368 81.026) (end 143.082 83.312) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 138.256 83.312) (end 135.97 81.026) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 143.082 83.312) (end 138.256 83.312) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 140.434 66.334) (end 140.474 66.294) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 137.922 66.334) (end 140.434 66.334) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 137.922 66.334) (end 139.7 68.112) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 139.7 68.112) (end 139.7 70.612) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 135.97 74.342) (end 135.97 81.026) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 139.7 70.612) (end 135.97 74.342) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 140.462 58.42) (end 138.684 60.198) (width 0.5) (layer F.Cu) (net 2)) + (segment (start 142.494 58.42) (end 140.462 58.42) (width 0.5) (layer F.Cu) (net 2)) + (segment (start 147.32 63.246) (end 142.494 58.42) (width 0.5) (layer F.Cu) (net 2)) + (segment (start 149.182 63.246) (end 149.098 63.246) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 151.732 65.796) (end 149.182 63.246) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 151.732 66.421) (end 151.732 65.796) (width 0.3) (layer F.Cu) (net 2)) + (segment (start 164.338 63.246) (end 149.098 63.246) (width 0.5) (layer F.Cu) (net 2)) + (segment (start 149.098 63.246) (end 147.32 63.246) (width 0.5) (layer F.Cu) (net 2)) + (segment (start 151.257 70.231) (end 151.732 70.231) (width 0.3) (layer F.Cu) (net 3)) + (segment (start 151.732 70.231) (end 149.225 70.231) (width 0.3) (layer F.Cu) (net 3)) + (segment (start 149.225 70.231) (end 146.304 67.31) (width 0.3) (layer F.Cu) (net 3)) + (segment (start 146.304 65.278) (end 141.224 60.198) (width 0.3) (layer F.Cu) (net 3)) + (segment (start 146.304 67.31) (end 146.304 65.278) (width 0.3) (layer F.Cu) (net 3)) + (segment (start 169.648 63.016) (end 169.418 63.246) (width 0.5) (layer F.Cu) (net 4)) + (segment (start 169.648 59.944) (end 169.648 63.016) (width 0.5) (layer F.Cu) (net 4)) + (segment (start 158.583999 59.348001) (end 157.734 60.198) (width 0.5) (layer F.Cu) (net 4)) + (segment (start 160.782 57.15) (end 158.583999 59.348001) (width 0.5) (layer F.Cu) (net 4)) + (segment (start 168.154 57.15) (end 160.782 57.15) (width 0.5) (layer F.Cu) (net 4)) + (segment (start 169.648 58.644) (end 168.154 57.15) (width 0.5) (layer F.Cu) (net 4)) + (segment (start 169.648 59.944) (end 169.648 58.644) (width 0.5) (layer F.Cu) (net 4)) + (segment (start 144.305 66.294) (end 144.432 66.421) (width 0.3) (layer F.Cu) (net 5)) + (segment (start 141.974 66.294) (end 144.305 66.294) (width 0.3) (layer F.Cu) (net 5)) + (segment (start 153.416 72.136) (end 157.266 75.986) (width 0.3) (layer F.Cu) (net 6)) + (segment (start 153.416 68.225) (end 153.416 72.136) (width 0.3) (layer F.Cu) (net 6)) + (segment (start 152.882 67.691) (end 153.416 68.225) (width 0.3) (layer F.Cu) (net 6)) + (segment (start 151.732 67.691) (end 152.882 67.691) (width 0.3) (layer F.Cu) (net 6)) + (segment (start 144.957 68.961) (end 144.432 68.961) (width 0.3) (layer F.Cu) (net 7)) + (segment (start 147.868 75.986) (end 147.868 71.872) (width 0.3) (layer F.Cu) (net 7)) + (segment (start 144.432 68.961) (end 146.177 68.961) (width 0.3) (layer F.Cu) (net 7)) + (segment (start 147.868 70.652) (end 147.868 71.872) (width 0.3) (layer F.Cu) (net 7)) + (segment (start 146.177 68.961) (end 147.868 70.652) (width 0.3) (layer F.Cu) (net 7)) + (via (at 148.844 64.516) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 8)) + (segment (start 148.844 66.598) (end 148.844 64.516) (width 0.3) (layer F.Cu) (net 8)) + (segment (start 151.732 68.961) (end 151.207 68.961) (width 0.3) (layer F.Cu) (net 8)) + (via (at 152.4 60.198) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 8)) + (segment (start 148.844 64.516) (end 148.844 63.754) (width 0.3) (layer B.Cu) (net 8)) + (segment (start 148.844 63.754) (end 152.4 60.198) (width 0.3) (layer B.Cu) (net 8)) + (segment (start 152.4 60.198) (end 149.352 60.198) (width 0.3) (layer F.Cu) (net 8)) + (segment (start 151.732 68.961) (end 150.241 68.961) (width 0.3) (layer F.Cu) (net 8)) + (segment (start 148.844 67.564) (end 148.844 66.598) (width 0.3) (layer F.Cu) (net 8)) + (segment (start 150.241 68.961) (end 148.844 67.564) (width 0.3) (layer F.Cu) (net 8)) + (segment (start 144.432 67.691) (end 143.129 67.691) (width 0.3) (layer F.Cu) (net 9)) + (segment (start 143.129 67.691) (end 141.224 69.596) (width 0.3) (layer F.Cu) (net 9)) + (segment (start 141.224 73.232) (end 138.47 75.986) (width 0.3) (layer F.Cu) (net 9)) + (segment (start 141.224 69.596) (end 141.224 73.232) (width 0.3) (layer F.Cu) (net 9)) ) diff --git a/kicad/RailroadSwitch/RailroadSwitch.net b/kicad/RailroadSwitch/RailroadSwitch.net index 9ec16f5..d63ce01 100644 --- a/kicad/RailroadSwitch/RailroadSwitch.net +++ b/kicad/RailroadSwitch/RailroadSwitch.net @@ -1,7 +1,7 @@ (export (version D) (design (source P:\Electronics\RailroadSwitch\kicad\RailroadSwitch\RailroadSwitch.sch) - (date "1-1-2019 19:51:10") + (date "3-1-2019 19:49:40") (tool "Eeschema (5.0.1)-3") (sheet (number 1) (name /) (tstamps /) (title_block @@ -76,7 +76,28 @@ (datasheet http://www.st.com/content/ccc/resource/technical/document/datasheet/41/4f/b3/b0/12/d4/47/88/CD00000444.pdf/files/CD00000444.pdf/jcr:content/translations/en.CD00000444.pdf) (libsource (lib Regulator_Linear) (part L7805) (description "Positive 1.5A 35V Linear Regulator, Fixed Output 5V, TO-220/TO-263/TO-252")) (sheetpath (names /) (tstamps /)) - (tstamp 5C2CDA60))) + (tstamp 5C2CDA60)) + (comp (ref C2) + (value 22pF) + (footprint Capacitors_SMD:C_1206) + (datasheet ~) + (libsource (lib Device) (part C) (description "Unpolarized capacitor")) + (sheetpath (names /) (tstamps /)) + (tstamp 5C2E5A00)) + (comp (ref RV3) + (value 10k) + (footprint Potentiometers:Potentiometer_Triwood_RM-065) + (datasheet ~) + (libsource (lib Device) (part R_POT) (description Potentiometer)) + (sheetpath (names /) (tstamps /)) + (tstamp 5C2EE588)) + (comp (ref C3) + (value 470uF) + (footprint Capacitors_ThroughHole:CP_Radial_D6.3mm_P2.50mm) + (datasheet ~) + (libsource (lib Device) (part C) (description "Unpolarized capacitor")) + (sheetpath (names /) (tstamps /)) + (tstamp 5C2EF195))) (libparts (libpart (lib Connector) (part Conn_01x02_Male) (description "Generic connector, single row, 01x02, script generated (kicad-library-utils/schlib/autogen/connector/)") @@ -202,40 +223,47 @@ (library (logical Switch) (uri "C:\\Program Files\\KiCad\\share\\kicad\\library/Switch.lib"))) (nets - (net (code 1) (name "Net-(J1-Pad3)") - (node (ref J1) (pin 3)) - (node (ref U1) (pin 5))) - (net (code 2) (name GND) - (node (ref RV2) (pin 1)) - (node (ref RV1) (pin 1)) - (node (ref U2) (pin 2)) - (node (ref C1) (pin 2)) - (node (ref SW1) (pin 2)) - (node (ref J2) (pin 1)) + (net (code 1) (name GND) (node (ref J1) (pin 1)) - (node (ref U1) (pin 4))) - (net (code 3) (name "Net-(SW1-Pad1)") - (node (ref SW1) (pin 1)) - (node (ref U1) (pin 6))) - (net (code 4) (name "Net-(RV2-Pad2)") - (node (ref U1) (pin 3)) - (node (ref RV2) (pin 2))) - (net (code 5) (name "Net-(RV1-Pad2)") - (node (ref U1) (pin 7)) - (node (ref RV1) (pin 2))) - (net (code 6) (name +12V) - (node (ref U2) (pin 1)) - (node (ref J2) (pin 2))) - (net (code 7) (name "Net-(U1-Pad2)") - (node (ref U1) (pin 2))) - (net (code 8) (name +5V) + (node (ref C3) (pin 1)) + (node (ref U1) (pin 4)) + (node (ref RV2) (pin 1)) + (node (ref C1) (pin 2)) + (node (ref RV3) (pin 1)) + (node (ref SW1) (pin 2)) + (node (ref RV1) (pin 1)) + (node (ref C2) (pin 2)) + (node (ref U2) (pin 2)) + (node (ref J2) (pin 1))) + (net (code 2) (name +5V) + (node (ref R1) (pin 1)) + (node (ref C1) (pin 1)) (node (ref RV1) (pin 3)) (node (ref RV2) (pin 3)) (node (ref J1) (pin 2)) + (node (ref RV3) (pin 3)) + (node (ref C3) (pin 2)) (node (ref U2) (pin 3)) - (node (ref R1) (pin 1)) - (node (ref C1) (pin 1)) (node (ref U1) (pin 8))) - (net (code 9) (name "Net-(R1-Pad2)") + (net (code 3) (name +12V) + (node (ref J2) (pin 2)) + (node (ref C2) (pin 1)) + (node (ref U2) (pin 1))) + (net (code 4) (name "Net-(J1-Pad3)") + (node (ref U1) (pin 5)) + (node (ref J1) (pin 3))) + (net (code 5) (name "Net-(RV3-Pad2)") + (node (ref U1) (pin 2)) + (node (ref RV3) (pin 2))) + (net (code 6) (name "Net-(RV2-Pad2)") + (node (ref RV2) (pin 2)) + (node (ref U1) (pin 3))) + (net (code 7) (name "Net-(R1-Pad2)") (node (ref R1) (pin 2)) - (node (ref U1) (pin 1))))) \ No newline at end of file + (node (ref U1) (pin 1))) + (net (code 8) (name "Net-(RV1-Pad2)") + (node (ref U1) (pin 7)) + (node (ref RV1) (pin 2))) + (net (code 9) (name "Net-(SW1-Pad1)") + (node (ref U1) (pin 6)) + (node (ref SW1) (pin 1))))) \ No newline at end of file diff --git a/kicad/RailroadSwitch/RailroadSwitch.sch b/kicad/RailroadSwitch/RailroadSwitch.sch index 80c9e48..3def67a 100644 --- a/kicad/RailroadSwitch/RailroadSwitch.sch +++ b/kicad/RailroadSwitch/RailroadSwitch.sch @@ -65,332 +65,406 @@ Wire Wire Line $Comp L MCU_Microchip_ATtiny:ATtiny85-20SU U1 U 1 1 5C2BB273 -P 5850 3800 -F 0 "U1" H 5320 3846 50 0000 R CNN -F 1 "ATtiny85" H 5320 3755 50 0000 R CNN -F 2 "Housings_SOIC:SOIJ-8_5.3x5.3mm_Pitch1.27mm" H 5850 3800 50 0001 C CIN -F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf" H 5850 3800 50 0001 C CNN - 1 5850 3800 +P 5300 4350 +F 0 "U1" H 4770 4396 50 0000 R CNN +F 1 "ATtiny85" H 4770 4305 50 0000 R CNN +F 2 "Housings_SOIC:SOIJ-8_5.3x5.3mm_Pitch1.27mm" H 5300 4350 50 0001 C CIN +F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf" H 5300 4350 50 0001 C CNN + 1 5300 4350 1 0 0 -1 $EndComp $Comp L Device:C C1 U 1 1 5C2C52A2 -P 4450 3800 -F 0 "C1" H 4565 3846 50 0000 L CNN -F 1 "100nF" H 4565 3755 50 0000 L CNN -F 2 "Capacitors_SMD:C_1206" H 4488 3650 50 0001 C CNN -F 3 "~" H 4450 3800 50 0001 C CNN - 1 4450 3800 +P 3900 4350 +F 0 "C1" H 4015 4396 50 0000 L CNN +F 1 "100nF" H 4015 4305 50 0000 L CNN +F 2 "Capacitors_SMD:C_1206" H 3938 4200 50 0001 C CNN +F 3 "~" H 3900 4350 50 0001 C CNN + 1 3900 4350 1 0 0 -1 $EndComp Wire Wire Line - 5850 3200 5850 3050 + 5300 3750 5300 3600 Wire Wire Line - 5850 3050 4450 3050 + 5300 3600 3900 3600 Wire Wire Line - 4450 3050 4450 3650 + 3900 3600 3900 4200 Wire Wire Line - 5850 4400 5850 4500 + 5300 4950 5300 5050 Wire Wire Line - 5850 4500 4450 4500 + 5300 5050 3900 5050 Wire Wire Line - 4450 4500 4450 3950 + 3900 5050 3900 4500 $Comp L Device:R R1 U 1 1 5C2C5686 -P 6650 4250 -F 0 "R1" H 6580 4204 50 0000 R CNN -F 1 "10k" H 6580 4295 50 0000 R CNN -F 2 "Resistors_SMD:R_0603" V 6580 4250 50 0001 C CNN -F 3 "~" H 6650 4250 50 0001 C CNN - 1 6650 4250 +P 6100 4800 +F 0 "R1" H 6030 4754 50 0000 R CNN +F 1 "10k" H 6030 4845 50 0000 R CNN +F 2 "Resistors_SMD:R_0603" V 6030 4800 50 0001 C CNN +F 3 "~" H 6100 4800 50 0001 C CNN + 1 6100 4800 -1 0 0 1 $EndComp $Comp L power:+5V #PWR05 U 1 1 5C2C5834 -P 6650 4550 -F 0 "#PWR05" H 6650 4400 50 0001 C CNN -F 1 "+5V" H 6665 4723 50 0000 C CNN -F 2 "" H 6650 4550 50 0001 C CNN -F 3 "" H 6650 4550 50 0001 C CNN - 1 6650 4550 +P 6100 5100 +F 0 "#PWR05" H 6100 4950 50 0001 C CNN +F 1 "+5V" H 6115 5273 50 0000 C CNN +F 2 "" H 6100 5100 50 0001 C CNN +F 3 "" H 6100 5100 50 0001 C CNN + 1 6100 5100 -1 0 0 1 $EndComp Wire Wire Line - 6450 4000 6650 4000 + 5900 4550 6100 4550 Wire Wire Line - 6650 4000 6650 4100 + 6100 4550 6100 4650 Wire Wire Line - 6650 4400 6650 4550 + 6100 4950 6100 5100 $Comp L Device:R_POT RV2 U 1 1 5C2C5A17 -P 7400 3900 -F 0 "RV2" H 7331 3854 50 0000 R CNN -F 1 "10k" H 7331 3945 50 0000 R CNN -F 2 "Potentiometers:Potentiometer_Triwood_RM-065" H 7400 3900 50 0001 C CNN -F 3 "~" H 7400 3900 50 0001 C CNN - 1 7400 3900 +P 6650 4900 +F 0 "RV2" H 6581 4854 50 0000 R CNN +F 1 "10k" H 6581 4945 50 0000 R CNN +F 2 "Potentiometers:Potentiometer_Triwood_RM-065" H 6650 4900 50 0001 C CNN +F 3 "~" H 6650 4900 50 0001 C CNN + 1 6650 4900 -1 0 0 1 $EndComp $Comp L Device:R_POT RV1 U 1 1 5C2C5AE5 -P 7850 3400 -F 0 "RV1" H 7781 3354 50 0000 R CNN -F 1 "10k" H 7781 3445 50 0000 R CNN -F 2 "Potentiometers:Potentiometer_Triwood_RM-065" H 7850 3400 50 0001 C CNN -F 3 "~" H 7850 3400 50 0001 C CNN - 1 7850 3400 +P 7300 3950 +F 0 "RV1" H 7231 3904 50 0000 R CNN +F 1 "10k" H 7231 3995 50 0000 R CNN +F 2 "Potentiometers:Potentiometer_Triwood_RM-065" H 7300 3950 50 0001 C CNN +F 3 "~" H 7300 3950 50 0001 C CNN + 1 7300 3950 -1 0 0 1 $EndComp $Comp L Switch:SW_SPST SW1 U 1 1 5C2C5D71 -P 7200 3150 -F 0 "SW1" H 7200 3385 50 0000 C CNN -F 1 "SW_SPST" H 7200 3294 50 0000 C CNN -F 2 "Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm" H 7200 3150 50 0001 C CNN -F 3 "" H 7200 3150 50 0001 C CNN - 1 7200 3150 +P 6650 3700 +F 0 "SW1" H 6650 3935 50 0000 C CNN +F 1 "SW_SPST" H 6650 3844 50 0000 C CNN +F 2 "Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm" H 6650 3700 50 0001 C CNN +F 3 "" H 6650 3700 50 0001 C CNN + 1 6650 3700 1 0 0 -1 $EndComp $Comp L power:+5V #PWR04 U 1 1 5C2C60DC -P 5850 2900 -F 0 "#PWR04" H 5850 2750 50 0001 C CNN -F 1 "+5V" H 5865 3073 50 0000 C CNN -F 2 "" H 5850 2900 50 0001 C CNN -F 3 "" H 5850 2900 50 0001 C CNN - 1 5850 2900 +P 5300 3450 +F 0 "#PWR04" H 5300 3300 50 0001 C CNN +F 1 "+5V" H 5315 3623 50 0000 C CNN +F 2 "" H 5300 3450 50 0001 C CNN +F 3 "" H 5300 3450 50 0001 C CNN + 1 5300 3450 1 0 0 -1 $EndComp Wire Wire Line - 5850 2900 5850 3050 -Connection ~ 5850 3050 + 5300 3450 5300 3600 +Connection ~ 5300 3600 $Comp L power:GND #PWR06 U 1 1 5C2C61DC -P 5850 4650 -F 0 "#PWR06" H 5850 4400 50 0001 C CNN -F 1 "GND" H 5855 4477 50 0000 C CNN -F 2 "" H 5850 4650 50 0001 C CNN -F 3 "" H 5850 4650 50 0001 C CNN - 1 5850 4650 +P 5300 5200 +F 0 "#PWR06" H 5300 4950 50 0001 C CNN +F 1 "GND" H 5305 5027 50 0000 C CNN +F 2 "" H 5300 5200 50 0001 C CNN +F 3 "" H 5300 5200 50 0001 C CNN + 1 5300 5200 1 0 0 -1 $EndComp Wire Wire Line - 5850 4500 5850 4650 -Connection ~ 5850 4500 + 5300 5050 5300 5200 +Connection ~ 5300 5050 $Comp L power:+5V #PWR010 U 1 1 5C2C8DBC -P 7400 3700 -F 0 "#PWR010" H 7400 3550 50 0001 C CNN -F 1 "+5V" H 7415 3873 50 0000 C CNN -F 2 "" H 7400 3700 50 0001 C CNN -F 3 "" H 7400 3700 50 0001 C CNN - 1 7400 3700 +P 6650 4750 +F 0 "#PWR010" H 6650 4600 50 0001 C CNN +F 1 "+5V" H 6665 4923 50 0000 C CNN +F 2 "" H 6650 4750 50 0001 C CNN +F 3 "" H 6650 4750 50 0001 C CNN + 1 6650 4750 1 0 0 -1 $EndComp $Comp L power:+5V #PWR08 U 1 1 5C2C8DE7 -P 7850 3200 -F 0 "#PWR08" H 7850 3050 50 0001 C CNN -F 1 "+5V" H 7865 3373 50 0000 C CNN -F 2 "" H 7850 3200 50 0001 C CNN -F 3 "" H 7850 3200 50 0001 C CNN - 1 7850 3200 +P 7300 3800 +F 0 "#PWR08" H 7300 3650 50 0001 C CNN +F 1 "+5V" H 7315 3973 50 0000 C CNN +F 2 "" H 7300 3800 50 0001 C CNN +F 3 "" H 7300 3800 50 0001 C CNN + 1 7300 3800 1 0 0 -1 $EndComp $Comp L power:GND #PWR011 U 1 1 5C2C8E02 -P 7400 4100 -F 0 "#PWR011" H 7400 3850 50 0001 C CNN -F 1 "GND" H 7405 3927 50 0000 C CNN -F 2 "" H 7400 4100 50 0001 C CNN -F 3 "" H 7400 4100 50 0001 C CNN - 1 7400 4100 +P 6650 5050 +F 0 "#PWR011" H 6650 4800 50 0001 C CNN +F 1 "GND" H 6655 4877 50 0000 C CNN +F 2 "" H 6650 5050 50 0001 C CNN +F 3 "" H 6650 5050 50 0001 C CNN + 1 6650 5050 1 0 0 -1 $EndComp $Comp L power:GND #PWR09 U 1 1 5C2C8E1D -P 7850 3600 -F 0 "#PWR09" H 7850 3350 50 0001 C CNN -F 1 "GND" H 7855 3427 50 0000 C CNN -F 2 "" H 7850 3600 50 0001 C CNN -F 3 "" H 7850 3600 50 0001 C CNN - 1 7850 3600 +P 7300 4100 +F 0 "#PWR09" H 7300 3850 50 0001 C CNN +F 1 "GND" H 7305 3927 50 0000 C CNN +F 2 "" H 7300 4100 50 0001 C CNN +F 3 "" H 7300 4100 50 0001 C CNN + 1 7300 4100 1 0 0 -1 $EndComp Wire Wire Line - 7400 4050 7400 4100 + 7150 3950 6450 3950 Wire Wire Line - 7400 3750 7400 3700 + 6450 3950 6450 4250 Wire Wire Line - 7850 3200 7850 3250 + 6450 4250 5900 4250 Wire Wire Line - 7850 3550 7850 3600 + 6450 3700 6300 3700 Wire Wire Line - 7700 3400 7000 3400 + 6300 3700 6300 4150 Wire Wire Line - 7000 3400 7000 3700 -Wire Wire Line - 7000 3700 6450 3700 -Wire Wire Line - 7250 3900 6450 3900 -Wire Wire Line - 7000 3150 6850 3150 -Wire Wire Line - 6850 3150 6850 3600 -Wire Wire Line - 6850 3600 6450 3600 + 6300 4150 5900 4150 $Comp L power:GND #PWR07 U 1 1 5C2CAB2A -P 7450 3150 -F 0 "#PWR07" H 7450 2900 50 0001 C CNN -F 1 "GND" H 7455 2977 50 0000 C CNN -F 2 "" H 7450 3150 50 0001 C CNN -F 3 "" H 7450 3150 50 0001 C CNN - 1 7450 3150 +P 6900 3700 +F 0 "#PWR07" H 6900 3450 50 0001 C CNN +F 1 "GND" H 6905 3527 50 0000 C CNN +F 2 "" H 6900 3700 50 0001 C CNN +F 3 "" H 6900 3700 50 0001 C CNN + 1 6900 3700 0 -1 -1 0 $EndComp Wire Wire Line - 7400 3150 7450 3150 + 6850 3700 6900 3700 Wire Wire Line - 6450 3500 6750 3500 + 5900 4050 6200 4050 Wire Wire Line - 6750 3500 6750 2750 + 6200 4050 6200 3300 Wire Wire Line - 6750 2750 7000 2750 + 6200 3300 6450 3300 $Comp L Connector:Conn_01x03_Male J1 U 1 1 5C2CB61A -P 7200 2650 -F 0 "J1" H 7172 2673 50 0000 R CNN -F 1 "Servo" H 7172 2582 50 0000 R CNN -F 2 "Pin_Headers:Pin_Header_Straight_1x03_Pitch2.54mm" H 7200 2650 50 0001 C CNN -F 3 "~" H 7200 2650 50 0001 C CNN - 1 7200 2650 +P 6650 3200 +F 0 "J1" H 6622 3223 50 0000 R CNN +F 1 "Servo" H 6622 3132 50 0000 R CNN +F 2 "Pin_Headers:Pin_Header_Straight_1x03_Pitch2.54mm" H 6650 3200 50 0001 C CNN +F 3 "~" H 6650 3200 50 0001 C CNN + 1 6650 3200 -1 0 0 -1 $EndComp $Comp L Connector:Conn_01x02_Male J2 U 1 1 5C2CC12F -P 7200 1850 -F 0 "J2" H 7172 1823 50 0000 R CNN -F 1 "Power" H 7172 1732 50 0000 R CNN -F 2 "Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm" H 7200 1850 50 0001 C CNN -F 3 "~" H 7200 1850 50 0001 C CNN - 1 7200 1850 +P 6650 2100 +F 0 "J2" H 6622 2073 50 0000 R CNN +F 1 "Power" H 6622 1982 50 0000 R CNN +F 2 "Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm" H 6650 2100 50 0001 C CNN +F 3 "~" H 6650 2100 50 0001 C CNN + 1 6650 2100 -1 0 0 -1 $EndComp $Comp L power:+5V #PWR018 U 1 1 5C2CCBF6 -P 6650 2650 -F 0 "#PWR018" H 6650 2500 50 0001 C CNN -F 1 "+5V" H 6665 2823 50 0000 C CNN -F 2 "" H 6650 2650 50 0001 C CNN -F 3 "" H 6650 2650 50 0001 C CNN - 1 6650 2650 +P 5950 3200 +F 0 "#PWR018" H 5950 3050 50 0001 C CNN +F 1 "+5V" H 5965 3373 50 0000 C CNN +F 2 "" H 5950 3200 50 0001 C CNN +F 3 "" H 5950 3200 50 0001 C CNN + 1 5950 3200 0 -1 -1 0 $EndComp $Comp L power:GND #PWR017 U 1 1 5C2CCC29 -P 6900 2550 -F 0 "#PWR017" H 6900 2300 50 0001 C CNN -F 1 "GND" H 6905 2377 50 0000 C CNN -F 2 "" H 6900 2550 50 0001 C CNN -F 3 "" H 6900 2550 50 0001 C CNN - 1 6900 2550 +P 5950 2900 +F 0 "#PWR017" H 5950 2650 50 0001 C CNN +F 1 "GND" H 5955 2727 50 0000 C CNN +F 2 "" H 5950 2900 50 0001 C CNN +F 3 "" H 5950 2900 50 0001 C CNN + 1 5950 2900 0 1 1 0 $EndComp Wire Wire Line - 6900 2550 7000 2550 -Wire Wire Line - 7000 2650 6650 2650 + 6450 3200 6100 3200 $Comp L power:GND #PWR014 U 1 1 5C2CD426 -P 7000 1850 -F 0 "#PWR014" H 7000 1600 50 0001 C CNN -F 1 "GND" H 7005 1677 50 0000 C CNN -F 2 "" H 7000 1850 50 0001 C CNN -F 3 "" H 7000 1850 50 0001 C CNN - 1 7000 1850 +P 6450 2100 +F 0 "#PWR014" H 6450 1850 50 0001 C CNN +F 1 "GND" H 6455 1927 50 0000 C CNN +F 2 "" H 6450 2100 50 0001 C CNN +F 3 "" H 6450 2100 50 0001 C CNN + 1 6450 2100 0 1 1 0 $EndComp $Comp L power:+12V #PWR015 U 1 1 5C2CD4CB -P 6650 1950 -F 0 "#PWR015" H 6650 1800 50 0001 C CNN -F 1 "+12V" H 6665 2123 50 0000 C CNN -F 2 "" H 6650 1950 50 0001 C CNN -F 3 "" H 6650 1950 50 0001 C CNN - 1 6650 1950 +P 6100 2200 +F 0 "#PWR015" H 6100 2050 50 0001 C CNN +F 1 "+12V" H 6115 2373 50 0000 C CNN +F 2 "" H 6100 2200 50 0001 C CNN +F 3 "" H 6100 2200 50 0001 C CNN + 1 6100 2200 0 -1 -1 0 $EndComp Wire Wire Line - 6650 1950 7000 1950 + 6100 2200 6450 2200 $Comp L Regulator_Linear:L7805 U2 U 1 1 5C2CDA60 -P 5350 1800 -F 0 "U2" H 5350 2042 50 0000 C CNN -F 1 "L7805" H 5350 1951 50 0000 C CNN -F 2 "TO_SOT_Packages_THT:TO-220-3_Horizontal" H 5375 1650 50 0001 L CIN -F 3 "http://www.st.com/content/ccc/resource/technical/document/datasheet/41/4f/b3/b0/12/d4/47/88/CD00000444.pdf/files/CD00000444.pdf/jcr:content/translations/en.CD00000444.pdf" H 5350 1750 50 0001 C CNN - 1 5350 1800 +P 4850 2100 +F 0 "U2" H 4850 2342 50 0000 C CNN +F 1 "L7805" H 4850 2251 50 0000 C CNN +F 2 "TO_SOT_Packages_THT:TO-220-3_Horizontal" H 4875 1950 50 0001 L CIN +F 3 "http://www.st.com/content/ccc/resource/technical/document/datasheet/41/4f/b3/b0/12/d4/47/88/CD00000444.pdf/files/CD00000444.pdf/jcr:content/translations/en.CD00000444.pdf" H 4850 2050 50 0001 C CNN + 1 4850 2100 1 0 0 -1 $EndComp $Comp L power:+12V #PWR012 U 1 1 5C2CDF5F -P 5000 1800 -F 0 "#PWR012" H 5000 1650 50 0001 C CNN -F 1 "+12V" H 5015 1973 50 0000 C CNN -F 2 "" H 5000 1800 50 0001 C CNN -F 3 "" H 5000 1800 50 0001 C CNN - 1 5000 1800 +P 4050 2100 +F 0 "#PWR012" H 4050 1950 50 0001 C CNN +F 1 "+12V" H 4065 2273 50 0000 C CNN +F 2 "" H 4050 2100 50 0001 C CNN +F 3 "" H 4050 2100 50 0001 C CNN + 1 4050 2100 0 -1 -1 0 $EndComp Wire Wire Line - 5000 1800 5050 1800 + 4050 2100 4350 2100 $Comp L power:GND #PWR016 U 1 1 5C2CE36A -P 5350 2150 -F 0 "#PWR016" H 5350 1900 50 0001 C CNN -F 1 "GND" H 5355 1977 50 0000 C CNN -F 2 "" H 5350 2150 50 0001 C CNN -F 3 "" H 5350 2150 50 0001 C CNN - 1 5350 2150 +P 4850 2750 +F 0 "#PWR016" H 4850 2500 50 0001 C CNN +F 1 "GND" H 4855 2577 50 0000 C CNN +F 2 "" H 4850 2750 50 0001 C CNN +F 3 "" H 4850 2750 50 0001 C CNN + 1 4850 2750 1 0 0 -1 $EndComp $Comp L power:+5V #PWR013 U 1 1 5C2CE3A2 -P 5700 1800 -F 0 "#PWR013" H 5700 1650 50 0001 C CNN -F 1 "+5V" H 5715 1973 50 0000 C CNN -F 2 "" H 5700 1800 50 0001 C CNN -F 3 "" H 5700 1800 50 0001 C CNN - 1 5700 1800 +P 5200 2100 +F 0 "#PWR013" H 5200 1950 50 0001 C CNN +F 1 "+5V" H 5215 2273 50 0000 C CNN +F 2 "" H 5200 2100 50 0001 C CNN +F 3 "" H 5200 2100 50 0001 C CNN + 1 5200 2100 0 1 1 0 $EndComp Wire Wire Line - 5650 1800 5700 1800 + 5150 2100 5200 2100 Wire Wire Line - 5350 2100 5350 2150 -NoConn ~ 6450 3800 + 4850 2400 4850 2550 +$Comp +L Device:C C2 +U 1 1 5C2E5A00 +P 4350 2400 +F 0 "C2" H 4465 2446 50 0000 L CNN +F 1 "22pF" H 4465 2355 50 0000 L CNN +F 2 "Capacitors_SMD:C_1206" H 4388 2250 50 0001 C CNN +F 3 "~" H 4350 2400 50 0001 C CNN + 1 4350 2400 + 1 0 0 -1 +$EndComp +Wire Wire Line + 4350 2250 4350 2100 +Connection ~ 4350 2100 +Wire Wire Line + 4350 2100 4550 2100 +Wire Wire Line + 4350 2550 4850 2550 +Connection ~ 4850 2550 +Wire Wire Line + 4850 2550 4850 2750 +Wire Wire Line + 5900 4450 6450 4450 +Wire Wire Line + 6450 4450 6450 4900 +Wire Wire Line + 6450 4900 6500 4900 +$Comp +L Device:R_POT RV3 +U 1 1 5C2EE588 +P 7300 4900 +F 0 "RV3" H 7231 4854 50 0000 R CNN +F 1 "10k" H 7231 4945 50 0000 R CNN +F 2 "Potentiometers:Potentiometer_Triwood_RM-065" H 7300 4900 50 0001 C CNN +F 3 "~" H 7300 4900 50 0001 C CNN + 1 7300 4900 + -1 0 0 1 +$EndComp +$Comp +L power:+5V #PWR01 +U 1 1 5C2EE618 +P 7300 4750 +F 0 "#PWR01" H 7300 4600 50 0001 C CNN +F 1 "+5V" H 7315 4923 50 0000 C CNN +F 2 "" H 7300 4750 50 0001 C CNN +F 3 "" H 7300 4750 50 0001 C CNN + 1 7300 4750 + 1 0 0 -1 +$EndComp +$Comp +L power:GND #PWR019 +U 1 1 5C2EE639 +P 7300 5050 +F 0 "#PWR019" H 7300 4800 50 0001 C CNN +F 1 "GND" H 7305 4877 50 0000 C CNN +F 2 "" H 7300 5050 50 0001 C CNN +F 3 "" H 7300 5050 50 0001 C CNN + 1 7300 5050 + 1 0 0 -1 +$EndComp +Wire Wire Line + 5900 4350 7050 4350 +Wire Wire Line + 7050 4350 7050 4900 +Wire Wire Line + 7050 4900 7150 4900 +$Comp +L Device:C C3 +U 1 1 5C2EF195 +P 6100 3050 +F 0 "C3" H 6215 3096 50 0000 L CNN +F 1 "470uF" H 6215 3005 50 0000 L CNN +F 2 "Capacitors_ThroughHole:CP_Radial_D6.3mm_P2.50mm" H 6138 2900 50 0001 C CNN +F 3 "~" H 6100 3050 50 0001 C CNN + 1 6100 3050 + 1 0 0 -1 +$EndComp +Connection ~ 6100 3200 +Wire Wire Line + 6100 3200 5950 3200 +Wire Wire Line + 5950 2900 6100 2900 +Wire Wire Line + 6100 2900 6450 2900 +Wire Wire Line + 6450 2900 6450 3100 +Connection ~ 6100 2900 $EndSCHEMATC diff --git a/src/main.cpp b/src/main.cpp index 33d89b1..cbb2707 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -12,36 +12,42 @@ Wiring: - +---u---+ - 10k R to +5V -| 1 8 |- +5V - NC -| 2 7 |- "Off" potentiometer - "On" potentiometer -| 3 6 |- On/Off switch (active low) - GND -| 4 5 |- Servo PWM signal - +-------+ + +---u---+ + 10k R to +5V -| 1 8 |- +5V + "Speed" potentiometer (RV3) -| 2 7 |- "Off" potentiometer (RV1) + "On" potentiometer (RV2) -| 3 6 |- On/Off switch (active low) + GND -| 4 5 |- Servo PWM signal + +-------+ */ static const uint8_t PinServo = 0; static const uint8_t PinSwitch = 1; static const uint8_t PinOffPosition = A1; static const uint8_t PinOnPosition = A2; +static const uint8_t PinSpeed = A3; -static const float TransitionTime = 2000; +static const float TransitionTimeMin = 1; +static const float TransitionTimeMax = 5000; static const uint16_t SleepTime = 10000; - static const uint16_t ServoMinPulse = 544; static const uint16_t ServoMaxPulse = 2400; +static const uint16_t ServoPulseInterval = 20; +static const uint16_t ServoStabilizeDelay = 100; + int offPosition; // 0 - 180 degrees, read from "Off" potentiometer int onPosition; // 0 - 180 degrees, read from "On" potentiometer -float speed; // Degrees per millisecond +int speed; // 0 - 1023, read from "Speed" potentiometer +float degreesPerMilli; // Degrees per millisecond -bool startOn; // If the switch was on when it was last flipped +bool lastOn; // If the switch was on when it was last flipped int startPosition; // The position the servo was in when the switch was flipped unsigned long startTime; // The last time the switch was flipped +unsigned long idleTime; // The last time anything happened bool servoEnabled; // Whether or not pulses should be sent to the servo int servoPosition; // The desired position of the servo @@ -55,10 +61,12 @@ SoftwareSerial debug(-1,3); // Forward declarations void pulseServo(unsigned long currentTime); -bool updateOnOffPositions(); +bool updateSettings(); inline int getNewPosition(unsigned long currentTime, int targetPosition) __attribute__((always_inline)); void sleepUntilSwitch(); +float floatMap(float x, float in_min, float in_max, float out_min, float out_max); + void setup() { @@ -72,9 +80,13 @@ void setup() pinMode(PinSwitch, INPUT_PULLUP); pinMode(PinServo, OUTPUT); - updateOnOffPositions(); + offPosition = -1; + onPosition = -1; + speed = -1; - startOn = false; + updateSettings(); + + lastOn = false; startPosition = offPosition; servoPosition = offPosition; @@ -97,15 +109,16 @@ void loop() bool isOn = (digitalRead(PinSwitch) == LOW); // If the switch changed, start from the last known position - if (isOn != startOn) + if (isOn != lastOn) { #ifdef DEBUG debug.println("State changed"); #endif - startOn = isOn; + lastOn = isOn; startPosition = servoPosition; startTime = currentTime; + idleTime = startTime; } int targetPosition = isOn ? onPosition : offPosition; @@ -113,45 +126,52 @@ void loop() { servoPosition = getNewPosition(currentTime, targetPosition); servoEnabled = true; + idleTime = currentTime; } - else + else if (servoEnabled) { // Ensure we pulsed the last position - delay(20); - pulseServo(millis()); - delay(20); + currentTime = millis(); + + delay(ServoPulseInterval); + pulseServo(currentTime); + delay(ServoPulseInterval); // Stop sending pulses when we reach the destination, to prevent // power consumption and possible buzzing servoEnabled = false; + idleTime = currentTime; } - if (!servoEnabled) + // Don't update the settings while the servo is moving, as the + // voltage drop can cause fluctuating results + if (!servoEnabled && currentTime - idleTime >= ServoStabilizeDelay) { - // Don't update the positions while the servo is moving, as the - // voltage drop can cause fluctuating results - if (updateOnOffPositions()) + if (updateSettings()) { // Immediately go to the new position + currentTime = millis(); servoPosition = isOn ? onPosition : offPosition; - delay(20); - pulseServo(millis()); - delay(20); + delay(ServoPulseInterval); + pulseServo(currentTime); + delay(ServoPulseInterval); + + idleTime = currentTime; } } // Stay awake for a bit to allow changes to the on and off positions // to take effect immediately - if (currentTime - startTime >= SleepTime) + if (currentTime - idleTime >= SleepTime) sleepUntilSwitch(); } void pulseServo(unsigned long currentTime) { - if (currentTime - servoPulseTime < 20) + if (currentTime - servoPulseTime < ServoPulseInterval) return; int pulseWidth = map(servoPosition, 0, 180, ServoMinPulse, ServoMaxPulse); @@ -171,23 +191,27 @@ void pulseServo(unsigned long currentTime) } -bool updateOnOffPositions() +bool updateSettings() { int newOffPosition = map(analogRead(PinOffPosition), 0, 1023, 0, 180); int newOnPosition = map(analogRead(PinOnPosition), 0, 1023, 0, 180); + int newSpeed = analogRead(PinSpeed); - if (newOffPosition != offPosition || newOnPosition != onPosition) + if (newOffPosition != offPosition || newOnPosition != onPosition || newSpeed != speed) { offPosition = newOffPosition; onPosition = newOnPosition; + speed = newSpeed; - speed = abs((float)(onPosition - offPosition)) / TransitionTime; + float transitionTime = floatMap(speed, 0, 1023, TransitionTimeMin, TransitionTimeMax); + degreesPerMilli = abs((float)(onPosition - offPosition)) / transitionTime; #ifdef DEBUG debug.println("Positions changed"); - debug.print(" Off position: "); debug.println(offPosition); - debug.print(" On position : "); debug.println(onPosition); - debug.print(" Speed : "); debug.println(speed); + debug.print(" Off position : "); debug.println(offPosition); + debug.print(" On position : "); debug.println(onPosition); + debug.print(" Transition time: "); debug.println(transitionTime); + debug.print(" Degrees / milli: "); debug.println(degreesPerMilli); #endif return true; @@ -200,17 +224,17 @@ bool updateOnOffPositions() int getNewPosition(unsigned long currentTime, int targetPosition) { int newPosition; - float timePassed = currentTime - startTime; + unsigned long timePassed = currentTime - startTime; if (targetPosition > startPosition) { - newPosition = startPosition + (timePassed * speed); + newPosition = startPosition + ((float)timePassed * degreesPerMilli); if (newPosition > targetPosition) newPosition = targetPosition; } else { - newPosition = startPosition - (timePassed * speed); + newPosition = startPosition - ((float)timePassed * degreesPerMilli); if (newPosition < targetPosition) newPosition = targetPosition; } @@ -266,4 +290,10 @@ void sleepUntilSwitch() PCMSK = 0; sleepEnd(); } +} + + +float floatMap(float x, float in_min, float in_max, float out_min, float out_max) +{ + return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; } \ No newline at end of file