fixing broken branching (I guess)

This commit is contained in:
--global
2023-02-10 01:27:09 +02:00
parent ef82663e6f
commit 6b190610f2
2 changed files with 231 additions and 110 deletions

View File

@ -1187,6 +1187,46 @@
) )
) )
) )
(symbol "power:PWR_FLAG" (power) (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
(property "Reference" "#FLG" (id 0) (at 0 1.905 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Value" "PWR_FLAG" (id 1) (at 0 3.81 0)
(effects (font (size 1.27 1.27)))
)
(property "Footprint" "" (id 2) (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_keywords" "flag power" (id 4) (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_description" "Special symbol for telling ERC where power comes from" (id 5) (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(symbol "PWR_FLAG_0_0"
(pin power_out line (at 0 0 90) (length 0)
(name "pwr" (effects (font (size 1.27 1.27))))
(number "1" (effects (font (size 1.27 1.27))))
)
)
(symbol "PWR_FLAG_0_1"
(polyline
(pts
(xy 0 0)
(xy 0 1.27)
(xy -1.016 1.905)
(xy 0 2.54)
(xy 1.016 1.905)
(xy 0 1.27)
)
(stroke (width 0) (type default) (color 0 0 0 0))
(fill (type none))
)
)
)
) )
(junction (at 133.35 119.38) (diameter 0) (color 0 0 0 0) (junction (at 133.35 119.38) (diameter 0) (color 0 0 0 0)
@ -1265,11 +1305,11 @@
(no_connect (at 34.29 83.82) (uuid 8484e074-dbbf-4a1a-831d-0024b24e16ee)) (no_connect (at 34.29 83.82) (uuid 8484e074-dbbf-4a1a-831d-0024b24e16ee))
(no_connect (at 209.55 142.24) (uuid 8b95855d-6515-42b3-a41d-9f7ee688f1ee)) (no_connect (at 209.55 142.24) (uuid 8b95855d-6515-42b3-a41d-9f7ee688f1ee))
(no_connect (at 34.29 55.88) (uuid 8c00c48a-3885-4e94-a56e-75fdd48c8ac2)) (no_connect (at 34.29 55.88) (uuid 8c00c48a-3885-4e94-a56e-75fdd48c8ac2))
(no_connect (at 243.84 39.37) (uuid a0d170d8-3db5-4838-9c94-ef7870c6e049)) (no_connect (at 237.49 39.37) (uuid a0d170d8-3db5-4838-9c94-ef7870c6e049))
(no_connect (at 224.79 99.06) (uuid bab23eb2-2de9-4101-8518-b1550e4ed0ff)) (no_connect (at 224.79 99.06) (uuid bab23eb2-2de9-4101-8518-b1550e4ed0ff))
(no_connect (at 34.29 29.21) (uuid caea21cf-ff3a-459d-ae29-45e99bc93b79)) (no_connect (at 34.29 29.21) (uuid caea21cf-ff3a-459d-ae29-45e99bc93b79))
(no_connect (at 234.95 139.7) (uuid db24a170-3d86-4eab-9e17-58ef98514e13)) (no_connect (at 234.95 139.7) (uuid db24a170-3d86-4eab-9e17-58ef98514e13))
(no_connect (at 231.14 39.37) (uuid e8ca4f0d-a621-4155-bb6d-22c7e5b67cc8)) (no_connect (at 224.79 39.37) (uuid e8ca4f0d-a621-4155-bb6d-22c7e5b67cc8))
(no_connect (at 125.73 116.84) (uuid ea9f4de5-a3b7-4d25-b9b8-2a6dc773c798)) (no_connect (at 125.73 116.84) (uuid ea9f4de5-a3b7-4d25-b9b8-2a6dc773c798))
(no_connect (at 209.55 111.76) (uuid f8d1eb9a-85db-4bec-a3ee-1dfcab1b3638)) (no_connect (at 209.55 111.76) (uuid f8d1eb9a-85db-4bec-a3ee-1dfcab1b3638))
@ -1281,7 +1321,7 @@
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 027f9699-2343-42bb-a65b-9a391af04a84) (uuid 027f9699-2343-42bb-a65b-9a391af04a84)
) )
(wire (pts (xy 203.2 53.34) (xy 203.2 59.69)) (wire (pts (xy 208.28 57.15) (xy 208.28 63.5))
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 02f7a7c9-330b-4799-8e3c-3005ca5a2490) (uuid 02f7a7c9-330b-4799-8e3c-3005ca5a2490)
) )
@ -1365,7 +1405,7 @@
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 2450b13d-1b2c-42e2-9f3c-022c8d283799) (uuid 2450b13d-1b2c-42e2-9f3c-022c8d283799)
) )
(wire (pts (xy 198.12 57.15) (xy 198.12 59.69)) (wire (pts (xy 203.2 60.96) (xy 203.2 63.5))
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 24898c03-0432-4355-9022-1dd4a494db3b) (uuid 24898c03-0432-4355-9022-1dd4a494db3b)
) )
@ -1373,7 +1413,7 @@
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 24a77f75-c600-45cb-bf5f-afea87ea647c) (uuid 24a77f75-c600-45cb-bf5f-afea87ea647c)
) )
(wire (pts (xy 208.28 53.34) (xy 203.2 53.34)) (wire (pts (xy 213.36 57.15) (xy 208.28 57.15))
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 2687bf03-ffc2-4d48-aa6f-1aef93caa657) (uuid 2687bf03-ffc2-4d48-aa6f-1aef93caa657)
) )
@ -1445,7 +1485,7 @@
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 424bddd5-e4c0-4213-9962-b2fbadf83fa5) (uuid 424bddd5-e4c0-4213-9962-b2fbadf83fa5)
) )
(wire (pts (xy 266.7 29.21) (xy 266.7 33.02)) (wire (pts (xy 264.16 59.69) (xy 264.16 63.5))
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 4311a415-97b2-43f6-a81d-718e51e1b859) (uuid 4311a415-97b2-43f6-a81d-718e51e1b859)
) )
@ -1505,7 +1545,7 @@
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 562310d2-adf2-419e-9830-62ae0465e602) (uuid 562310d2-adf2-419e-9830-62ae0465e602)
) )
(wire (pts (xy 200.66 52.07) (xy 200.66 59.69)) (wire (pts (xy 205.74 55.88) (xy 205.74 63.5))
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 578b6235-424f-4ef7-a13a-2eb828fdff70) (uuid 578b6235-424f-4ef7-a13a-2eb828fdff70)
) )
@ -1557,7 +1597,7 @@
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 72a11c15-bc2e-4e4e-b064-0530d656a4f2) (uuid 72a11c15-bc2e-4e4e-b064-0530d656a4f2)
) )
(wire (pts (xy 205.74 55.88) (xy 205.74 59.69)) (wire (pts (xy 210.82 59.69) (xy 210.82 63.5))
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 72d28e7a-0912-41d1-8bf0-5186c787f495) (uuid 72d28e7a-0912-41d1-8bf0-5186c787f495)
) )
@ -1581,6 +1621,10 @@
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 79316b3e-2102-4fb8-bab4-d5f294e51ad5) (uuid 79316b3e-2102-4fb8-bab4-d5f294e51ad5)
) )
(wire (pts (xy 264.16 30.48) (xy 264.16 29.21))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 7bcb371c-ec10-470a-b2e8-66db86fe4716)
)
(wire (pts (xy 128.27 81.28) (xy 128.27 88.9)) (wire (pts (xy 128.27 81.28) (xy 128.27 88.9))
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 7bd72df4-68a1-4663-8001-035714ea1d46) (uuid 7bd72df4-68a1-4663-8001-035714ea1d46)
@ -1601,7 +1645,7 @@
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 82317089-b175-489a-bc94-26da770e0fe7) (uuid 82317089-b175-489a-bc94-26da770e0fe7)
) )
(wire (pts (xy 191.77 63.5) (xy 191.77 57.15)) (wire (pts (xy 196.85 67.31) (xy 196.85 60.96))
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 84628db2-78f4-455d-935c-669b74635348) (uuid 84628db2-78f4-455d-935c-669b74635348)
) )
@ -1609,7 +1653,7 @@
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 84cd1643-db67-46fc-bdb3-0f8472565395) (uuid 84cd1643-db67-46fc-bdb3-0f8472565395)
) )
(wire (pts (xy 266.7 40.64) (xy 266.7 44.45)) (wire (pts (xy 264.16 71.12) (xy 264.16 74.93))
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid 86c8fad4-f866-45ee-b358-729a62f22e4b) (uuid 86c8fad4-f866-45ee-b358-729a62f22e4b)
) )
@ -1737,6 +1781,10 @@
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid be91969f-27d0-4896-bda7-89479ff2c6f0) (uuid be91969f-27d0-4896-bda7-89479ff2c6f0)
) )
(wire (pts (xy 259.08 39.37) (xy 269.24 39.37))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid c12ccb97-f783-44fd-8738-834eb199f813)
)
(wire (pts (xy 41.91 170.18) (xy 41.91 172.72)) (wire (pts (xy 41.91 170.18) (xy 41.91 172.72))
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid c1344527-bf12-418e-bb93-1ab1cbcbc765) (uuid c1344527-bf12-418e-bb93-1ab1cbcbc765)
@ -1785,7 +1833,7 @@
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid d80078b3-94d9-48bf-85f9-0552f3304675) (uuid d80078b3-94d9-48bf-85f9-0552f3304675)
) )
(wire (pts (xy 191.77 57.15) (xy 198.12 57.15)) (wire (pts (xy 196.85 60.96) (xy 203.2 60.96))
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid d8c2b0e0-464d-4f8a-a354-013c2fcd2746) (uuid d8c2b0e0-464d-4f8a-a354-013c2fcd2746)
) )
@ -1841,7 +1889,7 @@
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid f1f7c476-78c3-4fc6-86a1-82fcc5b5f687) (uuid f1f7c476-78c3-4fc6-86a1-82fcc5b5f687)
) )
(wire (pts (xy 208.28 55.88) (xy 205.74 55.88)) (wire (pts (xy 213.36 59.69) (xy 210.82 59.69))
(stroke (width 0) (type default) (color 0 0 0 0)) (stroke (width 0) (type default) (color 0 0 0 0))
(uuid f3cfd946-5506-454f-be6b-f33cc891d633) (uuid f3cfd946-5506-454f-be6b-f33cc891d633)
) )
@ -2050,17 +2098,17 @@
(effects (font (size 1.27 1.27)) (justify right) hide) (effects (font (size 1.27 1.27)) (justify right) hide)
) )
) )
(global_label "I2C SCL" (shape input) (at 208.28 53.34 0) (fields_autoplaced) (global_label "I2C SCL" (shape input) (at 213.36 57.15 0) (fields_autoplaced)
(effects (font (size 1.27 1.27)) (justify left)) (effects (font (size 1.27 1.27)) (justify left))
(uuid dcdc363f-2ef2-4d10-9454-938591e28501) (uuid dcdc363f-2ef2-4d10-9454-938591e28501)
(property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 218.2526 53.2606 0) (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 223.3326 57.0706 0)
(effects (font (size 1.27 1.27)) (justify left) hide) (effects (font (size 1.27 1.27)) (justify left) hide)
) )
) )
(global_label "I2C SDA" (shape input) (at 208.28 55.88 0) (fields_autoplaced) (global_label "I2C SDA" (shape input) (at 213.36 59.69 0) (fields_autoplaced)
(effects (font (size 1.27 1.27)) (justify left)) (effects (font (size 1.27 1.27)) (justify left))
(uuid e25bc814-1635-4f2a-9ce5-9421e47606a9) (uuid e25bc814-1635-4f2a-9ce5-9421e47606a9)
(property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 218.3131 55.8006 0) (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 223.3931 59.6106 0)
(effects (font (size 1.27 1.27)) (justify left) hide) (effects (font (size 1.27 1.27)) (justify left) hide)
) )
) )
@ -2243,6 +2291,24 @@
(pin "1" (uuid f431883c-f5bf-4a41-a503-ce9ba57e99f5)) (pin "1" (uuid f431883c-f5bf-4a41-a503-ce9ba57e99f5))
) )
(symbol (lib_id "power:+12V") (at 264.16 29.21 0) (unit 1)
(in_bom yes) (on_board yes)
(uuid 2898a7e8-2109-4141-b7cd-4e8e186df734)
(property "Reference" "#PWR0136" (id 0) (at 264.16 33.02 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Value" "+12V" (id 1) (at 266.7 24.13 0)
(effects (font (size 1.27 1.27)) (justify right))
)
(property "Footprint" "" (id 2) (at 264.16 29.21 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "" (id 3) (at 264.16 29.21 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 3390d881-e3da-4991-aceb-06045a3541ee))
)
(symbol (lib_id "power:GND") (at 147.32 171.45 0) (mirror y) (unit 1) (symbol (lib_id "power:GND") (at 147.32 171.45 0) (mirror y) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced) (in_bom yes) (on_board yes) (fields_autoplaced)
(uuid 29bed306-5048-43ff-849c-7d57c7e3f851) (uuid 29bed306-5048-43ff-849c-7d57c7e3f851)
@ -2291,19 +2357,19 @@
(pin "1" (uuid 89efd7c0-a6c5-4ce9-b2dc-e6f87dfca314)) (pin "1" (uuid 89efd7c0-a6c5-4ce9-b2dc-e6f87dfca314))
) )
(symbol (lib_id "power:GND") (at 231.14 31.75 270) (unit 1) (symbol (lib_id "power:GND") (at 224.79 31.75 270) (unit 1)
(in_bom yes) (on_board yes) (in_bom yes) (on_board yes)
(uuid 2da6c588-b66c-4c5c-8249-6c2ceb681034) (uuid 2da6c588-b66c-4c5c-8249-6c2ceb681034)
(property "Reference" "#PWR0130" (id 0) (at 224.79 31.75 0) (property "Reference" "#PWR0130" (id 0) (at 218.44 31.75 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Value" "GND" (id 1) (at 223.52 31.75 90) (property "Value" "GND" (id 1) (at 217.17 31.75 90)
(effects (font (size 1.27 1.27)) (justify left)) (effects (font (size 1.27 1.27)) (justify left))
) )
(property "Footprint" "" (id 2) (at 231.14 31.75 0) (property "Footprint" "" (id 2) (at 224.79 31.75 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Datasheet" "" (id 3) (at 231.14 31.75 0) (property "Datasheet" "" (id 3) (at 224.79 31.75 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "1" (uuid 7cd6c880-a128-403a-9c10-ec94d9f512e3)) (pin "1" (uuid 7cd6c880-a128-403a-9c10-ec94d9f512e3))
@ -2340,19 +2406,19 @@
(pin "2" (uuid 8934e0a6-600e-4e18-ae1d-7c62d8927779)) (pin "2" (uuid 8934e0a6-600e-4e18-ae1d-7c62d8927779))
) )
(symbol (lib_id "power:GND") (at 243.84 31.75 90) (unit 1) (symbol (lib_id "power:GND") (at 237.49 31.75 90) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced) (in_bom yes) (on_board yes) (fields_autoplaced)
(uuid 36e94740-d5ed-476d-8416-a951bfac7323) (uuid 36e94740-d5ed-476d-8416-a951bfac7323)
(property "Reference" "#PWR0119" (id 0) (at 250.19 31.75 0) (property "Reference" "#PWR0119" (id 0) (at 243.84 31.75 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Value" "GND" (id 1) (at 247.65 31.7499 90) (property "Value" "GND" (id 1) (at 241.3 31.7499 90)
(effects (font (size 1.27 1.27)) (justify right)) (effects (font (size 1.27 1.27)) (justify right))
) )
(property "Footprint" "" (id 2) (at 243.84 31.75 0) (property "Footprint" "" (id 2) (at 237.49 31.75 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Datasheet" "" (id 3) (at 243.84 31.75 0) (property "Datasheet" "" (id 3) (at 237.49 31.75 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "1" (uuid d84a11e7-ce5e-4a0d-a653-bed50f50fee6)) (pin "1" (uuid d84a11e7-ce5e-4a0d-a653-bed50f50fee6))
@ -2377,35 +2443,35 @@
(pin "2" (uuid a21b04d6-96f7-4b46-add5-792547db9134)) (pin "2" (uuid a21b04d6-96f7-4b46-add5-792547db9134))
) )
(symbol (lib_id "power:GND") (at 266.7 44.45 0) (unit 1) (symbol (lib_id "power:GND") (at 264.16 74.93 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced) (in_bom yes) (on_board yes) (fields_autoplaced)
(uuid 3a9f9db6-a257-453e-af78-b6a17d84ce98) (uuid 3a9f9db6-a257-453e-af78-b6a17d84ce98)
(property "Reference" "#PWR0125" (id 0) (at 266.7 50.8 0) (property "Reference" "#PWR0125" (id 0) (at 264.16 81.28 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Value" "GND" (id 1) (at 266.7 49.53 0)) (property "Value" "GND" (id 1) (at 264.16 80.01 0))
(property "Footprint" "" (id 2) (at 266.7 44.45 0) (property "Footprint" "" (id 2) (at 264.16 74.93 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Datasheet" "" (id 3) (at 266.7 44.45 0) (property "Datasheet" "" (id 3) (at 264.16 74.93 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "1" (uuid f6b8a1c2-1359-4f07-a654-fb1455545c11)) (pin "1" (uuid f6b8a1c2-1359-4f07-a654-fb1455545c11))
) )
(symbol (lib_id "power:GND") (at 243.84 36.83 90) (unit 1) (symbol (lib_id "power:GND") (at 237.49 36.83 90) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced) (in_bom yes) (on_board yes) (fields_autoplaced)
(uuid 3ddc416b-cdb0-4d5f-890d-29c11aaad5c2) (uuid 3ddc416b-cdb0-4d5f-890d-29c11aaad5c2)
(property "Reference" "#PWR0120" (id 0) (at 250.19 36.83 0) (property "Reference" "#PWR0120" (id 0) (at 243.84 36.83 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Value" "GND" (id 1) (at 247.65 36.8299 90) (property "Value" "GND" (id 1) (at 241.3 36.8299 90)
(effects (font (size 1.27 1.27)) (justify right)) (effects (font (size 1.27 1.27)) (justify right))
) )
(property "Footprint" "" (id 2) (at 243.84 36.83 0) (property "Footprint" "" (id 2) (at 237.49 36.83 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Datasheet" "" (id 3) (at 243.84 36.83 0) (property "Datasheet" "" (id 3) (at 237.49 36.83 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "1" (uuid dd20f6c7-e850-4faa-bada-b929a4ce8ab4)) (pin "1" (uuid dd20f6c7-e850-4faa-bada-b929a4ce8ab4))
@ -2543,19 +2609,19 @@
(pin "1" (uuid 7d6e2aad-da4e-4f7a-8214-ca372074356c)) (pin "1" (uuid 7d6e2aad-da4e-4f7a-8214-ca372074356c))
) )
(symbol (lib_id "power:GND") (at 231.14 36.83 270) (unit 1) (symbol (lib_id "power:GND") (at 224.79 36.83 270) (unit 1)
(in_bom yes) (on_board yes) (in_bom yes) (on_board yes)
(uuid 597c32f2-24ed-45d0-9536-7d901c7d412c) (uuid 597c32f2-24ed-45d0-9536-7d901c7d412c)
(property "Reference" "#PWR0129" (id 0) (at 224.79 36.83 0) (property "Reference" "#PWR0129" (id 0) (at 218.44 36.83 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Value" "GND" (id 1) (at 223.52 36.83 90) (property "Value" "GND" (id 1) (at 217.17 36.83 90)
(effects (font (size 1.27 1.27)) (justify left)) (effects (font (size 1.27 1.27)) (justify left))
) )
(property "Footprint" "" (id 2) (at 231.14 36.83 0) (property "Footprint" "" (id 2) (at 224.79 36.83 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Datasheet" "" (id 3) (at 231.14 36.83 0) (property "Datasheet" "" (id 3) (at 224.79 36.83 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "1" (uuid f5f04236-85e9-459a-96a7-29074a775ffc)) (pin "1" (uuid f5f04236-85e9-459a-96a7-29074a775ffc))
@ -2606,6 +2672,22 @@
(pin "2" (uuid 35cad84c-ae12-4fb8-8cbc-373d0846f281)) (pin "2" (uuid 35cad84c-ae12-4fb8-8cbc-373d0846f281))
) )
(symbol (lib_id "power:PWR_FLAG") (at 264.16 30.48 180) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(uuid 647c41dc-c5c6-44b2-bbb5-1916822efaef)
(property "Reference" "#FLG0101" (id 0) (at 264.16 32.385 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Value" "PWR_FLAG" (id 1) (at 264.16 35.56 0))
(property "Footprint" "" (id 2) (at 264.16 30.48 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 264.16 30.48 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 5d899b55-4ea2-46b3-b557-b0efd9933718))
)
(symbol (lib_id "Device:R") (at 55.88 81.28 270) (mirror x) (unit 1) (symbol (lib_id "Device:R") (at 55.88 81.28 270) (mirror x) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced) (in_bom yes) (on_board yes) (fields_autoplaced)
(uuid 6531f44c-be45-4ce2-9295-7226491db535) (uuid 6531f44c-be45-4ce2-9295-7226491db535)
@ -2702,55 +2784,55 @@
(pin "1" (uuid fbecd8bf-d195-419a-b9e8-a73df623232b)) (pin "1" (uuid fbecd8bf-d195-419a-b9e8-a73df623232b))
) )
(symbol (lib_id "power:+12V") (at 231.14 29.21 90) (unit 1) (symbol (lib_id "power:+12V") (at 224.79 29.21 90) (unit 1)
(in_bom yes) (on_board yes) (in_bom yes) (on_board yes)
(uuid 70eb0086-5e7a-45b5-9379-3264d02ec304) (uuid 70eb0086-5e7a-45b5-9379-3264d02ec304)
(property "Reference" "#PWR0128" (id 0) (at 234.95 29.21 0) (property "Reference" "#PWR0128" (id 0) (at 228.6 29.21 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Value" "+12V" (id 1) (at 222.25 29.21 90) (property "Value" "+12V" (id 1) (at 215.9 29.21 90)
(effects (font (size 1.27 1.27)) (justify right)) (effects (font (size 1.27 1.27)) (justify right))
) )
(property "Footprint" "" (id 2) (at 231.14 29.21 0) (property "Footprint" "" (id 2) (at 224.79 29.21 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Datasheet" "" (id 3) (at 231.14 29.21 0) (property "Datasheet" "" (id 3) (at 224.79 29.21 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "1" (uuid a75d29bd-ee1a-439e-8a41-a74433298b87)) (pin "1" (uuid a75d29bd-ee1a-439e-8a41-a74433298b87))
) )
(symbol (lib_id "power:GND") (at 191.77 63.5 0) (unit 1) (symbol (lib_id "power:GND") (at 196.85 67.31 0) (unit 1)
(in_bom yes) (on_board yes) (in_bom yes) (on_board yes)
(uuid 7b7ad927-3c71-49b5-bc26-0ba2998debe8) (uuid 7b7ad927-3c71-49b5-bc26-0ba2998debe8)
(property "Reference" "#PWR0126" (id 0) (at 191.77 69.85 0) (property "Reference" "#PWR0126" (id 0) (at 196.85 73.66 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Value" "GND" (id 1) (at 185.42 64.77 0) (property "Value" "GND" (id 1) (at 190.5 68.58 0)
(effects (font (size 1.27 1.27)) (justify left)) (effects (font (size 1.27 1.27)) (justify left))
) )
(property "Footprint" "" (id 2) (at 191.77 63.5 0) (property "Footprint" "" (id 2) (at 196.85 67.31 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Datasheet" "" (id 3) (at 191.77 63.5 0) (property "Datasheet" "" (id 3) (at 196.85 67.31 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "1" (uuid d58a4889-37f2-4dd1-ae53-30c5dfe86da8)) (pin "1" (uuid d58a4889-37f2-4dd1-ae53-30c5dfe86da8))
) )
(symbol (lib_id "SSD1306-128x64_OLED:SSD1306") (at 201.93 68.58 0) (unit 1) (symbol (lib_id "SSD1306-128x64_OLED:SSD1306") (at 207.01 72.39 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced) (in_bom yes) (on_board yes) (fields_autoplaced)
(uuid 7bf92304-c94f-487f-a0a2-64400cc70b48) (uuid 7bf92304-c94f-487f-a0a2-64400cc70b48)
(property "Reference" "Brd1" (id 0) (at 209.55 67.3099 0) (property "Reference" "Brd1" (id 0) (at 214.63 71.1199 0)
(effects (font (size 1.27 1.27)) (justify left)) (effects (font (size 1.27 1.27)) (justify left))
) )
(property "Value" "SSD1306" (id 1) (at 209.55 69.8499 0) (property "Value" "SSD1306" (id 1) (at 214.63 73.6599 0)
(effects (font (size 1.27 1.27)) (justify left)) (effects (font (size 1.27 1.27)) (justify left))
) )
(property "Footprint" "SDD1360 I2C:128x64OLED" (id 2) (at 201.93 62.23 0) (property "Footprint" "SDD1360 I2C:128x64OLED" (id 2) (at 207.01 66.04 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Datasheet" "" (id 3) (at 201.93 62.23 0) (property "Datasheet" "" (id 3) (at 207.01 66.04 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "1" (uuid 5e5814e2-8551-4875-86de-1466c4dc031c)) (pin "1" (uuid 5e5814e2-8551-4875-86de-1466c4dc031c))
@ -2858,19 +2940,35 @@
(pin "2" (uuid 38ffb1cf-7a9d-4de8-99bc-7bf4b971910b)) (pin "2" (uuid 38ffb1cf-7a9d-4de8-99bc-7bf4b971910b))
) )
(symbol (lib_id "power:+12V") (at 243.84 29.21 270) (unit 1) (symbol (lib_id "power:PWR_FLAG") (at 269.24 39.37 180) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(uuid 92b6bfb6-e11a-411b-8bf1-9276cfdeeba7)
(property "Reference" "#FLG0102" (id 0) (at 269.24 41.275 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Value" "PWR_FLAG" (id 1) (at 269.24 44.45 0))
(property "Footprint" "" (id 2) (at 269.24 39.37 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 269.24 39.37 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid daefb100-cea2-466d-aa73-09b3e61e091f))
)
(symbol (lib_id "power:+12V") (at 237.49 29.21 270) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced) (in_bom yes) (on_board yes) (fields_autoplaced)
(uuid 93f1bd82-2064-45c0-a102-acab5818a56f) (uuid 93f1bd82-2064-45c0-a102-acab5818a56f)
(property "Reference" "#PWR0118" (id 0) (at 240.03 29.21 0) (property "Reference" "#PWR0118" (id 0) (at 233.68 29.21 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Value" "+12V" (id 1) (at 247.65 29.2099 90) (property "Value" "+12V" (id 1) (at 241.3 29.2099 90)
(effects (font (size 1.27 1.27)) (justify left)) (effects (font (size 1.27 1.27)) (justify left))
) )
(property "Footprint" "" (id 2) (at 243.84 29.21 0) (property "Footprint" "" (id 2) (at 237.49 29.21 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Datasheet" "" (id 3) (at 243.84 29.21 0) (property "Datasheet" "" (id 3) (at 237.49 29.21 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "1" (uuid 44129472-7846-4947-9329-a7f8211de9ed)) (pin "1" (uuid 44129472-7846-4947-9329-a7f8211de9ed))
@ -2939,17 +3037,17 @@
(pin "1" (uuid ef7525fe-28fc-4eb2-8cd0-40d69a298de0)) (pin "1" (uuid ef7525fe-28fc-4eb2-8cd0-40d69a298de0))
) )
(symbol (lib_id "power:+12V") (at 266.7 29.21 0) (unit 1) (symbol (lib_id "power:+12V") (at 264.16 59.69 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced) (in_bom yes) (on_board yes) (fields_autoplaced)
(uuid 9fece9c7-d85b-4e2f-9722-30dfa3f80773) (uuid 9fece9c7-d85b-4e2f-9722-30dfa3f80773)
(property "Reference" "#PWR0124" (id 0) (at 266.7 33.02 0) (property "Reference" "#PWR0124" (id 0) (at 264.16 63.5 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Value" "+12V" (id 1) (at 266.7 24.13 0)) (property "Value" "+12V" (id 1) (at 264.16 54.61 0))
(property "Footprint" "" (id 2) (at 266.7 29.21 0) (property "Footprint" "" (id 2) (at 264.16 59.69 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Datasheet" "" (id 3) (at 266.7 29.21 0) (property "Datasheet" "" (id 3) (at 264.16 59.69 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "1" (uuid 155da672-1389-4303-bce6-3f1bfeff18e6)) (pin "1" (uuid 155da672-1389-4303-bce6-3f1bfeff18e6))
@ -2986,19 +3084,19 @@
(pin "1" (uuid a77df635-30c3-4230-a2d4-9bdbf14563bb)) (pin "1" (uuid a77df635-30c3-4230-a2d4-9bdbf14563bb))
) )
(symbol (lib_id "power:GND") (at 231.14 34.29 270) (unit 1) (symbol (lib_id "power:GND") (at 224.79 34.29 270) (unit 1)
(in_bom yes) (on_board yes) (in_bom yes) (on_board yes)
(uuid a746479f-0e4c-4131-9c4e-ed32506e811d) (uuid a746479f-0e4c-4131-9c4e-ed32506e811d)
(property "Reference" "#PWR0127" (id 0) (at 224.79 34.29 0) (property "Reference" "#PWR0127" (id 0) (at 218.44 34.29 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Value" "GND" (id 1) (at 223.52 34.29 90) (property "Value" "GND" (id 1) (at 217.17 34.29 90)
(effects (font (size 1.27 1.27)) (justify left)) (effects (font (size 1.27 1.27)) (justify left))
) )
(property "Footprint" "" (id 2) (at 231.14 34.29 0) (property "Footprint" "" (id 2) (at 224.79 34.29 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Datasheet" "" (id 3) (at 231.14 34.29 0) (property "Datasheet" "" (id 3) (at 224.79 34.29 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "1" (uuid 5cb2bb0d-3ab8-45e7-ad7c-849a136eb425)) (pin "1" (uuid 5cb2bb0d-3ab8-45e7-ad7c-849a136eb425))
@ -3103,19 +3201,19 @@
(pin "1" (uuid a8d9dd74-d0de-43b9-98e6-512bc4f25aff)) (pin "1" (uuid a8d9dd74-d0de-43b9-98e6-512bc4f25aff))
) )
(symbol (lib_id "power:+5V") (at 200.66 52.07 0) (unit 1) (symbol (lib_id "power:+5V") (at 205.74 55.88 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced) (in_bom yes) (on_board yes) (fields_autoplaced)
(uuid c04ba119-585c-4bfe-a8b5-9f8155289443) (uuid c04ba119-585c-4bfe-a8b5-9f8155289443)
(property "Reference" "#PWR0122" (id 0) (at 200.66 55.88 0) (property "Reference" "#PWR0122" (id 0) (at 205.74 59.69 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Value" "+5V" (id 1) (at 202.565 50.7999 0) (property "Value" "+5V" (id 1) (at 207.645 54.6099 0)
(effects (font (size 1.27 1.27)) (justify left)) (effects (font (size 1.27 1.27)) (justify left))
) )
(property "Footprint" "" (id 2) (at 200.66 52.07 0) (property "Footprint" "" (id 2) (at 205.74 55.88 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Datasheet" "" (id 3) (at 200.66 52.07 0) (property "Datasheet" "" (id 3) (at 205.74 55.88 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "1" (uuid ac14a4b0-7aa9-4651-a8e0-fa67805451ec)) (pin "1" (uuid ac14a4b0-7aa9-4651-a8e0-fa67805451ec))
@ -3141,19 +3239,19 @@
(pin "TN" (uuid 0279eb80-dab6-4800-8bc2-5c583bce7363)) (pin "TN" (uuid 0279eb80-dab6-4800-8bc2-5c583bce7363))
) )
(symbol (lib_id "Device:C_Polarized") (at 266.7 36.83 0) (unit 1) (symbol (lib_id "Device:C_Polarized") (at 264.16 67.31 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced) (in_bom yes) (on_board yes) (fields_autoplaced)
(uuid c76da21c-1f4b-43d9-83f0-b73a1ab63890) (uuid c76da21c-1f4b-43d9-83f0-b73a1ab63890)
(property "Reference" "C1" (id 0) (at 270.51 34.6709 0) (property "Reference" "C1" (id 0) (at 267.97 65.1509 0)
(effects (font (size 1.27 1.27)) (justify left)) (effects (font (size 1.27 1.27)) (justify left))
) )
(property "Value" "10uF" (id 1) (at 270.51 37.2109 0) (property "Value" "10uF" (id 1) (at 267.97 67.6909 0)
(effects (font (size 1.27 1.27)) (justify left)) (effects (font (size 1.27 1.27)) (justify left))
) )
(property "Footprint" "Capacitor_THT:CP_Radial_D4.0mm_P2.00mm" (id 2) (at 267.6652 40.64 0) (property "Footprint" "Capacitor_THT:CP_Radial_D4.0mm_P2.00mm" (id 2) (at 265.1252 71.12 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Datasheet" "~" (id 3) (at 266.7 36.83 0) (property "Datasheet" "~" (id 3) (at 264.16 67.31 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "1" (uuid 421e5099-aab9-4727-b34a-0b5d81ee2145)) (pin "1" (uuid 421e5099-aab9-4727-b34a-0b5d81ee2145))
@ -3206,15 +3304,15 @@
(pin "2" (uuid c2df397a-8279-4b42-a64a-efffd11c33d4)) (pin "2" (uuid c2df397a-8279-4b42-a64a-efffd11c33d4))
) )
(symbol (lib_id "Connector_Generic:Conn_02x05_Odd_Even") (at 236.22 34.29 0) (unit 1) (symbol (lib_id "Connector_Generic:Conn_02x05_Odd_Even") (at 229.87 34.29 0) (unit 1)
(in_bom yes) (on_board yes) (in_bom yes) (on_board yes)
(uuid cfacf08c-d7f6-49e7-ab77-ddac5a3ad490) (uuid cfacf08c-d7f6-49e7-ab77-ddac5a3ad490)
(property "Reference" "J10" (id 0) (at 237.49 22.86 0)) (property "Reference" "J10" (id 0) (at 231.14 22.86 0))
(property "Value" "Power" (id 1) (at 237.49 25.4 0)) (property "Value" "Power" (id 1) (at 231.14 25.4 0))
(property "Footprint" "Connector_IDC:IDC-Header_2x05_P2.54mm_Vertical" (id 2) (at 236.22 34.29 0) (property "Footprint" "Connector_IDC:IDC-Header_2x05_P2.54mm_Vertical" (id 2) (at 229.87 34.29 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Datasheet" "~" (id 3) (at 236.22 34.29 0) (property "Datasheet" "~" (id 3) (at 229.87 34.29 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "1" (uuid 8441c456-ee99-4dd2-9d4b-4704548bec62)) (pin "1" (uuid 8441c456-ee99-4dd2-9d4b-4704548bec62))
@ -3345,19 +3443,19 @@
(pin "2" (uuid 504c7f97-0e44-4a7f-ab24-02bf4a53447d)) (pin "2" (uuid 504c7f97-0e44-4a7f-ab24-02bf4a53447d))
) )
(symbol (lib_id "power:GND") (at 243.84 34.29 90) (unit 1) (symbol (lib_id "power:GND") (at 237.49 34.29 90) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced) (in_bom yes) (on_board yes) (fields_autoplaced)
(uuid e154ad8a-4f24-488c-86f7-cb96b9fa1ac7) (uuid e154ad8a-4f24-488c-86f7-cb96b9fa1ac7)
(property "Reference" "#PWR0121" (id 0) (at 250.19 34.29 0) (property "Reference" "#PWR0121" (id 0) (at 243.84 34.29 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Value" "GND" (id 1) (at 247.65 34.2899 90) (property "Value" "GND" (id 1) (at 241.3 34.2899 90)
(effects (font (size 1.27 1.27)) (justify right)) (effects (font (size 1.27 1.27)) (justify right))
) )
(property "Footprint" "" (id 2) (at 243.84 34.29 0) (property "Footprint" "" (id 2) (at 237.49 34.29 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Datasheet" "" (id 3) (at 243.84 34.29 0) (property "Datasheet" "" (id 3) (at 237.49 34.29 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "1" (uuid 5553b271-20f5-411a-a697-7e0ecffb5265)) (pin "1" (uuid 5553b271-20f5-411a-a697-7e0ecffb5265))
@ -3459,11 +3557,33 @@
(pin "1" (uuid b4eb0b75-ba86-4505-8edd-f8750197d17b)) (pin "1" (uuid b4eb0b75-ba86-4505-8edd-f8750197d17b))
) )
(symbol (lib_id "power:GND") (at 259.08 39.37 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(uuid f8d9f56d-a720-4b7d-a8e1-7f25162a9648)
(property "Reference" "#PWR0138" (id 0) (at 259.08 45.72 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Value" "GND" (id 1) (at 259.08 44.45 0))
(property "Footprint" "" (id 2) (at 259.08 39.37 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "" (id 3) (at 259.08 39.37 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 82538fc7-d484-4df9-98b0-93c802ab3056))
)
(sheet_instances (sheet_instances
(path "/" (page "1")) (path "/" (page "1"))
) )
(symbol_instances (symbol_instances
(path "/647c41dc-c5c6-44b2-bbb5-1916822efaef"
(reference "#FLG0101") (unit 1) (value "PWR_FLAG") (footprint "")
)
(path "/92b6bfb6-e11a-411b-8bf1-9276cfdeeba7"
(reference "#FLG0102") (unit 1) (value "PWR_FLAG") (footprint "")
)
(path "/f6d489ad-265c-4722-a754-e898ab2107cb" (path "/f6d489ad-265c-4722-a754-e898ab2107cb"
(reference "#PWR0101") (unit 1) (value "GND") (footprint "") (reference "#PWR0101") (unit 1) (value "GND") (footprint "")
) )
@ -3569,6 +3689,12 @@
(path "/a68220e0-3af4-48c2-b7fe-c8527b65fc2c" (path "/a68220e0-3af4-48c2-b7fe-c8527b65fc2c"
(reference "#PWR0135") (unit 1) (value "GND") (footprint "") (reference "#PWR0135") (unit 1) (value "GND") (footprint "")
) )
(path "/2898a7e8-2109-4141-b7cd-4e8e186df734"
(reference "#PWR0136") (unit 1) (value "+12V") (footprint "")
)
(path "/f8d9f56d-a720-4b7d-a8e1-7f25162a9648"
(reference "#PWR0138") (unit 1) (value "GND") (footprint "")
)
(path "/4c634076-2117-4c1d-92ba-39f5c41f33db" (path "/4c634076-2117-4c1d-92ba-39f5c41f33db"
(reference "A1") (unit 1) (value "Arduino_Nano_v2.x") (footprint "Module:Arduino_Nano") (reference "A1") (unit 1) (value "Arduino_Nano_v2.x") (footprint "Module:Arduino_Nano")
) )

View File

@ -12,7 +12,6 @@
#define MAXBPM 250 //250 at 24ppqn with 5ms pulse will be 50/50 square wave #define MAXBPM 250 //250 at 24ppqn with 5ms pulse will be 50/50 square wave
#define MINBPM 20 #define MINBPM 20
#define INPUT_CONNECTED_PIN 0
#define INPUT_PIN 2 //needs to be an interrupt pin #define INPUT_PIN 2 //needs to be an interrupt pin
#define ENC_BTN_PIN 17 #define ENC_BTN_PIN 17
#define ENC_D1_PIN 4 #define ENC_D1_PIN 4
@ -29,7 +28,7 @@ unsigned int bpm = 130;
struct channel { struct channel {
unsigned int mode; unsigned int mode;
bool random; int random;
bool modulationChannel; //0 - A1, 1 - A2 bool modulationChannel; //0 - A1, 1 - A2
int modulationRange; int modulationRange;
}; };
@ -80,7 +79,6 @@ void setup() {
EEPROM.get(0, bpm); EEPROM.get(0, bpm);
EEPROM.get(sizeof(int), channels); EEPROM.get(sizeof(int), channels);
pinMode(INPUT_CONNECTED_PIN, INPUT);
pinMode(ENC_BTN_PIN, INPUT_PULLUP); pinMode(ENC_BTN_PIN, INPUT_PULLUP);
pinMode(START_STOP_BTN_PIN, INPUT_PULLUP); pinMode(START_STOP_BTN_PIN, INPUT_PULLUP);
pinMode(START_STOP_BTN_PIN, ANALOGUE_INPUT_1_PIN); pinMode(START_STOP_BTN_PIN, ANALOGUE_INPUT_1_PIN);
@ -207,14 +205,6 @@ void saveState() {
void checkInputs() { void checkInputs() {
//input jack switcch
externalClockConnected = digitalRead(INPUT_CONNECTED_PIN);
if (externalClockConnected != externalClockConnectedOld) {
//updateScreen();
externalClockConnectedOld = externalClockConnected;
Serial.println(externalClockConnected);
}
//encoder button //encoder button
if (!digitalRead(ENC_BTN_PIN) && !encPressRegistered) { if (!digitalRead(ENC_BTN_PIN) && !encPressRegistered) {
encPressRegistered = true; encPressRegistered = true;
@ -269,7 +259,10 @@ void checkInputs() {
} }
needToResetChannel = displayTab-1; needToResetChannel = displayTab-1;
} else if (displayTab != 0 && insideTab == 1) { //random } else if (displayTab != 0 && insideTab == 1) { //random
channels[displayTab-1].random = !channels[displayTab-1].random; channels[displayTab-1].random = channels[displayTab-1].random + change;
if (channels[displayTab-1].random > 9 || channels[displayTab-1].random < 0) {
channels[displayTab-1].random = 0;
}
} else if (displayTab != 0 && insideTab == 2) { //modulation } else if (displayTab != 0 && insideTab == 2) { //modulation
channels[displayTab-1].modulationRange = channels[displayTab-1].modulationRange + change; channels[displayTab-1].modulationRange = channels[displayTab-1].modulationRange + change;
if (channels[displayTab-1].modulationRange > 6 || channels[displayTab-1].modulationRange < -6) { if (channels[displayTab-1].modulationRange > 6 || channels[displayTab-1].modulationRange < -6) {
@ -329,13 +322,13 @@ void updateScreen() {
} }
} }
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE); display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
//display.println(F(" "));
display.fillRect(108, 2, 20, 8, SSD1306_WHITE); display.fillRect(108, 2, 20, 8, SSD1306_WHITE);
display.println(); display.println();
display.println(); display.println();
display.fillRect(0, 10, 128, 2, SSD1306_WHITE); display.fillRect(0, 10, 128, 2, SSD1306_WHITE);
//Content //Content
display.setCursor(4,16);
display.setTextSize(3); display.setTextSize(3);
display.setTextColor(SSD1306_WHITE); display.setTextColor(SSD1306_WHITE);
if (displayTab == 0) { if (displayTab == 0) {
@ -357,6 +350,7 @@ void updateScreen() {
display.println(); display.println();
//Extra params //Extra params
display.setCursor(58,16);
display.setTextSize(1); display.setTextSize(1);
if (displayTab != 0) { if (displayTab != 0) {
if (insideTab == 1) { if (insideTab == 1) {
@ -365,17 +359,18 @@ void updateScreen() {
display.setTextColor(SSD1306_WHITE); display.setTextColor(SSD1306_WHITE);
} }
display.print(F(" RND:")); display.print(F(" RND:"));
if (channels[displayTab-1].random) { if (channels[displayTab-1].random > 0) {
display.print(F("On ")); display.print(channels[displayTab-1].random);
display.print(F("0% "));
} else { } else {
display.print(F("Off ")); display.print(F("Off "));
} }
display.setCursor(60,50);
if (insideTab == 2) { if (insideTab == 2) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE); display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
} else { } else {
display.setTextColor(SSD1306_WHITE); display.setTextColor(SSD1306_WHITE);
} }
display.setCursor(58,30);
display.print(F(" MOD:")); display.print(F(" MOD:"));
if (channels[displayTab-1].modulationChannel && channels[displayTab-1].modulationRange != 0) { if (channels[displayTab-1].modulationChannel && channels[displayTab-1].modulationRange != 0) {
display.print(F("A2 ")); display.print(F("A2 "));