From 8349e036ba9ec9cba926762651440a0f5c0baa0d Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 30 Aug 2012 13:47:43 +0000 Subject: cleanups git-svn-id: https://svn.spreadspace.org/mur.sat@629 7de4ea59-55d0-425e-a1af-a3118ea81d4c --- doc/diagrams/overview/overview.svg | 632 +++++++++++++++++++++++- hardware/satelite-bus/mainpower.sch | 2 +- hardware/satelite-bus/powerpath.sch | 2 +- hardware/satelite-bus/satelite-bus.sch | 863 ++++++++++++++++----------------- hardware/satelite-bus/solar-input.sch | 2 +- hardware/satelite-bus/ttxcrx.sch | 2 +- 6 files changed, 1028 insertions(+), 475 deletions(-) diff --git a/doc/diagrams/overview/overview.svg b/doc/diagrams/overview/overview.svg index 39c9e35..4b2da98 100644 --- a/doc/diagrams/overview/overview.svg +++ b/doc/diagrams/overview/overview.svg @@ -17,6 +17,58 @@ sodipodi:docname="overview.svg"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + transform="translate(-93.15141,-48.342444)"> @@ -320,7 +484,7 @@ @@ -426,7 +590,7 @@ + transform="translate(117.61225,-46.141865)"> + transform="translate(138.43318,6.5063075)"> + transform="translate(117.51695,151.29834)"> + transform="matrix(0,1,-1,0,1013.9811,286.00996)"> + transform="matrix(0,1,-1,0,1032.3519,186.88446)"> + transform="matrix(0,1,-1,0,1002.8821,393.5554)"> + transform="translate(-67.89795,-48.56436)"> + transform="translate(-47.07701,4.0838065)"> + transform="translate(-67.99325,148.87584)"> + transform="matrix(0,1,-1,0,822.89371,288.96635)"> + transform="matrix(0,1,-1,0,841.26445,189.84085)"> + transform="matrix(0,1,-1,0,811.79472,396.51179)"> + transform="translate(-30.590505,-141.67635)"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2,8 V<10 mA + + + + 3,3 V<300 mA + + + + 5-7 V<2.0 A + + + + + + + + + + 5-7 V<2.0 A + + + + + + + + + + 3.3 V<2.0 A + + + + + + + + mur.sat - energy diff --git a/hardware/satelite-bus/mainpower.sch b/hardware/satelite-bus/mainpower.sch index b1ea34e..0743654 100644 --- a/hardware/satelite-bus/mainpower.sch +++ b/hardware/satelite-bus/mainpower.sch @@ -1,4 +1,4 @@ -EESchema Schematic File Version 2 date Don 30 Aug 2012 14:23:23 CEST +EESchema Schematic File Version 2 date Don 30 Aug 2012 15:46:26 CEST LIBS:mur-sat LIBS:power LIBS:device diff --git a/hardware/satelite-bus/powerpath.sch b/hardware/satelite-bus/powerpath.sch index 8a2379d..7349141 100644 --- a/hardware/satelite-bus/powerpath.sch +++ b/hardware/satelite-bus/powerpath.sch @@ -1,4 +1,4 @@ -EESchema Schematic File Version 2 date Don 30 Aug 2012 14:23:23 CEST +EESchema Schematic File Version 2 date Don 30 Aug 2012 15:46:26 CEST LIBS:mur-sat LIBS:power LIBS:device diff --git a/hardware/satelite-bus/satelite-bus.sch b/hardware/satelite-bus/satelite-bus.sch index 59a096e..4ead9ef 100644 --- a/hardware/satelite-bus/satelite-bus.sch +++ b/hardware/satelite-bus/satelite-bus.sch @@ -1,4 +1,4 @@ -EESchema Schematic File Version 2 date Don 30 Aug 2012 14:23:23 CEST +EESchema Schematic File Version 2 date Don 30 Aug 2012 15:46:26 CEST LIBS:mur-sat LIBS:power LIBS:device @@ -44,784 +44,774 @@ Comment3 "" Comment4 "" $EndDescr Wire Wire Line - 1450 4300 850 4300 + 8000 1800 7700 1800 Wire Wire Line - 850 4300 850 6250 + 2000 6350 800 6350 Wire Wire Line - 850 6250 2000 6250 -Connection ~ 6850 900 -Wire Wire Line - 6850 1200 6850 650 + 800 6350 800 4200 Wire Wire Line - 6850 650 6750 650 -Connection ~ 6850 1050 + 800 4200 1450 4200 Wire Wire Line - 6900 1200 6800 1200 + 6800 1300 6800 1200 +Connection ~ 6850 1200 Wire Wire Line - 6900 1200 6900 1300 + 6750 900 6850 900 Wire Wire Line - 6850 1050 5650 1050 + 5650 850 5750 850 Wire Wire Line - 6250 900 6350 900 + 5750 850 5750 650 Wire Wire Line - 5750 950 5650 950 + 10850 4900 10850 4800 Wire Wire Line - 4600 650 5750 650 -Connection ~ 4950 650 + 10200 1750 10150 1750 Wire Wire Line - 4950 650 4950 1600 + 3950 6900 3950 6800 Wire Wire Line - 10850 5350 10850 5300 + 2850 6650 3400 6650 Wire Wire Line - 10850 4300 10850 4250 -Connection ~ 9700 1750 + 3400 6650 3400 6900 Wire Wire Line - 9550 1750 9750 1750 + 3300 6900 3300 6750 Wire Wire Line - 3750 6900 3750 6600 + 3300 6750 2850 6750 Wire Wire Line - 3550 6850 3500 6850 + 10550 1250 10600 1250 +Connection ~ 7500 5700 Wire Wire Line - 3500 6850 3500 6900 + 7500 5700 7500 6400 +Connection ~ 10200 5700 Wire Wire Line - 3200 6900 3200 6850 + 10200 5700 10200 6200 +Connection ~ 7200 5700 Wire Wire Line - 3200 6850 2850 6850 + 7200 5700 7200 5750 Wire Wire Line - 10600 1350 10550 1350 -Connection ~ 10500 5700 + 9150 3600 10550 3600 Wire Wire Line - 10500 5700 10500 5850 -Connection ~ 6250 4800 -Wire Wire Line - 6300 4800 5600 4800 + 10550 3600 10550 2300 Wire Wire Line - 10600 2400 10600 3750 + 10550 2300 10600 2300 Wire Wire Line - 10600 3750 9700 3750 + 10600 1900 9100 1900 Wire Wire Line - 10600 2200 10500 2200 + 10600 2100 10300 2100 Wire Wire Line - 10500 2200 10500 3250 + 8650 5700 6150 5700 Wire Wire Line - 10500 3250 9850 3250 + 10200 6200 9700 6200 Wire Wire Line - 10600 2000 9700 2000 + 7500 6400 8000 6400 +Connection ~ 1850 6550 Wire Wire Line - 8750 2150 8800 2150 + 1850 6550 1850 6750 Wire Wire Line - 9050 5700 10600 5700 + 6000 2900 4900 2900 Wire Wire Line - 9700 6400 10500 6400 -Connection ~ 4500 6950 + 5700 3000 6000 3000 Wire Wire Line - 4500 6950 4500 7250 + 5700 3200 6000 3200 Wire Wire Line - 4500 7250 4450 7250 -Connection ~ 4900 3750 + 6000 3400 5250 3400 Wire Wire Line - 4900 3800 4900 2900 + 5700 2600 6000 2600 Wire Wire Line - 4800 2800 4800 3300 + 5700 2400 6000 2400 Wire Wire Line - 4800 2800 6000 2800 + 5700 2000 6000 2000 Wire Wire Line - 5700 3100 6000 3100 + 5700 1800 6000 1800 +Connection ~ 4650 2200 Wire Wire Line - 5700 3300 6000 3300 + 4650 2150 4650 2200 Wire Wire Line - 6000 3500 5400 3500 + 6000 1600 4950 1600 Wire Wire Line - 5700 2500 6000 2500 + 5750 1250 5650 1250 Wire Wire Line - 5700 2100 6000 2100 + 4600 1100 4600 1050 +Connection ~ 4250 850 Wire Wire Line - 5700 1900 6000 1900 -Connection ~ 4650 2300 + 4200 850 4300 850 Wire Wire Line - 4650 2350 4650 2300 + 4300 3800 4300 3300 Wire Wire Line - 4800 3300 4300 3300 + 4300 4250 4300 4200 Wire Wire Line - 5750 1150 5650 1150 + 4650 2900 4650 2850 Wire Wire Line - 5650 1350 5750 1350 + 4350 2900 4500 2900 Wire Wire Line - 5750 1350 5750 1400 + 4500 2900 4500 2300 Wire Wire Line - 3700 850 3650 850 + 4500 2300 6000 2300 Wire Wire Line - 4250 900 4250 850 + 6250 650 6350 650 Wire Wire Line - 4900 4250 4900 4200 -Connection ~ 4300 3750 + 1300 3250 1300 2450 Wire Wire Line - 4350 1550 4400 1550 + 1400 3050 1400 2650 Wire Wire Line - 4400 1550 4400 1500 + 750 4100 750 6450 Wire Wire Line - 4400 2750 4400 2800 + 1050 4550 1050 6050 Wire Wire Line - 4400 2800 4350 2800 + 1250 5800 1250 5000 Wire Wire Line - 4650 1500 4650 1650 + 1350 5600 1350 5300 Wire Wire Line - 1350 3150 1350 2550 + 1450 5100 1300 5100 +Connection ~ 3500 5200 +Connection ~ 3800 5200 Wire Wire Line - 700 4000 700 6550 + 3450 5200 3800 5200 +Connection ~ 4500 2200 Wire Wire Line - 1000 4450 1000 6150 + 4500 2200 4500 1650 Wire Wire Line - 1150 4850 1150 5950 + 4500 1650 4350 1650 Wire Wire Line - 1300 5700 1300 5100 + 1400 3050 1450 3050 Wire Wire Line - 1450 5300 1350 5300 + 2000 6550 700 6550 Wire Wire Line - 1450 5000 1250 5000 + 2000 6150 1000 6150 Wire Wire Line - 3500 5500 3500 5200 + 2000 5950 1150 5950 Wire Wire Line - 1350 3150 1450 3150 + 1450 5700 1300 5700 Wire Wire Line - 2000 6450 750 6450 + 3500 5900 3500 6250 Wire Wire Line - 2000 6050 1050 6050 + 1200 7550 2000 7550 Wire Wire Line - 1450 5800 1250 5800 + 2000 7450 1200 7450 Wire Wire Line - 1450 5600 1350 5600 + 10550 1000 10550 950 Wire Wire Line - 3750 6600 4550 6600 + 10600 750 10550 750 Wire Wire Line - 4550 6800 3950 6800 -Connection ~ 3850 7450 + 1450 4850 1150 4850 Wire Wire Line - 3950 7450 3750 7450 + 2550 4250 2400 4250 Wire Wire Line - 10550 850 10600 850 + 9250 5200 9150 5200 Wire Wire Line - 10600 950 10550 950 + 7100 5200 7200 5200 Wire Wire Line - 2400 4350 2550 4350 + 5250 3400 5250 3650 +Connection ~ 7850 1700 Wire Wire Line - 6050 4000 6050 4100 + 7850 1050 7850 1700 Wire Wire Line - 6150 4100 6150 4050 + 8250 1050 8250 1200 Wire Wire Line - 6150 4050 6200 4050 + 8050 1100 8050 1050 Wire Wire Line - 9150 4700 9250 4700 + 7700 1700 8000 1700 Wire Wire Line - 7200 4700 7100 4700 + 8000 6600 8050 6600 Wire Wire Line - 10000 1550 9950 1550 -Connection ~ 7850 1200 + 8050 6600 8050 6850 Wire Wire Line - 7450 1200 8250 1200 + 7500 6600 7450 6600 Wire Wire Line - 7450 1200 7450 1050 + 7500 6800 7450 6800 Wire Wire Line - 7650 1100 7650 1050 + 3750 4300 3800 4300 Wire Wire Line - 8450 1100 8450 1050 -Connection ~ 8050 6800 + 3750 7400 3750 7450 Wire Wire Line - 8650 6800 8600 6800 + 3950 7400 3950 7450 Wire Wire Line - 8100 6800 8000 6800 -Connection ~ 3200 3900 + 3850 7500 3850 7450 Wire Wire Line - 3250 4300 3200 4300 + 2400 3900 3350 3900 Wire Wire Line - 3200 4300 3200 3900 + 6550 6850 6550 6500 Wire Wire Line - 9200 5450 9150 5450 + 6550 6850 6850 6850 Wire Wire Line - 9650 5500 9650 5400 -Connection ~ 7600 5450 + 6850 6850 6850 6800 +Connection ~ 9650 5450 Wire Wire Line - 7550 5450 7600 5450 + 9600 5450 9650 5450 Wire Wire Line - 2550 4650 2400 4650 + 7150 5450 7100 5450 Wire Wire Line - 9150 5000 9250 5000 + 7600 5500 7600 5400 Wire Wire Line - 9250 4600 9150 4600 + 2550 4750 2400 4750 Wire Wire Line - 9150 4400 9250 4400 + 9150 5100 9250 5100 Wire Wire Line - 7100 4500 7200 4500 + 9150 4900 9250 4900 Wire Wire Line - 7200 4900 7100 4900 + 9150 4500 9250 4500 Wire Wire Line - 7200 5100 7100 5100 + 7200 4400 7100 4400 Wire Wire Line - 8150 4550 8100 4550 + 7200 4600 7100 4600 Wire Wire Line - 7600 4150 7600 3900 + 7100 5000 7200 5000 Wire Wire Line - 7600 3900 9650 3900 + 8150 5050 8100 5050 Wire Wire Line - 7800 4150 7800 4100 -Connection ~ 8450 4000 + 7700 4150 7700 4000 Wire Wire Line - 8450 4000 8450 3500 + 7700 4000 9750 4000 Wire Wire Line - 9650 3900 9650 4150 + 3200 1400 2600 1400 Wire Wire Line - 7700 5400 7700 5450 + 2600 1500 3200 1500 Wire Wire Line - 9850 5400 9850 5450 + 3200 1600 2600 1600 Wire Wire Line - 10200 4550 10150 4550 + 2600 1700 3200 1700 +Connection ~ 8550 3900 Wire Wire Line - 10600 1800 10550 1800 + 8550 3900 8550 3400 Wire Wire Line - 9200 3750 9150 3750 + 8550 3400 7700 3400 Wire Wire Line - 9150 3750 9150 3550 + 7700 3500 8450 3500 Wire Wire Line - 8900 2850 8800 2850 + 9750 4000 9750 4150 Wire Wire Line - 10600 1450 10550 1450 + 9850 4150 9850 4100 Wire Wire Line - 10550 1450 10550 1500 + 7800 5450 7800 5400 Wire Wire Line - 9050 1400 9150 1400 + 9750 5450 9750 5400 Wire Wire Line - 9150 1400 9150 1150 + 10200 5050 10150 5050 Wire Wire Line - 3350 3800 2400 3800 + 9400 2850 9550 2850 Wire Wire Line - 2400 3700 3350 3700 + 9550 2850 9550 3050 Wire Wire Line - 3350 3600 2400 3600 + 9250 1150 9250 1500 Wire Wire Line - 2400 3500 3350 3500 + 9250 1500 9050 1500 +Connection ~ 9350 1400 Wire Wire Line - 2400 3400 3350 3400 + 9350 1150 9350 1550 Wire Wire Line - 1450 4550 1050 4550 + 9350 1550 9450 1550 Wire Wire Line - 1800 750 1100 750 + 1300 3250 1450 3250 Wire Wire Line - 1800 950 1100 950 + 1450 4450 1000 4450 Wire Wire Line - 1800 1150 1100 1150 + 1800 850 1100 850 Wire Wire Line - 1800 2150 1100 2150 + 1800 1050 1100 1050 Wire Wire Line - 1800 1950 1100 1950 + 1800 2250 1100 2250 Wire Wire Line - 1800 2650 1400 2650 + 1800 2050 1100 2050 Wire Wire Line - 1800 2450 1300 2450 + 1800 1850 1100 1850 Wire Wire Line - 2600 1300 3200 1300 + 1800 2550 1350 2550 Wire Wire Line - 3200 1800 3150 1800 + 2950 5200 2400 5200 Wire Wire Line - 1100 2350 1150 2350 + 8950 1200 9050 1200 Wire Wire Line - 1150 2350 1150 2400 + 9050 1200 9050 1150 Wire Wire Line - 6000 2200 4350 2200 + 4500 4800 3800 4800 Wire Wire Line - 9450 1150 9450 1200 + 4400 3050 4400 3000 Wire Wire Line - 9450 1200 9550 1200 + 4400 3000 4350 3000 Wire Wire Line - 9450 1400 9350 1400 + 4400 2350 4400 2300 Wire Wire Line - 4400 1800 4400 1750 + 4400 2300 4350 2300 Wire Wire Line - 4400 1750 4350 1750 + 750 4100 1450 4100 Wire Wire Line - 4350 2100 4400 2100 + 9100 1900 9100 1950 Wire Wire Line - 4400 2100 4400 2050 + 10300 2700 10300 2550 Wire Wire Line - 700 4000 1450 4000 + 1850 6750 1200 6750 Wire Wire Line - 9100 2500 9100 2350 + 9950 2350 10000 2350 Wire Wire Line - 9700 2000 9700 2050 + 5400 3650 5400 3500 Wire Wire Line - 10300 2150 10300 2100 + 5250 4200 5250 4150 Wire Wire Line - 9700 2600 9700 2450 + 7700 2600 8000 2600 Wire Wire Line - 3800 5700 3800 4800 + 7700 2800 8000 2800 Wire Wire Line - 3800 5700 4550 5700 + 8000 3200 7700 3200 Wire Wire Line - 5400 4200 5400 4150 + 7700 1900 8000 1900 Wire Wire Line - 9700 1700 9700 1750 + 7700 2100 8000 2100 Wire Wire Line - 8000 2700 7700 2700 + 7700 2400 8000 2400 Wire Wire Line - 8000 2900 7700 2900 + 3300 4050 3300 4000 Wire Wire Line - 7700 3300 8000 3300 + 3300 4000 3350 4000 Wire Wire Line - 8000 2000 7700 2000 + 5750 5100 5700 5100 Wire Wire Line - 8000 2200 7700 2200 + 5700 5100 5700 4950 Wire Wire Line - 8000 2300 7700 2300 + 9150 3150 9150 3100 +Connection ~ 9550 3000 Wire Wire Line - 3300 3250 3300 3300 + 1200 7650 1250 7650 Wire Wire Line - 3300 3300 3350 3300 -Connection ~ 5900 4800 -Connection ~ 6250 5700 + 1250 7650 1250 7700 Wire Wire Line - 6250 5700 6250 4800 + 1100 1250 1150 1250 Wire Wire Line - 5900 4800 5900 4850 -Connection ~ 9150 3600 + 5700 4950 5600 4950 Wire Wire Line - 8750 3350 8750 3100 + 4500 4950 4400 4950 Wire Wire Line - 8750 3350 8850 3350 + 6150 6350 6650 6350 Wire Wire Line - 9550 3500 9550 3450 + 6650 6350 6650 6550 Wire Wire Line - 7700 3000 9550 3000 + 6650 6550 6700 6550 +Connection ~ 6300 6500 Wire Wire Line - 8750 3100 7700 3100 + 6150 6950 6300 6950 Wire Wire Line - 9350 2250 9400 2250 + 10500 6450 10500 6250 Wire Wire Line - 1150 1300 1150 1250 + 7950 6200 8000 6200 Wire Wire Line - 6150 6500 6550 6500 -Connection ~ 7200 6250 + 9750 6100 9700 6100 Wire Wire Line - 7200 6150 7200 6300 -Connection ~ 10500 6400 + 5900 5350 5900 5400 Wire Wire Line - 7950 6300 8000 6300 + 5000 5450 5000 5400 Wire Wire Line - 7950 6100 8000 6100 + 4450 6150 4550 6150 Wire Wire Line - 9750 6300 9700 6300 + 4300 7550 4300 7500 Wire Wire Line - 5100 5450 5100 5400 + 4300 7000 4300 6950 Wire Wire Line - 3800 6200 3800 6250 + 4300 6950 4550 6950 +Connection ~ 6250 5950 Wire Wire Line - 4550 5950 3950 5950 + 6250 5950 6250 6050 Wire Wire Line - 4550 6300 4000 6300 + 6250 6050 6150 6050 +Connection ~ 6850 5700 Wire Wire Line - 5350 7200 5350 7250 + 6850 6250 7200 6250 Wire Wire Line - 6150 5950 6700 5950 -Connection ~ 6850 6250 + 6850 6200 6850 6300 Wire Wire Line - 4050 6150 4000 6150 + 6300 7450 6300 7400 Wire Wire Line - 4000 6150 4000 6300 -Connection ~ 6300 6950 + 1200 7050 2000 7050 Wire Wire Line - 6300 6900 6300 7000 + 1200 7250 2000 7250 Wire Wire Line - 1200 6950 2000 6950 + 6900 3800 6900 3850 Wire Wire Line - 1200 7150 2000 7150 + 6800 3800 6800 3850 Wire Wire Line - 2000 7350 1200 7350 + 3150 1850 3150 1800 Wire Wire Line 1200 6850 2000 6850 Wire Wire Line - 3150 1800 3150 1850 -Wire Wire Line - 6800 3800 6800 3850 -Wire Wire Line - 6900 3800 6900 3850 -Wire Wire Line - 1200 7250 2000 7250 + 2000 7350 1200 7350 Wire Wire Line - 1200 7050 2000 7050 + 1200 7150 2000 7150 Wire Wire Line - 6300 7450 6300 7400 + 1200 6950 2000 6950 Wire Wire Line - 6850 6200 6850 6300 + 6300 6900 6300 7000 +Connection ~ 6300 6950 Wire Wire Line - 6850 6250 7200 6250 -Connection ~ 6850 5700 + 4000 6150 4000 6300 Wire Wire Line - 6150 6050 6250 6050 + 4000 6150 4050 6150 +Connection ~ 6850 6250 Wire Wire Line - 6250 6050 6250 5950 -Connection ~ 6250 5950 + 6150 5950 6700 5950 Wire Wire Line - 4550 6950 4300 6950 + 5350 7200 5350 7250 Wire Wire Line - 4300 6950 4300 7000 + 4000 6300 4550 6300 Wire Wire Line - 4300 7550 4300 7500 + 4550 5950 3950 5950 Wire Wire Line - 4450 6150 4550 6150 + 3800 6200 3800 6250 Wire Wire Line - 5000 5450 5000 5400 + 5100 5450 5100 5400 Wire Wire Line - 5900 5350 5900 5400 + 9750 6300 9700 6300 Wire Wire Line - 9750 6100 9700 6100 + 7950 6100 8000 6100 Wire Wire Line - 7950 6200 8000 6200 + 7950 6300 8000 6300 +Connection ~ 10500 6400 Wire Wire Line - 10500 6450 10500 6250 + 7200 6150 7200 6300 +Connection ~ 7200 6250 Wire Wire Line - 6150 6950 6300 6950 -Connection ~ 6300 6500 + 6550 6500 6150 6500 Wire Wire Line - 6700 6550 6650 6550 + 1150 1250 1150 1300 Wire Wire Line - 6650 6550 6650 6350 + 9350 2250 9400 2250 Wire Wire Line - 6650 6350 6150 6350 + 7700 3100 8750 3100 Wire Wire Line - 4500 4950 4400 4950 + 7700 3000 9550 3000 Wire Wire Line - 5600 4950 5700 4950 + 9550 3500 9550 3450 Wire Wire Line - 1150 1250 1100 1250 + 8850 3350 8750 3350 Wire Wire Line - 1250 7700 1250 7650 + 8750 3350 8750 3100 +Connection ~ 9150 3600 Wire Wire Line - 1250 7650 1200 7650 -Connection ~ 9550 3000 + 5900 4800 5900 4850 Wire Wire Line - 9150 3150 9150 3100 + 6250 5700 6250 4800 +Connection ~ 6250 5700 +Connection ~ 5900 4800 Wire Wire Line - 5700 4950 5700 5100 + 3350 3300 3300 3300 Wire Wire Line - 5700 5100 5750 5100 + 3300 3300 3300 3250 Wire Wire Line - 3350 4000 3300 4000 + 8000 2300 7700 2300 Wire Wire Line - 3300 4000 3300 4050 + 8000 2200 7700 2200 Wire Wire Line - 7700 2400 8000 2400 + 8000 2000 7700 2000 Wire Wire Line - 7700 2100 8000 2100 + 7700 3300 8000 3300 Wire Wire Line - 7700 1900 8000 1900 + 8000 2900 7700 2900 Wire Wire Line - 8000 3200 7700 3200 + 8000 2700 7700 2700 Wire Wire Line - 7700 2800 8000 2800 + 9700 1700 9700 1750 Wire Wire Line - 7700 2600 8000 2600 + 5400 4200 5400 4150 Wire Wire Line - 5250 4200 5250 4150 + 4550 5700 3800 5700 Wire Wire Line - 5400 3500 5400 3650 + 3800 5700 3800 4800 Wire Wire Line - 9950 2350 10000 2350 + 9700 2600 9700 2450 Wire Wire Line - 1200 6750 1850 6750 + 10300 2100 10300 2150 Wire Wire Line - 10300 2700 10300 2550 + 9700 2050 9700 2000 Wire Wire Line - 9100 1950 9100 1900 + 9100 2500 9100 2350 Wire Wire Line - 1450 4100 750 4100 + 1450 4000 700 4000 Wire Wire Line - 4350 2300 4400 2300 + 4400 2050 4400 2100 Wire Wire Line - 4400 2300 4400 2350 + 4400 2100 4350 2100 Wire Wire Line - 4350 3000 4400 3000 + 4350 1750 4400 1750 Wire Wire Line - 4400 3000 4400 3050 + 4400 1750 4400 1800 Wire Wire Line - 3800 4800 4500 4800 + 9450 1400 9350 1400 Wire Wire Line - 9050 1150 9050 1200 + 9550 1200 9450 1200 Wire Wire Line - 9050 1200 8950 1200 + 9450 1200 9450 1150 Wire Wire Line - 2950 5200 2400 5200 + 6000 2200 4350 2200 Wire Wire Line - 1350 2550 1800 2550 + 1150 2400 1150 2350 Wire Wire Line - 1800 1850 1100 1850 + 1150 2350 1100 2350 Wire Wire Line - 1800 2050 1100 2050 + 3150 1800 3200 1800 Wire Wire Line - 1800 2250 1100 2250 + 2600 1300 3200 1300 Wire Wire Line - 1800 1050 1100 1050 + 1300 2450 1800 2450 Wire Wire Line - 1800 850 1100 850 + 1400 2650 1800 2650 Wire Wire Line - 1000 4450 1450 4450 + 1800 1950 1100 1950 Wire Wire Line - 1450 3250 1300 3250 + 1800 2150 1100 2150 Wire Wire Line - 9450 1550 9350 1550 + 1800 1150 1100 1150 Wire Wire Line - 9350 1550 9350 1150 -Connection ~ 9350 1400 + 1800 950 1100 950 Wire Wire Line - 9050 1500 9250 1500 + 1800 750 1100 750 Wire Wire Line - 9250 1500 9250 1150 + 1050 4550 1450 4550 Wire Wire Line - 9550 3050 9550 2850 + 2400 3400 3350 3400 Wire Wire Line - 9550 2850 9400 2850 + 2400 3500 3350 3500 Wire Wire Line - 10200 5050 10150 5050 + 3350 3600 2400 3600 Wire Wire Line - 9750 5450 9750 5400 + 2400 3700 3350 3700 Wire Wire Line - 7800 5450 7800 5400 + 3350 3800 2400 3800 Wire Wire Line - 9850 4150 9850 4100 + 9150 1150 9150 1400 Wire Wire Line - 9750 4150 9750 4000 + 9150 1400 9050 1400 Wire Wire Line - 8450 3500 7700 3500 + 10550 1500 10550 1450 Wire Wire Line - 7700 3400 8550 3400 + 10550 1450 10600 1450 Wire Wire Line - 8550 3400 8550 3900 -Connection ~ 8550 3900 + 8900 2850 8800 2850 Wire Wire Line - 2600 1700 3200 1700 + 9150 3550 9150 3750 Wire Wire Line - 3200 1600 2600 1600 + 9150 3750 9200 3750 Wire Wire Line - 2600 1500 3200 1500 + 10600 1800 10550 1800 Wire Wire Line - 3200 1400 2600 1400 + 10200 4550 10150 4550 Wire Wire Line - 9750 4000 7700 4000 + 9850 5400 9850 5450 Wire Wire Line - 7700 4000 7700 4150 + 7700 5400 7700 5450 Wire Wire Line - 8150 5050 8100 5050 + 9650 4150 9650 3900 Wire Wire Line - 7100 5000 7200 5000 + 8450 3500 8450 4000 +Connection ~ 8450 4000 Wire Wire Line - 7200 4600 7100 4600 + 7800 4150 7800 4100 Wire Wire Line - 7200 4400 7100 4400 + 9650 3900 7600 3900 Wire Wire Line - 9150 4500 9250 4500 + 7600 3900 7600 4150 Wire Wire Line - 9150 4900 9250 4900 + 8150 4550 8100 4550 Wire Wire Line - 9150 5100 9250 5100 + 7200 5100 7100 5100 Wire Wire Line - 2550 4750 2400 4750 + 7200 4900 7100 4900 Wire Wire Line - 7600 5500 7600 5400 + 7100 4500 7200 4500 Wire Wire Line - 7150 5450 7100 5450 + 9150 4400 9250 4400 Wire Wire Line - 9600 5450 9650 5450 -Connection ~ 9650 5450 + 9250 4600 9150 4600 Wire Wire Line - 6850 6800 6850 6850 + 9150 5000 9250 5000 Wire Wire Line - 6850 6850 6550 6850 + 2550 4650 2400 4650 Wire Wire Line - 6550 6850 6550 6500 + 7550 5450 7600 5450 +Connection ~ 7600 5450 Wire Wire Line - 2400 3900 3350 3900 + 9650 5500 9650 5400 Wire Wire Line - 8450 1800 7700 1800 + 9200 5450 9150 5450 Wire Wire Line - 3850 7500 3850 7450 + 3200 3900 3200 4300 Wire Wire Line - 3950 7450 3950 7400 + 3200 4300 3250 4300 +Connection ~ 3200 3900 Wire Wire Line - 3750 7450 3750 7400 + 8100 6800 8000 6800 Wire Wire Line - 3750 4300 3800 4300 + 8650 6800 8600 6800 +Connection ~ 8050 6800 Wire Wire Line - 7500 6800 7450 6800 + 8450 1100 8450 1050 Wire Wire Line - 7500 6600 7450 6600 + 7650 1100 7650 1050 Wire Wire Line - 8050 6850 8050 6600 + 7450 1050 7450 1200 Wire Wire Line - 8050 6600 8000 6600 + 7450 1200 8250 1200 +Connection ~ 7850 1200 Wire Wire Line - 7700 1700 8000 1700 + 10000 1550 9950 1550 Wire Wire Line - 8050 1100 8050 1050 + 7200 4700 7100 4700 Wire Wire Line - 8250 1200 8250 1050 + 9150 4700 9250 4700 Wire Wire Line - 7850 1050 7850 1700 -Connection ~ 7850 1700 + 2400 4350 2550 4350 Wire Wire Line - 5250 3650 5250 3400 + 10550 950 10600 950 Wire Wire Line - 7100 5200 7200 5200 + 10550 850 10600 850 Wire Wire Line - 9250 5200 9150 5200 + 3950 7450 3750 7450 +Connection ~ 3850 7450 Wire Wire Line - 2550 4250 2400 4250 + 3950 6800 4550 6800 Wire Wire Line - 1150 4850 1450 4850 + 4550 6600 3750 6600 Wire Wire Line - 5900 4050 5950 4050 + 1350 5600 1450 5600 Wire Wire Line - 5950 4050 5950 4100 + 1250 5800 1450 5800 Wire Wire Line - 10600 750 10550 750 + 1050 6050 2000 6050 Wire Wire Line - 10550 950 10550 1000 + 750 6450 2000 6450 Wire Wire Line - 2000 7450 1200 7450 + 1450 3150 1350 3150 Wire Wire Line - 1200 7550 2000 7550 + 3500 5500 3500 5200 Wire Wire Line - 3500 5900 3500 6250 + 1250 5000 1450 5000 Wire Wire Line - 1300 5700 1450 5700 + 1350 5300 1450 5300 Wire Wire Line - 1150 5950 2000 5950 + 1300 5700 1300 5100 Wire Wire Line - 1000 6150 2000 6150 + 1150 4850 1150 5950 Wire Wire Line - 700 6550 2000 6550 + 1000 4450 1000 6150 Wire Wire Line - 1450 3050 1400 3050 + 700 4000 700 6550 Wire Wire Line - 4350 1650 4500 1650 + 1350 3150 1350 2550 Wire Wire Line - 4500 1650 4500 2200 -Connection ~ 4500 2200 + 4650 1500 4650 1650 Wire Wire Line - 3450 5200 3800 5200 -Connection ~ 3800 5200 -Connection ~ 3500 5200 + 4350 2800 4400 2800 Wire Wire Line - 1300 5100 1450 5100 + 4400 2800 4400 2750 Wire Wire Line - 1350 5600 1350 5300 + 4400 1500 4400 1550 Wire Wire Line - 1250 5800 1250 5000 + 4400 1550 4350 1550 +Connection ~ 4300 3750 Wire Wire Line - 1050 4550 1050 6050 + 4900 4250 4900 4200 Wire Wire Line - 750 4100 750 6450 + 4250 900 4250 850 Wire Wire Line - 1400 3050 1400 2650 + 3700 850 3650 850 Wire Wire Line - 1300 3250 1300 2450 + 5750 1400 5750 1350 Wire Wire Line - 6250 650 6350 650 + 5750 1350 5650 1350 Wire Wire Line - 6000 2300 4500 2300 + 5750 1150 5650 1150 Wire Wire Line - 4500 2300 4500 2900 + 4300 3300 4800 3300 Wire Wire Line - 4500 2900 4350 2900 + 4650 2350 4650 2300 +Connection ~ 4650 2300 Wire Wire Line - 4650 2900 4650 2850 + 5700 1900 6000 1900 Wire Wire Line - 4300 4250 4300 4200 + 5700 2100 6000 2100 Wire Wire Line - 4300 3300 4300 3800 + 5700 2500 6000 2500 Wire Wire Line - 4200 850 4300 850 -Connection ~ 4250 850 + 5400 3500 6000 3500 Wire Wire Line - 4600 1100 4600 1050 + 5700 3300 6000 3300 Wire Wire Line - 5750 1250 5650 1250 + 5700 3100 6000 3100 Wire Wire Line - 4950 1600 6000 1600 + 6000 2800 4800 2800 Wire Wire Line - 4650 2150 4650 2200 -Connection ~ 4650 2200 + 4800 2800 4800 3300 Wire Wire Line - 5700 1800 6000 1800 + 4900 2900 4900 3800 +Connection ~ 4900 3750 Wire Wire Line - 5700 2000 6000 2000 + 4450 7250 4500 7250 Wire Wire Line - 5700 2400 6000 2400 + 4500 7250 4500 6950 +Connection ~ 4500 6950 Wire Wire Line - 5700 2600 6000 2600 + 9700 6400 10500 6400 Wire Wire Line - 5250 3400 6000 3400 + 9050 5700 10600 5700 Wire Wire Line - 5700 3200 6000 3200 + 8750 2150 8800 2150 Wire Wire Line - 5700 3000 6000 3000 + 9700 2000 10600 2000 Wire Wire Line - 4900 2900 6000 2900 + 9850 3250 10500 3250 Wire Wire Line - 1850 6750 1850 6550 -Connection ~ 1850 6550 + 10500 3250 10500 2200 Wire Wire Line - 8000 6400 7500 6400 + 10500 2200 10600 2200 Wire Wire Line - 9700 6200 10200 6200 + 9700 3750 10600 3750 Wire Wire Line - 8650 5700 6150 5700 + 10600 3750 10600 2400 Wire Wire Line - 10300 2100 10600 2100 + 6300 4800 5600 4800 +Connection ~ 6250 4800 Wire Wire Line - 9100 1900 10600 1900 + 10500 5700 10500 5850 +Connection ~ 10500 5700 Wire Wire Line - 10600 2300 10550 2300 + 10600 1350 10550 1350 Wire Wire Line - 10550 2300 10550 3600 + 2850 6850 3200 6850 Wire Wire Line - 10550 3600 9150 3600 + 3200 6850 3200 6900 Wire Wire Line - 7200 5700 7200 5750 -Connection ~ 7200 5700 + 3500 6900 3500 6850 Wire Wire Line - 10200 6200 10200 5700 -Connection ~ 10200 5700 + 3500 6850 3550 6850 Wire Wire Line - 7500 6400 7500 5700 -Connection ~ 7500 5700 + 3750 6600 3750 6900 Wire Wire Line - 10550 1250 10600 1250 + 9550 1750 9750 1750 +Connection ~ 9700 1750 Wire Wire Line - 2850 6750 3300 6750 + 10850 4300 10850 4250 Wire Wire Line - 3300 6750 3300 6900 + 10850 5350 10850 5300 Wire Wire Line - 3400 6900 3400 6650 + 4950 1600 4950 650 +Connection ~ 4950 650 Wire Wire Line - 3400 6650 2850 6650 + 5750 650 4600 650 Wire Wire Line - 3950 6800 3950 6900 + 5750 950 5650 950 Wire Wire Line - 10200 1750 10150 1750 + 6250 900 6350 900 Wire Wire Line - 10850 4900 10850 4800 + 6850 1050 5650 1050 Wire Wire Line - 5750 650 5750 850 + 6900 1300 6900 1200 Wire Wire Line - 5750 850 5650 850 + 6900 1200 6800 1200 +Connection ~ 6850 1050 Wire Wire Line - 6750 900 6850 900 -Connection ~ 6850 1200 + 6750 650 6850 650 Wire Wire Line - 6800 1200 6800 1300 + 6850 650 6850 1200 +Connection ~ 6850 900 Wire Wire Line - 1450 4200 800 4200 + 2000 6250 850 6250 Wire Wire Line - 800 4200 800 6350 + 850 6250 850 4300 Wire Wire Line - 800 6350 2000 6350 + 850 4300 1450 4300 $Comp L C C114 U 1 1 4FF37CFD @@ -969,15 +959,6 @@ F 2 "microchip-2-TQFP44" H 6900 2650 50 0001 C CNN 1 6900 2500 1 0 0 -1 $EndComp -$Comp -L CONN_3 K4 -U 1 1 4FB99B79 -P 6050 4450 -F 0 "K4" V 6000 4450 50 0000 C CNN -F 1 "IHU_UNUSED" V 6100 4450 40 0000 C CNN - 1 6050 4450 - 0 1 1 0 -$EndComp Text Label 4250 900 3 60 ~ 0 IHU_RST Text Label 1350 7450 0 60 ~ 0 @@ -1052,30 +1033,8 @@ Text Label 2900 6750 0 60 ~ 0 HEAT0_DIR Text Label 2900 6650 0 60 ~ 0 HEAT1_DIR -$Comp -L VCC #PWR38 -U 1 1 4F85D395 -P 6200 4050 -F 0 "#PWR38" H 6200 4150 30 0001 C CNN -F 1 "VCC" H 6200 4150 30 0000 C CNN - 1 6200 4050 - 0 1 1 0 -$EndComp -$Comp -L GND #PWR36 -U 1 1 4F85D389 -P 5900 4050 -F 0 "#PWR36" H 5900 4050 30 0001 C CNN -F 1 "GND" H 5900 3980 30 0001 C CNN - 1 5900 4050 - 0 1 1 0 -$EndComp -Text Label 6050 4000 1 60 ~ 0 -RE0 Text Label 5700 2500 2 60 ~ 0 CTR_RST -Text Label 5700 2400 2 60 ~ 0 -RE0 Text Label 8000 2200 0 60 ~ 0 CAPGOOD $Comp @@ -1219,7 +1178,7 @@ F 1 "OPU" V 3750 7150 50 0000 C CNN 1 3750 7150 1 0 0 -1 $EndComp -Text Label 8450 1800 0 60 ~ 0 +Text Label 8000 2100 0 60 ~ 0 BATT_AL Text Label 2600 3900 0 60 ~ 0 BATT_AL @@ -1403,12 +1362,12 @@ ADC_C1 Text Label 8150 4550 0 60 ~ 0 ADC_C0 Text Label 8000 3400 0 60 ~ 0 -SOL_SEL1 +ADC_SEL1 Text Label 8000 3500 0 60 ~ 0 -SOL_SEL0 +ADC_SEL0 Text Label 8000 2300 0 60 ~ 0 POWER_FAIL -Text Label 8000 2100 0 60 ~ 0 +Text Label 5700 2400 2 60 ~ 0 RADIO_SILENCE Text Label 9800 3750 0 60 ~ 0 MPU_PWR @@ -2144,9 +2103,9 @@ Text Label 5700 3100 2 60 ~ 0 MPU_RST Text Label 5700 3000 2 60 ~ 0 MPU_EN -Text Label 8450 3100 0 60 ~ 0 +Text Label 8000 3100 0 60 ~ 0 MPU_TX -Text Label 8450 3000 0 60 ~ 0 +Text Label 8000 3000 0 60 ~ 0 MPU_RX $Comp L VCC #PWR34 diff --git a/hardware/satelite-bus/solar-input.sch b/hardware/satelite-bus/solar-input.sch index 004de6c..b70e4e8 100644 --- a/hardware/satelite-bus/solar-input.sch +++ b/hardware/satelite-bus/solar-input.sch @@ -1,4 +1,4 @@ -EESchema Schematic File Version 2 date Don 30 Aug 2012 14:23:23 CEST +EESchema Schematic File Version 2 date Don 30 Aug 2012 15:46:26 CEST LIBS:mur-sat LIBS:power LIBS:device diff --git a/hardware/satelite-bus/ttxcrx.sch b/hardware/satelite-bus/ttxcrx.sch index e480f80..c34441b 100644 --- a/hardware/satelite-bus/ttxcrx.sch +++ b/hardware/satelite-bus/ttxcrx.sch @@ -1,4 +1,4 @@ -EESchema Schematic File Version 2 date Don 30 Aug 2012 14:23:23 CEST +EESchema Schematic File Version 2 date Don 30 Aug 2012 15:46:26 CEST LIBS:mur-sat LIBS:power LIBS:device -- cgit v1.2.3