From e90f94f763cbf10f0d05ae912712d55651fda142 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 4 Mar 2012 21:40:34 +0000 Subject: small cleanup git-svn-id: https://svn.spreadspace.org/mur.sat@274 7de4ea59-55d0-425e-a1af-a3118ea81d4c --- contrib/kicad-libs/mur-sat.lib | 6 +- hardware/ihu-ttx-test/ihu-ttx-test.sch | 416 ++++++++++++++++----------------- hardware/ihu-ttx-test/powerpath.sch | 2 +- hardware/ihu-ttx-test/solar-input.sch | 2 +- hardware/ihu-ttx-test/ttxcrx.sch | 2 +- 5 files changed, 212 insertions(+), 216 deletions(-) diff --git a/contrib/kicad-libs/mur-sat.lib b/contrib/kicad-libs/mur-sat.lib index b7504e1..48c754e 100644 --- a/contrib/kicad-libs/mur-sat.lib +++ b/contrib/kicad-libs/mur-sat.lib @@ -1,4 +1,4 @@ -EESchema-LIBRARY Version 2.3 Date: Son 04 Mär 2012 19:11:28 CET +EESchema-LIBRARY Version 2.3 Date: Son 04 Mär 2012 22:20:16 CET # # DS1374C # @@ -118,13 +118,13 @@ X RST_FB 6 800 250 200 L 50 50 1 1 I X RST 7 -800 -400 200 R 50 50 1 1 O I X EN_CHG 8 -800 -150 200 R 50 50 1 1 I X PROG 9 -800 -650 200 R 50 50 1 1 I -X CPO_FB 10 800 -100 200 L 50 50 1 1 I +X CPO_FB 10 800 -50 200 L 50 50 1 1 I X CAPGOOD 11 -800 -500 200 R 50 50 1 1 O X C- 12 -800 0 200 R 50 50 1 1 B X Vin 13 -800 600 200 R 50 50 1 1 W X VMID 14 800 -650 200 L 50 50 1 1 O X C+ 15 -800 150 200 R 50 50 1 1 B -X CPO 16 800 -250 200 L 50 50 1 1 O +X CPO 16 800 -200 200 L 50 50 1 1 O X GND 17 0 -900 200 U 50 50 1 1 W ENDDRAW ENDDEF diff --git a/hardware/ihu-ttx-test/ihu-ttx-test.sch b/hardware/ihu-ttx-test/ihu-ttx-test.sch index 36fa4c8..f209393 100644 --- a/hardware/ihu-ttx-test/ihu-ttx-test.sch +++ b/hardware/ihu-ttx-test/ihu-ttx-test.sch @@ -1,4 +1,4 @@ -EESchema Schematic File Version 2 date Son 04 Mär 2012 22:12:08 CET +EESchema Schematic File Version 2 date Son 04 Mär 2012 22:39:17 CET LIBS:mur-sat LIBS:power LIBS:device @@ -43,368 +43,364 @@ Comment2 "" Comment3 "" Comment4 "" $EndDescr -Text Notes 8650 5850 0 150 ~ 30 -RTC -Text Notes 6750 2700 0 150 ~ 30 -IHU -Connection ~ 7250 5700 Wire Wire Line - 7250 5750 7250 5600 -Wire Wire Line - 7600 5150 7600 5900 + 6200 5800 6700 5800 Wire Wire Line - 2250 3900 1750 3900 + 6700 5800 6700 6000 Wire Wire Line - 2250 5650 1950 5650 + 6700 6000 6750 6000 +Connection ~ 6350 5950 Wire Wire Line - 1950 5650 1950 4200 + 6200 6400 6350 6400 +Connection ~ 7450 5150 Wire Wire Line - 1950 4200 2250 4200 + 7450 5150 7450 5050 Wire Wire Line - 2250 3550 2100 3550 + 1750 4000 2250 4000 Wire Wire Line - 2100 3550 2100 2900 + 1950 3700 1950 2800 Wire Wire Line - 2100 2900 2250 2900 -Connection ~ 2100 5150 + 1950 3700 2250 3700 Wire Wire Line - 2250 5500 2100 5500 + 2250 4350 2100 4350 Wire Wire Line - 2100 5150 2550 5150 + 2100 4350 2100 5500 Wire Wire Line - 8650 5150 6200 5150 -Connection ~ 10450 5900 + 1950 2800 2250 2800 +Connection ~ 3300 5150 Wire Wire Line - 9750 5900 10450 5900 + 2750 5150 4600 5150 Wire Wire Line - 10450 5350 10450 5150 + 10450 5750 10450 5950 +Connection ~ 10450 5150 Wire Wire Line - 10550 5150 9050 5150 -Connection ~ 7600 5150 + 8050 5900 7600 5900 Wire Wire Line - 8000 5800 8050 5800 + 8000 5700 8050 5700 +Connection ~ 10200 5150 Wire Wire Line - 8000 5600 8050 5600 + 10200 5150 10200 5700 Wire Wire Line - 9800 5800 9750 5800 + 10200 5700 9750 5700 Wire Wire Line - 3300 5150 3300 4200 -Connection ~ 7250 5150 + 9800 5600 9750 5600 +Connection ~ 3300 4350 Wire Wire Line - 3300 4200 3450 4200 -Connection ~ 3500 5150 + 4850 4700 4850 4750 Wire Wire Line - 3300 4350 3450 4350 + 5400 4500 5400 4850 Wire Wire Line - 4700 4450 4600 4450 + 3950 4850 3950 4800 +Connection ~ 6300 5150 Wire Wire Line - 4600 4450 4600 4350 + 3500 5600 3500 5700 Wire Wire Line - 4600 4350 4550 4350 + 4500 5600 4600 5600 Wire Wire Line - 6300 5150 6300 4200 + 4350 7000 4350 6950 Wire Wire Line - 6300 4200 5600 4200 -Connection ~ 4850 4200 + 4350 6450 4350 6400 Wire Wire Line - 5200 4200 4550 4200 + 4350 6400 4600 6400 +Connection ~ 6300 5400 Wire Wire Line - 4050 4850 4050 4800 + 6300 5400 6300 5500 Wire Wire Line - 3850 5650 3850 5700 -Connection ~ 3850 5150 + 6300 5500 6200 5500 +Connection ~ 6900 5150 Wire Wire Line - 3500 5150 3500 5200 + 7250 5700 6900 5700 Wire Wire Line - 4600 5400 4000 5400 + 6900 5750 6900 5650 Wire Wire Line - 4600 5750 4050 5750 -Connection ~ 4500 6400 + 6350 6900 6350 6850 Wire Wire Line - 4500 6400 4500 6700 + 1450 6050 2250 6050 Wire Wire Line - 5400 6650 5400 6700 + 1450 6250 2250 6250 Wire Wire Line - 6750 5400 6200 5400 + 4750 2200 6050 2200 Wire Wire Line - 7250 5150 7250 5200 -Connection ~ 6900 5700 + 4750 2600 6050 2600 Wire Wire Line - 6200 5850 6650 5850 + 4750 2400 6050 2400 Wire Wire Line - 6650 5850 6650 6000 + 10100 3400 9350 3400 Wire Wire Line - 6650 6000 6750 6000 + 10100 3200 7750 3200 Wire Wire Line - 4100 5600 4050 5600 + 7750 3100 10100 3100 Wire Wire Line - 4050 5600 4050 5750 -Connection ~ 6350 6450 + 6050 3200 4750 3200 Wire Wire Line - 6350 6500 6350 6400 + 5350 1250 5350 1650 Wire Wire Line - 1450 5950 2250 5950 + 5350 1650 5650 1650 Wire Wire Line - 1450 6150 2250 6150 + 6050 1700 6050 1250 Wire Wire Line - 2250 6350 1450 6350 + 5250 1350 5250 1250 Wire Wire Line - 1450 5850 2250 5850 + 10050 1800 10050 1750 Wire Wire Line - 2250 1650 1450 1650 + 9500 2200 10050 2200 Wire Wire Line - 1450 1750 2250 1750 + 9500 2000 10050 2000 +Connection ~ 4450 2300 Wire Wire Line - 3950 2300 6050 2300 + 4450 2300 4450 2200 Wire Wire Line - 4750 2700 6050 2700 + 3950 2400 3950 2450 Wire Wire Line - 4750 2500 6050 2500 + 3950 1850 3950 1900 Wire Wire Line - 2250 2550 1450 2550 + 3950 1750 4150 1750 Wire Wire Line - 1450 2450 2250 2450 + 4750 2100 6050 2100 Wire Wire Line - 2250 2350 1450 2350 + 6050 1900 4750 1900 +Connection ~ 4200 3500 Wire Wire Line - 1450 2250 2250 2250 + 6050 3000 4600 3000 Wire Wire Line - 2250 2150 1450 2150 + 4600 3000 4600 3500 Wire Wire Line - 1450 2050 2250 2050 + 4600 3500 4050 3500 +Connection ~ 4200 2900 Wire Wire Line - 2250 1950 1450 1950 + 6050 2900 4050 2900 Wire Wire Line - 1450 1850 2250 1850 + 7400 1300 7500 1300 +Connection ~ 6950 1300 Wire Wire Line - 9350 3300 10100 3300 + 6950 1400 6950 1300 Wire Wire Line - 4750 3100 6050 3100 + 6950 3900 6950 3950 Wire Wire Line - 5650 1550 5450 1550 + 7750 3500 8500 3500 Wire Wire Line - 5450 1550 5450 1250 + 7750 3000 8500 3000 Wire Wire Line - 5650 1250 6050 1250 + 7750 2800 8500 2800 Wire Wire Line - 5550 1350 5550 1250 + 8500 2400 7750 2400 Wire Wire Line - 1450 1550 1450 1500 + 7750 2200 8500 2200 Wire Wire Line - 1450 2650 1450 2700 + 7750 2000 8500 2000 Wire Wire Line - 10050 2400 10050 2450 + 7750 1800 8500 1800 Wire Wire Line - 10050 2300 9500 2300 + 4750 3300 6050 3300 Wire Wire Line - 10050 2100 9500 2100 + 6050 3500 4750 3500 Wire Wire Line - 10050 1900 9500 1900 -Connection ~ 4150 2300 + 10100 3000 10100 2900 Wire Wire Line - 4150 2300 4150 1750 + 10100 3500 10100 3600 Wire Wire Line - 3950 2150 3950 2200 + 4750 3600 6050 3600 Wire Wire Line - 4450 1700 4450 1650 + 6050 3400 4750 3400 Wire Wire Line - 3950 1600 3950 1650 + 8500 1900 7750 1900 Wire Wire Line - 3950 1650 4450 1650 + 7750 2100 8500 2100 Wire Wire Line - 6050 2000 4750 2000 + 8500 2300 7750 2300 Wire Wire Line - 3650 3500 3550 3500 + 8500 2500 7750 2500 Wire Wire Line - 3650 2900 3550 2900 + 8500 2700 7750 2700 Wire Wire Line - 6850 1200 6850 1400 -Connection ~ 6850 1300 + 8500 2900 7750 2900 Wire Wire Line - 6850 1300 7000 1300 + 8500 3300 7750 3300 Wire Wire Line - 6850 3900 6850 3950 + 8500 3400 7750 3400 Wire Wire Line 7750 3600 8500 3600 Wire Wire Line - 8500 3400 7750 3400 -Wire Wire Line - 8500 3300 7750 3300 + 6850 3900 6850 3950 Wire Wire Line - 8500 2900 7750 2900 + 6850 1300 7000 1300 +Connection ~ 6850 1300 Wire Wire Line - 8500 2700 7750 2700 + 6850 1200 6850 1400 Wire Wire Line - 8500 2500 7750 2500 + 3650 2900 3550 2900 Wire Wire Line - 8500 2300 7750 2300 + 3650 3500 3550 3500 Wire Wire Line - 7750 2100 8500 2100 + 6050 2000 4750 2000 Wire Wire Line - 8500 1900 7750 1900 + 3950 1650 4450 1650 Wire Wire Line - 6050 3400 4750 3400 + 3950 1650 3950 1600 Wire Wire Line - 4750 3600 6050 3600 + 4450 1650 4450 1700 Wire Wire Line - 10100 3500 10100 3600 + 3950 2150 3950 2200 Wire Wire Line - 10100 3000 10100 2900 + 4150 1750 4150 2300 +Connection ~ 4150 2300 Wire Wire Line - 6050 3500 4750 3500 + 10050 1900 9500 1900 Wire Wire Line - 4750 3300 6050 3300 + 10050 2100 9500 2100 Wire Wire Line - 7750 1800 8500 1800 + 10050 2300 9500 2300 Wire Wire Line - 7750 2000 8500 2000 + 10050 2400 10050 2450 Wire Wire Line - 7750 2200 8500 2200 + 1450 2650 1450 2700 Wire Wire Line - 8500 2400 7750 2400 + 1450 1550 1450 1500 Wire Wire Line - 7750 2800 8500 2800 + 5550 1350 5550 1250 Wire Wire Line - 7750 3000 8500 3000 + 6050 1250 5650 1250 Wire Wire Line - 7750 3500 8500 3500 + 5450 1250 5450 1550 Wire Wire Line - 6950 3900 6950 3950 + 5450 1550 5650 1550 Wire Wire Line - 6950 1400 6950 1300 -Connection ~ 6950 1300 + 4750 3100 6050 3100 Wire Wire Line - 7400 1300 7500 1300 + 9350 3300 10100 3300 Wire Wire Line - 6050 2900 4050 2900 -Connection ~ 4200 2900 + 1450 1850 2250 1850 Wire Wire Line - 4050 3500 4600 3500 + 2250 1950 1450 1950 Wire Wire Line - 4600 3500 4600 3000 + 1450 2050 2250 2050 Wire Wire Line - 4600 3000 6050 3000 -Connection ~ 4200 3500 + 2250 2150 1450 2150 Wire Wire Line - 6050 1900 4750 1900 + 1450 2250 2250 2250 Wire Wire Line - 4750 2100 6050 2100 + 2250 2350 1450 2350 Wire Wire Line - 4150 1750 3950 1750 + 1450 2450 2250 2450 Wire Wire Line - 3950 1850 3950 1900 + 2250 2550 1450 2550 Wire Wire Line - 3950 2400 3950 2450 + 4750 2500 6050 2500 Wire Wire Line - 4450 2300 4450 2200 -Connection ~ 4450 2300 + 4750 2700 6050 2700 Wire Wire Line - 9500 2000 10050 2000 + 3950 2300 6050 2300 Wire Wire Line - 9500 2200 10050 2200 + 1450 1750 2250 1750 Wire Wire Line - 10050 1800 10050 1750 + 2250 1650 1450 1650 Wire Wire Line - 5250 1350 5250 1250 + 1450 5850 2250 5850 Wire Wire Line - 6050 1250 6050 1700 + 2250 6350 1450 6350 Wire Wire Line - 5650 1650 5350 1650 + 1450 6150 2250 6150 Wire Wire Line - 5350 1650 5350 1250 + 1450 5950 2250 5950 Wire Wire Line - 6050 3200 4750 3200 + 6350 6450 6350 6350 +Connection ~ 6350 6400 Wire Wire Line - 7750 3100 10100 3100 + 4050 5600 4050 5750 Wire Wire Line - 10100 3200 7750 3200 + 4050 5600 4100 5600 +Connection ~ 6900 5700 Wire Wire Line - 10100 3400 9350 3400 + 7250 5150 7250 5200 Wire Wire Line - 4750 2400 6050 2400 + 6750 5400 6200 5400 Wire Wire Line - 4750 2600 6050 2600 + 5400 6650 5400 6700 Wire Wire Line - 4750 2200 6050 2200 + 4500 6400 4500 6700 +Connection ~ 4500 6400 Wire Wire Line - 1450 6250 2250 6250 + 4050 5750 4600 5750 Wire Wire Line - 1450 6050 2250 6050 -Connection ~ 6350 6000 + 4600 5400 4000 5400 Wire Wire Line - 6350 6950 6350 6900 + 3500 5150 3500 5200 +Connection ~ 3850 5150 Wire Wire Line - 6200 6000 6550 6000 + 3850 5650 3850 5700 Wire Wire Line - 6550 6000 6550 6250 + 4050 4850 4050 4800 Wire Wire Line - 6550 6250 6900 6250 + 5200 4200 4550 4200 +Connection ~ 4850 4200 Wire Wire Line - 6900 5750 6900 5650 + 5600 4200 6300 4200 Wire Wire Line - 7250 5700 6900 5700 -Connection ~ 6900 5150 + 6300 4200 6300 5150 Wire Wire Line - 6200 5500 6300 5500 + 4550 4350 4600 4350 Wire Wire Line - 6300 5500 6300 5400 -Connection ~ 6300 5400 + 4600 4350 4600 4450 Wire Wire Line - 4600 6400 4350 6400 + 4600 4450 4700 4450 Wire Wire Line - 4350 6400 4350 6450 + 3300 4350 3450 4350 +Connection ~ 3500 5150 Wire Wire Line - 4350 7000 4350 6950 + 3450 4200 3300 4200 +Connection ~ 7250 5150 Wire Wire Line - 4500 5600 4600 5600 + 3300 4200 3300 5150 Wire Wire Line - 3500 5600 3500 5700 -Connection ~ 6300 5150 + 9800 5800 9750 5800 Wire Wire Line - 3950 4850 3950 4800 + 8000 5600 8050 5600 Wire Wire Line - 5400 4500 5400 4850 + 8000 5800 8050 5800 +Connection ~ 7600 5150 Wire Wire Line - 4850 4700 4850 4750 -Connection ~ 3300 4350 + 10550 5150 9050 5150 Wire Wire Line - 6200 6400 6250 6400 + 10450 5350 10450 5150 Wire Wire Line - 6250 6400 6250 6450 + 9750 5900 10450 5900 +Connection ~ 10450 5900 Wire Wire Line - 6250 6450 6350 6450 + 8650 5150 6200 5150 Wire Wire Line - 9800 5600 9750 5600 + 2100 5150 2550 5150 Wire Wire Line - 9750 5700 10200 5700 + 2100 5500 2250 5500 +Connection ~ 2100 5150 Wire Wire Line - 10200 5700 10200 5150 -Connection ~ 10200 5150 + 2250 2900 2100 2900 Wire Wire Line - 8000 5700 8050 5700 + 2100 2900 2100 3550 Wire Wire Line - 7600 5900 8050 5900 -Connection ~ 10450 5150 + 2100 3550 2250 3550 Wire Wire Line - 10450 5750 10450 5950 + 2250 4200 1950 4200 Wire Wire Line - 2750 5150 4600 5150 -Connection ~ 3300 5150 + 1950 4200 1950 5650 Wire Wire Line - 2250 2800 1950 2800 + 1950 5650 2250 5650 Wire Wire Line - 2100 5500 2100 4350 + 2250 3900 1750 3900 Wire Wire Line - 2100 4350 2250 4350 + 7600 5900 7600 5150 Wire Wire Line - 2250 3700 1950 3700 + 7250 5750 7250 5600 +Connection ~ 7250 5700 Wire Wire Line - 1950 3700 1950 2800 + 6200 5950 6600 5950 Wire Wire Line - 1750 4000 2250 4000 + 6600 5950 6600 6250 Wire Wire Line - 7450 5150 7450 5050 -Connection ~ 7450 5150 + 6600 6250 6900 6250 +Text Notes 8650 5850 0 150 ~ 30 +RTC +Text Notes 6750 2700 0 150 ~ 30 +IHU Text Label 1750 4000 2 60 ~ 0 BATT1_EN Text Label 1750 3900 2 60 ~ 0 @@ -536,10 +532,10 @@ $EndComp $Comp L GND #PWR? U 1 1 4F53AEE9 -P 6350 6950 -F 0 "#PWR?" H 6350 6950 30 0001 C CNN -F 1 "GND" H 6350 6880 30 0001 C CNN - 1 6350 6950 +P 6350 6900 +F 0 "#PWR?" H 6350 6900 30 0001 C CNN +F 1 "GND" H 6350 6830 30 0001 C CNN + 1 6350 6900 1 0 0 -1 $EndComp $Comp @@ -608,19 +604,19 @@ $EndComp $Comp L CP1 C? U 1 1 4F53AD76 -P 6350 6700 -F 0 "C?" H 6400 6800 50 0000 L CNN -F 1 "10F" H 6400 6600 50 0000 L CNN - 1 6350 6700 +P 6350 6650 +F 0 "C?" H 6400 6750 50 0000 L CNN +F 1 "10F" H 6400 6550 50 0000 L CNN + 1 6350 6650 1 0 0 -1 $EndComp $Comp L CP1 C? U 1 1 4F53AD71 -P 6350 6200 -F 0 "C?" H 6400 6300 50 0000 L CNN -F 1 "10F" H 6400 6100 50 0000 L CNN - 1 6350 6200 +P 6350 6150 +F 0 "C?" H 6400 6250 50 0000 L CNN +F 1 "10F" H 6400 6050 50 0000 L CNN + 1 6350 6150 1 0 0 -1 $EndComp $Comp diff --git a/hardware/ihu-ttx-test/powerpath.sch b/hardware/ihu-ttx-test/powerpath.sch index d0cfe12..aacb2b1 100644 --- a/hardware/ihu-ttx-test/powerpath.sch +++ b/hardware/ihu-ttx-test/powerpath.sch @@ -1,4 +1,4 @@ -EESchema Schematic File Version 2 date Son 04 Mär 2012 22:12:08 CET +EESchema Schematic File Version 2 date Son 04 Mär 2012 22:39:17 CET LIBS:mur-sat LIBS:power LIBS:device diff --git a/hardware/ihu-ttx-test/solar-input.sch b/hardware/ihu-ttx-test/solar-input.sch index 31ef42d..0691d4d 100644 --- a/hardware/ihu-ttx-test/solar-input.sch +++ b/hardware/ihu-ttx-test/solar-input.sch @@ -1,4 +1,4 @@ -EESchema Schematic File Version 2 date Son 04 Mär 2012 22:12:08 CET +EESchema Schematic File Version 2 date Son 04 Mär 2012 22:39:17 CET LIBS:mur-sat LIBS:power LIBS:device diff --git a/hardware/ihu-ttx-test/ttxcrx.sch b/hardware/ihu-ttx-test/ttxcrx.sch index 4b8a098..aabdf6d 100644 --- a/hardware/ihu-ttx-test/ttxcrx.sch +++ b/hardware/ihu-ttx-test/ttxcrx.sch @@ -1,4 +1,4 @@ -EESchema Schematic File Version 2 date Son 04 Mär 2012 22:12:08 CET +EESchema Schematic File Version 2 date Son 04 Mär 2012 22:39:17 CET LIBS:mur-sat LIBS:power LIBS:device -- cgit v1.2.3