Put LCD on I2C2, use global nets for power

1 files changed, 25 insertions, 98 deletions

diff --git a/kicad/picardy.sch b/kicad/picardy.sch
index 13ada3e..c60dd9c 100644
--- a/kicad/picardy.sch
+++ b/kicad/picardy.sch
@@ -22,9 +22,7 @@ F2 "CW_TONE" O R 4700 1450 50
 F3 "SEQ0n" O R 4700 1700 50 
 F4 "SEQ1n" O R 4700 1800 50 
 F5 "SEQ2n" O R 4700 1900 50 
-F6 "LCD_5V" I L 3450 1750 50 
 F7 "MIC" O R 4700 2300 50 
-F8 "MIC_8V" I L 3450 2250 50 
 F9 "MUTE_SPKR" O R 4700 2200 50 
 F10 "S_METER" I L 3450 2400 50 
 F11 "CW_KEYn" O R 4700 2100 50 
@@ -40,16 +38,14 @@ F2 "LO1" I L 4100 5450 50
 F3 "HF_RX" I L 4100 5650 50 
 F4 "MIC" I L 4100 5150 50 
 F5 "MUTE_SPKR" I L 4100 5050 50 
-F6 "+8V_RX" I L 4100 4550 50 
-F7 "+8V_TX" I L 4100 4450 50 
-F8 "SWITCH_RELAYn" I L 4100 4350 50 
-F9 "HF_TX" O R 5750 4750 50 
-F11 "METER" O R 5750 4650 50 
-F12 "CW_TONE" I L 4100 4800 50 
-F13 "BFO" I L 4100 5550 50 
-F14 "CW_KEYn" I L 4100 4950 50 
-F15 "AF_OUT" O R 5750 5200 50 
-F16 "MIC_SDn" I L 4100 5250 50 
+F6 "SWITCH_RELAYn" I L 4100 4350 50 
+F7 "HF_TX" O R 5750 4750 50 
+F8 "METER" O R 5750 4650 50 
+F9 "CW_TONE" I L 4100 4800 50 
+F10 "BFO" I L 4100 5550 50 
+F11 "CW_KEYn" I L 4100 4950 50 
+F12 "AF_OUT" O R 5750 5200 50 
+F13 "MIC_SDn" I L 4100 5250 50 
 $EndSheet
 $Sheet
 S 1350 3250 1450 950 
@@ -98,8 +94,6 @@ Wire Wire Line
 	5850 4650 5850 4200
 Wire Wire Line
 	5850 4200 6150 4200
-Text GLabel 2650 2350 2    50   Input ~ 0
-+8V
 $Comp
 L Connector:Conn_Coaxial J?
 U 1 1 5E585BF6
@@ -132,19 +126,6 @@ $EndComp
 Wire Wire Line
 	1050 1800 1050 1650
 $Comp
-L power:+3.3V #PWR?
-U 1 1 5E61ED5A
-P 2650 1650
-AR Path="/5E2FA006/5E61ED5A" Ref="#PWR?"  Part="1" 
-AR Path="/5E61ED5A" Ref="#PWR0104"  Part="1" 
-F 0 "#PWR0104" H 2650 1500 50  0001 C CNN
-F 1 "+3.3V" H 2550 1800 50  0000 L CNN
-F 2 "" H 2650 1650 50  0001 C CNN
-F 3 "" H 2650 1650 50  0001 C CNN
-	1    2650 1650
-	1    0    0    -1  
-$EndComp
-$Comp
 L power:+12V #PWR0102
 U 1 1 5E4C192F
 P 1150 1550
@@ -163,15 +144,13 @@ F1 "anglian3l.sch" 50
 F2 "VHF_LO" I L 7850 4950 50 
 F3 "IFTX" I L 7850 5050 50 
 F4 "VHFRX" I L 7850 4800 50 
-F5 "5VRX" I L 7850 4550 50 
-F6 "5VTX" I L 7850 4650 50 
-F7 "IFRX" O R 8950 4800 50 
-F8 "VHFTX" O R 8950 5050 50 
+F5 "IFRX" O R 8950 4800 50 
+F6 "VHFTX" O R 8950 5050 50 
 $EndSheet
-Text Notes 8150 4500 0    50   ~ 0
-Needs +5VA
-Text Notes 4700 4500 0    50   ~ 0
-Needs +8V and +3.3V
+Text Notes 7850 4500 0    50   ~ 0
+Needs +5VA, +5VRX, +5VTX
+Text Notes 4200 4600 0    50   ~ 0
+Needs +8V, +8VTX, +8VRX\nand +3.3V
 Wire Wire Line
 	2800 4000 3300 4000
 Wire Wire Line
@@ -182,8 +161,6 @@ Wire Wire Line
 	7150 4950 7850 4950
 Text Notes 1700 3350 0    50   ~ 0
 Needs +3V3
-Wire Wire Line
-	2650 1650 2550 1650
 Text Notes 3600 1400 0    50   ~ 0
 Needs +3V3
 Text Label 6500 6100 0    50   ~ 0
@@ -250,40 +227,6 @@ F 3 "" H 9650 5250 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	9450 5050 8950 5050
-$Sheet
-S 1400 1350 1150 1300
-U 5E2DC494
-F0 "Power" 50
-F1 "power.sch" 50
-F2 "IN_+12V" I L 1400 1550 50 
-F3 "IN_GND" I L 1400 1650 50 
-F4 "+8V" O R 2550 2350 50 
-F5 "+3V3" O R 2550 1650 50 
-F6 "+5V" O R 2550 1750 50 
-F7 "5VTX" O R 2550 2100 50 
-F8 "5VRX" O R 2550 2000 50 
-F9 "8VTX" O R 2550 2550 50 
-F10 "8VRX" O R 2550 2450 50 
-F11 "SWITCH_5V_8V_TXn" I L 1400 2050 50 
-F12 "SWITCH_EXTn" I L 1400 2250 50 
-F13 "SWITCH_EXT_PAn" I L 1400 2150 50 
-$EndSheet
-Text GLabel 2550 2100 2    50   Input ~ 0
-+5TX
-Text GLabel 2550 2450 2    50   Input ~ 0
-+8VRX
-Text GLabel 2550 2550 2    50   Input ~ 0
-+8VTX
-Text GLabel 2550 2000 2    50   Input ~ 0
-+5RX
-Text GLabel 7850 4550 0    50   Input ~ 0
-+5RX
-Text GLabel 7850 4650 0    50   Input ~ 0
-+5TX
-Text GLabel 4100 4450 0    50   Input ~ 0
-+8VTX
-Text GLabel 4100 4550 0    50   Input ~ 0
-+8VRX
 Wire Wire Line
 	4700 1700 5100 1700
 Wire Wire Line
@@ -324,15 +267,6 @@ F 4 "0" H 850 1650 50  0001 C CNN "Need_order"
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	2550 2350 2600 2350
-Wire Wire Line
-	2600 2350 2600 2250
-Wire Wire Line
-	2600 2250 3450 2250
-Connection ~ 2600 2350
-Wire Wire Line
-	2600 2350 2650 2350
-Wire Wire Line
 	4700 2300 4850 2300
 Wire Wire Line
 	4850 2300 4850 2700
@@ -365,24 +299,6 @@ Wire Wire Line
 Wire Wire Line
 	3650 5050 4100 5050
 $Comp
-L power:+5VA #PWR?
-U 1 1 5EFD915C
-P 2800 1750
-AR Path="/5E4C0E28/5EFD915C" Ref="#PWR?"  Part="1" 
-AR Path="/5EFD915C" Ref="#PWR0105"  Part="1" 
-F 0 "#PWR0105" H 2800 1600 50  0001 C CNN
-F 1 "+5VA" H 2815 1923 50  0000 C CNN
-F 2 "" H 2800 1750 50  0001 C CNN
-F 3 "" H 2800 1750 50  0001 C CNN
-	1    2800 1750
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	2550 1750 2800 1750
-Connection ~ 2800 1750
-Wire Wire Line
-	2800 1750 3450 1750
-$Comp
 L power:PWR_FLAG #FLG0102
 U 1 1 5EFE089E
 P 1050 1800
@@ -540,4 +456,15 @@ Wire Wire Line
 	6750 6100 4000 6100
 Wire Wire Line
 	7150 6100 9100 6100
+$Sheet
+S 1400 1350 1150 1300
+U 5E2DC494
+F0 "Power" 50
+F1 "power.sch" 50
+F2 "IN_+12V" I L 1400 1550 50 
+F3 "IN_GND" I L 1400 1650 50 
+F4 "SWITCH_5V_8V_TXn" I L 1400 2050 50 
+F5 "SWITCH_EXTn" I L 1400 2250 50 
+F6 "SWITCH_EXT_PAn" I L 1400 2150 50 
+$EndSheet
 $EndSCHEMATC