summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2009-11-22 13:08:01 +0100
committerMichael Buesch <mb@bu3sch.de>2009-11-22 13:08:01 +0100
commita5535dc44ba3ec8110c7b1ac56a629352c4cb023 (patch)
tree75e7e7a63c854257df883390fe79ef35f0c7d302
parent72f6b5a060553a81744f9e598f898d4567aee737 (diff)
downloadcnc-a5535dc44ba3ec8110c7b1ac56a629352c4cb023.zip
cnc-a5535dc44ba3ec8110c7b1ac56a629352c4cb023.tar.xz
pressure_control: Reduce ADC noise
Signed-off-by: Michael Buesch <mb@bu3sch.de>
-rw-r--r--pressure_control/firmware/main.c2
-rw-r--r--pressure_control/schematics/pressure_control.sch430
2 files changed, 214 insertions, 218 deletions
diff --git a/pressure_control/firmware/main.c b/pressure_control/firmware/main.c
index b6f8220..9cddf08 100644
--- a/pressure_control/firmware/main.c
+++ b/pressure_control/firmware/main.c
@@ -54,7 +54,7 @@ DEFINE_VALVE_2MAG(z_control_valves,
D,4, D,5,
0);
DEFINE_VALVE_1MAG(xy_control_valves,
- C,2, C,3,
+ D,3, D,2,
400);
static DEFINE_SENSOR(z_control_sensor, 0, 245, 4400, 10000);
static DEFINE_SENSOR(xy_control_sensor, (1<<MUX0), 245, 4400, 10000);
diff --git a/pressure_control/schematics/pressure_control.sch b/pressure_control/schematics/pressure_control.sch
index 00446ea..2d624dc 100644
--- a/pressure_control/schematics/pressure_control.sch
+++ b/pressure_control/schematics/pressure_control.sch
@@ -13,380 +13,380 @@ Comment2 ""
Comment3 ""
Comment4 ""
$EndDescr
-Connection ~ 2150 1200
-Wire Wire Line
- 2150 1200 2150 900
-Wire Wire Line
- 2150 900 2000 900
-Connection ~ 2150 1900
+NoConn ~ 5450 1000
+Connection ~ 5650 800
Wire Wire Line
- 2150 1900 2150 1600
+ 5150 800 5650 800
Wire Wire Line
- 2150 1600 2000 1600
-Connection ~ 1450 2600
+ 4550 2100 3900 2100
Wire Wire Line
- 1450 2600 1450 2300
+ 3900 2100 3900 7300
Wire Wire Line
- 1450 2300 1600 2300
-Connection ~ 2150 3300
+ 6950 1800 7150 1800
Wire Wire Line
- 2150 3300 2150 3000
+ 7150 1800 7150 4750
Wire Wire Line
- 2150 3000 2000 3000
-Connection ~ 2150 5400
+ 7150 1100 7150 1450
Wire Wire Line
- 2150 5400 2150 5100
+ 7150 1450 7250 1450
Wire Wire Line
- 2150 5100 2000 5100
-Connection ~ 2150 6100
+ 7250 1450 7250 2200
Wire Wire Line
- 2150 6100 2150 5800
+ 7250 2200 6950 2200
+Connection ~ 1450 1200
Wire Wire Line
- 2150 5800 2000 5800
-Connection ~ 1450 6800
+ 1450 1200 1450 900
Wire Wire Line
- 1450 6800 1450 6500
+ 1450 900 1600 900
+Connection ~ 1450 1900
Wire Wire Line
- 1450 6500 1600 6500
-Connection ~ 2150 7500
+ 1450 1900 1450 1600
Wire Wire Line
- 2150 7500 2150 7200
+ 1450 1600 1600 1600
+Connection ~ 2150 2600
Wire Wire Line
- 2150 7200 2000 7200
+ 2150 2600 2150 2300
Wire Wire Line
- 11150 3600 11150 5350
+ 2150 2300 2000 2300
+Connection ~ 1450 3300
Wire Wire Line
- 11150 3600 10950 3600
+ 1450 3300 1450 3000
Wire Wire Line
- 10950 3000 10950 3200
+ 1450 3000 1600 3000
+Connection ~ 1450 5400
Wire Wire Line
- 10950 3000 10800 3000
+ 1450 5400 1450 5100
Wire Wire Line
- 10500 2800 10500 2600
+ 1450 5100 1600 5100
+Connection ~ 1450 6100
Wire Wire Line
- 9950 1050 9950 900
+ 1450 6100 1450 5800
Wire Wire Line
- 9100 1450 9100 1600
-Connection ~ 5450 5700
+ 1450 5800 1600 5800
+Connection ~ 2150 6800
Wire Wire Line
- 5450 5450 5450 5700
+ 2150 6800 2150 6500
Wire Wire Line
- 7550 5650 7550 2800
+ 2150 6500 2000 6500
+Connection ~ 1450 7500
Wire Wire Line
- 7550 5650 7400 5650
-Connection ~ 7000 5900
+ 1450 7500 1450 7200
Wire Wire Line
- 7000 5900 7000 5650
+ 1450 7200 1600 7200
Wire Wire Line
- 7200 6050 7200 6200
+ 11100 3200 10950 3200
Wire Wire Line
- 6950 2900 7450 2900
-Connection ~ 7900 2600
+ 10500 5700 10500 5350
Wire Wire Line
- 7900 3400 7900 2600
+ 10500 5350 11150 5350
+Connection ~ 10500 2700
Wire Wire Line
- 3500 7300 3900 7300
+ 10500 2700 11100 2700
+Connection ~ 7900 3400
Wire Wire Line
- 3900 7300 3900 4950
+ 10500 3200 10500 3400
Wire Wire Line
- 3900 4950 7350 4950
+ 10500 3400 6950 3400
Wire Wire Line
- 7350 4950 7350 3000
+ 9950 1600 9950 1450
Wire Wire Line
- 7350 3000 6950 3000
+ 9100 900 9100 1050
Wire Wire Line
- 3500 5900 3700 5900
+ 7450 5450 5850 5450
Wire Wire Line
- 3700 5900 3700 4750
+ 5300 5700 5750 5700
Wire Wire Line
- 3700 4750 7150 4750
+ 5750 5700 5750 6200
Wire Wire Line
- 7150 4750 7150 3200
+ 7400 6200 7400 5650
Wire Wire Line
- 7150 3200 6950 3200
+ 6850 5900 7300 5900
Wire Wire Line
- 1150 5400 1500 5400
+ 7300 5900 7300 6200
Wire Wire Line
- 1150 6800 1500 6800
+ 7450 5450 7450 2900
Wire Wire Line
- 2100 5400 2650 5400
+ 5850 5450 5850 6200
Wire Wire Line
- 2100 6800 2650 6800
+ 5650 6050 5650 6200
Wire Wire Line
- 2950 7300 3000 7300
+ 6950 2800 7550 2800
+Connection ~ 7900 2900
Wire Wire Line
- 2950 5900 3000 5900
+ 7900 2900 8050 2900
Wire Wire Line
- 2650 6400 2650 6300
+ 8000 2600 7550 2600
Wire Wire Line
- 2650 5000 2650 4900
+ 7550 2600 7550 1100
Wire Wire Line
- 2650 5700 2650 5600
+ 3500 6600 3800 6600
Wire Wire Line
- 2650 7100 2650 7000
+ 3600 4650 7050 4650
Wire Wire Line
- 2950 5200 3000 5200
+ 3600 4650 3600 5200
Wire Wire Line
- 2950 6600 3000 6600
+ 3600 5200 3500 5200
Wire Wire Line
- 2100 7500 2650 7500
+ 10900 5700 10900 5200
Wire Wire Line
- 2100 6100 2650 6100
+ 10900 5200 10200 5200
Wire Wire Line
- 1150 7500 1500 7500
+ 10700 5700 10700 5550
+Connection ~ 10300 4500
Wire Wire Line
- 1150 6100 1500 6100
+ 10300 4500 10300 4600
Wire Wire Line
- 4350 4450 8100 4450
+ 8600 5000 8200 5000
Wire Wire Line
- 4350 4450 4350 1800
+ 8200 5000 8200 4350
Wire Wire Line
- 9250 2400 6950 2400
+ 8200 4350 4450 4350
Wire Wire Line
- 11000 5700 11000 5000
+ 4450 4350 4450 1900
Wire Wire Line
- 11000 5000 10200 5000
+ 10900 3900 10200 3900
Wire Wire Line
- 10650 4700 10450 4700
+ 8400 4800 8600 4800
Wire Wire Line
- 10450 4700 10450 4500
+ 8400 4300 8600 4300
Wire Wire Line
- 10450 4500 10200 4500
-Connection ~ 10500 3900
+ 10200 4300 10650 4300
Wire Wire Line
- 10500 4000 10500 3900
+ 8550 2600 8500 2600
Wire Wire Line
- 8600 5200 8100 5200
+ 6950 2300 7350 2300
Wire Wire Line
- 8100 5200 8100 4450
+ 7350 2300 7350 1100
Wire Wire Line
- 4350 1800 4550 1800
+ 7250 1200 7250 1100
Wire Wire Line
- 4550 1900 4450 1900
+ 4550 2200 4150 2200
Wire Wire Line
- 10200 4800 10900 4800
+ 4150 2200 4150 1000
Wire Wire Line
- 10900 4800 10900 4300
+ 4150 1000 3500 1000
Wire Wire Line
- 8600 4400 8400 4400
+ 3500 2400 4550 2400
Wire Wire Line
- 8400 3900 8600 3900
+ 1150 1900 1500 1900
Wire Wire Line
- 8450 2900 8600 2900
+ 1150 3300 1500 3300
Wire Wire Line
- 6950 2100 7450 2100
+ 2100 1900 2650 1900
Wire Wire Line
- 7450 2100 7450 1100
+ 2100 3300 2650 3300
Wire Wire Line
- 7650 1100 7650 1200
+ 5950 4200 5950 4250
Wire Wire Line
- 6950 2200 7150 2200
+ 6050 950 6050 1000
Wire Wire Line
- 7150 2200 7150 1100
+ 2950 2400 3000 2400
Wire Wire Line
- 4850 900 4950 900
+ 2950 1000 3000 1000
Wire Wire Line
- 3500 1700 4050 1700
+ 2650 2900 2650 2800
Wire Wire Line
- 4050 1700 4050 2300
+ 2650 1500 2650 1400
Wire Wire Line
- 4050 2300 4550 2300
+ 2650 800 2650 700
Wire Wire Line
- 3500 3100 4050 3100
+ 2650 2200 2650 2100
Wire Wire Line
- 4050 3100 4050 2500
+ 2950 1700 3000 1700
Wire Wire Line
- 4050 2500 4550 2500
+ 2950 3100 3000 3100
Wire Wire Line
- 1150 1200 1500 1200
+ 5550 4250 5550 4200
Wire Wire Line
- 1150 2600 1500 2600
+ 2100 2600 2650 2600
Wire Wire Line
2100 1200 2650 1200
Wire Wire Line
- 2100 2600 2650 2600
-Wire Wire Line
- 5550 4250 5550 4200
+ 1150 2600 1500 2600
Wire Wire Line
- 5650 950 5650 1000
+ 1150 1200 1500 1200
Wire Wire Line
- 2950 3100 3000 3100
+ 4550 2500 4050 2500
Wire Wire Line
- 2950 1700 3000 1700
+ 4050 2500 4050 3100
Wire Wire Line
- 2650 2200 2650 2100
+ 4050 3100 3500 3100
Wire Wire Line
- 2650 800 2650 700
+ 4550 2300 4050 2300
Wire Wire Line
- 2650 1500 2650 1400
+ 4050 2300 4050 1700
Wire Wire Line
- 2650 2900 2650 2800
+ 4050 1700 3500 1700
Wire Wire Line
- 2950 1000 3000 1000
+ 4650 800 4750 800
Wire Wire Line
- 2950 2400 3000 2400
+ 7650 1100 7650 1200
Wire Wire Line
- 6050 950 6050 1000
+ 7450 1100 7450 2100
Wire Wire Line
- 5950 4200 5950 4250
+ 7450 2100 6950 2100
Wire Wire Line
- 2100 3300 2650 3300
+ 8450 2900 8600 2900
Wire Wire Line
- 2100 1900 2650 1900
+ 8400 3900 8600 3900
Wire Wire Line
- 1150 3300 1500 3300
+ 8600 4400 8400 4400
Wire Wire Line
- 1150 1900 1500 1900
+ 10900 4300 10900 4800
Wire Wire Line
- 3500 2400 4550 2400
+ 10900 4800 10200 4800
Wire Wire Line
- 3500 1000 4150 1000
+ 4450 1900 4550 1900
Wire Wire Line
- 4150 1000 4150 2200
+ 4550 1800 4350 1800
Wire Wire Line
- 4150 2200 4550 2200
+ 8100 5200 8100 4450
Wire Wire Line
- 5350 900 5450 900
+ 8100 5200 8600 5200
Wire Wire Line
- 5450 900 5450 1000
+ 10500 4000 10500 3900
+Connection ~ 10500 3900
Wire Wire Line
- 7250 1200 7250 1100
+ 10200 4500 10450 4500
Wire Wire Line
- 7350 1100 7350 2300
+ 10450 4500 10450 4700
Wire Wire Line
- 7350 2300 6950 2300
+ 10450 4700 10650 4700
Wire Wire Line
- 8550 2600 8500 2600
+ 10200 5000 11000 5000
Wire Wire Line
- 10200 4300 10650 4300
+ 11000 5000 11000 5700
Wire Wire Line
- 8400 4300 8600 4300
+ 9250 2400 6950 2400
Wire Wire Line
- 8400 4800 8600 4800
+ 4350 1800 4350 4450
Wire Wire Line
- 10900 3900 10200 3900
+ 4350 4450 8100 4450
Wire Wire Line
- 4450 1900 4450 4350
+ 1150 6100 1500 6100
Wire Wire Line
- 4450 4350 8200 4350
+ 1150 7500 1500 7500
Wire Wire Line
- 8200 4350 8200 5000
+ 2100 6100 2650 6100
Wire Wire Line
- 8200 5000 8600 5000
+ 2100 7500 2650 7500
Wire Wire Line
- 10300 4500 10300 4600
-Connection ~ 10300 4500
+ 2950 6600 3000 6600
Wire Wire Line
- 10700 5700 10700 5550
+ 2950 5200 3000 5200
Wire Wire Line
- 10200 5200 10900 5200
+ 2650 7100 2650 7000
Wire Wire Line
- 10900 5200 10900 5700
+ 2650 5700 2650 5600
Wire Wire Line
- 3500 5200 3600 5200
+ 2650 5000 2650 4900
Wire Wire Line
- 3600 5200 3600 4650
+ 2650 6400 2650 6300
Wire Wire Line
- 3600 4650 7050 4650
+ 2950 5900 3000 5900
Wire Wire Line
- 7050 4650 7050 3300
+ 2950 7300 3000 7300
Wire Wire Line
- 7050 3300 6950 3300
+ 2100 6800 2650 6800
Wire Wire Line
- 3500 6600 3800 6600
+ 2100 5400 2650 5400
Wire Wire Line
- 3800 6600 3800 4850
+ 1150 6800 1500 6800
Wire Wire Line
- 3800 4850 7250 4850
+ 1150 5400 1500 5400
Wire Wire Line
- 7250 4850 7250 3100
+ 7150 4750 3700 4750
Wire Wire Line
- 7250 3100 6950 3100
+ 3700 4750 3700 5900
Wire Wire Line
- 7550 1100 7550 2600
+ 3700 5900 3500 5900
Wire Wire Line
- 7550 2600 8000 2600
+ 3900 7300 3500 7300
Wire Wire Line
- 7900 2900 8050 2900
-Connection ~ 7900 2900
+ 7900 3400 7900 2600
+Connection ~ 7900 2600
Wire Wire Line
- 7550 2800 6950 2800
+ 7450 2900 6950 2900
Wire Wire Line
- 5650 6050 5650 6200
+ 7200 6050 7200 6200
Wire Wire Line
- 5850 6200 5850 5450
+ 7000 5900 7000 5650
+Connection ~ 7000 5900
Wire Wire Line
- 7450 2900 7450 5450
+ 7400 5650 7550 5650
Wire Wire Line
- 7300 6200 7300 5900
+ 7550 5650 7550 2800
Wire Wire Line
- 7300 5900 6850 5900
+ 5450 5450 5450 5700
+Connection ~ 5450 5700
Wire Wire Line
- 7400 5650 7400 6200
+ 9100 1450 9100 1600
Wire Wire Line
- 5750 6200 5750 5700
+ 9950 1050 9950 900
Wire Wire Line
- 5750 5700 5300 5700
+ 10500 2800 10500 2600
Wire Wire Line
- 7450 5450 5850 5450
+ 10800 3000 10950 3000
Wire Wire Line
- 9100 900 9100 1050
+ 10950 3000 10950 3200
Wire Wire Line
- 9950 1600 9950 1450
+ 10950 3600 11150 3600
Wire Wire Line
- 6950 3400 10500 3400
+ 11150 3600 11150 5350
Wire Wire Line
- 10500 3400 10500 3200
-Connection ~ 7900 3400
+ 2000 7200 2150 7200
Wire Wire Line
- 10500 2700 11100 2700
-Connection ~ 10500 2700
+ 2150 7200 2150 7500
+Connection ~ 2150 7500
Wire Wire Line
- 11150 5350 10500 5350
+ 1600 6500 1450 6500
Wire Wire Line
- 10500 5350 10500 5700
+ 1450 6500 1450 6800
+Connection ~ 1450 6800
Wire Wire Line
- 10950 3200 11100 3200
+ 2000 5800 2150 5800
Wire Wire Line
- 1600 7200 1450 7200
+ 2150 5800 2150 6100
+Connection ~ 2150 6100
Wire Wire Line
- 1450 7200 1450 7500
-Connection ~ 1450 7500
+ 2000 5100 2150 5100
Wire Wire Line
- 2000 6500 2150 6500
+ 2150 5100 2150 5400
+Connection ~ 2150 5400
Wire Wire Line
- 2150 6500 2150 6800
-Connection ~ 2150 6800
+ 2000 3000 2150 3000
Wire Wire Line
- 1600 5800 1450 5800
+ 2150 3000 2150 3300
+Connection ~ 2150 3300
Wire Wire Line
- 1450 5800 1450 6100
-Connection ~ 1450 6100
+ 1600 2300 1450 2300
Wire Wire Line
- 1600 5100 1450 5100
+ 1450 2300 1450 2600
+Connection ~ 1450 2600
Wire Wire Line
- 1450 5100 1450 5400
-Connection ~ 1450 5400
+ 2000 1600 2150 1600
Wire Wire Line
- 1600 3000 1450 3000
+ 2150 1600 2150 1900
+Connection ~ 2150 1900
Wire Wire Line
- 1450 3000 1450 3300
-Connection ~ 1450 3300
+ 2000 900 2150 900
Wire Wire Line
- 2000 2300 2150 2300
+ 2150 900 2150 1200
+Connection ~ 2150 1200
Wire Wire Line
- 2150 2300 2150 2600
-Connection ~ 2150 2600
+ 6950 1900 7050 1900
Wire Wire Line
- 1600 1600 1450 1600
+ 7050 1900 7050 4650
Wire Wire Line
- 1450 1600 1450 1900
-Connection ~ 1450 1900
+ 3800 6600 3800 2000
Wire Wire Line
- 1600 900 1450 900
+ 3800 2000 4550 2000
Wire Wire Line
- 1450 900 1450 1200
-Connection ~ 1450 1200
+ 5650 700 5650 1000
+NoConn ~ 6950 3300
+NoConn ~ 6950 3200
+NoConn ~ 6950 3100
+NoConn ~ 6950 3000
$Comp
L DIODE D?
U 1 1 4B07F796
@@ -570,8 +570,6 @@ F 1 "10n" H 5700 5350 50 0000 L C
1 5650 5450
0 1 1 0
$EndComp
-NoConn ~ 6950 1900
-NoConn ~ 6950 1800
$Comp
L +5V #PWR21
U 1 1 4A20046C
@@ -860,7 +858,6 @@ F 1 "RS232 serial" V 10750 6050 60 0000 C C
$EndComp
Text Notes 8950 5750 0 60 ~
Control interface
-NoConn ~ 4550 2000
$Comp
L C C7
U 1 1 48EC9158
@@ -910,7 +907,6 @@ NoConn ~ 6950 2000
NoConn ~ 6950 2500
NoConn ~ 4550 3100
NoConn ~ 4550 3000
-NoConn ~ 4550 2100
NoConn ~ 9850 2400
$Comp
L CRYSTAL X1
@@ -969,19 +965,19 @@ $EndComp
$Comp
L GND #PWR17
U 1 1 48EB3F38
-P 4850 900
-F 0 "#PWR17" H 4850 900 30 0001 C C
-F 1 "GND" H 4850 830 30 0001 C C
- 1 4850 900
+P 4650 800
+F 0 "#PWR17" H 4650 800 30 0001 C C
+F 1 "GND" H 4650 730 30 0001 C C
+ 1 4650 800
0 1 1 0
$EndComp
$Comp
L C C2
U 1 1 48EB3F22
-P 5150 900
-F 0 "C2" H 5200 1000 50 0000 L C
-F 1 "47p" H 5200 800 50 0000 L C
- 1 5150 900
+P 4950 800
+F 0 "C2" H 5000 900 50 0000 L C
+F 1 "100nF" H 5000 700 50 0000 L C
+ 1 4950 800
0 1 1 0
$EndComp
Text Notes 550 700 0 60 ~
@@ -1106,10 +1102,10 @@ $EndComp
$Comp
L +5V #PWR20
U 1 1 48EB3587
-P 5650 950
-F 0 "#PWR20" H 5650 1040 20 0001 C C
-F 1 "+5V" H 5650 1040 30 0000 C C
- 1 5650 950
+P 5650 700
+F 0 "#PWR20" H 5650 790 20 0001 C C
+F 1 "+5V" H 5650 790 30 0000 C C
+ 1 5650 700
1 0 0 -1
$EndComp
$Comp
bues.ch cgit interface