diff --git a/firmware/include/lemon-pepper.h b/firmware/include/lemon-pepper.h index 09a0a2d..fd29f04 100644 --- a/firmware/include/lemon-pepper.h +++ b/firmware/include/lemon-pepper.h @@ -30,6 +30,15 @@ #define ISENSE_U PA3 // VOPAMP1_P, ADC1_IN4 #define ISENSE_V PB13 // VOPAMP3_P +/** + * 0b00 10V/V + * 0b01 20V/V + * 0b10 50V/V + * 0b11 100V/V +*/ +#define ISENSEGAIN_0 PC13 // GAIN0 +#define ISENSEGAIN_1 PC14 // GAIN1 + // COMMUNICATION /** * Note that you can only use one input peripheral diff --git a/hardware/encoder.kicad_sch b/hardware/encoder.kicad_sch index 7b6e640..c74b0dc 100644 --- a/hardware/encoder.kicad_sch +++ b/hardware/encoder.kicad_sch @@ -522,7 +522,7 @@ (symbol (lib_id "Device:R_Small_US") (at 107.95 86.36 0) (mirror y) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 6ce927d7-7f7d-4606-9fa7-f6da06fdd47b) - (property "Reference" "R?" (at 105.41 85.09 0) + (property "Reference" "R401" (at 105.41 85.09 0) (effects (font (size 1.27 1.27)) (justify left)) ) (property "Value" "10k" (at 105.41 87.63 0) @@ -541,9 +541,6 @@ (pin "2" (uuid 622f4233-7a57-4ac1-b922-f15f27105aef)) (instances (project "lemon-pepper" - (path "/0306e2fa-4433-4288-91d9-65a3484207ad/7f2d245a-6dca-4eb9-9839-7fdf255edd98" - (reference "R?") (unit 1) - ) (path "/0306e2fa-4433-4288-91d9-65a3484207ad/e3a86f21-c1c7-4a99-9511-7bc9966878a0" (reference "R401") (unit 1) ) @@ -591,7 +588,7 @@ (symbol (lib_id "power:+3V3") (at 107.95 81.28 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid a957ced1-9f14-450e-a1f3-96a8f9bbe8a3) - (property "Reference" "#PWR0313" (at 107.95 85.09 0) + (property "Reference" "#PWR0404" (at 107.95 85.09 0) (effects (font (size 1.27 1.27)) hide) ) (property "Value" "+3V3" (at 107.95 76.2 0) @@ -606,9 +603,6 @@ (pin "1" (uuid bcb42574-5cf1-4371-9c33-6adb5d7ffbc7)) (instances (project "lemon-pepper" - (path "/0306e2fa-4433-4288-91d9-65a3484207ad/7f2d245a-6dca-4eb9-9839-7fdf255edd98" - (reference "#PWR0313") (unit 1) - ) (path "/0306e2fa-4433-4288-91d9-65a3484207ad/e3a86f21-c1c7-4a99-9511-7bc9966878a0" (reference "#PWR0404") (unit 1) ) diff --git a/hardware/halfbridges.kicad_sch b/hardware/halfbridges.kicad_sch index 9350131..17c440c 100644 --- a/hardware/halfbridges.kicad_sch +++ b/hardware/halfbridges.kicad_sch @@ -850,7 +850,7 @@ (symbol (lib_id "easyeda2kicad:L6226QTR") (at 137.16 91.44 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 37880a97-b6a0-4a9d-a6d3-f01d330a7505) - (property "Reference" "U?" (at 138.43 90.17 0) + (property "Reference" "U601" (at 138.43 90.17 0) (effects (font (size 1.27 1.27))) ) (property "Value" "L6226QTR" (at 138.43 92.71 0) @@ -900,9 +900,6 @@ (pin "8" (uuid 01f56fa4-97c0-4948-ac05-b5f07bac82c0)) (instances (project "lemon-pepper" - (path "/0306e2fa-4433-4288-91d9-65a3484207ad" - (reference "U?") (unit 1) - ) (path "/0306e2fa-4433-4288-91d9-65a3484207ad/ac193888-c8ba-43d9-af32-3c2e2d16ba47" (reference "U601") (unit 1) ) @@ -913,7 +910,7 @@ (symbol (lib_id "matei:Vmot") (at 158.75 55.88 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid 50f18639-c15e-4a10-a2e8-8837c5da88fb) - (property "Reference" "#PWR0105" (at 153.67 59.69 0) + (property "Reference" "#PWR0602" (at 153.67 59.69 0) (effects (font (size 1.27 1.27)) hide) ) (property "Value" "Vmot" (at 158.75 50.8 0) @@ -928,9 +925,6 @@ (pin "1" (uuid fd8b8e1c-a085-4f75-8152-b8d020343dc8)) (instances (project "lemon-pepper" - (path "/0306e2fa-4433-4288-91d9-65a3484207ad" - (reference "#PWR0105") (unit 1) - ) (path "/0306e2fa-4433-4288-91d9-65a3484207ad/ac193888-c8ba-43d9-af32-3c2e2d16ba47" (reference "#PWR0602") (unit 1) ) @@ -941,7 +935,7 @@ (symbol (lib_id "power:GND") (at 158.75 116.84 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid 64a45537-fa6d-43ea-a9bf-92d58d5a7aa5) - (property "Reference" "#PWR0103" (at 158.75 123.19 0) + (property "Reference" "#PWR0603" (at 158.75 123.19 0) (effects (font (size 1.27 1.27)) hide) ) (property "Value" "GND" (at 158.75 121.92 0) @@ -956,9 +950,6 @@ (pin "1" (uuid 1091c7e7-9714-466a-a53d-94b1b03fb950)) (instances (project "lemon-pepper" - (path "/0306e2fa-4433-4288-91d9-65a3484207ad" - (reference "#PWR0103") (unit 1) - ) (path "/0306e2fa-4433-4288-91d9-65a3484207ad/ac193888-c8ba-43d9-af32-3c2e2d16ba47" (reference "#PWR0603") (unit 1) ) @@ -969,7 +960,7 @@ (symbol (lib_id "Device:R_Small_US") (at 97.79 99.06 270) (mirror x) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 8890abe6-70b8-4275-9fc5-c77630cd7d38) - (property "Reference" "R?" (at 97.79 102.87 90) + (property "Reference" "R601" (at 97.79 102.87 90) (effects (font (size 1.27 1.27))) ) (property "Value" "5k1" (at 97.79 105.41 90) @@ -988,9 +979,6 @@ (pin "2" (uuid cd601b00-70dc-40ba-99e4-7bb108b315f3)) (instances (project "lemon-pepper" - (path "/0306e2fa-4433-4288-91d9-65a3484207ad" - (reference "R?") (unit 1) - ) (path "/0306e2fa-4433-4288-91d9-65a3484207ad/ac193888-c8ba-43d9-af32-3c2e2d16ba47" (reference "R601") (unit 1) ) @@ -1001,7 +989,7 @@ (symbol (lib_id "Device:D_Small") (at 139.7 58.42 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid 8bcdea43-24d6-4037-aa47-a0b54c9c0c4e) - (property "Reference" "D?" (at 139.7 52.07 0) + (property "Reference" "D602" (at 139.7 52.07 0) (effects (font (size 1.27 1.27))) ) (property "Value" "1N4148WS" (at 139.7 54.61 0) @@ -1026,9 +1014,6 @@ (pin "2" (uuid 1462ce2d-de52-43c2-bc35-343f43d93c27)) (instances (project "lemon-pepper" - (path "/0306e2fa-4433-4288-91d9-65a3484207ad" - (reference "D?") (unit 1) - ) (path "/0306e2fa-4433-4288-91d9-65a3484207ad/ac193888-c8ba-43d9-af32-3c2e2d16ba47" (reference "D602") (unit 1) ) @@ -1039,7 +1024,7 @@ (symbol (lib_id "Device:C_Small") (at 149.86 68.58 90) (mirror x) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid b314e2a1-05b5-4717-81c4-f8b715eeebac) - (property "Reference" "C?" (at 147.32 62.23 90) + (property "Reference" "C602" (at 147.32 62.23 90) (effects (font (size 1.27 1.27)) (justify right)) ) (property "Value" "220n" (at 147.32 64.77 90) @@ -1058,9 +1043,6 @@ (pin "2" (uuid 17c91ad8-55e0-4fb5-9961-11c9d590b282)) (instances (project "lemon-pepper" - (path "/0306e2fa-4433-4288-91d9-65a3484207ad" - (reference "C?") (unit 1) - ) (path "/0306e2fa-4433-4288-91d9-65a3484207ad/ac193888-c8ba-43d9-af32-3c2e2d16ba47" (reference "C602") (unit 1) ) @@ -1071,7 +1053,7 @@ (symbol (lib_id "Device:C_Small") (at 129.54 63.5 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid bf8452e9-5264-4688-ab6e-658f3294d8a8) - (property "Reference" "C?" (at 127 62.2363 0) + (property "Reference" "C601" (at 127 62.2363 0) (effects (font (size 1.27 1.27)) (justify right)) ) (property "Value" "10n" (at 127 64.7763 0) @@ -1090,9 +1072,6 @@ (pin "2" (uuid 6fd5555d-c2c3-4275-afe7-e6a1408fe16f)) (instances (project "lemon-pepper" - (path "/0306e2fa-4433-4288-91d9-65a3484207ad" - (reference "C?") (unit 1) - ) (path "/0306e2fa-4433-4288-91d9-65a3484207ad/ac193888-c8ba-43d9-af32-3c2e2d16ba47" (reference "C601") (unit 1) ) @@ -1103,7 +1082,7 @@ (symbol (lib_id "Device:D_Small") (at 139.7 68.58 0) (mirror y) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid f33a26df-aece-43c8-9415-6ac5576d1432) - (property "Reference" "D?" (at 139.7 62.23 0) + (property "Reference" "D603" (at 139.7 62.23 0) (effects (font (size 1.27 1.27))) ) (property "Value" "1N4148WS" (at 139.7 64.77 0) @@ -1128,9 +1107,6 @@ (pin "2" (uuid ef0a2d0e-fe4a-499e-8622-9df246ae5c01)) (instances (project "lemon-pepper" - (path "/0306e2fa-4433-4288-91d9-65a3484207ad" - (reference "D?") (unit 1) - ) (path "/0306e2fa-4433-4288-91d9-65a3484207ad/ac193888-c8ba-43d9-af32-3c2e2d16ba47" (reference "D603") (unit 1) ) @@ -1141,7 +1117,7 @@ (symbol (lib_id "power:+3V3") (at 92.71 96.52 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid f9aa1b99-228b-439d-817b-005acf7c5a62) - (property "Reference" "#PWR0109" (at 92.71 100.33 0) + (property "Reference" "#PWR0601" (at 92.71 100.33 0) (effects (font (size 1.27 1.27)) hide) ) (property "Value" "+3V3" (at 92.71 91.44 0) @@ -1156,9 +1132,6 @@ (pin "1" (uuid 2d18ddd1-f5cd-4b26-9116-bcce81c12086)) (instances (project "lemon-pepper" - (path "/0306e2fa-4433-4288-91d9-65a3484207ad" - (reference "#PWR0109") (unit 1) - ) (path "/0306e2fa-4433-4288-91d9-65a3484207ad/ac193888-c8ba-43d9-af32-3c2e2d16ba47" (reference "#PWR0601") (unit 1) ) @@ -1169,7 +1142,7 @@ (symbol (lib_id "Device:LED") (at 107.95 99.06 180) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid fd0e2a50-e9d1-47f3-a8dd-0b3fcc5e140e) - (property "Reference" "D?" (at 108.9025 102.87 0) + (property "Reference" "D601" (at 108.9025 102.87 0) (effects (font (size 1.27 1.27))) ) (property "Value" "OCD" (at 108.9025 105.41 0) @@ -1188,9 +1161,6 @@ (pin "2" (uuid eebdaa37-993b-417c-ab77-12378ce2558d)) (instances (project "lemon-pepper" - (path "/0306e2fa-4433-4288-91d9-65a3484207ad" - (reference "D?") (unit 1) - ) (path "/0306e2fa-4433-4288-91d9-65a3484207ad/ac193888-c8ba-43d9-af32-3c2e2d16ba47" (reference "D601") (unit 1) ) diff --git a/hardware/lemon-pepper.kicad_sch b/hardware/lemon-pepper.kicad_sch index 9508115..c2e9322 100644 --- a/hardware/lemon-pepper.kicad_sch +++ b/hardware/lemon-pepper.kicad_sch @@ -1368,7 +1368,7 @@ (symbol (lib_id "Device:R_Small_US") (at 82.55 92.71 90) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 2ee515ec-1c12-40ce-9c56-215ed6b94d01) - (property "Reference" "R602" (at 78.74 90.17 90) + (property "Reference" "R104" (at 78.74 90.17 90) (effects (font (size 1.27 1.27))) ) (property "Value" "0R" (at 86.36 90.17 90) @@ -1387,9 +1387,6 @@ (pin "2" (uuid 876c1359-50ed-48de-a448-e8f2eb799a0b)) (instances (project "lemon-pepper" - (path "/0306e2fa-4433-4288-91d9-65a3484207ad/7f2d245a-6dca-4eb9-9839-7fdf255edd98" - (reference "R602") (unit 1) - ) (path "/0306e2fa-4433-4288-91d9-65a3484207ad" (reference "R104") (unit 1) ) @@ -1432,7 +1429,7 @@ (symbol (lib_id "Device:R_Small_US") (at 82.55 95.25 270) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 46ce0156-2765-4c40-8ac1-08ac50337531) - (property "Reference" "R603" (at 78.74 97.79 90) + (property "Reference" "R105" (at 78.74 97.79 90) (effects (font (size 1.27 1.27))) ) (property "Value" "0R" (at 86.36 97.79 90) @@ -1451,9 +1448,6 @@ (pin "2" (uuid bceff20a-34d8-4368-af34-4924bbfbdc45)) (instances (project "lemon-pepper" - (path "/0306e2fa-4433-4288-91d9-65a3484207ad/7f2d245a-6dca-4eb9-9839-7fdf255edd98" - (reference "R603") (unit 1) - ) (path "/0306e2fa-4433-4288-91d9-65a3484207ad" (reference "R105") (unit 1) ) @@ -1867,7 +1861,7 @@ (symbol (lib_id "Device:R_Small_US") (at 69.85 57.15 90) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid d321c20b-6961-4094-9a94-4da017abbada) - (property "Reference" "R602" (at 66.04 54.61 90) + (property "Reference" "R102" (at 66.04 54.61 90) (effects (font (size 1.27 1.27))) ) (property "Value" "5k1" (at 73.66 54.61 90) @@ -1886,9 +1880,6 @@ (pin "2" (uuid 40b4b1b3-387b-478b-9cd9-cbc244f28d01)) (instances (project "lemon-pepper" - (path "/0306e2fa-4433-4288-91d9-65a3484207ad/7f2d245a-6dca-4eb9-9839-7fdf255edd98" - (reference "R602") (unit 1) - ) (path "/0306e2fa-4433-4288-91d9-65a3484207ad" (reference "R102") (unit 1) ) @@ -2036,7 +2027,7 @@ (symbol (lib_id "Device:R_Small_US") (at 69.85 59.69 270) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid f3ddb8ee-dbb4-493a-ae39-77e171290f99) - (property "Reference" "R603" (at 66.04 62.23 90) + (property "Reference" "R101" (at 66.04 62.23 90) (effects (font (size 1.27 1.27))) ) (property "Value" "5k1" (at 73.66 62.23 90) @@ -2055,9 +2046,6 @@ (pin "2" (uuid b0567dc0-ca1d-4799-af33-c94b78192c48)) (instances (project "lemon-pepper" - (path "/0306e2fa-4433-4288-91d9-65a3484207ad/7f2d245a-6dca-4eb9-9839-7fdf255edd98" - (reference "R603") (unit 1) - ) (path "/0306e2fa-4433-4288-91d9-65a3484207ad" (reference "R101") (unit 1) ) diff --git a/hardware/mcu.kicad_sch b/hardware/mcu.kicad_sch index 82990c3..022eaf3 100644 --- a/hardware/mcu.kicad_sch +++ b/hardware/mcu.kicad_sch @@ -1527,6 +1527,10 @@ (stroke (width 0) (type default)) (uuid 3faf3947-c0c7-4591-a34d-e8594c237916) ) + (wire (pts (xy 66.04 99.06) (xy 76.2 99.06)) + (stroke (width 0) (type default)) + (uuid 40af0fb2-b894-4d55-8b8a-0d552d11ba27) + ) (wire (pts (xy 232.41 48.26) (xy 243.84 48.26)) (stroke (width 0) (type default)) (uuid 48000910-5247-4f66-a102-fec2fb6f1a09) @@ -1774,6 +1778,10 @@ (stroke (width 0) (type default)) (uuid c6ba0234-40ba-4f7e-a69d-f7f046e5ae96) ) + (wire (pts (xy 66.04 101.6) (xy 76.2 101.6)) + (stroke (width 0) (type default)) + (uuid c889db82-6cf0-4b1d-ad5a-c298d0ea80de) + ) (wire (pts (xy 99.06 52.07) (xy 99.06 66.04)) (stroke (width 0) (type default)) (uuid cb8be750-e4bc-4a0c-9fa0-6e70cddf722e) @@ -2149,7 +2157,7 @@ (effects (font (size 1.27 1.27)) (justify right)) (uuid b431fb32-a08c-4eb8-89f2-23b466b1f8bd) ) - (hierarchical_label "GAIN_0" (shape output) (at 76.2 99.06 180) (fields_autoplaced) + (hierarchical_label "GAIN_0" (shape output) (at 66.04 99.06 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right)) (uuid b4656646-aa09-4c39-99d8-535ce5c57cb6) ) @@ -2157,7 +2165,7 @@ (effects (font (size 1.27 1.27)) (justify right)) (uuid d358859b-ec8e-4c3a-bf01-3644c8c83381) ) - (hierarchical_label "GAIN_1" (shape output) (at 76.2 101.6 180) (fields_autoplaced) + (hierarchical_label "GAIN_1" (shape output) (at 66.04 101.6 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right)) (uuid e59e2a22-bd69-49c9-82d9-2243181e1bf3) ) diff --git a/lemon-pepper.pdf b/lemon-pepper.pdf index d5947cb..fcb6625 100644 Binary files a/lemon-pepper.pdf and b/lemon-pepper.pdf differ