Merge branch 'master' of https://github.com/mck1117/wideband

.gitignore

@@ -23,7 +23,6 @@ fp-info-cache
 
 # Exported BOM files
 *.xml
-*.csv
 
 
 

board_dev/export/bom.csv

@@ -0,0 +1,26 @@
+Comment,Designator,Footprint, LCSC
+1u,"C1,C4,C7,C14,C16",Capacitor_SMD:C_0402_1005Metric,C52923
+4.7u,C10,Capacitor_SMD:C_0603_1608Metric,C19666
+100n,C2,Capacitor_SMD:C_0603_1608Metric,C14663
+33n,C3,Capacitor_SMD:C_0402_1005Metric,C1585
+1n,C6,Capacitor_SMD:C_0402_1005Metric,C1523
+100n,"C8,C5,C9,C11,C13,C12",Capacitor_SMD:C_0402_1005Metric,C1525
+RED,D1,LED_SMD:LED_0603_1608Metric,C2286
+GREEN,D2,LED_SMD:LED_0603_1608Metric,C72043
+BTS3028,Q1,Package_TO_SOT_SMD:TO-252-2,C112639
+61.9,R10,Resistor_SMD:R_0603_1608Metric,C23092
+51k,R13,Resistor_SMD:R_0402_1005Metric,C25794
+3.3k,"R14,R16,R24",Resistor_SMD:R_0402_1005Metric,C25890
+100k,"R15,R17",Resistor_SMD:R_0402_1005Metric,C25741
+10k,"R2,R11,R12,R4,R3,R18,R21,R20,R19,R29,R1,R33,R34",Resistor_SMD:R_0402_1005Metric,C25744
+10k,R22,Resistor_SMD:R_0603_1608Metric,C25804
+33,R23,Resistor_SMD:R_0402_1005Metric,C25105
+1k,"R25,R26,R27,R30",Resistor_SMD:R_0402_1005Metric,C11702
+68k,"R32,R31",Resistor_SMD:R_0402_1005Metric,C36871
+22k,R6,Resistor_SMD:R_0402_1005Metric,C25768
+27k,"R7,R5",Resistor_SMD:R_0402_1005Metric,C25771
+47,R8,Resistor_SMD:R_0402_1005Metric,C25118
+10,R9,Resistor_SMD:R_0402_1005Metric,C25077
+MCP6004,"U1,U2",Package_SO:TSSOP-14_4.4x5mm_P0.65mm,C50282
+STM32F042K6Ux,U4,Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.45x3.45mm,C110616
+XC6206P332MR,U9,Package_TO_SOT_SMD:SOT-23,C5446

board_dev/export/pos.csv

@@ -0,0 +1,57 @@
+Designator,Val,Package,Mid X,Mid Y,Rotation,Layer
+C1,1u,C_0402_1005Metric,105.918,-87.122,90,top
+C2,100n,C_0603_1608Metric,97.38,-99.695,180,top
+C3,33n,C_0402_1005Metric,93.599,-83.312,180,top
+C4,1u,C_0402_1005Metric,105.029,-84.455,0,top
+C5,100n,C_0402_1005Metric,95.504,-95.885,270,top
+C6,1n,C_0402_1005Metric,95.758,-93.98,270,top
+C7,1u,C_0402_1005Metric,93.218,-88.773,270,top
+C8,100n,C_0402_1005Metric,85.217,-81.915,270,top
+C9,100n,C_0402_1005Metric,92.202,-88.773,270,top
+C10,4.7u,C_0603_1608Metric,90.297,-81.407,270,top
+C11,100n,C_0402_1005Metric,92.075,-85.852,180,top
+C12,100n,C_0402_1005Metric,91.7,-91.5,270,top
+C13,100n,C_0402_1005Metric,85.217,-84.074,90,top
+C14,1u,C_0402_1005Metric,105.918,-90.932,270,top
+C16,1u,C_0402_1005Metric,105.283,-96.266,0,top
+D1,RED,LED_0603_1608Metric,98.171,-78.105,270,top
+D2,GREEN,LED_0603_1608Metric,87.884,-78.359,0,top
+J4,FTSH-107-01-F-DV-K,PinHeader_2x07_P1.27mm_Vertical_SMD,89.281,-100.076,90,top
+Q1,BTS3028,TO-252-2,102.9,-76.6,90,top
+R1,10k,R_0402_1005Metric,105.41,-89.408,0,top
+R2,10k,R_0402_1005Metric,104.902,-87.122,90,top
+R3,10k,R_0402_1005Metric,95.758,-89.2,270,top
+R4,10k,R_0402_1005Metric,99.314,-92.329,180,top
+R5,27k,R_0402_1005Metric,97.282,-92.329,180,top
+R6,22k,R_0402_1005Metric,95.25,-98.298,180,top
+R7,27k,R_0402_1005Metric,95.758,-91.2,270,top
+R8,47,R_0402_1005Metric,95.25,-84.582,270,top
+R9,10,R_0402_1005Metric,103.378,-84.836,270,top
+R10,61.9,R_0603_1608Metric,98.552,-84.201,90,top
+R11,10k,R_0402_1005Metric,100.33,-85.344,180,top
+R12,10k,R_0402_1005Metric,100.33,-84.328,180,top
+R13,51k,R_0402_1005Metric,94.107,-93.98,90,top
+R14,3.3k,R_0402_1005Metric,94.488,-95.885,90,top
+R15,100k,R_0402_1005Metric,102.362,-84.836,270,top
+R16,3.3k,R_0402_1005Metric,101.346,-92.329,180,top
+R17,100k,R_0402_1005Metric,104.902,-90.932,90,top
+R18,10k,R_0402_1005Metric,104.902,-93.599,90,top
+R19,10k,R_0402_1005Metric,105.283,-95.25,0,top
+R20,10k,R_0402_1005Metric,101.854,-99.65,90,top
+R21,10k,R_0402_1005Metric,103.378,-92.329,0,top
+R22,10k,R_0603_1608Metric,100.3,-100.2,90,top
+R23,33,R_0402_1005Metric,94.234,-88.773,270,top
+R24,3.3k,R_0402_1005Metric,94.107,-86.36,180,top
+R25,1k,R_0402_1005Metric,96.901,-80.645,270,top
+R26,1k,R_0402_1005Metric,98.171,-80.645,90,top
+R27,1k,R_0402_1005Metric,95.885,-79.883,270,top
+R29,10k,R_0402_1005Metric,89.535,-92.456,90,top
+R30,1k,R_0402_1005Metric,90.043,-78.74,270,top
+R31,68k,R_0402_1005Metric,92.7862,-84.836,0,top
+R32,68k,R_0402_1005Metric,97.282,-85.09,90,top
+R33,10k,R_0402_1005Metric,94.234,-84.836,270,top
+R34,10k,R_0402_1005Metric,96.266,-84.455,270,top
+U1,MCP6004,TSSOP-14_4.4x5mm_P0.65mm,100.33,-88.9,270,top
+U2,MCP6004,TSSOP-14_4.4x5mm_P0.65mm,100.33,-95.758,90,top
+U4,STM32F042K6Ux,QFN-32-1EP_5x5mm_P0.5mm_EP3.45x3.45mm,88.011,-88.265,180,top
+U9,XC6206P332MR,SOT-23,87.63,-81.153,0,top

board_dev/wideband_controller-cache.lib

@@ -96,38 +96,46 @@ X Pin_8 8 -200 -400 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Connector_Generic_Conn_02x05_Odd_Even
+# Connector_Generic_Conn_02x07_Odd_Even
 #
-DEF Connector_Generic_Conn_02x05_Odd_Even J 0 40 Y N 1 F N
+DEF Connector_Generic_Conn_02x07_Odd_Even J 0 40 Y N 1 F N
-F0 "J" 50 300 50 H V C CNN
+F0 "J" 50 400 50 H V C CNN
-F1 "Connector_Generic_Conn_02x05_Odd_Even" 50 -300 50 H V C CNN
+F1 "Connector_Generic_Conn_02x07_Odd_Even" 50 -400 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  Connector*:*_2x??_*
 $ENDFPLIST
 DRAW
+S -50 -295 0 -305 1 1 6 N
 S -50 -195 0 -205 1 1 6 N
 S -50 -95 0 -105 1 1 6 N
 S -50 5 0 -5 1 1 6 N
 S -50 105 0 95 1 1 6 N
 S -50 205 0 195 1 1 6 N
-S -50 250 150 -250 1 1 10 f
+S -50 305 0 295 1 1 6 N
+S -50 350 150 -350 1 1 10 f
+S 150 -295 100 -305 1 1 6 N
 S 150 -195 100 -205 1 1 6 N
 S 150 -95 100 -105 1 1 6 N
 S 150 5 100 -5 1 1 6 N
 S 150 105 100 95 1 1 6 N
 S 150 205 100 195 1 1 6 N
-X Pin_1 1 -200 200 150 R 50 50 1 1 P
+S 150 305 100 295 1 1 6 N
-X Pin_10 10 300 -200 150 L 50 50 1 1 P
+X Pin_1 1 -200 300 150 R 50 50 1 1 P
-X Pin_2 2 300 200 150 L 50 50 1 1 P
+X Pin_10 10 300 -100 150 L 50 50 1 1 P
-X Pin_3 3 -200 100 150 R 50 50 1 1 P
+X Pin_11 11 -200 -200 150 R 50 50 1 1 P
-X Pin_4 4 300 100 150 L 50 50 1 1 P
+X Pin_12 12 300 -200 150 L 50 50 1 1 P
-X Pin_5 5 -200 0 150 R 50 50 1 1 P
+X Pin_13 13 -200 -300 150 R 50 50 1 1 P
-X Pin_6 6 300 0 150 L 50 50 1 1 P
+X Pin_14 14 300 -300 150 L 50 50 1 1 P
-X Pin_7 7 -200 -100 150 R 50 50 1 1 P
+X Pin_2 2 300 300 150 L 50 50 1 1 P
-X Pin_8 8 300 -100 150 L 50 50 1 1 P
+X Pin_3 3 -200 200 150 R 50 50 1 1 P
-X Pin_9 9 -200 -200 150 R 50 50 1 1 P
+X Pin_4 4 300 200 150 L 50 50 1 1 P
+X Pin_5 5 -200 100 150 R 50 50 1 1 P
+X Pin_6 6 300 100 150 L 50 50 1 1 P
+X Pin_7 7 -200 0 150 R 50 50 1 1 P
+X Pin_8 8 300 0 150 L 50 50 1 1 P
+X Pin_9 9 -200 -100 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #

board_dev/wideband_controller.pro

@@ -1,4 +1,4 @@
-update=Thursday, September 17, 2020 at 11:00:43 PM
+update=Monday, September 21, 2020 at 12:52:09 PM
 version=1
 last_client=kicad
 [general]
@@ -29,9 +29,10 @@ MinMicroViaDiameter=0.2
 MinMicroViaDrill=0.09999999999999999
 MinHoleToHole=0.25
 TrackWidth1=0.25
-TrackWidth2=0.25
+TrackWidth2=0.2032
-TrackWidth3=0.5
+TrackWidth3=0.25
-TrackWidth4=3
+TrackWidth4=0.5
+TrackWidth5=3
 ViaDiameter1=0.6
 ViaDrill1=0.3
 ViaDiameter2=0.6

board_dev/wideband_controller.sch

@@ -21,29 +21,29 @@ Text Label 7925 5100 2    50   ~ 0
 LSU_Un
 Text Label 7925 5000 2    50   ~ 0
 LSU_Rtrim
-Text Label 3150 3425 2    50   ~ 0
+Text Label 3000 3700 2    50   ~ 0
 LSU_Ip
 $Comp
 L Device:R R10
 U 1 1 5EB087E2
-P 3225 3200
+P 3075 3475
-F 0 "R10" H 3295 3246 50  0000 L CNN
+F 0 "R10" H 3145 3521 50  0000 L CNN
-F 1 "61.9" H 3295 3155 50  0000 L CNN
+F 1 "61.9" H 3145 3430 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 3155 3200 50  0001 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 3005 3475 50  0001 C CNN
-F 3 "~" H 3225 3200 50  0001 C CNN
+F 3 "~" H 3075 3475 50  0001 C CNN
-F 4 "C23092" H 3225 3200 50  0001 C CNN "LCSC"
+F 4 "C23092" H 3075 3475 50  0001 C CNN "LCSC"
-	1    3225 3200
+	1    3075 3475
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3225 3050 3225 2975
+	3075 3325 3075 3250
 Wire Wire Line
-	3225 3350 3225 3425
+	3075 3625 3075 3700
 Wire Wire Line
-	3225 3425 3150 3425
+	3075 3700 3000 3700
 Text Label 4000 1100 2    50   ~ 0
 LSU_Vm
-Text Notes 2900 2750 0    50   ~ 0
+Text Notes 3100 3000 0    50   ~ 0
 Pump Current Sense
 $Comp
 L Device:R R2
@@ -149,144 +149,104 @@ Pump Ref Current - 20uA source
 $Comp
 L Device:R R11
 U 1 1 5EB31C23
-P 3925 3075
+P 3775 3350
-F 0 "R11" V 3825 3075 50  0000 C CNN
+F 0 "R11" V 3675 3350 50  0000 C CNN
-F 1 "10k" V 3925 3075 50  0000 C CNN
+F 1 "10k" V 3775 3350 50  0000 C CNN
-F 2 "Resistor_SMD:R_0402_1005Metric" V 3855 3075 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 3705 3350 50  0001 C CNN
-F 3 "~" H 3925 3075 50  0001 C CNN
+F 3 "~" H 3775 3350 50  0001 C CNN
-F 4 "C25744" H 3925 3075 50  0001 C CNN "LCSC"
+F 4 "C25744" H 3775 3350 50  0001 C CNN "LCSC"
-	1    3925 3075
+	1    3775 3350
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:R R12
 U 1 1 5EB335A9
-P 3925 3275
+P 3775 3550
-F 0 "R12" V 4025 3275 50  0000 C CNN
+F 0 "R12" V 3875 3550 50  0000 C CNN
-F 1 "10k" V 3925 3275 50  0000 C CNN
+F 1 "10k" V 3775 3550 50  0000 C CNN
-F 2 "Resistor_SMD:R_0402_1005Metric" V 3855 3275 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 3705 3550 50  0001 C CNN
-F 3 "~" H 3925 3275 50  0001 C CNN
+F 3 "~" H 3775 3550 50  0001 C CNN
-F 4 "C25744" H 3925 3275 50  0001 C CNN "LCSC"
+F 4 "C25744" H 3775 3550 50  0001 C CNN "LCSC"
-	1    3925 3275
+	1    3775 3550
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	4075 3075 4150 3075
+	3925 3350 4000 3350
 Wire Wire Line
-	3775 3275 3500 3275
+	3625 3550 3350 3550
 Wire Wire Line
-	3500 3275 3500 3425
+	3350 3550 3350 3700
 Wire Wire Line
-	3500 3425 3225 3425
+	3350 3700 3075 3700
-Connection ~ 3225 3425
+Connection ~ 3075 3700
 Wire Wire Line
-	3225 2975 3500 2975
+	3075 3250 3350 3250
 Wire Wire Line
-	3500 2975 3500 3075
+	3350 3250 3350 3350
 Wire Wire Line
-	3500 3075 3775 3075
+	3350 3350 3625 3350
-Connection ~ 3225 2975
 $Comp
 L Device:R R15
 U 1 1 5EB37011
-P 4150 3600
+P 3775 3875
-F 0 "R15" V 4075 3550 50  0000 L CNN
+F 0 "R15" V 3700 3825 50  0000 L CNN
-F 1 "100k" V 4150 3525 50  0000 L CNN
+F 1 "100k" V 3775 3800 50  0000 L CNN
-F 2 "Resistor_SMD:R_0402_1005Metric" V 4080 3600 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 3705 3875 50  0001 C CNN
-F 3 "~" H 4150 3600 50  0001 C CNN
+F 3 "~" H 3775 3875 50  0001 C CNN
-F 4 "C25471" H 4150 3600 50  0001 C CNN "LCSC"
+F 4 "C25741" H 3775 3875 50  0001 C CNN "LCSC"
-	1    4150 3600
+	1    3775 3875
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	4150 3450 4150 3275
-Connection ~ 4150 3275
-Wire Wire Line
-	4150 3275 4075 3275
-$Comp
-L Device:R R17
-U 1 1 5EB38FC0
-P 4500 2800
-F 0 "R17" V 4400 2800 50  0000 C CNN
-F 1 "100k" V 4500 2800 50  0000 C CNN
-F 2 "Resistor_SMD:R_0402_1005Metric" V 4430 2800 50  0001 C CNN
-F 3 "~" H 4500 2800 50  0001 C CNN
-F 4 "C25471" H 4500 2800 50  0001 C CNN "LCSC"
-	1    4500 2800
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	4350 2800 4150 2800
+	3925 3875 4000 3875
+$Comp
+L Device:R R17
+U 1 1 5EB38FC0
+P 4350 3075
+F 0 "R17" V 4250 3075 50  0000 C CNN
+F 1 "100k" V 4350 3075 50  0000 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 4280 3075 50  0001 C CNN
+F 3 "~" H 4350 3075 50  0001 C CNN
+F 4 "C25741" H 4350 3075 50  0001 C CNN "LCSC"
+	1    4350 3075
+	0    1    1    0   
+$EndComp
 Wire Wire Line
-	4150 2800 4150 3075
+	4200 3075 4000 3075
-Connection ~ 4150 3075
 Wire Wire Line
-	4650 2800 4900 2800
+	4000 3075 4000 3350
+Connection ~ 4000 3350
 Wire Wire Line
-	4900 2800 4900 3175
+	4500 3075 4750 3075
 Wire Wire Line
-	4900 3175 4800 3175
+	4750 3075 4750 3450
-Text Label 5025 3175 0    50   ~ 0
+Wire Wire Line
+	4750 3450 4650 3450
+Text Label 5625 3450 2    50   ~ 0
 Ip_sense
-Wire Wire Line
+Connection ~ 4750 3450
-	5025 3175 4900 3175
+Text Notes 1100 2225 0    50   ~ 0
-Connection ~ 4900 3175
-Text Notes 825  2450 0    50   ~ 0
 Pump Driver
-Text Label 1075 3075 2    50   ~ 0
+Text Label 1100 2575 0    50   ~ 0
 Ip_dac
 $Comp
 L Device:R R8
 U 1 1 5EB3C02D
-P 2175 2975
+P 2550 2875
-F 0 "R8" V 1968 2975 50  0000 C CNN
+F 0 "R8" V 2450 2875 50  0000 C CNN
-F 1 "10" V 2059 2975 50  0000 C CNN
+F 1 "47" V 2550 2875 50  0000 C CNN
-F 2 "Resistor_SMD:R_0402_1005Metric" V 2105 2975 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 2480 2875 50  0001 C CNN
-F 3 "~" H 2175 2975 50  0001 C CNN
+F 3 "~" H 2550 2875 50  0001 C CNN
-F 4 "C25077" H 2175 2975 50  0001 C CNN "LCSC"
+F 4 "C25118" H 2550 2875 50  0001 C CNN "LCSC"
-	1    2175 2975
+	1    2550 2875
-	0    1    1    0   
+	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	1900 2625 1150 2625
+	1775 2575 1850 2575
 Wire Wire Line
-	1150 2625 1150 2875
+	1700 2775 1775 2775
-Wire Wire Line
+Text Label 3075 3250 2    50   ~ 0
-	1150 2875 1225 2875
-Wire Wire Line
-	1075 3075 1225 3075
-$Comp
-L Device:C C3
-U 1 1 5EB3F97C
-P 2425 3225
-F 0 "C3" H 2540 3271 50  0000 L CNN
-F 1 "100n" H 2540 3180 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0402_1005Metric" H 2463 3075 50  0001 C CNN
-F 3 "~" H 2425 3225 50  0001 C CNN
-F 4 "C1525" H 2425 3225 50  0001 C CNN "LCSC"
-	1    2425 3225
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	2425 3075 2425 2975
-Wire Wire Line
-	2425 2975 2325 2975
-$Comp
-L power:GND #PWR05
-U 1 1 5EB40E1E
-P 2425 3375
-F 0 "#PWR05" H 2425 3125 50  0001 C CNN
-F 1 "GND" H 2430 3202 50  0000 C CNN
-F 2 "" H 2425 3375 50  0001 C CNN
-F 3 "" H 2425 3375 50  0001 C CNN
-	1    2425 3375
-	1    0    0    -1  
-$EndComp
-Text Label 3225 2975 2    50   ~ 0
 LSU_Rtrim
-Wire Wire Line
-	2425 2975 3225 2975
-Connection ~ 2425 2975
 $Comp
 L power:+3.3V #PWR02
 U 1 1 5EC0734A
@@ -330,7 +290,7 @@ F 0 "R7" V 5050 825 50  0000 C CNN
 F 1 "27k" V 4950 825 50  0000 C CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 4880 825 50  0001 C CNN
 F 3 "~" H 4950 825 50  0001 C CNN
-F 4 "C25711" H 4950 825 50  0001 C CNN "LCSC"
+F 4 "C25771" H 4950 825 50  0001 C CNN "LCSC"
 	1    4950 825 
 	0    -1   -1   0   
 $EndComp
@@ -342,7 +302,7 @@ F 0 "R5" V 4400 1500 50  0000 L CNN
 F 1 "27k" V 4300 1475 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 4230 1550 50  0001 C CNN
 F 3 "~" H 4300 1550 50  0001 C CNN
-F 4 "C25711" H 4300 1550 50  0001 C CNN "LCSC"
+F 4 "C25771" H 4300 1550 50  0001 C CNN "LCSC"
 	1    4300 1550
 	0    1    1    0   
 $EndComp
@@ -387,12 +347,8 @@ Text Notes 3800 900  0    50   ~ 0
 Nernst Sense
 Text Notes 3950 1825 0    50   ~ 0
 Un_sense = 2.7 * (Un - Vm)
-Text Notes 4300 3600 0    50   ~ 0
+Text Notes 3250 4050 0    50   ~ 0
 Ip_sense = 10 * (LSU_Ip - LSU_Rtrim)
-Wire Wire Line
-	4050 3800 4150 3800
-Wire Wire Line
-	4150 3800 4150 3750
 Wire Wire Line
 	4450 1300 4550 1300
 Wire Wire Line
@@ -421,7 +377,7 @@ Text Label 2150 1375 0    50   ~ 0
 Vm
 Text Label 3025 1375 0    50   ~ 0
 LSU_Vm
-Text Label 4050 3800 2    50   ~ 0
+Text Label 3450 3875 0    50   ~ 0
 Vm
 $Comp
 L Device:C C4
@@ -452,17 +408,6 @@ F 3 "" H 2900 1750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Connector_Generic:Conn_02x05_Odd_Even J1
-U 1 1 5ECAA616
-P 9675 1225
-F 0 "J1" H 9725 1642 50  0000 C CNN
-F 1 "Conn_02x05_Odd_Even" H 9725 1551 50  0000 C CNN
-F 2 "Connector_PinHeader_1.27mm:PinHeader_2x05_P1.27mm_Vertical_SMD" H 9675 1225 50  0001 C CNN
-F 3 "~" H 9675 1225 50  0001 C CNN
-	1    9675 1225
-	1    0    0    -1  
-$EndComp
-$Comp
 L power:+3.3V #PWR019
 U 1 1 5ECABBC7
 P 9475 1025
@@ -476,16 +421,14 @@ $EndComp
 $Comp
 L power:GND #PWR017
 U 1 1 5ECABF9C
-P 9375 1475
+P 9300 1225
-F 0 "#PWR017" H 9375 1225 50  0001 C CNN
+F 0 "#PWR017" H 9300 975 50  0001 C CNN
-F 1 "GND" H 9380 1302 50  0000 C CNN
+F 1 "GND" H 9305 1052 50  0000 C CNN
-F 2 "" H 9375 1475 50  0001 C CNN
+F 2 "" H 9300 1225 50  0001 C CNN
-F 3 "" H 9375 1475 50  0001 C CNN
+F 3 "" H 9300 1225 50  0001 C CNN
-	1    9375 1475
+	1    9300 1225
-	1    0    0    -1  
+	0    1    1    0   
 $EndComp
-Wire Wire Line
-	9375 1475 9375 1425
 Wire Wire Line
 	9375 1125 9475 1125
 Wire Wire Line
@@ -495,7 +438,6 @@ Wire Wire Line
 	9375 1225 9375 1125
 Wire Wire Line
 	9475 1425 9375 1425
-Connection ~ 9375 1425
 Wire Wire Line
 	9375 1425 9375 1225
 Wire Wire Line
@@ -515,13 +457,6 @@ Text Label 10275 1425 2    50   ~ 0
 nRESET
 Text Label 5675 5050 0    50   ~ 0
 heater_pwm
-Wire Wire Line
-	1900 2975 1825 2975
-Connection ~ 1900 2975
-Wire Wire Line
-	1900 2975 1900 2625
-Wire Wire Line
-	2025 2975 1900 2975
 Text Label 4975 4375 3    50   ~ 0
 Nernst_esr_drive
 $Comp
@@ -900,29 +835,27 @@ $EndComp
 $Comp
 L Amplifier_Operational:MCP6004 U1
 U 1 1 5F8980DF
-P 1525 2975
+P 2150 2675
-F 0 "U1" H 1675 3225 50  0000 C CNN
+F 0 "U1" H 2125 2900 50  0000 C CNN
-F 1 "MCP6004" H 1700 3125 50  0000 C CNN
+F 1 "MCP6004" H 2150 2450 50  0000 C CNN
-F 2 "Package_SO:TSSOP-14_4.4x5mm_P0.65mm" H 1475 3075 50  0001 C CNN
+F 2 "Package_SO:TSSOP-14_4.4x5mm_P0.65mm" H 2100 2775 50  0001 C CNN
-F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/21733j.pdf" H 1575 3175 50  0001 C CNN
+F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/21733j.pdf" H 2200 2875 50  0001 C CNN
-F 4 "C50282" H 1525 2975 50  0001 C CNN "LCSC"
+F 4 "C50282" H 2150 2675 50  0001 C CNN "LCSC"
-	1    1525 2975
+	1    2150 2675
 	1    0    0    1   
 $EndComp
 Wire Wire Line
-	4200 3275 4150 3275
+	4000 3350 4050 3350
-Wire Wire Line
-	4150 3075 4200 3075
 $Comp
 L Amplifier_Operational:MCP6004 U1
 U 3 1 5F8996DF
-P 4500 3175
+P 4350 3450
-F 0 "U1" H 4650 3425 50  0000 C CNN
+F 0 "U1" H 4500 3700 50  0000 C CNN
-F 1 "MCP6004" H 4675 3325 50  0000 C CNN
+F 1 "MCP6004" H 4525 3600 50  0000 C CNN
-F 2 "Package_SO:TSSOP-14_4.4x5mm_P0.65mm" H 4450 3275 50  0001 C CNN
+F 2 "Package_SO:TSSOP-14_4.4x5mm_P0.65mm" H 4300 3550 50  0001 C CNN
-F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/21733j.pdf" H 4550 3375 50  0001 C CNN
+F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/21733j.pdf" H 4400 3650 50  0001 C CNN
-F 4 "C50282" H 4500 3175 50  0001 C CNN "LCSC"
+F 4 "C50282" H 4350 3450 50  0001 C CNN "LCSC"
-	3    4500 3175
+	3    4350 3450
 	1    0    0    1   
 $EndComp
 $Comp
@@ -1037,10 +970,8 @@ Wire Wire Line
 	4975 4375 4975 5100
 Text Label 2100 6625 2    50   ~ 0
 Pump_Ref_Feedback
-Text Label 10900 2175 2    50   ~ 0
+Text Label 8850 2725 2    50   ~ 0
 Ip_sense
-Wire Wire Line
-	10400 2175 10900 2175
 Wire Wire Line
 	7675 1750 7675 1650
 $Comp
@@ -1051,7 +982,7 @@ F 0 "R23" H 7675 2050 50  0000 L CNN
 F 1 "33" V 7675 1850 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 7605 1900 50  0001 C CNN
 F 3 "~" H 7675 1900 50  0001 C CNN
-F 4 "C23140" H 7675 1900 50  0001 C CNN "LCSC"
+F 4 "C25105" H 7675 1900 50  0001 C CNN "LCSC"
 	1    7675 1900
 	1    0    0    -1  
 $EndComp
@@ -1122,42 +1053,42 @@ $EndComp
 $Comp
 L Device:C C11
 U 1 1 5FE80F0F
-P 10025 2400
+P 5225 3675
-F 0 "C11" H 10140 2446 50  0000 L CNN
+F 0 "C11" H 5340 3721 50  0000 L CNN
-F 1 "100n" H 10140 2355 50  0000 L CNN
+F 1 "100n" H 5340 3630 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0402_1005Metric" H 10063 2250 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 5263 3525 50  0001 C CNN
-F 3 "~" H 10025 2400 50  0001 C CNN
+F 3 "~" H 5225 3675 50  0001 C CNN
-F 4 "C1525" H 10025 2400 50  0001 C CNN "LCSC"
+F 4 "C1525" H 5225 3675 50  0001 C CNN "LCSC"
-	1    10025 2400
+	1    5225 3675
-	1    0    0    -1  
+	-1   0    0    -1  
 $EndComp
 $Comp
 L Device:R R24
 U 1 1 5FE81AAB
-P 10250 2175
+P 5000 3450
-F 0 "R24" V 10043 2175 50  0000 C CNN
+F 0 "R24" V 4793 3450 50  0000 C CNN
-F 1 "3.3k" V 10134 2175 50  0000 C CNN
+F 1 "3.3k" V 4884 3450 50  0000 C CNN
-F 2 "Resistor_SMD:R_0402_1005Metric" V 10180 2175 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 4930 3450 50  0001 C CNN
-F 3 "~" H 10250 2175 50  0001 C CNN
+F 3 "~" H 5000 3450 50  0001 C CNN
-F 4 "C25890" H 10250 2175 50  0001 C CNN "LCSC"
+F 4 "C25890" H 5000 3450 50  0001 C CNN "LCSC"
-	1    10250 2175
+	1    5000 3450
-	0    1    1    0   
+	0    -1   1    0   
 $EndComp
 $Comp
 L power:GND #PWR0106
 U 1 1 5FE88E31
-P 10025 2550
+P 5225 3825
-F 0 "#PWR0106" H 10025 2300 50  0001 C CNN
+F 0 "#PWR0106" H 5225 3575 50  0001 C CNN
-F 1 "GND" H 10030 2377 50  0000 C CNN
+F 1 "GND" H 5230 3652 50  0000 C CNN
-F 2 "" H 10025 2550 50  0001 C CNN
+F 2 "" H 5225 3825 50  0001 C CNN
-F 3 "" H 10025 2550 50  0001 C CNN
+F 3 "" H 5225 3825 50  0001 C CNN
-	1    10025 2550
+	1    5225 3825
-	1    0    0    -1  
+	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	10025 2250 10025 2175
+	5225 3525 5225 3450
 Wire Wire Line
-	10025 2175 10100 2175
+	5225 3450 5150 3450
 Text Label 8850 3625 2    50   ~ 0
 CAN_RX
 Wire Wire Line
@@ -1386,10 +1317,10 @@ F 3 "" H 10625 4100 50  0001 C CNN
 	1    10625 4100
 	0    -1   -1   0   
 $EndComp
-Text Label 8900 3225 2    50   ~ 0
+Text Label 8850 3225 2    50   ~ 0
 heater_pwm
 Wire Wire Line
-	8900 3225 8375 3225
+	8850 3225 8375 3225
 Wire Wire Line
 	8350 4600 6925 4600
 Wire Wire Line
@@ -1553,12 +1484,8 @@ Wire Wire Line
 Text Label 8850 2625 2    50   ~ 0
 LSU_Vm
 Wire Wire Line
-	10025 2175 9775 2175
+	5225 3450 5625 3450
-Wire Wire Line
+Connection ~ 5225 3450
-	9775 2175 9775 2725
-Wire Wire Line
-	9775 2725 8375 2725
-Connection ~ 10025 2175
 $Comp
 L MCU_ST_STM32F0:STM32F042K6Ux U4
 U 1 1 604EAF38
@@ -1575,8 +1502,6 @@ Wire Wire Line
 	8850 2625 8375 2625
 NoConn ~ 7375 2925
 NoConn ~ 7375 2825
-NoConn ~ 7375 3825
-NoConn ~ 7375 3925
 $Comp
 L power:GND #PWR0120
 U 1 1 60687757
@@ -1592,58 +1517,12 @@ Wire Wire Line
 	7375 2525 7075 2525
 Wire Wire Line
 	7375 2200 7375 2025
-Connection ~ 9800 3125
+Text Label 8850 3125 2    50   ~ 0
-Wire Wire Line
-	9800 3125 9725 3125
-Wire Wire Line
-	9800 3200 9800 3125
-$Comp
-L power:GND #PWR0119
-U 1 1 60487769
-P 9800 3500
-F 0 "#PWR0119" H 9800 3250 50  0001 C CNN
-F 1 "GND" H 9805 3327 50  0000 C CNN
-F 2 "" H 9800 3500 50  0001 C CNN
-F 3 "" H 9800 3500 50  0001 C CNN
-	1    9800 3500
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	8375 3125 9425 3125
-$Comp
-L Device:C C15
-U 1 1 6044EBCC
-P 9800 3350
-F 0 "C15" H 9915 3396 50  0000 L CNN
-F 1 "100n" H 9915 3305 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0402_1005Metric" H 9838 3200 50  0001 C CNN
-F 3 "~" H 9800 3350 50  0001 C CNN
-F 4 "C1525" H 9800 3350 50  0001 C CNN "LCSC"
-	1    9800 3350
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R28
-U 1 1 6044E8C3
-P 9575 3125
-F 0 "R28" V 9368 3125 50  0000 C CNN
-F 1 "3.3k" V 9459 3125 50  0000 C CNN
-F 2 "Resistor_SMD:R_0402_1005Metric" V 9505 3125 50  0001 C CNN
-F 3 "~" H 9575 3125 50  0001 C CNN
-F 4 "C25890" H 9575 3125 50  0001 C CNN "LCSC"
-	1    9575 3125
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	9800 3125 10275 3125
-Text Label 10275 3125 2    50   ~ 0
 Ip_dac
 NoConn ~ 8375 2825
 NoConn ~ 8375 2925
 NoConn ~ 8375 3025
 NoConn ~ 8375 3325
-NoConn ~ 8375 3425
-NoConn ~ 8375 3525
 NoConn ~ 7375 3425
 NoConn ~ 7375 3325
 NoConn ~ 7375 3225
@@ -1827,4 +1706,165 @@ F 3 "" H 1450 7375 50  0001 C CNN
 	1    1450 7375
 	1    0    0    -1  
 $EndComp
+$Comp
+L Device:R R33
+U 1 1 5F6F3B55
+P 2100 2200
+F 0 "R33" V 2200 2150 50  0000 L CNN
+F 1 "10k" V 2100 2125 50  0000 L CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 2030 2200 50  0001 C CNN
+F 3 "~" H 2100 2200 50  0001 C CNN
+F 4 "C25744" H 2100 2200 50  0001 C CNN "LCSC"
+	1    2100 2200
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R34
+U 1 1 5F6F4038
+P 2100 3075
+F 0 "R34" V 2200 3025 50  0000 L CNN
+F 1 "10k" V 2100 3000 50  0000 L CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 2030 3075 50  0001 C CNN
+F 3 "~" H 2100 3075 50  0001 C CNN
+F 4 "C25744" H 2100 3075 50  0001 C CNN "LCSC"
+	1    2100 3075
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	2550 2725 2550 2675
+Wire Wire Line
+	2550 2675 2450 2675
+Wire Wire Line
+	2250 3075 2550 3075
+Wire Wire Line
+	2550 3075 2550 3025
+Wire Wire Line
+	1950 3075 1775 3075
+Wire Wire Line
+	1775 3075 1775 2775
+Connection ~ 1775 2775
+Wire Wire Line
+	1775 2775 1850 2775
+Wire Wire Line
+	2250 2200 2350 2200
+Wire Wire Line
+	2550 2200 2550 2675
+Connection ~ 2550 2675
+Wire Wire Line
+	1775 2200 1850 2200
+Wire Wire Line
+	1775 2200 1775 2575
+$Comp
+L Device:R R32
+U 1 1 5F77EEDE
+P 1550 2775
+F 0 "R32" V 1650 2775 50  0000 C CNN
+F 1 "68k" V 1550 2775 50  0000 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 1480 2775 50  0001 C CNN
+F 3 "~" H 1550 2775 50  0001 C CNN
+F 4 "C36871" H 1550 2775 50  0001 C CNN "LCSC"
+	1    1550 2775
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R31
+U 1 1 5F77F74C
+P 1550 2575
+F 0 "R31" V 1650 2575 50  0000 C CNN
+F 1 "68k" V 1550 2575 50  0000 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 1480 2575 50  0001 C CNN
+F 3 "~" H 1550 2575 50  0001 C CNN
+F 4 "C36871" H 1550 2575 50  0001 C CNN "LCSC"
+	1    1550 2575
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	1700 2575 1775 2575
+Connection ~ 1775 2575
+Text Label 1100 2775 0    50   ~ 0
+Vm
+Wire Wire Line
+	2550 3075 3075 3075
+Wire Wire Line
+	3075 3075 3075 3250
+Connection ~ 2550 3075
+Connection ~ 3075 3250
+Wire Wire Line
+	1100 2775 1400 2775
+Wire Wire Line
+	1100 2575 1400 2575
+$Comp
+L Device:C C3
+U 1 1 5F942576
+P 2100 2000
+F 0 "C3" V 1848 2000 50  0000 C CNN
+F 1 "33n" V 1939 2000 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 2138 1850 50  0001 C CNN
+F 3 "~" H 2100 2000 50  0001 C CNN
+F 4 "C1585" H 2100 2000 50  0001 C CNN "LCSC"
+	1    2100 2000
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	1950 2000 1850 2000
+Wire Wire Line
+	1850 2000 1850 2200
+Connection ~ 1850 2200
+Wire Wire Line
+	1850 2200 1950 2200
+Wire Wire Line
+	2250 2000 2350 2000
+Wire Wire Line
+	2350 2000 2350 2200
+Connection ~ 2350 2200
+Wire Wire Line
+	2350 2200 2550 2200
+Wire Wire Line
+	3925 3550 4000 3550
+Wire Wire Line
+	3450 3875 3625 3875
+Wire Wire Line
+	4000 3550 4000 3875
+Connection ~ 4000 3550
+Wire Wire Line
+	4000 3550 4050 3550
+Wire Wire Line
+	8850 3125 8375 3125
+Wire Wire Line
+	4750 3450 4850 3450
+Wire Wire Line
+	8375 2725 8850 2725
+$Comp
+L Connector_Generic:Conn_02x07_Odd_Even J4
+U 1 1 5FAC09D3
+P 9675 1225
+F 0 "J4" H 9725 1742 50  0000 C CNN
+F 1 "FTSH-107-01-F-DV-K" H 9725 1651 50  0000 C CNN
+F 2 "Connector_PinHeader_1.27mm:PinHeader_2x07_P1.27mm_Vertical_SMD" H 9675 1225 50  0001 C CNN
+F 3 "~" H 9675 1225 50  0001 C CNN
+	1    9675 1225
+	1    0    0    -1  
+$EndComp
+NoConn ~ 9975 925 
+NoConn ~ 9475 925 
+Text Label 9100 1525 0    50   ~ 0
+UART_RX
+Text Label 10325 1525 2    50   ~ 0
+UART_TX
+Wire Wire Line
+	9975 1525 10325 1525
+Wire Wire Line
+	9300 1225 9375 1225
+Wire Wire Line
+	9100 1525 9475 1525
+Text Label 6875 3925 0    50   ~ 0
+UART_RX
+Text Label 6875 3825 0    50   ~ 0
+UART_TX
+Wire Wire Line
+	6875 3825 7375 3825
+Wire Wire Line
+	7375 3925 6875 3925
+NoConn ~ 8375 3425
+NoConn ~ 8375 3525
 $EndSCHEMATC