From e0a5a4d5f8665851739784e4d84a03e8fd49e2e5 Mon Sep 17 00:00:00 2001 From: Oleksiy Date: Sat, 23 Sep 2023 01:47:23 +0300 Subject: [PATCH] Added +5v pin to expander pins --- Hardware/gtoe/gtoe.kicad_pcb | 72 ++++++++------- Hardware/gtoe/gtoe.kicad_prl | 1 - Hardware/gtoe/gtoe.kicad_sch | 170 +++++++++++++++++++++-------------- Software/Gravity/Gravity.ino | 23 ++++- 4 files changed, 164 insertions(+), 102 deletions(-) diff --git a/Hardware/gtoe/gtoe.kicad_pcb b/Hardware/gtoe/gtoe.kicad_pcb index 3b4666f..5342e25 100644 --- a/Hardware/gtoe/gtoe.kicad_pcb +++ b/Hardware/gtoe/gtoe.kicad_pcb @@ -483,7 +483,7 @@ (property "Sheetname" "") (path "/7bf92304-c94f-487f-a0a2-64400cc70b48") (attr through_hole) - (fp_text reference "Screen" (at 0 -10.5) (layer "F.SilkS") + (fp_text reference "Screen1" (at 0 -10.5) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) (tstamp aaa97b05-7528-498c-a997-9a52df93bf53) ) @@ -2660,55 +2660,57 @@ ) ) - (footprint "Connector_PinHeader_2.54mm:PinHeader_1x06_P2.54mm_Vertical" (layer "B.Cu") + (footprint "Connector_PinHeader_2.54mm:PinHeader_1x07_P2.54mm_Vertical" (layer "B.Cu") (tedit 59FED5CC) (tstamp 80c1e20f-6d92-4489-a9c4-ea0a6db30d73) - (at 101.9 111.95 180) - (descr "Through hole straight pin header, 1x06, 2.54mm pitch, single row") - (tags "Through hole pin header THT 1x06 2.54mm single row") + (at 101.95 111.825 180) + (descr "Through hole straight pin header, 1x07, 2.54mm pitch, single row") + (tags "Through hole pin header THT 1x07 2.54mm single row") (property "Sheetfile" "gtoe.kicad_sch") (property "Sheetname" "") (path "/c6cc233c-14fd-4c7c-94bb-99dd887ea0f6") (attr through_hole) (fp_text reference "J11" (at 0 2.33) (layer "B.SilkS") (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp b6794fd0-8975-4c6f-b702-7c334d1f76d3) + (tstamp db233b4f-ed4c-4fba-beca-3fb282064e19) ) - (fp_text value "Conn_01x05" (at 2.75 -7.2 270) (layer "B.Fab") + (fp_text value "Conn_01x07" (at 0 -17.57) (layer "B.Fab") (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp 8787530b-438d-4494-8c52-5beabf753a70) + (tstamp b60b772a-dfd2-4d72-9049-943213537a99) ) - (fp_text user "${REFERENCE}" (at 0 -6.35 90) (layer "B.Fab") + (fp_text user "${REFERENCE}" (at 0 -7.62 90) (layer "B.Fab") (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp ed0f7051-6a48-4d8a-8d9f-4f97b2420cae) + (tstamp 23589534-4d79-427e-a791-0cf6d60901e7) ) - (fp_line (start -1.33 1.33) (end 0 1.33) (layer "B.SilkS") (width 0.12) (tstamp 0f88a4e0-e835-4ce2-8c0d-6d50cadced92)) - (fp_line (start -1.33 -1.27) (end 1.33 -1.27) (layer "B.SilkS") (width 0.12) (tstamp 191f052d-bc51-4e5d-8e59-5a0f0532ef0e)) - (fp_line (start -1.33 -14.03) (end 1.33 -14.03) (layer "B.SilkS") (width 0.12) (tstamp 40a614fc-e960-4dbf-bacd-0789f91b205d)) - (fp_line (start -1.33 0) (end -1.33 1.33) (layer "B.SilkS") (width 0.12) (tstamp 5e585af3-fef6-474a-b2ff-ed353a9ef1e9)) - (fp_line (start 1.33 -1.27) (end 1.33 -14.03) (layer "B.SilkS") (width 0.12) (tstamp 624abc9d-9a0e-461e-9a3f-57feda2217a7)) - (fp_line (start -1.33 -1.27) (end -1.33 -14.03) (layer "B.SilkS") (width 0.12) (tstamp 750e29c4-58ad-447b-9f37-06b28b1e4faa)) - (fp_line (start 1.8 1.8) (end -1.8 1.8) (layer "B.CrtYd") (width 0.05) (tstamp 0f16329d-ae3d-4b59-b9ec-e79200c7f7ed)) - (fp_line (start -1.8 1.8) (end -1.8 -14.5) (layer "B.CrtYd") (width 0.05) (tstamp 1d614312-0c03-4f36-9c24-1b61d22e06ca)) - (fp_line (start -1.8 -14.5) (end 1.8 -14.5) (layer "B.CrtYd") (width 0.05) (tstamp 6b236f82-ae9c-4e3e-a5f2-40c82b101f90)) - (fp_line (start 1.8 -14.5) (end 1.8 1.8) (layer "B.CrtYd") (width 0.05) (tstamp 9f9d281f-3f2f-46f8-892e-ee196a1fd43b)) - (fp_line (start 1.27 1.27) (end 1.27 -13.97) (layer "B.Fab") (width 0.1) (tstamp 42049121-3f1b-44d6-b6d7-9511ad007ded)) - (fp_line (start -1.27 0.635) (end -0.635 1.27) (layer "B.Fab") (width 0.1) (tstamp b659d22b-2f77-4c8b-a06a-d28446feee96)) - (fp_line (start -0.635 1.27) (end 1.27 1.27) (layer "B.Fab") (width 0.1) (tstamp cd2658b2-eff4-4dfb-81c3-73288a8f5985)) - (fp_line (start 1.27 -13.97) (end -1.27 -13.97) (layer "B.Fab") (width 0.1) (tstamp dd1680a1-b038-4b4f-9975-aa5ee6ad835f)) - (fp_line (start -1.27 -13.97) (end -1.27 0.635) (layer "B.Fab") (width 0.1) (tstamp e4364087-8d77-48c7-9f2e-e87385e6689e)) + (fp_line (start 1.33 -1.27) (end 1.33 -16.57) (layer "B.SilkS") (width 0.12) (tstamp 0eed4c7e-3619-4c02-86c0-c311e44a3b02)) + (fp_line (start -1.33 1.33) (end 0 1.33) (layer "B.SilkS") (width 0.12) (tstamp 30157643-a6ba-466d-b5b0-4387313c5473)) + (fp_line (start -1.33 -16.57) (end 1.33 -16.57) (layer "B.SilkS") (width 0.12) (tstamp 47d80ed1-50b2-4c86-8d4b-fa0125e9975f)) + (fp_line (start -1.33 -1.27) (end 1.33 -1.27) (layer "B.SilkS") (width 0.12) (tstamp 9a11e410-8ea8-4309-af65-36afe3836ed4)) + (fp_line (start -1.33 0) (end -1.33 1.33) (layer "B.SilkS") (width 0.12) (tstamp abe07a59-10fb-422a-85ee-cdd54e15b3c2)) + (fp_line (start -1.33 -1.27) (end -1.33 -16.57) (layer "B.SilkS") (width 0.12) (tstamp d893e42d-e2b1-48dd-983f-192d89334719)) + (fp_line (start 1.8 1.8) (end -1.8 1.8) (layer "B.CrtYd") (width 0.05) (tstamp 19a10298-c943-4d9f-905c-f41b3b42a0eb)) + (fp_line (start -1.8 -17.05) (end 1.8 -17.05) (layer "B.CrtYd") (width 0.05) (tstamp 40164c7e-a5c8-434e-8afe-118c086a33bc)) + (fp_line (start -1.8 1.8) (end -1.8 -17.05) (layer "B.CrtYd") (width 0.05) (tstamp 5d3f540e-e3c4-468d-bf1d-1f4b386c98ad)) + (fp_line (start 1.8 -17.05) (end 1.8 1.8) (layer "B.CrtYd") (width 0.05) (tstamp d495c3e1-3ff7-4b25-ba56-7661d197cc78)) + (fp_line (start -1.27 -16.51) (end -1.27 0.635) (layer "B.Fab") (width 0.1) (tstamp 71ddd0c8-7ebb-4cbf-b6d0-856511ed31e4)) + (fp_line (start -0.635 1.27) (end 1.27 1.27) (layer "B.Fab") (width 0.1) (tstamp 89991744-a52f-4b38-9708-69a661ad70d1)) + (fp_line (start -1.27 0.635) (end -0.635 1.27) (layer "B.Fab") (width 0.1) (tstamp ab59e9c2-b949-4605-9554-a523ed585305)) + (fp_line (start 1.27 -16.51) (end -1.27 -16.51) (layer "B.Fab") (width 0.1) (tstamp b4bfbb83-d5bf-44c7-9924-f8ee4ee3bfd9)) + (fp_line (start 1.27 1.27) (end 1.27 -16.51) (layer "B.Fab") (width 0.1) (tstamp d5351f40-e2cd-4733-8c33-72f71dfefb58)) (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) - (net 4 "GND") (pinfunction "Pin_1") (pintype "passive") (tstamp ed9a87ce-6bde-4900-b044-9a57d607b1ca)) + (net 4 "GND") (pinfunction "Pin_1") (pintype "passive") (tstamp 972b3027-964a-4cac-9b9d-56fbb52fc354)) (pad "2" thru_hole oval (at 0 -2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) - (net 14 "24ppqn OUT") (pinfunction "Pin_2") (pintype "passive") (tstamp 0a63c446-9637-44d3-b950-3577b29d4b0a)) + (net 14 "24ppqn OUT") (pinfunction "Pin_2") (pintype "passive") (tstamp ddbf0c66-961a-42ef-8c1b-b0c9175a2c0e)) (pad "3" thru_hole oval (at 0 -5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) - (net 5 "DIGITAL INPUT") (pinfunction "Pin_3") (pintype "passive") (tstamp 7a30f56d-ba2e-4d80-8309-a0a5034c4060)) + (net 5 "DIGITAL INPUT") (pinfunction "Pin_3") (pintype "passive") (tstamp 09576510-e2c3-4928-8112-29b3804c7327)) (pad "4" thru_hole oval (at 0 -7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) - (net 2 "Serial In") (pinfunction "Pin_4") (pintype "passive") (tstamp e3631a8d-48c1-424a-9fc5-57af485a6f51)) + (net 2 "Serial In") (pinfunction "Pin_4") (pintype "passive") (tstamp 50c5df34-89fd-47d4-897e-2a05fdf33309)) (pad "5" thru_hole oval (at 0 -10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) - (net 1 "Serial Out") (pinfunction "Pin_5") (pintype "passive") (tstamp a351acd7-8b47-4a99-90e0-3b2d68283fd6)) + (net 1 "Serial Out") (pinfunction "Pin_5") (pintype "passive") (tstamp 1629e129-1211-49ec-9b91-288f1756bf5f)) (pad "6" thru_hole oval (at 0 -12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) - (net 4 "GND") (pinfunction "Pin_6") (pintype "passive") (tstamp ed4aebe4-5792-4708-bf51-ec49e5b8089a)) - (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x06_P2.54mm_Vertical.wrl" + (net 4 "GND") (pinfunction "Pin_6") (pintype "passive") (tstamp a364b184-6f08-42c0-a4d0-9d2a3c9647ca)) + (pad "7" thru_hole oval (at 0 -15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (net 22 "+5V") (pinfunction "Pin_7") (pintype "passive") (tstamp 6bfb6cba-6b59-422f-8992-dddc15d6b89c)) + (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x07_P2.54mm_Vertical.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) @@ -7035,6 +7037,9 @@ (gr_text "MO" (at 104.5 122.2) (layer "B.SilkS") (tstamp b2e0bdb2-eeef-4ec1-8bfe-269b9432cb49) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) + (gr_text "+5" (at 104.55 127.2) (layer "B.SilkS") (tstamp d69b37b2-fcea-4a31-be74-113c97cba9ea) + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + ) (gr_text "CO" (at 104.55 114.55) (layer "B.SilkS") (tstamp f17bf883-9b82-44ea-ab19-09641ed95da9) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) @@ -7234,6 +7239,8 @@ (segment (start 114.181 124.2) (end 116.081 126.1) (width 0.25) (layer "B.Cu") (net 22) (tstamp 8dc426cc-85ce-47dd-8811-1f9a59f8afaf)) (segment (start 128.9 115.7) (end 126.1 112.9) (width 0.2) (layer "B.Cu") (net 22) (tstamp 90256cfb-2795-4161-b2f6-54fedd894e56)) (segment (start 126.1 112.9) (end 126.1 110.45) (width 0.2) (layer "B.Cu") (net 22) (tstamp aa943491-ab56-4fa3-a5ea-0f0043719378)) + (segment (start 103.56 128.675) (end 101.95 127.065) (width 0.25) (layer "B.Cu") (net 22) (tstamp b64aae69-ed10-49e0-9445-5c9f95032213)) + (segment (start 113.506 128.675) (end 103.56 128.675) (width 0.25) (layer "B.Cu") (net 22) (tstamp be64bc2d-fd63-49d7-a433-a89c919013cc)) (segment (start 100.7 90.6875) (end 102.9 92.8875) (width 0.2) (layer "B.Cu") (net 22) (tstamp c4586b95-c2b0-4bff-a74a-03c14f8a5f8d)) (segment (start 108.275 122.925) (end 109.55 124.2) (width 0.25) (layer "B.Cu") (net 22) (tstamp c60ceb0c-65e9-4f3b-9924-a2506542202d)) (segment (start 104.25 116.8) (end 104.25 107.58137) (width 0.2) (layer "B.Cu") (net 22) (tstamp c9cf5465-dbcd-4586-94aa-d2e45ed5502d)) @@ -7242,6 +7249,7 @@ (segment (start 100.7 51.302817) (end 100.7 90.6875) (width 0.2) (layer "B.Cu") (net 22) (tstamp d1654de6-7528-40f2-91bd-a18589acec45)) (segment (start 116.8 45.7125) (end 115.4125 47.1) (width 0.2) (layer "B.Cu") (net 22) (tstamp d18de2da-3e7a-45ac-964c-cfa09a41f98a)) (segment (start 107.5 118.3) (end 105.75 118.3) (width 0.2) (layer "B.Cu") (net 22) (tstamp eeee0f56-cedd-4fba-bc27-dcc5a0ea0217)) + (segment (start 116.081 126.1) (end 113.506 128.675) (width 0.25) (layer "B.Cu") (net 22) (tstamp efc10c28-a62f-40cd-8c11-db5e0e6a136f)) (segment (start 108.275 122.475) (end 108.275 119.075) (width 0.2) (layer "B.Cu") (net 22) (tstamp f669dce0-6a2a-49ce-a039-7424d18fb484)) (segment (start 104.925 104.05) (end 104.3 103.424999) (width 0.2) (layer "B.Cu") (net 22) (tstamp fbc0a7a8-a48c-48c7-9db7-cba4e301ea77)) (segment (start 104.902817 47.1) (end 100.7 51.302817) (width 0.2) (layer "B.Cu") (net 22) (tstamp fdfd286e-af82-4f71-90fd-a1dc83e62222)) diff --git a/Hardware/gtoe/gtoe.kicad_prl b/Hardware/gtoe/gtoe.kicad_prl index 693a188..1ff017d 100644 --- a/Hardware/gtoe/gtoe.kicad_prl +++ b/Hardware/gtoe/gtoe.kicad_prl @@ -37,7 +37,6 @@ 9, 10, 11, - 12, 13, 14, 15, diff --git a/Hardware/gtoe/gtoe.kicad_sch b/Hardware/gtoe/gtoe.kicad_sch index 18ad38e..9bcdd9e 100644 --- a/Hardware/gtoe/gtoe.kicad_sch +++ b/Hardware/gtoe/gtoe.kicad_sch @@ -229,11 +229,11 @@ ) ) ) - (symbol "Connector_Generic:Conn_01x06" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes) - (property "Reference" "J" (id 0) (at 0 7.62 0) + (symbol "Connector_Generic:Conn_01x07" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes) + (property "Reference" "J" (id 0) (at 0 10.16 0) (effects (font (size 1.27 1.27))) ) - (property "Value" "Conn_01x06" (id 1) (at 0 -10.16 0) + (property "Value" "Conn_01x07" (id 1) (at 0 -10.16 0) (effects (font (size 1.27 1.27))) ) (property "Footprint" "" (id 2) (at 0 0 0) @@ -245,13 +245,13 @@ (property "ki_keywords" "connector" (id 4) (at 0 0 0) (effects (font (size 1.27 1.27)) hide) ) - (property "ki_description" "Generic connector, single row, 01x06, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0) + (property "ki_description" "Generic connector, single row, 01x07, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0) (effects (font (size 1.27 1.27)) hide) ) (property "ki_fp_filters" "Connector*:*_1x??_*" (id 6) (at 0 0 0) (effects (font (size 1.27 1.27)) hide) ) - (symbol "Conn_01x06_1_1" + (symbol "Conn_01x07_1_1" (rectangle (start -1.27 -7.493) (end 0 -7.747) (stroke (width 0.1524) (type default) (color 0 0 0 0)) (fill (type none)) @@ -276,34 +276,42 @@ (stroke (width 0.1524) (type default) (color 0 0 0 0)) (fill (type none)) ) - (rectangle (start -1.27 6.35) (end 1.27 -8.89) + (rectangle (start -1.27 7.747) (end 0 7.493) + (stroke (width 0.1524) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (rectangle (start -1.27 8.89) (end 1.27 -8.89) (stroke (width 0.254) (type default) (color 0 0 0 0)) (fill (type background)) ) - (pin passive line (at -5.08 5.08 0) (length 3.81) + (pin passive line (at -5.08 7.62 0) (length 3.81) (name "Pin_1" (effects (font (size 1.27 1.27)))) (number "1" (effects (font (size 1.27 1.27)))) ) - (pin passive line (at -5.08 2.54 0) (length 3.81) + (pin passive line (at -5.08 5.08 0) (length 3.81) (name "Pin_2" (effects (font (size 1.27 1.27)))) (number "2" (effects (font (size 1.27 1.27)))) ) - (pin passive line (at -5.08 0 0) (length 3.81) + (pin passive line (at -5.08 2.54 0) (length 3.81) (name "Pin_3" (effects (font (size 1.27 1.27)))) (number "3" (effects (font (size 1.27 1.27)))) ) - (pin passive line (at -5.08 -2.54 0) (length 3.81) + (pin passive line (at -5.08 0 0) (length 3.81) (name "Pin_4" (effects (font (size 1.27 1.27)))) (number "4" (effects (font (size 1.27 1.27)))) ) - (pin passive line (at -5.08 -5.08 0) (length 3.81) + (pin passive line (at -5.08 -2.54 0) (length 3.81) (name "Pin_5" (effects (font (size 1.27 1.27)))) (number "5" (effects (font (size 1.27 1.27)))) ) - (pin passive line (at -5.08 -7.62 0) (length 3.81) + (pin passive line (at -5.08 -5.08 0) (length 3.81) (name "Pin_6" (effects (font (size 1.27 1.27)))) (number "6" (effects (font (size 1.27 1.27)))) ) + (pin passive line (at -5.08 -7.62 0) (length 3.81) + (name "Pin_7" (effects (font (size 1.27 1.27)))) + (number "7" (effects (font (size 1.27 1.27)))) + ) ) ) (symbol "Connector_Generic:Conn_02x05_Odd_Even" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes) @@ -1550,9 +1558,6 @@ (junction (at 41.91 60.96) (diameter 0) (color 0 0 0 0) (uuid a5a39816-f1ee-4ab9-8314-e277f66dbe27) ) - (junction (at 223.52 154.94) (diameter 0) (color 0 0 0 0) - (uuid ace1d0a5-8f41-47b3-84a2-d13fc43afe5d) - ) (junction (at 69.85 34.29) (diameter 0) (color 0 0 0 0) (uuid b23f1ea8-6677-4ea6-a94b-85b8eb53b8d8) ) @@ -1632,10 +1637,6 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 0875d199-3a61-4f17-843a-f75a66a4050e) ) - (wire (pts (xy 254 66.04) (xy 254 63.5)) - (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid 090f674a-39dc-4d32-abfc-009b9b3755f5) - ) (wire (pts (xy 39.37 58.42) (xy 39.37 52.07)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 0a2211b4-91f5-4459-8d97-5e8e188af34c) @@ -1680,7 +1681,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 12553f91-cba2-4ab1-b10c-9a2c101efbcb) ) - (wire (pts (xy 238.76 68.58) (xy 236.22 68.58)) + (wire (pts (xy 240.03 64.77) (xy 238.76 64.77)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 15573316-7046-4cb3-be84-b290b3262405) ) @@ -1688,10 +1689,6 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 1696b3ef-3157-4d71-9b48-209593675872) ) - (wire (pts (xy 223.52 154.94) (xy 226.06 154.94)) - (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid 16c74f4f-26d2-4480-a255-55053d75fe30) - ) (wire (pts (xy 41.91 34.29) (xy 46.99 34.29)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 18993a8a-ca5d-407f-848b-defb203a9189) @@ -1904,7 +1901,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 4c0b437f-8a01-477d-a6f9-7ec7ce2dc466) ) - (wire (pts (xy 238.76 66.04) (xy 236.22 66.04)) + (wire (pts (xy 240.03 62.23) (xy 238.76 62.23)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 4d458ee8-d508-40bd-9b92-392330328966) ) @@ -2212,7 +2209,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid ac927798-764a-470d-8e32-ab188c3be9d9) ) - (wire (pts (xy 236.22 71.12) (xy 238.76 71.12)) + (wire (pts (xy 238.76 67.31) (xy 240.03 67.31)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid ac977693-55e6-4f2b-9336-0acabaf5e6cc) ) @@ -2284,14 +2281,14 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid c1344527-bf12-418e-bb93-1ab1cbcbc765) ) + (wire (pts (xy 238.76 72.39) (xy 238.76 74.93)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid c383f35a-aa45-43ca-b0de-41ffbeccf210) + ) (wire (pts (xy 69.85 80.01) (xy 69.85 88.9)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid c3958be8-3003-4b81-a0e5-084b481ac3e8) ) - (wire (pts (xy 223.52 152.4) (xy 223.52 154.94)) - (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid c50581b5-4447-4088-bf17-173a09e402d5) - ) (wire (pts (xy 69.85 88.9) (xy 66.04 88.9)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid c6adff6e-82e1-42de-a1d3-c2320961301b) @@ -2324,7 +2321,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid d337bd41-b84a-4083-8138-b697897be715) ) - (wire (pts (xy 236.22 73.66) (xy 238.76 73.66)) + (wire (pts (xy 238.76 69.85) (xy 240.03 69.85)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid d3b10b90-4fd7-4a10-aadc-d707d0767705) ) @@ -2372,10 +2369,6 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid df7516ee-ff61-4db9-89ba-5c412ec89d3d) ) - (wire (pts (xy 236.22 78.74) (xy 236.22 76.2)) - (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid e02effa1-3de0-4ede-a8d0-c732a20fc74f) - ) (wire (pts (xy 236.22 127) (xy 240.03 127)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid e10d78c8-bc65-4a97-b811-fa8e485f78af) @@ -2448,7 +2441,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid f518df89-b116-40e8-99b0-a8b0297e7e7c) ) - (wire (pts (xy 223.52 154.94) (xy 223.52 157.48)) + (wire (pts (xy 223.52 152.4) (xy 223.52 154.94)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid f5e8264b-9b68-4427-8c75-2842df767dac) ) @@ -2480,7 +2473,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid fb2252ba-bbcf-47f2-ac5e-ea286245dbb4) ) - (wire (pts (xy 236.22 63.5) (xy 254 63.5)) + (wire (pts (xy 238.76 59.69) (xy 255.27 59.69)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid fbd877e4-4f40-4cab-9c7e-acd39ba0c4bd) ) @@ -2488,6 +2481,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid fed0662f-321b-4469-b503-9027372b80ec) ) + (wire (pts (xy 238.76 54.61) (xy 238.76 57.15)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid feff33c4-9126-456f-afd0-fca17419c548) + ) (wire (pts (xy 69.85 177.8) (xy 66.04 177.8)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid ffb029d0-1e8f-4995-834b-e49d98738e3f) @@ -2548,10 +2545,10 @@ (effects (font (size 1.27 1.27)) (justify right) hide) ) ) - (global_label "DIGITAL INPUT" (shape input) (at 238.76 71.12 0) (fields_autoplaced) + (global_label "DIGITAL INPUT" (shape input) (at 240.03 67.31 0) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify left)) (uuid 2b773878-cfc5-4d0e-b764-72a3b179111e) - (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 254.4779 71.1994 0) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 255.7479 67.3894 0) (effects (font (size 1.27 1.27)) (justify left) hide) ) ) @@ -2653,17 +2650,17 @@ (effects (font (size 1.27 1.27)) (justify left) hide) ) ) - (global_label "24ppqn OUT" (shape input) (at 238.76 73.66 0) (fields_autoplaced) + (global_label "24ppqn OUT" (shape input) (at 240.03 69.85 0) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify left)) (uuid b00754b5-1b0a-4ce3-88c7-7008bcd369ea) - (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 252.7845 73.7394 0) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 254.0545 69.9294 0) (effects (font (size 1.27 1.27)) (justify left) hide) ) ) - (global_label "Serial In" (shape input) (at 238.76 68.58 0) (fields_autoplaced) + (global_label "Serial In" (shape input) (at 240.03 64.77 0) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify left)) (uuid b3dc6832-efcd-4a73-b286-17dffd1c4e06) - (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 249.3979 68.6594 0) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 250.6679 64.8494 0) (effects (font (size 1.27 1.27)) (justify left) hide) ) ) @@ -2737,10 +2734,10 @@ (effects (font (size 1.27 1.27)) (justify left) hide) ) ) - (global_label "Serial Out" (shape input) (at 238.76 66.04 0) (fields_autoplaced) + (global_label "Serial Out" (shape input) (at 240.03 62.23 0) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify left)) (uuid f3281dd4-f462-4bd0-8120-ab4a82e2ee10) - (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 250.8493 66.1194 0) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 252.1193 62.3094 0) (effects (font (size 1.27 1.27)) (justify left) hide) ) ) @@ -2789,17 +2786,17 @@ (pin "1" (uuid bef493d7-9fe4-4ac1-a80c-cbf670a48529)) ) - (symbol (lib_id "power:GND") (at 223.52 157.48 0) (unit 1) - (in_bom yes) (on_board yes) (fields_autoplaced) + (symbol (lib_id "power:GND") (at 223.52 154.94 0) (unit 1) + (in_bom yes) (on_board yes) (uuid 035b2ae3-d867-47c3-bf19-9eb9de2fbc56) - (property "Reference" "#PWR0115" (id 0) (at 223.52 163.83 0) + (property "Reference" "#PWR0115" (id 0) (at 223.52 161.29 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (id 1) (at 223.52 162.56 0)) - (property "Footprint" "" (id 2) (at 223.52 157.48 0) + (property "Value" "GND" (id 1) (at 219.71 156.21 0)) + (property "Footprint" "" (id 2) (at 223.52 154.94 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 223.52 157.48 0) + (property "Datasheet" "" (id 3) (at 223.52 154.94 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid d1e725cd-7935-44c3-ab0a-51394d341c81)) @@ -3011,17 +3008,17 @@ (pin "1" (uuid f431883c-f5bf-4a41-a503-ce9ba57e99f5)) ) - (symbol (lib_id "power:GND") (at 254 66.04 0) (unit 1) + (symbol (lib_id "power:GND") (at 255.27 59.69 0) (unit 1) (in_bom yes) (on_board yes) (uuid 260a3fd8-313b-4a9e-8440-803cf0a5f65e) - (property "Reference" "#PWR0109" (id 0) (at 254 72.39 0) + (property "Reference" "#PWR0109" (id 0) (at 255.27 66.04 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (id 1) (at 257.81 67.31 0)) - (property "Footprint" "" (id 2) (at 254 66.04 0) + (property "Value" "GND" (id 1) (at 259.08 60.96 0)) + (property "Footprint" "" (id 2) (at 255.27 59.69 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 254 66.04 0) + (property "Datasheet" "" (id 3) (at 255.27 59.69 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 96f5e47a-966d-4135-8f30-500c430e569f)) @@ -3460,6 +3457,22 @@ (pin "1" (uuid f5f04236-85e9-459a-96a7-29074a775ffc)) ) + (symbol (lib_id "power:+5V") (at 238.76 54.61 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 5a8d7aee-78df-4eda-a697-34655515481a) + (property "Reference" "#PWR0136" (id 0) (at 238.76 58.42 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "+5V" (id 1) (at 242.57 53.34 0)) + (property "Footprint" "" (id 2) (at 238.76 54.61 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "" (id 3) (at 238.76 54.61 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 56cd882b-5927-4a12-96d0-cd975f43a667)) + ) + (symbol (lib_id "Device:R") (at 62.23 148.59 90) (mirror x) (unit 1) (in_bom yes) (on_board yes) (fields_autoplaced) (uuid 5ca8a51b-9e91-4a8d-91e1-7c127ca86307) @@ -4140,6 +4153,22 @@ (pin "1" (uuid 5cb2bb0d-3ab8-45e7-ad7c-849a136eb425)) ) + (symbol (lib_id "power:GND") (at 226.06 154.94 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid a8bb9677-b32f-4954-a2ee-d9957faa10d5) + (property "Reference" "#PWR0114" (id 0) (at 226.06 161.29 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "GND" (id 1) (at 229.87 156.21 0)) + (property "Footprint" "" (id 2) (at 226.06 154.94 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "" (id 3) (at 226.06 154.94 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 4871e119-2918-48a5-a549-43ac045ece1b)) + ) + (symbol (lib_id "Device:R") (at 132.08 151.13 90) (mirror x) (unit 1) (in_bom yes) (on_board yes) (uuid aa809784-41f6-4722-b8db-035cb8e26edc) @@ -4171,17 +4200,17 @@ (pin "1" (uuid 3c6e278d-d021-4b6c-864e-a91a5020a84d)) ) - (symbol (lib_id "power:GND") (at 236.22 78.74 0) (unit 1) + (symbol (lib_id "power:GND") (at 238.76 74.93 0) (unit 1) (in_bom yes) (on_board yes) (uuid ab89d681-949f-4c7d-b0eb-52bb500d7dfe) - (property "Reference" "#PWR07" (id 0) (at 236.22 85.09 0) + (property "Reference" "#PWR07" (id 0) (at 238.76 81.28 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (id 1) (at 231.14 80.01 0)) - (property "Footprint" "" (id 2) (at 236.22 78.74 0) + (property "Value" "GND" (id 1) (at 243.84 76.2 0)) + (property "Footprint" "" (id 2) (at 238.76 74.93 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 236.22 78.74 0) + (property "Datasheet" "" (id 3) (at 238.76 74.93 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid ea63f69e-74b6-467e-ac24-e4fdb4652518)) @@ -4334,15 +4363,15 @@ (pin "TN" (uuid 0279eb80-dab6-4800-8bc2-5c583bce7363)) ) - (symbol (lib_id "Connector_Generic:Conn_01x06") (at 231.14 71.12 180) (unit 1) + (symbol (lib_id "Connector_Generic:Conn_01x07") (at 233.68 64.77 180) (unit 1) (in_bom yes) (on_board yes) (uuid c6cc233c-14fd-4c7c-94bb-99dd887ea0f6) - (property "Reference" "J11" (id 0) (at 231.14 57.15 0)) - (property "Value" "Conn_01x05" (id 1) (at 234.95 59.69 0)) - (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x06_P2.54mm_Vertical" (id 2) (at 231.14 71.12 0) + (property "Reference" "J11" (id 0) (at 233.68 50.8 0)) + (property "Value" "Conn_01x07" (id 1) (at 229.87 53.34 0)) + (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x07_P2.54mm_Vertical" (id 2) (at 233.68 64.77 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (id 3) (at 231.14 71.12 0) + (property "Datasheet" "~" (id 3) (at 233.68 64.77 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 6e642493-b026-41b7-bb16-a90f9d083726)) @@ -4351,6 +4380,7 @@ (pin "4" (uuid b844ae78-764b-4231-831f-1accfd15223d)) (pin "5" (uuid a0eca2b8-395e-4455-bce4-9dea2574e696)) (pin "6" (uuid 0c5aecf9-f7dc-47b5-ac34-cdeab25fe4f2)) + (pin "7" (uuid 47ba4990-ac1d-4683-bdfe-5998e6da38f9)) ) (symbol (lib_id "Device:C_Polarized") (at 265.43 71.12 0) (unit 1) @@ -4933,6 +4963,9 @@ (path "/f92bd2b4-0ead-4f3f-bbf9-b01cf688b592" (reference "#PWR0113") (unit 1) (value "GND") (footprint "") ) + (path "/a8bb9677-b32f-4954-a2ee-d9957faa10d5" + (reference "#PWR0114") (unit 1) (value "GND") (footprint "") + ) (path "/035b2ae3-d867-47c3-bf19-9eb9de2fbc56" (reference "#PWR0115") (unit 1) (value "GND") (footprint "") ) @@ -4996,6 +5029,9 @@ (path "/a68220e0-3af4-48c2-b7fe-c8527b65fc2c" (reference "#PWR0135") (unit 1) (value "GND") (footprint "") ) + (path "/5a8d7aee-78df-4eda-a697-34655515481a" + (reference "#PWR0136") (unit 1) (value "+5V") (footprint "") + ) (path "/243f59d3-62ac-44dd-a2ae-34812adab945" (reference "#PWR0137") (unit 1) (value "-12V") (footprint "") ) @@ -5093,7 +5129,7 @@ (reference "J10") (unit 1) (value "Power") (footprint "Connector_PinHeader_2.54mm:PinHeader_2x05_P2.54mm_Vertical") ) (path "/c6cc233c-14fd-4c7c-94bb-99dd887ea0f6" - (reference "J11") (unit 1) (value "Conn_01x05") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x06_P2.54mm_Vertical") + (reference "J11") (unit 1) (value "Conn_01x07") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x07_P2.54mm_Vertical") ) (path "/e49f288e-02e2-4c18-bba4-27f7b024e641" (reference "Q1") (unit 1) (value "PN2222A") (footprint "Package_TO_SOT_THT:TO-92_Inline") diff --git a/Software/Gravity/Gravity.ino b/Software/Gravity/Gravity.ino index 40d0402..4eb46f7 100644 --- a/Software/Gravity/Gravity.ino +++ b/Software/Gravity/Gravity.ino @@ -9,12 +9,13 @@ const char version[5] = "V:1.0"; #define SCREEN_ADDRESS 0x3C + #define PPQN 24 #define PULSE_LENGTH 12 //ms (with 12 ms you can't get higher than 208bpm) #define MAXBPM 200 //250 at 24ppqn with 5ms pulse will be 50/50 square wave #define MINBPM 20 -// Rev 2 and 3 Config +// Rev 2+ Config #define ENC_BTN_PIN 14 #define ENC_D1_PIN 17 #define ENC_D2_PIN 4 @@ -25,10 +26,28 @@ const char version[5] = "V:1.0"; #define ANALOGUE_INPUT_2_PIN A6 const byte outsPins[6] = { 7, 8, 10, 6, 9, 11 }; const byte clockOutPin = 3; +bool rotateScreen = false; +// + +/* Rev 1 Config +#define ENC_BTN_PIN 14 +#define ENC_D1_PIN 17 +#define ENC_D2_PIN 4 +#define START_STOP_BTN_PIN 5 +#define SHIFT_BTN_PIN 100 + +#define EXT_INPUT_PIN 2 //needs to be an interrupt pin +#define ANALOGUE_INPUT_1_PIN A2 +#define ANALOGUE_INPUT_2_PIN A1 + +const byte clockOutPin = 0; +const int outsPins[6] = {6, 11, 7, 10, 8, 9}; +bool rotateScreen = true; +*/ + int CV1Calibration = 512; int CV2Calibration = 512; -bool rotateScreen = false; bool showDone = false; const int subDivs[17] = { -24, -12, -8, -6, -4, -3, -2, 1, 2, 3, 4, 5, 6, 7, 8, 16, 32 }; //positive - divide, negative - multiply, 0 - off