summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@mur.at>2012-06-24 14:16:18 +0000
committerChristian Pointner <equinox@mur.at>2012-06-24 14:16:18 +0000
commit62b993c6e506120581b8302a0b7761919e53273e (patch)
tree1c5d8565bbf4c76337c2f49a406d109adeaf90a1
parentadded usb power path (diff)
first working version of battmon
git-svn-id: https://svn.spreadspace.org/mur.sat@563 7de4ea59-55d0-425e-a1af-a3118ea81d4c
-rw-r--r--contrib/kicad-libs/mur-sat.mdc2
-rw-r--r--contrib/kicad-libs/mur-sat.mod144
-rw-r--r--hardware/battmon/battmon.brd418
-rw-r--r--hardware/battmon/battmon.cmp4
-rw-r--r--hardware/battmon/battmon.net90
-rw-r--r--hardware/battmon/battmon.pro6
-rw-r--r--hardware/battmon/battmon.sch6
-rw-r--r--hardware/satelite-bus/mainpower.sch2
-rw-r--r--hardware/satelite-bus/powerpath.sch66
-rw-r--r--hardware/satelite-bus/satelite-bus.sch2
-rw-r--r--hardware/satelite-bus/solar-input.sch2
-rw-r--r--hardware/satelite-bus/ttxcrx.sch2
12 files changed, 476 insertions, 268 deletions
diff --git a/contrib/kicad-libs/mur-sat.mdc b/contrib/kicad-libs/mur-sat.mdc
index 19c6ed8..2fabf0f 100644
--- a/contrib/kicad-libs/mur-sat.mdc
+++ b/contrib/kicad-libs/mur-sat.mdc
@@ -1,4 +1,4 @@
-PCBNEW-LibDoc----V1 Son 24 Jun 2012 01:29:23 CEST
+PCBNEW-LibDoc----V1 Son 24 Jun 2012 15:36:19 CEST
#
$MODULE SO18E
Li SO18E
diff --git a/contrib/kicad-libs/mur-sat.mod b/contrib/kicad-libs/mur-sat.mod
index 52a2099..74b4b10 100644
--- a/contrib/kicad-libs/mur-sat.mod
+++ b/contrib/kicad-libs/mur-sat.mod
@@ -1,4 +1,4 @@
-PCBNEW-LibModule-V1 Son 24 Jun 2012 01:29:23 CEST
+PCBNEW-LibModule-V1 Son 24 Jun 2012 15:36:19 CEST
$INDEX
COIL10
COIL5
@@ -24,6 +24,7 @@ hhd70pa
DCB
BATT_CONTACT
CRA2010
+DCB_NOEXPOSED
$EndINDEX
$MODULE SO18E
Po 0 0 0 15 4ED25BC1 00000000 ~~
@@ -1495,9 +1496,48 @@ Ne 0 ""
Po 2992 -996
$EndPAD
$EndMODULE hhd70
-$MODULE DCB
-Po 0 0 0 15 4FE64DC2 00000000 ~~
-Li DCB
+$MODULE BATT_CONTACT
+Po 0 0 0 15 4FE64E67 00000000 ~~
+Li BATT_CONTACT
+Sc 00000000
+AR
+Op 0 0 0
+T0 0 -591 600 600 0 120 N V 21 N"BATT_CONTACT"
+T1 -197 827 600 600 0 120 N V 21 N"VAL**"
+$PAD
+Sh "1" R 1969 1969 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 0 0
+$EndPAD
+$EndMODULE BATT_CONTACT
+$MODULE CRA2010
+Po 0 0 0 15 4FE65150 00000000 ~~
+Li CRA2010
+Sc 00000000
+AR
+Op 0 0 0
+T0 -39 -315 600 600 0 120 N V 21 N"CRA2010"
+T1 0 512 600 600 0 120 N V 21 N"VAL**"
+$PAD
+Sh "1" R 1220 1063 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 0 -1142
+$EndPAD
+$PAD
+Sh "2" R 1220 1063 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 0 1142
+$EndPAD
+$EndMODULE CRA2010
+$MODULE DCB_NOEXPOSED
+Po 0 0 0 15 4FE7177C 00000000 ~~
+Li DCB_NOEXPOSED
Sc 00000000
AR
Op 0 0 0
@@ -1513,6 +1553,8 @@ Dr 0 0 0
At SMD N 00888000
Ne 0 ""
Po -197 561
+.SolderMask 50
+.LocalClearance 50
$EndPAD
$PAD
Sh "2" R 98 276 0 0 0
@@ -1520,6 +1562,8 @@ Dr 0 0 0
At SMD N 00888000
Ne 0 ""
Po 0 561
+.SolderMask 50
+.LocalClearance 50
$EndPAD
$PAD
Sh "3" R 98 276 0 0 0
@@ -1527,6 +1571,8 @@ Dr 0 0 0
At SMD N 00888000
Ne 0 ""
Po 197 561
+.SolderMask 50
+.LocalClearance 50
$EndPAD
$PAD
Sh "5" R 98 276 0 0 0
@@ -1534,6 +1580,8 @@ Dr 0 0 0
At SMD N 00888000
Ne 0 ""
Po 0 -561
+.SolderMask 50
+.LocalClearance 50
$EndPAD
$PAD
Sh "6" R 98 276 0 0 0
@@ -1541,6 +1589,8 @@ Dr 0 0 0
At SMD N 00888000
Ne 0 ""
Po -197 -561
+.SolderMask 50
+.LocalClearance 50
$EndPAD
$PAD
Sh "4" R 98 276 0 0 0
@@ -1548,52 +1598,84 @@ Dr 0 0 0
At SMD N 00888000
Ne 0 ""
Po 197 -561
+.SolderMask 50
+.LocalClearance 50
$EndPAD
+$EndMODULE DCB_NOEXPOSED
+$MODULE DCB
+Po 0 0 0 15 4FE717CF 00000000 ~~
+Li DCB
+Sc 00000000
+AR
+Op 0 0 0
+T0 0 197 276 276 0 69 N V 21 N"DCB"
+T1 0 -157 276 276 0 69 N V 21 N"VAL**"
+DS -394 -591 394 -591 150 21
+DS 394 -591 394 591 150 21
+DS 394 591 -394 591 150 21
+DS -394 591 -394 -591 150 21
$PAD
-Sh "" R 531 650 0 0 0
+Sh "1" R 98 276 0 0 0
Dr 0 0 0
At SMD N 00888000
Ne 0 ""
-Po 0 0
+Po -197 561
+.SolderMask 50
+.LocalClearance 50
$EndPAD
-$EndMODULE DCB
-$MODULE BATT_CONTACT
-Po 0 0 0 15 4FE64E67 00000000 ~~
-Li BATT_CONTACT
-Sc 00000000
-AR
-Op 0 0 0
-T0 0 -591 600 600 0 120 N V 21 N"BATT_CONTACT"
-T1 -197 827 600 600 0 120 N V 21 N"VAL**"
$PAD
-Sh "1" R 1969 1969 0 0 0
+Sh "2" R 98 276 0 0 0
Dr 0 0 0
At SMD N 00888000
Ne 0 ""
-Po 0 0
+Po 0 561
+.SolderMask 50
+.LocalClearance 50
$EndPAD
-$EndMODULE BATT_CONTACT
-$MODULE CRA2010
-Po 0 0 0 15 4FE65150 00000000 ~~
-Li CRA2010
-Sc 00000000
-AR
-Op 0 0 0
-T0 -39 -315 600 600 0 120 N V 21 N"CRA2010"
-T1 0 512 600 600 0 120 N V 21 N"VAL**"
$PAD
-Sh "1" R 1220 1063 0 0 0
+Sh "3" R 98 276 0 0 0
Dr 0 0 0
At SMD N 00888000
Ne 0 ""
-Po 0 -1142
+Po 197 561
+.SolderMask 50
+.LocalClearance 50
$EndPAD
$PAD
-Sh "2" R 1220 1063 0 0 0
+Sh "5" R 98 276 0 0 0
Dr 0 0 0
At SMD N 00888000
Ne 0 ""
-Po 0 1142
+Po 0 -561
+.SolderMask 50
+.LocalClearance 50
$EndPAD
-$EndMODULE CRA2010
+$PAD
+Sh "6" R 98 276 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -197 -561
+.SolderMask 50
+.LocalClearance 50
+$EndPAD
+$PAD
+Sh "4" R 98 276 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 197 -561
+.SolderMask 50
+.LocalClearance 50
+$EndPAD
+$PAD
+Sh "" R 531 650 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 0 0
+.SolderMask 50
+.LocalClearance 50
+$EndPAD
+$EndMODULE DCB
$EndLIBRARY
diff --git a/hardware/battmon/battmon.brd b/hardware/battmon/battmon.brd
index a818f8f..fdf84b2 100644
--- a/hardware/battmon/battmon.brd
+++ b/hardware/battmon/battmon.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Son 24 Jun 2012 15:22:19 CEST
+PCBNEW-BOARD Version 1 date Son 24 Jun 2012 16:12:00 CEST
# Created by Pcbnew(2010-00-09 BZR 23xx)-stable
@@ -7,10 +7,10 @@ LayerCount 2
Ly 1FFF8001
EnabledLayers 1FFF8001
Links 15
-NoConn 1
-Di 53356 29858 64842 59892
-Ndraw 0
-Ntrack 53
+NoConn 0
+Di 42956 23158 64792 59892
+Ndraw 27
+Ntrack 61
Nzone 0
BoardThickness 630
Nmodule 8
@@ -55,7 +55,7 @@ TextPcbSize 600 800
EdgeModWidth 150
TextModSize 600 600
TextModWidth 120
-PadSize 1220 1063
+PadSize 98 276
PadDrill 0
Pad2MaskClearance 100
AuxiliaryAxisOrg 0 0
@@ -100,9 +100,9 @@ uViaDia 200
uViaDrill 50
AddNet ""
AddNet "/ALARM"
+AddNet "/PWR"
AddNet "/SCL"
AddNet "/SDA"
-AddNet "GND"
$EndNCLASS
$NCLASS
Name "Power"
@@ -114,10 +114,10 @@ ViaDrill 250
uViaDia 200
uViaDrill 50
AddNet "/+"
-AddNet "/PWR"
+AddNet "GND"
$EndNCLASS
$MODULE BATT_CONTACT
-Po 63350 58400 0 15 4FE64E67 4FE65711 ~~
+Po 63300 58400 0 15 4FE64E67 4FE65711 ~~
Li BATT_CONTACT
Sc 4FE65711
AR /4FE64398
@@ -133,7 +133,7 @@ Po 0 0
$EndPAD
$EndMODULE BATT_CONTACT
$MODULE BATT_CONTACT
-Po 63300 31350 0 15 4FE64E67 4FE65713 ~~
+Po 63300 24650 0 15 4FE64E67 4FE65713 ~~
Li BATT_CONTACT
Sc 4FE65713
AR /4FE6438F
@@ -171,70 +171,8 @@ Ne 1 "/+"
Po 0 1142
$EndPAD
$EndMODULE CRA2010
-$MODULE DCB
-Po 62200 37000 2700 15 4FE64DC2 4FE65715 ~~
-Li DCB
-Sc 4FE65715
-AR /4F7103BE
-Op 0 0 0
-T0 0 197 276 276 2700 69 N V 21 N"U1"
-T1 0 -157 276 276 2700 69 N V 21 N"LTC2942"
-DS -394 -591 394 -591 150 21
-DS 394 -591 394 591 150 21
-DS 394 591 -394 591 150 21
-DS -394 591 -394 -591 150 21
-$PAD
-Sh "1" R 98 276 0 0 2700
-Dr 0 0 0
-At SMD N 00888000
-Ne 3 "/PWR"
-Po -197 561
-$EndPAD
-$PAD
-Sh "2" R 98 276 0 0 2700
-Dr 0 0 0
-At SMD N 00888000
-Ne 6 "GND"
-Po 0 561
-$EndPAD
-$PAD
-Sh "3" R 98 276 0 0 2700
-Dr 0 0 0
-At SMD N 00888000
-Ne 4 "/SCL"
-Po 197 561
-$EndPAD
-$PAD
-Sh "5" R 98 276 0 0 2700
-Dr 0 0 0
-At SMD N 00888000
-Ne 2 "/ALARM"
-Po 0 -561
-$EndPAD
-$PAD
-Sh "6" R 98 276 0 0 2700
-Dr 0 0 0
-At SMD N 00888000
-Ne 1 "/+"
-Po -197 -561
-$EndPAD
-$PAD
-Sh "4" R 98 276 0 0 2700
-Dr 0 0 0
-At SMD N 00888000
-Ne 5 "/SDA"
-Po 197 -561
-$EndPAD
-$PAD
-Sh "" R 531 650 0 0 2700
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po 0 0
-$EndPAD
-$EndMODULE DCB
$MODULE SIL-5
-Po 54850 38450 2700 0 00200000 4FE65716 ~~
+Po 44450 38450 2700 0 00200000 4FE65716 ~~
Li SIL-5
Cd Connecteur 5 pins
Kw CONN DEV
@@ -266,14 +204,14 @@ $PAD
Sh "3" C 550 550 0 0 2700
Dr 320 0 0
At STD N 00D0FFFF
-Ne 5 "/SDA"
+Ne 2 "/ALARM"
Po -500 0
$EndPAD
$PAD
Sh "4" C 550 550 0 0 2700
Dr 320 0 0
At STD N 00D0FFFF
-Ne 2 "/ALARM"
+Ne 5 "/SDA"
Po 500 0
$EndPAD
$PAD
@@ -285,7 +223,7 @@ Po 1500 0
$EndPAD
$EndMODULE SIL-5
$MODULE SM0603
-Po 60150 37100 2700 15 455C3716 4FE65717 ~~
+Po 63350 37100 2700 15 455C3716 4FE65717 ~~
Li SM0603
Sc 4FE65717
AR /4F71C709
@@ -319,7 +257,7 @@ Ro 0.000000 0.000000 0.000000
$EndSHAPE3D
$EndMODULE SM0603
$MODULE SM0603
-Po 59450 37100 2700 15 455C3716 4FE65719 ~~
+Po 60300 37100 2700 15 455C3716 4FE65719 ~~
Li SM0603
Sc 4FE65719
AR /4F71C70E
@@ -386,11 +324,215 @@ Of 0.000000 0.000000 0.000000
Ro 0.000000 0.000000 0.000000
$EndSHAPE3D
$EndMODULE SM0603
+$MODULE DCB_NOEXPOSED
+Po 62200 37000 2700 15 4FE7177C 4FE65715 ~~
+Li DCB_NOEXPOSED
+Sc 4FE65715
+AR /4F7103BE
+Op 0 0 0
+T0 0 197 276 276 2700 69 N V 21 N"U1"
+T1 0 -157 276 276 2700 69 N V 21 N"LTC2942"
+DS -394 -591 394 -591 150 21
+DS 394 -591 394 591 150 21
+DS 394 591 -394 591 150 21
+DS -394 591 -394 -591 150 21
+$PAD
+Sh "1" R 98 276 0 0 2700
+Dr 0 0 0
+At SMD N 00888000
+Ne 3 "/PWR"
+Po -197 561
+.SolderMask 50
+.LocalClearance 50
+$EndPAD
+$PAD
+Sh "2" R 98 276 0 0 2700
+Dr 0 0 0
+At SMD N 00888000
+Ne 6 "GND"
+Po 0 561
+.SolderMask 50
+.LocalClearance 50
+$EndPAD
+$PAD
+Sh "3" R 98 276 0 0 2700
+Dr 0 0 0
+At SMD N 00888000
+Ne 4 "/SCL"
+Po 197 561
+.SolderMask 50
+.LocalClearance 50
+$EndPAD
+$PAD
+Sh "5" R 98 276 0 0 2700
+Dr 0 0 0
+At SMD N 00888000
+Ne 2 "/ALARM"
+Po 0 -561
+.SolderMask 50
+.LocalClearance 50
+$EndPAD
+$PAD
+Sh "6" R 98 276 0 0 2700
+Dr 0 0 0
+At SMD N 00888000
+Ne 1 "/+"
+Po -197 -561
+.SolderMask 50
+.LocalClearance 50
+$EndPAD
+$PAD
+Sh "4" R 98 276 0 0 2700
+Dr 0 0 0
+At SMD N 00888000
+Ne 5 "/SDA"
+Po 197 -561
+.SolderMask 50
+.LocalClearance 50
+$EndPAD
+$EndMODULE DCB_NOEXPOSED
+$COTATION
+Ge 0 25 0
+Va 4050
+Te "10,287 mm"
+Po 61975 41753 394 512 99 0 1
+Sb 0 64000 41299 59950 41299 99
+Sd 0 59950 39800 59950 42207 99
+Sg 0 64000 39800 64000 42207 99
+S1 0 59950 41299 60393 41069 99
+S2 0 59950 41299 60393 41529 99
+S3 0 64000 41299 63557 41069 99
+S4 0 64000 41299 63557 41529 99
+$endCOTATION
+$COTATION
+Ge 0 25 0
+Va 4650
+Te "11,811 mm"
+Po 65954 37275 394 512 99 900 1
+Sb 0 65500 39600 65500 34950 99
+Sd 0 64250 34950 66408 34950 99
+Sg 0 64250 39600 66408 39600 99
+S1 0 65500 34950 65730 35393 99
+S2 0 65500 34950 65270 35393 99
+S3 0 65500 39600 65730 39157 99
+S4 0 65500 39600 65270 39157 99
+$endCOTATION
+$DRAWSEGMENT
+Po 0 64000 25750 64000 57300 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 64400 25750 64000 25750 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 64400 23550 64400 25750 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 62200 23550 64400 23550 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 62200 25750 62200 23550 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 62600 25750 62200 25750 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 62600 34950 62600 25750 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$COTATION
+Ge 0 25 0
+Va 33750
+Te "85,725 mm"
+Po 68090 41525 600 800 120 900 1
+Sb 0 67450 58400 67450 24650 120
+Sd 0 63300 24650 68730 24650 120
+Sg 0 63300 58400 68730 58400 120
+S1 0 67450 24650 67680 25093 120
+S2 0 67450 24650 67220 25093 120
+S3 0 67450 58400 67680 57957 120
+S4 0 67450 58400 67220 57957 120
+$endCOTATION
+$DRAWSEGMENT
+Po 0 59550 34950 62600 34950 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 58200 36300 59550 34950 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 46200 36300 58200 36300 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 45100 35200 46200 36300 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 43700 35200 45100 35200 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 43700 35250 43700 35200 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 43700 40700 43700 35250 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 45100 40700 43700 40700 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 46200 39600 45100 40700 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 61900 39600 46200 39600 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 62600 40300 61900 39600 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 62600 57300 62600 40300 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 62200 57300 62600 57300 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 62200 59500 62200 57300 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 64400 59500 62200 59500 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 64400 57300 64400 59500 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 64000 57300 64400 57300 150
+De 28 0 900 0 0
+$EndDRAWSEGMENT
$TRACK
-Po 0 63300 31350 63300 35742 1181 -1
+Po 0 63300 24650 63300 31350 1181 -1
De 15 0 1 0 800
Po 0 63300 35742 63292 35750 1181 -1
De 15 0 1 0 400
+Po 0 63300 31350 63300 35742 1181 -1
+De 15 0 1 0 0
Po 0 62761 36803 62761 36661 80 -1
De 15 0 1 0 800
Po 0 62500 35750 63292 35750 80 -1
@@ -399,23 +541,37 @@ Po 0 62500 36400 62500 35750 80 -1
De 15 0 1 0 0
Po 0 62761 36661 62500 36400 80 -1
De 15 0 1 0 0
-Po 0 62761 37000 63000 37000 80 -1
+Po 0 44450 37950 61600 37950 80 -1
De 15 0 2 0 800
-Po 0 63000 37000 63100 37100 80 -1
+Po 0 62550 37000 61600 37950 80 -1
De 15 0 2 0 0
-Po 0 54850 38810 54850 38950 80 -1
+Po 0 62550 37000 62761 37000 80 -1
De 15 0 2 0 400
-Po 0 55528 38132 54850 38810 80 -1
-De 15 0 2 0 0
-Po 0 62268 38132 55528 38132 80 -1
-De 15 0 2 0 0
-Po 0 63100 37300 62268 38132 80 -1
-De 15 0 2 0 0
-Po 0 63100 37100 63100 37300 80 -1
-De 15 0 2 0 0
-Po 0 61008 35750 58900 35750 1181 -1
+Po 0 63350 36800 63500 36800 80 -1
De 15 0 3 0 800
-Po 0 58900 35750 57700 36950 1181 -1
+Po 3 60150 35750 60150 35750 350 -1
+De 15 1 3 0 0
+Po 0 63150 35750 60150 35750 80 -1
+De 0 0 3 0 0
+Po 0 63450 36050 63150 35750 80 -1
+De 0 0 3 0 0
+Po 0 63450 37950 63450 36050 80 -1
+De 0 0 3 0 0
+Po 3 63450 37950 63450 37950 350 -1
+De 15 1 3 0 0
+Po 0 63750 37650 63450 37950 80 -1
+De 15 0 3 0 0
+Po 0 63750 37050 63750 37650 80 -1
+De 15 0 3 0 0
+Po 0 63500 36800 63750 37050 80 -1
+De 15 0 3 0 0
+Po 0 61000 36800 60300 36800 80 -1
+De 15 0 3 0 C00
+Po 0 61008 35750 60150 35750 1181 -1
+De 15 0 3 0 800
+Po 0 60150 35750 59750 35750 1181 -1
+De 15 0 3 0 0
+Po 0 59750 35750 58500 37000 1181 -1
De 15 0 3 0 0
Po 0 61639 36803 61639 36661 80 -1
De 15 0 3 0 800
@@ -425,66 +581,66 @@ Po 0 61900 36400 61900 35750 80 -1
De 15 0 3 0 0
Po 0 61639 36661 61900 36400 80 -1
De 15 0 3 0 0
-Po 0 60150 36800 59450 36800 80 -1
-De 15 0 3 0 C00
-Po 0 61000 36800 60150 36800 80 -1
-De 15 0 3 0 C00
Po 0 61639 36803 61003 36803 80 -1
De 15 0 3 0 800
Po 0 61003 36803 61000 36800 80 -1
De 15 0 3 0 400
-Po 0 55600 35950 54850 35950 1181 -1
+Po 0 44850 35950 44450 35950 1181 -1
De 15 0 3 0 400
-Po 0 56600 36950 55600 35950 1181 -1
+Po 0 45900 37000 44850 35950 1181 -1
De 15 0 3 0 0
-Po 0 57700 36950 56600 36950 1181 -1
+Po 0 58500 37000 45900 37000 1181 -1
De 15 0 3 0 0
-Po 0 54850 36950 54850 37050 80 -1
-De 15 0 4 0 800
-Po 0 54850 37050 55550 37750 80 -1
+Po 0 45250 37750 44450 36950 80 -1
+De 15 0 4 0 400
+Po 0 60300 37750 45250 37750 80 -1
De 15 0 4 0 0
-Po 0 61639 37197 61639 37661 80 -1
+Po 0 61639 37197 61639 37411 80 -1
De 15 0 4 0 800
-Po 0 61639 37661 61550 37750 80 -1
-De 15 0 4 0 0
-Po 0 61550 37750 60700 37750 80 -1
-De 15 0 4 0 0
-Po 0 60700 37750 60600 37650 80 -1
-De 15 0 4 0 0
-Po 0 60600 37650 60600 37250 80 -1
-De 15 0 4 0 0
-Po 0 60600 37250 60450 37100 80 -1
-De 15 0 4 0 0
-Po 0 60450 37100 59450 37100 80 -1
-De 15 0 4 0 0
-Po 0 59450 37100 59450 37400 80 -1
+Po 0 60300 37750 60300 37400 80 -1
De 15 0 4 0 400
-Po 0 59100 37750 59450 37400 80 -1
-De 15 0 4 0 400
-Po 0 55550 37750 59100 37750 80 -1
+Po 0 61300 37750 60300 37750 80 -1
+De 15 0 4 0 0
+Po 0 61639 37411 61300 37750 80 -1
De 15 0 4 0 0
-Po 0 62761 37197 62761 37239 80 -1
+Po 0 44450 38950 45250 38150 80 -1
De 15 0 5 0 800
-Po 0 62050 37950 60114 37950 80 -1
+Po 0 62761 37289 61900 38150 80 -1
De 15 0 5 0 0
-Po 0 62761 37239 62050 37950 80 -1
+Po 0 61900 38150 45250 38150 80 -1
De 15 0 5 0 0
-Po 0 54850 37950 60114 37950 80 -1
+Po 0 62761 37289 62761 37197 80 -1
+De 15 0 5 0 400
+Po 0 63350 37400 63200 37400 80 -1
De 15 0 5 0 800
-Po 0 60114 37950 60150 37914 80 -1
-De 15 0 5 0 0
-Po 0 60150 37914 60150 37400 80 -1
+Po 0 62997 37197 62761 37197 80 -1
De 15 0 5 0 400
-Po 0 54850 39950 55450 39950 1181 -1
+Po 0 63200 37400 62997 37197 80 -1
+De 15 0 5 0 0
+Po 0 63300 58400 63300 39300 1181 -1
De 15 0 6 0 800
-Po 0 55450 39950 56400 39000 1181 -1
+Po 0 62900 38900 62150 38900 1181 -1
De 15 0 6 0 0
-Po 0 56400 39000 63200 39000 1181 -1
+Po 0 63300 39300 62900 38900 1181 -1
De 15 0 6 0 0
-Po 0 63200 39000 63350 39150 1181 -1
+Po 0 62150 38950 62150 38900 80 -1
+De 15 0 6 0 0
+Po 0 61639 37000 62050 37000 80 -1
+De 15 0 6 0 800
+Po 3 62150 38950 62150 38950 350 -1
+De 15 1 6 0 0
+Po 0 62150 36900 62150 38950 80 -1
+De 0 0 6 0 0
+Po 3 62150 36900 62150 36900 350 -1
+De 15 1 6 0 0
+Po 0 62050 37000 62150 36900 80 -1
+De 15 0 6 0 0
+Po 0 44450 39950 44850 39950 1181 -1
+De 15 0 6 0 800
+Po 0 45900 38900 62150 38900 1181 -1
+De 15 0 6 0 0
+Po 0 44850 39950 45900 38900 1181 -1
De 15 0 6 0 0
-Po 0 63350 39150 63350 58400 1181 -1
-De 15 0 6 0 400
Po 0 61000 37400 61000 37100 80 -1
De 15 0 6 0 800
Po 0 61450 37000 61350 37100 80 -1
diff --git a/hardware/battmon/battmon.cmp b/hardware/battmon/battmon.cmp
index 0b88ddb..a3a43d1 100644
--- a/hardware/battmon/battmon.cmp
+++ b/hardware/battmon/battmon.cmp
@@ -1,4 +1,4 @@
-Cmp-Mod V01 Created by CvPCB (2010-00-09 BZR 23xx)-stable date = Son 24 Jun 2012 01:53:29 CEST
+Cmp-Mod V01 Created by CvPCB (2010-00-09 BZR 23xx)-stable date = Son 24 Jun 2012 15:48:48 CEST
BeginCmp
TimeStamp = /4F71D412;
@@ -53,7 +53,7 @@ BeginCmp
TimeStamp = /4F7103BE;
Reference = U1;
ValeurCmp = LTC2942;
-IdModule = DCB;
+IdModule = DCB_NOEXPOSED;
EndCmp
EndListe
diff --git a/hardware/battmon/battmon.net b/hardware/battmon/battmon.net
index daadeba..90350a5 100644
--- a/hardware/battmon/battmon.net
+++ b/hardware/battmon/battmon.net
@@ -1,41 +1,41 @@
-# EESchema Netlist Version 1.1 created Son 24 Jun 2012 15:21:44 CEST
+# EESchema Netlist Version 1.1 created Son 24 Jun 2012 15:48:48 CEST
(
- ( /4FE64398 $noname P3 - {Lib=CONN_1}
- ( 1 GND )
+ ( /4F71D412 SM0603 C1 100nF
+ ( 1 GND )
+ ( 2 /PWR )
)
- ( /4FE6438F $noname P2 + {Lib=CONN_1}
- ( 1 /+ )
+ ( /4FE642F8 SIL-5 P1 BATT
+ ( 1 /PWR )
+ ( 2 /SCL )
+ ( 3 /ALARM )
+ ( 4 /SDA )
+ ( 5 GND )
)
- ( /4FE642F8 $noname P1 BATT {Lib=CONN_5}
- ( 1 /PWR )
- ( 2 /SCL )
- ( 3 /SDA )
- ( 4 /ALARM )
- ( 5 GND )
+ ( /4FE6438F BATT_CONTACT P2 +
+ ( 1 /+ )
)
- ( /4F71D412 $noname C1 100nF {Lib=C}
- ( 1 GND )
- ( 2 /PWR )
+ ( /4FE64398 BATT_CONTACT P3 -
+ ( 1 GND )
)
- ( /4F71C70E $noname R1 3k3 {Lib=R}
- ( 1 /PWR )
- ( 2 /SCL )
+ ( /4F71C70E SM0603 R1 3k3
+ ( 1 /PWR )
+ ( 2 /SCL )
)
- ( /4F71C709 $noname R2 3k3 {Lib=R}
- ( 1 /PWR )
- ( 2 /SDA )
+ ( /4F71C709 SM0603 R2 3k3
+ ( 1 /PWR )
+ ( 2 /SDA )
)
- ( /4F710666 $noname R3 10m/1W {Lib=R}
- ( 1 /PWR )
- ( 2 /+ )
+ ( /4F710666 CRA2010 R3 10m/1W
+ ( 1 /PWR )
+ ( 2 /+ )
)
- ( /4F7103BE $noname U1 LTC2942 {Lib=LTC2942}
- ( 1 /PWR )
- ( 2 GND )
- ( 3 /SCL )
- ( 4 /SDA )
- ( 5 /ALARM )
- ( 6 /+ )
+ ( /4F7103BE DCB_NOEXPOSED U1 LTC2942
+ ( 1 /PWR )
+ ( 2 GND )
+ ( 3 /SCL )
+ ( 4 /SDA )
+ ( 5 /ALARM )
+ ( 6 /+ )
)
)
*
@@ -65,33 +65,3 @@ $component R3
$endlist
$endfootprintlist
}
-{ Pin List by Nets
-Net 1 "GND" "GND"
- U1 2
- P1 5
- C1 1
- P3 1
-Net 2 "/SCL" "SCL"
- U1 3
- P1 2
- R1 2
-Net 3 "/SDA" "SDA"
- R2 2
- U1 4
- P1 3
-Net 4 "/ALARM" "ALARM"
- P1 4
- U1 5
-Net 5 "/+" "+"
- P2 1
- U1 6
- R3 2
-Net 6 "/PWR" "PWR"
- R3 1
- R2 1
- C1 2
- R1 1
- P1 1
- U1 1
-}
-#End
diff --git a/hardware/battmon/battmon.pro b/hardware/battmon/battmon.pro
index c8e8189..f895408 100644
--- a/hardware/battmon/battmon.pro
+++ b/hardware/battmon/battmon.pro
@@ -1,4 +1,4 @@
-update=Son 24 Jun 2012 15:22:43 CEST
+update=Son 24 Jun 2012 16:12:25 CEST
version=1
last_client=pcbnew
[cvpcb]
@@ -83,8 +83,8 @@ LibName31=mur-sat
[pcbnew]
version=1
PadDrlX=0
-PadDimH=1220
-PadDimV=1063
+PadDimH=98
+PadDimV=276
BoardThickness=630
SgPcb45=1
TxtPcbV=800
diff --git a/hardware/battmon/battmon.sch b/hardware/battmon/battmon.sch
index 8ef5115..f336538 100644
--- a/hardware/battmon/battmon.sch
+++ b/hardware/battmon/battmon.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2 date Son 24 Jun 2012 15:21:39 CEST
+EESchema Schematic File Version 2 date Son 24 Jun 2012 16:15:30 CEST
LIBS:power
LIBS:device
LIBS:transistors
@@ -128,11 +128,11 @@ F 1 "GND" H 4100 3380 30 0001 C CNN
1 4100 3450
1 0 0 -1
$EndComp
-Text Label 4100 3200 0 60 ~ 0
+Text Label 4100 3300 0 60 ~ 0
SDA
Text Label 4100 3100 0 60 ~ 0
SCL
-Text Label 4100 3300 0 60 ~ 0
+Text Label 4100 3200 0 60 ~ 0
ALARM
$Comp
L CONN_5 P1
diff --git a/hardware/satelite-bus/mainpower.sch b/hardware/satelite-bus/mainpower.sch
index 2ecde6c..53e4c5c 100644
--- a/hardware/satelite-bus/mainpower.sch
+++ b/hardware/satelite-bus/mainpower.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2 date Son 24 Jun 2012 15:21:29 CEST
+EESchema Schematic File Version 2 date Son 24 Jun 2012 16:15:15 CEST
LIBS:mur-sat
LIBS:power
LIBS:device
diff --git a/hardware/satelite-bus/powerpath.sch b/hardware/satelite-bus/powerpath.sch
index ee72f2a..67f60b8 100644
--- a/hardware/satelite-bus/powerpath.sch
+++ b/hardware/satelite-bus/powerpath.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2 date Son 24 Jun 2012 15:21:29 CEST
+EESchema Schematic File Version 2 date Son 24 Jun 2012 16:15:15 CEST
LIBS:mur-sat
LIBS:power
LIBS:device
@@ -43,6 +43,17 @@ Comment2 ""
Comment3 ""
Comment4 ""
$EndDescr
+Connection ~ 9650 6050
+Wire Wire Line
+ 9650 6650 10350 6650
+Wire Wire Line
+ 9650 3550 9650 6650
+Connection ~ 9650 4800
+Wire Wire Line
+ 9650 5400 10350 5400
+Connection ~ 9650 3550
+Wire Wire Line
+ 9650 4150 10350 4150
Wire Wire Line
6900 2450 6800 2450
Wire Wire Line
@@ -62,14 +73,6 @@ Wire Wire Line
Connection ~ 3450 3150
Wire Wire Line
4000 3150 2100 3150
-Connection ~ 9650 5500
-Wire Wire Line
- 10350 6150 9650 6150
-Connection ~ 9650 4250
-Wire Wire Line
- 9650 4900 10350 4900
-Wire Wire Line
- 10350 3650 9550 3650
Wire Wire Line
10350 4050 10250 4050
Wire Wire Line
@@ -83,17 +86,17 @@ Wire Wire Line
Wire Wire Line
10200 3350 10350 3350
Wire Wire Line
- 10250 6650 10350 6650
+ 10250 6750 10350 6750
Wire Wire Line
- 10250 6050 10350 6050
+ 10250 6150 10350 6150
Wire Wire Line
- 10350 5400 10250 5400
+ 10350 5500 10250 5500
Wire Wire Line
- 10250 4800 10350 4800
+ 10250 4900 10350 4900
Wire Wire Line
- 10350 4150 10250 4150
+ 10350 4250 10250 4250
Wire Wire Line
- 10350 3550 10250 3550
+ 10350 3650 10250 3650
Wire Wire Line
8650 4800 8550 4800
Wire Wire Line
@@ -733,17 +736,6 @@ Wire Wire Line
Wire Wire Line
10350 3450 10250 3450
Wire Wire Line
- 9650 4250 10350 4250
-Connection ~ 9650 3650
-Wire Wire Line
- 9650 5500 10350 5500
-Connection ~ 9650 4900
-Wire Wire Line
- 10350 6750 9650 6750
-Wire Wire Line
- 9650 6750 9650 3650
-Connection ~ 9650 6150
-Wire Wire Line
4350 2650 4300 2650
Wire Wire Line
4300 2650 4300 2700
@@ -769,6 +761,14 @@ Wire Wire Line
6650 3450 6600 3450
Wire Wire Line
4000 2450 4350 2450
+Wire Wire Line
+ 10350 3550 9550 3550
+Wire Wire Line
+ 9650 4800 10350 4800
+Connection ~ 9650 4150
+Wire Wire Line
+ 9650 6050 10350 6050
+Connection ~ 9650 5400
$Comp
L FUSE F?
U 1 1 4FE712AE
@@ -870,31 +870,31 @@ F 1 "LTC4065" H 4950 2650 60 0000 C CNN
$EndComp
Text Label 6650 3450 0 60 ~ 0
VITAL_PWR_STBY
-Text Label 9550 3650 2 60 ~ 0
+Text Label 9550 3550 2 60 ~ 0
BATT_AL
Text Label 10250 6550 2 60 ~ 0
BATT_SCL21
-Text Label 10250 6650 2 60 ~ 0
+Text Label 10250 6750 2 60 ~ 0
BATT_SDA21
Text Label 10250 5950 2 60 ~ 0
BATT_SCL20
-Text Label 10250 6050 2 60 ~ 0
+Text Label 10250 6150 2 60 ~ 0
BATT_SDA20
Text Label 10250 5300 2 60 ~ 0
BATT_SCL11
-Text Label 10250 5400 2 60 ~ 0
+Text Label 10250 5500 2 60 ~ 0
BATT_SDA11
Text Label 10250 4700 2 60 ~ 0
BATT_SCL10
-Text Label 10250 4800 2 60 ~ 0
+Text Label 10250 4900 2 60 ~ 0
BATT_SDA10
Text Label 10250 4050 2 60 ~ 0
BATT_SCL01
-Text Label 10250 4150 2 60 ~ 0
+Text Label 10250 4250 2 60 ~ 0
BATT_SDA01
Text Label 10250 3450 2 60 ~ 0
BATT_SCL00
-Text Label 10250 3550 2 60 ~ 0
+Text Label 10250 3650 2 60 ~ 0
BATT_SDA00
$Comp
L GND #PWR072
diff --git a/hardware/satelite-bus/satelite-bus.sch b/hardware/satelite-bus/satelite-bus.sch
index 8e46ebc..f17eade 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 Son 24 Jun 2012 15:21:29 CEST
+EESchema Schematic File Version 2 date Son 24 Jun 2012 16:15:15 CEST
LIBS:mur-sat
LIBS:power
LIBS:device
diff --git a/hardware/satelite-bus/solar-input.sch b/hardware/satelite-bus/solar-input.sch
index fc74c97..b01d263 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 Son 24 Jun 2012 15:21:29 CEST
+EESchema Schematic File Version 2 date Son 24 Jun 2012 16:15:15 CEST
LIBS:mur-sat
LIBS:power
LIBS:device
diff --git a/hardware/satelite-bus/ttxcrx.sch b/hardware/satelite-bus/ttxcrx.sch
index 0035a2d..83a4574 100644
--- a/hardware/satelite-bus/ttxcrx.sch
+++ b/hardware/satelite-bus/ttxcrx.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2 date Son 24 Jun 2012 15:21:29 CEST
+EESchema Schematic File Version 2 date Son 24 Jun 2012 16:15:15 CEST
LIBS:mur-sat
LIBS:power
LIBS:device