display: Fix batteries, add power switches, fix DRC errors.

display/hardware/display-cache.lib

@@ -36,28 +36,22 @@ X Pin_9 9 -200 -200 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Device_Battery
+# Device_Battery_Cell
 #
-DEF Device_Battery BT 0 0 N N 1 F N
+DEF Device_Battery_Cell BT 0 0 N N 1 F N
 F0 "BT" 100 100 50 H V L CNN
-F1 "Device_Battery" 100 0 50 H V L CNN
+F1 "Device_Battery_Cell" 100 0 50 H V L CNN
 F2 "" 0 60 50 V I C CNN
 F3 "" 0 60 50 V I C CNN
 DRAW
-S -80 -55 80 -65 0 1 0 F
-S -80 70 80 60 0 1 0 F
-S -52 -78 50 -98 0 1 0 F
-S -52 47 50 27 0 1 0 F
-P 2 0 1 0 0 -60 0 -50 N
-P 2 0 1 0 0 -40 0 -30 N
-P 2 0 1 0 0 -20 0 -10 N
-P 2 0 1 0 0 0 0 10 N
-P 2 0 1 0 0 20 0 30 N
+S -90 70 90 60 0 1 0 F
+S -62 47 58 27 0 1 0 F
+P 2 0 1 0 0 30 0 0 N
 P 2 0 1 0 0 70 0 100 N
-P 2 0 1 10 10 105 50 105 N
-P 2 0 1 10 30 125 30 85 N
+P 2 0 1 10 20 135 60 135 N
+P 2 0 1 10 40 155 40 115 N
 X + 1 0 200 100 D 50 50 1 1 P
-X - 2 0 -200 100 U 50 50 1 1 P
+X - 2 0 -100 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -156,6 +150,38 @@ X D 3 100 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Device_Q_PMOS_GSD
+#
+DEF Device_Q_PMOS_GSD Q 0 0 Y N 1 F N
+F0 "Q" 200 50 50 H V L CNN
+F1 "Device_Q_PMOS_GSD" 200 -50 50 H V L CNN
+F2 "" 200 100 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+C 65 0 111 0 1 10 N
+C 100 -70 11 0 1 0 F
+C 100 70 11 0 1 0 F
+P 2 0 1 0 2 0 10 0 N
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 90 0 50 -15 50 15 90 0 F
+P 4 0 1 0 100 -70 130 -70 130 70 100 70 N
+P 4 0 1 0 110 -20 115 -15 145 -15 150 -10 N
+P 4 0 1 0 130 -15 115 10 145 10 130 -15 N
+X G 1 -200 0 200 R 50 50 1 1 I
+X S 2 100 -200 100 U 50 50 1 1 P
+X D 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Device_R
 #
 DEF Device_R R 0 0 N Y 1 F N
@@ -516,7 +542,6 @@ F0 "#PWR" 0 -150 50 H I C CNN
 F1 "power_+3.3V" 0 140 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-ALIAS +3.3V
 DRAW
 P 2 0 1 0 -30 50 0 100 N
 P 2 0 1 0 0 0 0 100 N
@@ -532,6 +557,7 @@ F0 "#PWR" 0 -150 50 H I C CNN
 F1 "power_+3V3" 0 140 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+ALIAS +3.3V
 DRAW
 P 2 0 1 0 -30 50 0 100 N
 P 2 0 1 0 0 0 0 100 N

display/hardware/display.sch

@@ -48,7 +48,7 @@ L Device:C C16
 U 1 1 5C4A551A
 P 900 2950
 F 0 "C16" H 1015 2996 50  0000 L CNN
-F 1 "1uF/6.3V" H 1015 2905 50  0000 L CNN
+F 1 "0.1uF/6.3V" H 1015 2905 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric" H 938 2800 50  0001 C CNN
 F 3 "~" H 900 2950 50  0001 C CNN
 F 4 "C0603C105K4PACTU" H 900 2950 50  0001 C CNN "Mfg. ID"
@@ -61,7 +61,7 @@ L Device:C C17
 U 1 1 5C4A5633
 P 1500 3150
 F 0 "C17" H 1615 3196 50  0000 L CNN
-F 1 "1uF/6.3V" H 1615 3105 50  0000 L CNN
+F 1 "0.1uF/6.3V" H 1615 3105 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric" H 1538 3000 50  0001 C CNN
 F 3 "~" H 1500 3150 50  0001 C CNN
 	1    1500 3150
@@ -72,7 +72,7 @@ L Device:C C18
 U 1 1 5C4A5685
 P 1700 2950
 F 0 "C18" H 1815 2996 50  0000 L CNN
-F 1 "1uF/6.3V" H 1815 2905 50  0000 L CNN
+F 1 "0.1uF/6.3V" H 1815 2905 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric" H 1738 2800 50  0001 C CNN
 F 3 "~" H 1700 2950 50  0001 C CNN
 	1    1700 2950
@@ -83,7 +83,7 @@ L Device:C C19
 U 1 1 5C4A56CD
 P 2300 3150
 F 0 "C19" H 2185 3196 50  0000 R CNN
-F 1 "1uF/6.3V" H 2185 3105 50  0000 R CNN
+F 1 "0.1uF/6.3V" H 2185 3105 50  0000 R CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric" H 2338 3000 50  0001 C CNN
 F 3 "~" H 2300 3150 50  0001 C CNN
 	1    2300 3150
@@ -187,32 +187,22 @@ Wire Wire Line
 Connection ~ 5800 6900
 Wire Wire Line
 	5800 6900 5600 6900
-$Comp
-L NRF24L01_Breakout_SMD:NRF24L01_Breakout_SMD U2
-U 1 1 5E7AFF0E
-P 9600 1450
-F 0 "U2" H 9980 1496 50  0000 L CNN
-F 1 "NRF24L01_Breakout_SMD" H 9980 1405 50  0000 L CNN
-F 2 "footprints:NRF24L01+breakout_SMD" H 9750 2050 50  0001 L CIN
-F 3 "http://www.nordicsemi.com/eng/content/download/2730/34105/file/nRF24L01_Product_Specification_v2_0.pdf" H 9600 1350 50  0001 C CNN
-	1    9600 1450
-	1    0    0    -1  
-$EndComp
 $Sheet
-S 8150 2800 1050 1300
+S 8250 2800 1050 1400
 U 5E98FCAF
 F0 "output" 50
 F1 "output.sch" 50
-F2 "GREEN" I L 8150 3200 50 
-F3 "RED" I L 8150 3100 50 
-F4 "BUZZER" I L 8150 2900 50 
-F5 "BLUE" I L 8150 3300 50 
-F6 "MOSI" I L 8150 3900 50 
-F7 "SCK" I L 8150 4000 50 
-F8 "DISP_~CS" I L 8150 3800 50 
-F9 "DISP_~RST" I L 8150 3700 50 
-F10 "DISP_D~C" I L 8150 3600 50 
-F11 "DISP_~BUSY" I L 8150 3500 50 
+F2 "GREEN" I L 8250 3200 50 
+F3 "RED" I L 8250 3100 50 
+F4 "BUZZER" I L 8250 2900 50 
+F5 "BLUE" I L 8250 3300 50 
+F6 "MOSI" I L 8250 3900 50 
+F7 "SCK" I L 8250 4000 50 
+F8 "DISP_~CS" I L 8250 3800 50 
+F9 "DISP_~RST" I L 8250 3700 50 
+F10 "DISP_D~C" I L 8250 3600 50 
+F11 "DISP_~BUSY" I L 8250 3500 50 
+F12 "DISP_~PWR" I L 8250 4100 50 
 $EndSheet
 Text Label 4150 2200 0    50   ~ 0
 SWDCLK
@@ -247,25 +237,26 @@ $EndComp
 Text Label 4150 2500 0    50   ~ 0
 SWDIO
 $Sheet
-S 8150 4300 900  2000
+S 8250 4400 900  2200
 U 5E937ACB
 F0 "input" 50
 F1 "input.sch" 50
-F2 "EN_ALS" I L 8150 4400 50 
-F3 "ALS" O L 8150 4500 50 
-F4 "MISO" O L 8150 4900 50 
-F5 "SCK" I L 8150 4800 50 
-F6 "MOSI" I L 8150 5000 50 
-F7 "BME_~CS" I L 8150 4700 50 
-F8 "SW_L1" O L 8150 6200 50 
-F9 "SW_L2" O L 8150 6100 50 
-F10 "SW_L3" O L 8150 6000 50 
-F11 "SW_L4" O L 8150 5900 50 
-F12 "SW_R1" O L 8150 5700 50 
-F13 "SW_R2" O L 8150 5600 50 
-F14 "SW_R3" O L 8150 5500 50 
-F15 "SW_R4" O L 8150 5400 50 
-F16 "SW_TOP" O L 8150 5200 50 
+F2 "EN_ALS" I L 8250 4500 50 
+F3 "ALS" O L 8250 4600 50 
+F4 "MISO" O L 8250 5000 50 
+F5 "SCK" I L 8250 4900 50 
+F6 "MOSI" I L 8250 5100 50 
+F7 "BME_~CS" I L 8250 4800 50 
+F8 "SW_L1" O L 8250 6300 50 
+F9 "SW_L2" O L 8250 6200 50 
+F10 "SW_L3" O L 8250 6100 50 
+F11 "SW_L4" O L 8250 6000 50 
+F12 "SW_R1" O L 8250 5800 50 
+F13 "SW_R2" O L 8250 5700 50 
+F14 "SW_R3" O L 8250 5600 50 
+F15 "SW_R4" O L 8250 5500 50 
+F16 "SW_TOP" O L 8250 5300 50 
+F17 "BME_~PWR" I L 8250 6500 50 
 $EndSheet
 NoConn ~ 1000 4600
 NoConn ~ 1000 5000
@@ -293,7 +284,7 @@ U 1 1 5EC3255F
 P 1200 4800
 F 0 "J1" H 1250 5217 50  0000 C CNN
 F 1 "SWD" H 1250 5126 50  0000 C CNN
-F 2 "" H 1200 4800 50  0001 C CNN
+F 2 "Connector_PinSocket_1.27mm:PinSocket_2x05_P1.27mm_Vertical" H 1200 4800 50  0001 C CNN
 F 3 "~" H 1200 4800 50  0001 C CNN
 	1    1200 4800
 	1    0    0    -1  
@@ -349,59 +340,35 @@ Wire Wire Line
 Text Notes 5300 700  2    50   ~ 0
 TODO: Quartz?
 Wire Wire Line
-	8150 6200 6900 6200
-Wire Wire Line
-	8150 6100 6900 6100
-Wire Wire Line
-	8150 6000 6900 6000
-Wire Wire Line
-	8150 5900 6900 5900
-Wire Wire Line
-	8150 5700 7900 5700
-Wire Wire Line
-	7900 5700 7900 5800
-Wire Wire Line
-	7900 5800 6900 5800
-Wire Wire Line
-	8150 5600 7800 5600
-Wire Wire Line
-	7800 5600 7800 5700
-Wire Wire Line
-	7800 5700 6900 5700
-Wire Wire Line
-	8150 5500 7700 5500
-Wire Wire Line
-	7700 5500 7700 5600
-Wire Wire Line
-	7700 5600 6900 5600
+	8250 5800 6900 5800
 Wire Wire Line
-	8150 5400 7600 5400
+	8250 5700 6900 5700
 Wire Wire Line
-	7600 5400 7600 5500
+	8250 5600 6900 5600
 Wire Wire Line
-	7600 5500 6900 5500
+	8250 5500 6900 5500
 Wire Wire Line
-	8150 5000 7550 5000
+	8250 5100 7550 5100
 Wire Wire Line
-	7550 5000 7550 4600
+	7550 5100 7550 4600
 Wire Wire Line
 	7550 4600 6900 4600
 Wire Wire Line
-	8150 4900 7650 4900
+	8250 5000 7650 5000
 Wire Wire Line
-	7650 4900 7650 4500
+	7650 5000 7650 4500
 Wire Wire Line
 	7650 4500 6900 4500
 Wire Wire Line
-	8150 4800 7750 4800
+	8250 4900 7750 4900
 Wire Wire Line
-	7750 4800 7750 4400
+	7750 4900 7750 4400
 Wire Wire Line
 	7750 4400 6900 4400
 Wire Wire Line
-	8150 4500 7850 4500
+	8250 4600 7850 4600
 Wire Wire Line
-	7850 4500 7850 4700
+	7850 4600 7850 4700
 Wire Wire Line
 	7850 4700 7350 4700
 Wire Wire Line
@@ -409,19 +376,19 @@ Wire Wire Line
 Wire Wire Line
 	7350 5400 6900 5400
 Wire Wire Line
-	8150 4400 7950 4400
+	8250 4500 7950 4500
 Wire Wire Line
-	7950 4400 7950 5100
+	7950 4500 7950 5200
 Wire Wire Line
-	7950 5100 7000 5100
+	7950 5200 7000 5200
 Wire Wire Line
-	7000 5100 7000 4800
+	7000 5200 7000 4800
 Wire Wire Line
 	7000 4800 6900 4800
 Wire Wire Line
-	8150 4700 8050 4700
+	8250 4800 8050 4800
 Wire Wire Line
-	8050 4700 8050 4300
+	8050 4800 8050 4300
 Wire Wire Line
 	8050 4300 7250 4300
 Wire Wire Line
@@ -431,145 +398,65 @@ Wire Wire Line
 Wire Wire Line
 	7750 4400 7750 4000
 Wire Wire Line
-	7750 4000 8150 4000
+	7750 4000 8250 4000
 Connection ~ 7750 4400
 Wire Wire Line
-	8150 3900 7550 3900
+	8250 3900 7550 3900
 Wire Wire Line
 	7550 3900 7550 4600
 Connection ~ 7550 4600
 Wire Wire Line
-	8150 3800 7350 3800
+	8250 3800 7350 3800
 Wire Wire Line
 	7350 3800 7350 4200
 Wire Wire Line
 	7350 4200 6900 4200
 Wire Wire Line
-	8150 3700 7250 3700
+	8250 3700 7250 3700
 Wire Wire Line
 	7250 3700 7250 4100
 Wire Wire Line
 	6900 4100 7250 4100
 Wire Wire Line
-	8150 3600 7150 3600
+	8250 3600 7150 3600
 Wire Wire Line
 	7150 3600 7150 4000
 Wire Wire Line
 	7150 4000 6900 4000
 Wire Wire Line
-	8150 3500 7050 3500
+	8250 3500 7050 3500
 Wire Wire Line
 	7050 3500 7050 3900
 Wire Wire Line
 	7050 3900 6900 3900
 Wire Wire Line
-	8150 3300 6900 3300
+	8250 3300 6900 3300
 Wire Wire Line
-	8150 3200 6900 3200
+	8250 3200 6900 3200
 Wire Wire Line
-	8150 3100 6900 3100
+	8250 3100 6900 3100
 Wire Wire Line
 	900  5000 900  5100
-$Comp
-L Device:R R3
-U 1 1 5ED76FB5
-P 8850 1250
-F 0 "R3" V 8643 1250 50  0000 C CNN
-F 1 "1K" V 8734 1250 50  0000 C CNN
-F 2 "" V 8780 1250 50  0001 C CNN
-F 3 "~" H 8850 1250 50  0001 C CNN
-	1    8850 1250
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R4
-U 1 1 5ED77982
-P 8850 1750
-F 0 "R4" V 8643 1750 50  0000 C CNN
-F 1 "1K" V 8734 1750 50  0000 C CNN
-F 2 "" V 8780 1750 50  0001 C CNN
-F 3 "~" H 8850 1750 50  0001 C CNN
-	1    8850 1750
-	0    1    1    0   
-$EndComp
-$Comp
-L power:GND #PWR0106
-U 1 1 5ED786AF
-P 9600 2150
-F 0 "#PWR0106" H 9600 1900 50  0001 C CNN
-F 1 "GND" H 9605 1977 50  0000 C CNN
-F 2 "" H 9600 2150 50  0001 C CNN
-F 3 "" H 9600 2150 50  0001 C CNN
-	1    9600 2150
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:+3.3V #PWR0107
-U 1 1 5ED7F420
-P 9600 750
-F 0 "#PWR0107" H 9600 600 50  0001 C CNN
-F 1 "+3.3V" H 9615 923 50  0000 C CNN
-F 2 "" H 9600 750 50  0001 C CNN
-F 3 "" H 9600 750 50  0001 C CNN
-	1    9600 750 
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	9600 750  9600 850 
 Wire Wire Line
-	9600 2050 9600 2150
+	8250 5300 7150 5300
 Wire Wire Line
-	8150 5200 7150 5200
-Wire Wire Line
-	7150 5200 7150 4300
+	7150 5300 7150 4300
 Wire Wire Line
 	7150 4300 6900 4300
 Wire Wire Line
-	8150 2900 8050 2900
+	8250 2900 8050 2900
 Wire Wire Line
 	8050 2900 8050 3000
 Wire Wire Line
 	8050 3000 6900 3000
 Wire Wire Line
-	8700 1250 7950 1250
-Wire Wire Line
-	7950 1250 7950 2900
-Wire Wire Line
-	7950 2900 6900 2900
-Wire Wire Line
-	9100 1150 7850 1150
-Wire Wire Line
-	7850 1150 7850 2800
-Wire Wire Line
-	7850 2800 6900 2800
-Wire Wire Line
-	9100 1350 8050 1350
-Wire Wire Line
-	8050 1350 8050 2700
-Wire Wire Line
-	8050 2700 6900 2700
-Wire Wire Line
-	6900 2600 8150 2600
-Wire Wire Line
-	8150 2600 8150 1750
-Wire Wire Line
-	8150 1750 8700 1750
-Wire Wire Line
-	9000 1750 9100 1750
-Wire Wire Line
-	9000 1250 9100 1250
+	7850 2900 6900 2900
 Wire Wire Line
-	9100 1650 7750 1650
+	7750 2800 6900 2800
 Wire Wire Line
-	7750 1650 7750 2500
+	7950 2700 6900 2700
 Wire Wire Line
-	7750 2500 6900 2500
-Wire Wire Line
-	6900 2400 7650 2400
-Wire Wire Line
-	7650 2400 7650 1450
-Wire Wire Line
-	7650 1450 9100 1450
+	6900 2400 7550 2400
 NoConn ~ 4500 2400
 NoConn ~ 4500 2600
 NoConn ~ 4500 2700
@@ -582,9 +469,6 @@ NoConn ~ 4500 3900
 NoConn ~ 4500 4000
 NoConn ~ 4500 4100
 NoConn ~ 4500 4600
-NoConn ~ 4500 4700
-NoConn ~ 4500 4800
-NoConn ~ 4500 4900
 NoConn ~ 6900 2200
 NoConn ~ 6900 2300
 Wire Wire Line
@@ -593,4 +477,220 @@ Wire Wire Line
 	2050 1200 2050 2300
 Wire Wire Line
 	2050 2300 4500 2300
+Wire Wire Line
+	8250 6000 8050 6000
+Wire Wire Line
+	8050 6000 8050 5900
+Wire Wire Line
+	8050 5900 6900 5900
+Wire Wire Line
+	6900 6000 7950 6000
+Wire Wire Line
+	7950 6000 7950 6100
+Wire Wire Line
+	7950 6100 8250 6100
+Wire Wire Line
+	8250 6200 7850 6200
+Wire Wire Line
+	7850 6200 7850 6100
+Wire Wire Line
+	7850 6100 6900 6100
+Wire Wire Line
+	6900 6200 7750 6200
+Wire Wire Line
+	7750 6200 7750 6300
+Wire Wire Line
+	7750 6300 8250 6300
+Text Label 7850 6500 0    50   ~ 0
+BME_~PWR
+Wire Wire Line
+	8250 6500 7850 6500
+Text Label 4100 4900 0    50   ~ 0
+BME_~PWR
+Text Label 7850 4100 0    50   ~ 0
+DISP_~PWR
+Wire Wire Line
+	8250 4100 7850 4100
+Text Label 4100 4800 0    50   ~ 0
+DISP_~PWR
+Text Label 4100 4700 0    50   ~ 0
+NRF_~PWR
+Wire Wire Line
+	4500 4900 4100 4900
+Wire Wire Line
+	4100 4800 4500 4800
+Wire Wire Line
+	4500 4700 4100 4700
+Wire Wire Line
+	7950 2200 7950 2700
+Wire Wire Line
+	7850 2100 7850 2900
+Wire Wire Line
+	7750 2000 7750 2800
+Wire Wire Line
+	7550 2400 7550 2300
+Text Label 9450 1300 0    50   ~ 0
+NRF_~PWR
+Connection ~ 10000 1300
+Wire Wire Line
+	10000 1300 9450 1300
+Wire Wire Line
+	10400 800  10400 1100
+Connection ~ 10400 800 
+Wire Wire Line
+	10000 800  10400 800 
+Wire Wire Line
+	10000 900  10000 800 
+Wire Wire Line
+	10000 1300 10000 1200
+Wire Wire Line
+	10100 1300 10000 1300
+Wire Wire Line
+	10400 700  10400 800 
+$Comp
+L Device:R R?
+U 1 1 5EEDB0D9
+P 10000 1050
+AR Path="/5E98FCAF/5EEDB0D9" Ref="R?"  Part="1" 
+AR Path="/5EEDB0D9" Ref="R33"  Part="1" 
+F 0 "R33" H 9930 1004 50  0000 R CNN
+F 1 "1M" H 9930 1095 50  0000 R CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 1050 50  0001 C CNN
+F 3 "~" H 10000 1050 50  0001 C CNN
+	1    10000 1050
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:Q_PMOS_GSD Q?
+U 1 1 5EEDB0D3
+P 10300 1300
+AR Path="/5E98FCAF/5EEDB0D3" Ref="Q?"  Part="1" 
+AR Path="/5EEDB0D3" Ref="Q8"  Part="1" 
+F 0 "Q8" H 10506 1346 50  0000 L CNN
+F 1 "NX2301P" H 10506 1255 50  0000 L CNN
+F 2 "" H 10500 1400 50  0001 C CNN
+F 3 "~" H 10300 1300 50  0001 C CNN
+	1    10300 1300
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3V3 #PWR?
+U 1 1 5EEDB0CD
+P 10400 700
+AR Path="/5E98FCAF/5EEDB0CD" Ref="#PWR?"  Part="1" 
+AR Path="/5EEDB0CD" Ref="#PWR03"  Part="1" 
+F 0 "#PWR03" H 10400 550 50  0001 C CNN
+F 1 "+3V3" H 10415 873 50  0000 C CNN
+F 2 "" H 10400 700 50  0001 C CNN
+F 3 "" H 10400 700 50  0001 C CNN
+	1    10400 700 
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7550 2300 9900 2300
+Wire Wire Line
+	9800 2100 9900 2100
+Wire Wire Line
+	9800 2600 9900 2600
+Wire Wire Line
+	9900 2200 7950 2200
+Wire Wire Line
+	9900 2000 7750 2000
+Wire Wire Line
+	9500 2100 7850 2100
+Wire Wire Line
+	10400 2900 10400 3000
+$Comp
+L power:GND #PWR0106
+U 1 1 5ED786AF
+P 10400 3000
+F 0 "#PWR0106" H 10400 2750 50  0001 C CNN
+F 1 "GND" H 10405 2827 50  0000 C CNN
+F 2 "" H 10400 3000 50  0001 C CNN
+F 3 "" H 10400 3000 50  0001 C CNN
+	1    10400 3000
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R4
+U 1 1 5ED77982
+P 9650 2600
+F 0 "R4" V 9443 2600 50  0000 C CNN
+F 1 "1K" V 9534 2600 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 9580 2600 50  0001 C CNN
+F 3 "~" H 9650 2600 50  0001 C CNN
+	1    9650 2600
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R3
+U 1 1 5ED76FB5
+P 9650 2100
+F 0 "R3" V 9443 2100 50  0000 C CNN
+F 1 "1K" V 9534 2100 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 9580 2100 50  0001 C CNN
+F 3 "~" H 9650 2100 50  0001 C CNN
+	1    9650 2100
+	0    1    1    0   
+$EndComp
+$Comp
+L NRF24L01_Breakout_SMD:NRF24L01_Breakout_SMD U2
+U 1 1 5E7AFF0E
+P 10400 2300
+F 0 "U2" H 10780 2346 50  0000 L CNN
+F 1 "NRF24L01_Breakout_SMD" H 10780 2255 50  0000 L CNN
+F 2 "footprints:NRF24L01+breakout_SMD" H 10550 2900 50  0001 L CIN
+F 3 "http://www.nordicsemi.com/eng/content/download/2730/34105/file/nRF24L01_Product_Specification_v2_0.pdf" H 10400 2200 50  0001 C CNN
+	1    10400 2300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6900 2600 9500 2600
+Wire Wire Line
+	6900 2500 9900 2500
+$Comp
+L power:PWR_FLAG #FLG01
+U 1 1 5F038464
+P 11000 1600
+F 0 "#FLG01" H 11000 1675 50  0001 C CNN
+F 1 "PWR_FLAG" V 11000 1728 50  0000 L CNN
+F 2 "" H 11000 1600 50  0001 C CNN
+F 3 "~" H 11000 1600 50  0001 C CNN
+	1    11000 1600
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10400 1600 10400 1700
+$Comp
+L Device:C C2
+U 1 1 5F04FA38
+P 11000 1850
+F 0 "C2" H 11115 1896 50  0000 L CNN
+F 1 "10uF" H 11115 1805 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 11038 1700 50  0001 C CNN
+F 3 "~" H 11000 1850 50  0001 C CNN
+	1    11000 1850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10400 1600 11000 1600
+Wire Wire Line
+	11000 1600 11000 1700
+Connection ~ 11000 1600
+Wire Wire Line
+	10400 1600 10400 1500
+Connection ~ 10400 1600
+$Comp
+L power:GND #PWR06
+U 1 1 5F06B5A3
+P 11000 2100
+F 0 "#PWR06" H 11000 1850 50  0001 C CNN
+F 1 "GND" H 11005 1927 50  0000 C CNN
+F 2 "" H 11000 2100 50  0001 C CNN
+F 3 "" H 11000 2100 50  0001 C CNN
+	1    11000 2100
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	11000 2000 11000 2100
 $EndSCHEMATC

display/hardware/input.sch

@@ -16,245 +16,232 @@ $EndDescr
 $Comp
 L Device:R R?
 U 1 1 5E94AE1D
-P 10000 4700
+P 4450 2900
 AR Path="/5E94AE1D" Ref="R?"  Part="1" 
 AR Path="/5E8F0014/5E94AE1D" Ref="R?"  Part="1" 
 AR Path="/5E937ACB/5E94AE1D" Ref="R32"  Part="1" 
-F 0 "R32" H 10070 4746 50  0000 L CNN
-F 1 "22K" H 10070 4655 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 4700 50  0001 C CNN
-F 3 "~" H 10000 4700 50  0001 C CNN
-	1    10000 4700
+F 0 "R32" H 4520 2946 50  0000 L CNN
+F 1 "22K" H 4520 2855 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 4380 2900 50  0001 C CNN
+F 3 "~" H 4450 2900 50  0001 C CNN
+	1    4450 2900
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:+3.3V #PWR?
 U 1 1 5E94AE23
-P 10000 3850
+P 4450 2050
 AR Path="/5E94AE23" Ref="#PWR?"  Part="1" 
 AR Path="/5E8F0014/5E94AE23" Ref="#PWR?"  Part="1" 
 AR Path="/5E937ACB/5E94AE23" Ref="#PWR0121"  Part="1" 
-F 0 "#PWR0121" H 10000 3700 50  0001 C CNN
-F 1 "+3.3V" H 10015 4023 50  0000 C CNN
-F 2 "" H 10000 3850 50  0001 C CNN
-F 3 "" H 10000 3850 50  0001 C CNN
-	1    10000 3850
+F 0 "#PWR0121" H 4450 1900 50  0001 C CNN
+F 1 "+3.3V" H 4465 2223 50  0000 C CNN
+F 2 "" H 4450 2050 50  0001 C CNN
+F 3 "" H 4450 2050 50  0001 C CNN
+	1    4450 2050
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10000 4350 10000 4450
-Connection ~ 10000 4450
+	4450 2550 4450 2650
+Connection ~ 4450 2650
 Wire Wire Line
-	10000 4450 10000 4550
+	4450 2650 4450 2750
 $Comp
 L power:GND #PWR?
 U 1 1 5E94AE2C
-P 10000 5450
+P 4450 3650
 AR Path="/5E94AE2C" Ref="#PWR?"  Part="1" 
 AR Path="/5E8F0014/5E94AE2C" Ref="#PWR?"  Part="1" 
 AR Path="/5E937ACB/5E94AE2C" Ref="#PWR0122"  Part="1" 
-F 0 "#PWR0122" H 10000 5200 50  0001 C CNN
-F 1 "GND" H 10005 5277 50  0000 C CNN
-F 2 "" H 10000 5450 50  0001 C CNN
-F 3 "" H 10000 5450 50  0001 C CNN
-	1    10000 5450
+F 0 "#PWR0122" H 4450 3400 50  0001 C CNN
+F 1 "GND" H 4455 3477 50  0000 C CNN
+F 2 "" H 4450 3650 50  0001 C CNN
+F 3 "" H 4450 3650 50  0001 C CNN
+	1    4450 3650
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10000 4950 10000 4850
+	4450 3150 4450 3050
 Wire Wire Line
-	10000 4450 9500 4450
-Text Notes 9800 3550 0    50   ~ 0
+	4450 2650 3950 2650
+Text Notes 4250 1750 0    50   ~ 0
 ambient light sensor
-Text Notes 9350 4300 0    50   ~ 0
+Text Notes 3800 2500 0    50   ~ 0
 1V threshold\nfor 50 lux
 Wire Notes Line
-	10700 3450 9100 3450
+	5150 1650 3550 1650
 Wire Notes Line
-	9100 3450 9100 5950
+	3550 1650 3550 4150
 Wire Notes Line
-	9100 5950 10700 5950
+	3550 4150 5150 4150
 Wire Notes Line
-	10700 5950 10700 3450
+	5150 4150 5150 1650
 $Comp
 L Device:Q_NMOS_GSD Q?
 U 1 1 5E94AE3D
-P 9900 5150
+P 4350 3350
 AR Path="/5E94AE3D" Ref="Q?"  Part="1" 
 AR Path="/5E8F0014/5E94AE3D" Ref="Q?"  Part="1" 
 AR Path="/5E937ACB/5E94AE3D" Ref="Q6"  Part="1" 
-F 0 "Q6" H 10106 5196 50  0000 L CNN
-F 1 "IRFML8244" H 10106 5105 50  0000 L CNN
-F 2 "Package_TO_SOT_SMD:SOT-23_Handsoldering" H 10100 5250 50  0001 C CNN
-F 3 "~" H 9900 5150 50  0001 C CNN
-F 4 "IRFML8244TRPBF" H 9900 5150 50  0001 C CNN "Mfg. ID"
-F 5 "IRFML8244TRPBFCT-ND" H 9900 5150 50  0001 C CNN "Digikey"
-	1    9900 5150
+F 0 "Q6" H 4556 3396 50  0000 L CNN
+F 1 "IRFML8244" H 4556 3305 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-23_Handsoldering" H 4550 3450 50  0001 C CNN
+F 3 "~" H 4350 3350 50  0001 C CNN
+F 4 "IRFML8244TRPBF" H 4350 3350 50  0001 C CNN "Mfg. ID"
+F 5 "IRFML8244TRPBFCT-ND" H 4350 3350 50  0001 C CNN "Digikey"
+	1    4350 3350
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R?
 U 1 1 5E94AE44
-P 9600 5400
+P 4050 3600
 AR Path="/5E94AE44" Ref="R?"  Part="1" 
 AR Path="/5E8F0014/5E94AE44" Ref="R?"  Part="1" 
 AR Path="/5E937ACB/5E94AE44" Ref="R31"  Part="1" 
-F 0 "R31" H 9670 5446 50  0000 L CNN
-F 1 "1M" H 9670 5355 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9530 5400 50  0001 C CNN
-F 3 "~" H 9600 5400 50  0001 C CNN
-	1    9600 5400
+F 0 "R31" H 4120 3646 50  0000 L CNN
+F 1 "1M" H 4120 3555 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 3980 3600 50  0001 C CNN
+F 3 "~" H 4050 3600 50  0001 C CNN
+	1    4050 3600
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR?
 U 1 1 5E94AE4A
-P 9600 5650
+P 4050 3850
 AR Path="/5E94AE4A" Ref="#PWR?"  Part="1" 
 AR Path="/5E8F0014/5E94AE4A" Ref="#PWR?"  Part="1" 
 AR Path="/5E937ACB/5E94AE4A" Ref="#PWR0123"  Part="1" 
-F 0 "#PWR0123" H 9600 5400 50  0001 C CNN
-F 1 "GND" H 9605 5477 50  0000 C CNN
-F 2 "" H 9600 5650 50  0001 C CNN
-F 3 "" H 9600 5650 50  0001 C CNN
-	1    9600 5650
+F 0 "#PWR0123" H 4050 3600 50  0001 C CNN
+F 1 "GND" H 4055 3677 50  0000 C CNN
+F 2 "" H 4050 3850 50  0001 C CNN
+F 3 "" H 4050 3850 50  0001 C CNN
+	1    4050 3850
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10000 5350 10000 5450
+	4450 3550 4450 3650
 Wire Wire Line
-	9600 5650 9600 5550
+	4050 3850 4050 3750
 Wire Wire Line
-	9700 5150 9600 5150
+	4150 3350 4050 3350
 Wire Wire Line
-	9600 5250 9600 5150
-Connection ~ 9600 5150
+	4050 3450 4050 3350
+Connection ~ 4050 3350
 Wire Wire Line
-	9600 5150 9500 5150
+	4050 3350 3950 3350
 $Comp
 L Sensor_Optical:KPS-3227 Q?
 U 1 1 5E94AE58
-P 10000 4150
+P 4450 2350
 AR Path="/5E94AE58" Ref="Q?"  Part="1" 
 AR Path="/5E8F0014/5E94AE58" Ref="Q?"  Part="1" 
 AR Path="/5E937ACB/5E94AE58" Ref="Q7"  Part="1" 
-F 0 "Q7" H 10090 4196 50  0000 L CNN
-F 1 "KPS-3227" H 10090 4105 50  0000 L CNN
-F 2 "LED_SMD:LED_RGB_1210" H 10000 4300 50  0001 C CNN
-F 3 "http://www.kingbright.com/attachments/file/psearch/000/00/watermark00/KPS-3227SP1C(Ver.9).pdf" H 10000 4300 50  0001 C CNN
-F 4 "APS3227SP1C-P22" H 10000 4150 50  0001 C CNN "Mfg. ID"
-F 5 "754-2214-1-ND" H 10000 4150 50  0001 C CNN "Digikey"
-	1    10000 4150
+F 0 "Q7" H 4540 2396 50  0000 L CNN
+F 1 "KPS-3227" H 4540 2305 50  0000 L CNN
+F 2 "LED_SMD:LED_RGB_1210" H 4450 2500 50  0001 C CNN
+F 3 "http://www.kingbright.com/attachments/file/psearch/000/00/watermark00/KPS-3227SP1C(Ver.9).pdf" H 4450 2500 50  0001 C CNN
+F 4 "APS3227SP1C-P22" H 4450 2350 50  0001 C CNN "Mfg. ID"
+F 5 "754-2214-1-ND" H 4450 2350 50  0001 C CNN "Digikey"
+	1    4450 2350
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10000 3850 10000 3950
-Text HLabel 9500 5150 0    50   Input ~ 0
+	4450 2050 4450 2150
+Text HLabel 3950 3350 0    50   Input ~ 0
 EN_ALS
-Text HLabel 9500 4450 0    50   Output ~ 0
+Text HLabel 3950 2650 0    50   Output ~ 0
 ALS
 $Comp
 L power:GND #PWR?
 U 1 1 5E978112
-P 9600 2700
+P 9150 4550
 AR Path="/5E978112" Ref="#PWR?"  Part="1" 
 AR Path="/5E937ACB/5E978112" Ref="#PWR0124"  Part="1" 
-F 0 "#PWR0124" H 9600 2450 50  0001 C CNN
-F 1 "GND" H 9605 2527 50  0000 C CNN
-F 2 "" H 9600 2700 50  0001 C CNN
-F 3 "" H 9600 2700 50  0001 C CNN
-	1    9600 2700
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:+3.3V #PWR?
-U 1 1 5E978118
-P 9600 1100
-AR Path="/5E978118" Ref="#PWR?"  Part="1" 
-AR Path="/5E937ACB/5E978118" Ref="#PWR0125"  Part="1" 
-F 0 "#PWR0125" H 9600 950 50  0001 C CNN
-F 1 "+3.3V" H 9615 1273 50  0000 C CNN
-F 2 "" H 9600 1100 50  0001 C CNN
-F 3 "" H 9600 1100 50  0001 C CNN
-	1    9600 1100
+F 0 "#PWR0124" H 9150 4300 50  0001 C CNN
+F 1 "GND" H 9155 4377 50  0000 C CNN
+F 2 "" H 9150 4550 50  0001 C CNN
+F 3 "" H 9150 4550 50  0001 C CNN
+	1    9150 4550
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9600 1100 9600 1200
+	9150 2950 9150 3050
 Wire Wire Line
-	9600 2600 9600 2700
+	9150 4450 9150 4550
 $Comp
 L Device:C C?
 U 1 1 5E978120
-P 10200 1450
+P 9750 3300
 AR Path="/5E978120" Ref="C?"  Part="1" 
 AR Path="/5E937ACB/5E978120" Ref="C1"  Part="1" 
-F 0 "C1" H 10315 1496 50  0000 L CNN
-F 1 "C" H 10315 1405 50  0000 L CNN
-F 2 "" H 10238 1300 50  0001 C CNN
-F 3 "~" H 10200 1450 50  0001 C CNN
-	1    10200 1450
+F 0 "C1" H 9865 3346 50  0000 L CNN
+F 1 "10uF" H 9865 3255 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 9788 3150 50  0001 C CNN
+F 3 "~" H 9750 3300 50  0001 C CNN
+	1    9750 3300
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR?
 U 1 1 5E978126
-P 10200 1700
+P 9750 3550
 AR Path="/5E978126" Ref="#PWR?"  Part="1" 
 AR Path="/5E937ACB/5E978126" Ref="#PWR0126"  Part="1" 
-F 0 "#PWR0126" H 10200 1450 50  0001 C CNN
-F 1 "GND" H 10205 1527 50  0000 C CNN
-F 2 "" H 10200 1700 50  0001 C CNN
-F 3 "" H 10200 1700 50  0001 C CNN
-	1    10200 1700
+F 0 "#PWR0126" H 9750 3300 50  0001 C CNN
+F 1 "GND" H 9755 3377 50  0000 C CNN
+F 2 "" H 9750 3550 50  0001 C CNN
+F 3 "" H 9750 3550 50  0001 C CNN
+	1    9750 3550
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10200 1300 10200 1200
+	9750 3150 9750 3050
 Wire Wire Line
-	10200 1200 9600 1200
-Connection ~ 9600 1200
+	9750 3050 9150 3050
+Connection ~ 9150 3050
 Wire Wire Line
-	9600 1200 9600 1400
+	9150 3050 9150 3250
 Wire Wire Line
-	10200 1700 10200 1600
+	9750 3550 9750 3450
 $Comp
 L GY-B11_EP_280:GY-B11_EP_280 U?
 U 1 1 5E978131
-P 9600 2000
+P 9150 3850
 AR Path="/5E978131" Ref="U?"  Part="1" 
 AR Path="/5E937ACB/5E978131" Ref="U7"  Part="1" 
-F 0 "U7" H 9270 2046 50  0000 R CNN
-F 1 "GY-B11_EP_280" H 9270 1955 50  0000 R CNN
-F 2 "footprints:GY-B11_EP_280_SMD" H 11100 1550 50  0001 C CNN
-F 3 "https://ae-bst.resource.bosch.com/media/_tech/media/datasheets/BST-BME280-DS002.pdf" H 9500 1800 50  0001 C CNN
-	1    9600 2000
+F 0 "U7" H 8820 3896 50  0000 R CNN
+F 1 "GY-B11_EP_280" H 8820 3805 50  0000 R CNN
+F 2 "footprints:GY-B11_EP_280_SMD" H 10650 3400 50  0001 C CNN
+F 3 "https://ae-bst.resource.bosch.com/media/_tech/media/datasheets/BST-BME280-DS002.pdf" H 9050 3650 50  0001 C CNN
+	1    9150 3850
 	-1   0    0    -1  
 $EndComp
-Text Notes 9400 800  0    50   ~ 0
+Text Notes 8950 1850 0    50   ~ 0
 temperature/humidity/pressure
-Text HLabel 8600 1700 0    50   Output ~ 0
+Text HLabel 8150 3550 0    50   Output ~ 0
 MISO
-Text HLabel 8600 1900 0    50   Input ~ 0
+Text HLabel 8150 3750 0    50   Input ~ 0
 SCK
-Text HLabel 8600 2100 0    50   Input ~ 0
+Text HLabel 8150 3950 0    50   Input ~ 0
 MOSI
-Text HLabel 8600 2300 0    50   Input ~ 0
+Text HLabel 8150 4150 0    50   Input ~ 0
 BME_~CS
 Wire Wire Line
-	8600 1900 9100 1900
+	8150 3750 8650 3750
 Wire Wire Line
-	9100 2100 8600 2100
+	8650 3950 8150 3950
 Wire Wire Line
-	8600 2300 9100 2300
+	8150 4150 8650 4150
 Wire Notes Line
-	10650 850  8200 850 
+	10200 1750 7750 1750
 Wire Notes Line
-	8200 850  8200 3150
+	7750 1750 7750 5000
 Wire Notes Line
-	8200 3150 10650 3150
+	7750 5000 10200 5000
 Wire Notes Line
-	10650 3150 10650 850 
+	10200 5000 10200 1750
 $Comp
 L Switch:SW_Push SW?
 U 1 1 5EB8F0B7
@@ -263,7 +250,7 @@ AR Path="/5EB8F0B7" Ref="SW?"  Part="1"
 AR Path="/5E937ACB/5EB8F0B7" Ref="SW3"  Part="1" 
 F 0 "SW3" H 1700 3785 50  0000 C CNN
 F 1 "L1" H 1700 3694 50  0000 C CNN
-F 2 "Button_Switch_SMD:SW_SPST_EVQP0" H 1700 3700 50  0001 C CNN
+F 2 "" H 1700 3700 50  0001 C CNN
 F 3 "" H 1700 3700 50  0001 C CNN
 	1    1700 3500
 	1    0    0    -1  
@@ -276,7 +263,7 @@ AR Path="/5EB8F0BD" Ref="SW?"  Part="1"
 AR Path="/5E937ACB/5EB8F0BD" Ref="SW4"  Part="1" 
 F 0 "SW4" H 1700 4185 50  0000 C CNN
 F 1 "L2" H 1700 4094 50  0000 C CNN
-F 2 "Button_Switch_SMD:SW_SPST_EVQP0" H 1700 4100 50  0001 C CNN
+F 2 "" H 1700 4100 50  0001 C CNN
 F 3 "" H 1700 4100 50  0001 C CNN
 	1    1700 3900
 	1    0    0    -1  
@@ -289,7 +276,7 @@ AR Path="/5EB8F0C3" Ref="SW?"  Part="1"
 AR Path="/5E937ACB/5EB8F0C3" Ref="SW5"  Part="1" 
 F 0 "SW5" H 1700 4585 50  0000 C CNN
 F 1 "L3" H 1700 4494 50  0000 C CNN
-F 2 "Button_Switch_SMD:SW_SPST_EVQP0" H 1700 4500 50  0001 C CNN
+F 2 "" H 1700 4500 50  0001 C CNN
 F 3 "" H 1700 4500 50  0001 C CNN
 	1    1700 4300
 	1    0    0    -1  
@@ -302,7 +289,7 @@ AR Path="/5EB8F0C9" Ref="SW?"  Part="1"
 AR Path="/5E937ACB/5EB8F0C9" Ref="SW6"  Part="1" 
 F 0 "SW6" H 1700 4985 50  0000 C CNN
 F 1 "L4" H 1700 4894 50  0000 C CNN
-F 2 "Button_Switch_SMD:SW_SPST_EVQP0" H 1700 4900 50  0001 C CNN
+F 2 "" H 1700 4900 50  0001 C CNN
 F 3 "" H 1700 4900 50  0001 C CNN
 	1    1700 4700
 	1    0    0    -1  
@@ -315,7 +302,7 @@ AR Path="/5EB8F0CF" Ref="SW?"  Part="1"
 AR Path="/5E937ACB/5EB8F0CF" Ref="SW7"  Part="1" 
 F 0 "SW7" H 1700 5385 50  0000 C CNN
 F 1 "R1" H 1700 5294 50  0000 C CNN
-F 2 "Button_Switch_SMD:SW_SPST_EVQP0" H 1700 5300 50  0001 C CNN
+F 2 "" H 1700 5300 50  0001 C CNN
 F 3 "" H 1700 5300 50  0001 C CNN
 	1    1700 5100
 	1    0    0    -1  
@@ -328,7 +315,7 @@ AR Path="/5EB8F0D5" Ref="SW?"  Part="1"
 AR Path="/5E937ACB/5EB8F0D5" Ref="SW8"  Part="1" 
 F 0 "SW8" H 1700 5785 50  0000 C CNN
 F 1 "R2" H 1700 5694 50  0000 C CNN
-F 2 "Button_Switch_SMD:SW_SPST_EVQP0" H 1700 5700 50  0001 C CNN
+F 2 "" H 1700 5700 50  0001 C CNN
 F 3 "" H 1700 5700 50  0001 C CNN
 	1    1700 5500
 	1    0    0    -1  
@@ -341,7 +328,7 @@ AR Path="/5EB8F0DB" Ref="SW?"  Part="1"
 AR Path="/5E937ACB/5EB8F0DB" Ref="SW9"  Part="1" 
 F 0 "SW9" H 1700 6185 50  0000 C CNN
 F 1 "R3" H 1700 6094 50  0000 C CNN
-F 2 "Button_Switch_SMD:SW_SPST_EVQP0" H 1700 6100 50  0001 C CNN
+F 2 "" H 1700 6100 50  0001 C CNN
 F 3 "" H 1700 6100 50  0001 C CNN
 	1    1700 5900
 	1    0    0    -1  
@@ -354,7 +341,7 @@ AR Path="/5EB8F0E1" Ref="SW?"  Part="1"
 AR Path="/5E937ACB/5EB8F0E1" Ref="SW10"  Part="1" 
 F 0 "SW10" H 1700 6585 50  0000 C CNN
 F 1 "R4" H 1700 6494 50  0000 C CNN
-F 2 "Button_Switch_SMD:SW_SPST_EVQP0" H 1700 6500 50  0001 C CNN
+F 2 "" H 1700 6500 50  0001 C CNN
 F 3 "" H 1700 6500 50  0001 C CNN
 	1    1700 6300
 	1    0    0    -1  
@@ -571,7 +558,7 @@ U 1 1 5EBCEB98
 P 2000 2250
 F 0 "R20" H 2070 2296 50  0000 L CNN
 F 1 "10K" H 2070 2205 50  0000 L CNN
-F 2 "" V 1930 2250 50  0001 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 1930 2250 50  0001 C CNN
 F 3 "~" H 2000 2250 50  0001 C CNN
 	1    2000 2250
 	1    0    0    -1  
@@ -584,7 +571,7 @@ AR Path="/5EBD1023" Ref="SW?"  Part="1"
 AR Path="/5E937ACB/5EBD1023" Ref="SW1"  Part="1" 
 F 0 "SW1" H 1700 2785 50  0000 C CNN
 F 1 "TOP" H 1700 2694 50  0000 C CNN
-F 2 "Button_Switch_SMD:SW_SPST_EVQP0" H 1700 2700 50  0001 C CNN
+F 2 "" H 1700 2700 50  0001 C CNN
 F 3 "" H 1700 2700 50  0001 C CNN
 F 4 "SW1981-ND" H 1700 2500 50  0001 C CNN "Digikey PN"
 F 5 "https://www.digikey.de/product-detail/de/omron-electronics-inc-emc-div/D2FS-F-N-A1/SW1981-ND/4753387" H 1700 2500 50  0001 C CNN "Digikey Link"
@@ -599,7 +586,7 @@ AR Path="/5EBD069E" Ref="SW?"  Part="1"
 AR Path="/5E937ACB/5EBD069E" Ref="SW2"  Part="1" 
 F 0 "SW2" H 1700 3185 50  0000 C CNN
 F 1 "TOP" H 1700 3094 50  0000 C CNN
-F 2 "Button_Switch_SMD:SW_SPST_EVQP0" H 1700 3100 50  0001 C CNN
+F 2 "" H 1700 3100 50  0001 C CNN
 F 3 "" H 1700 3100 50  0001 C CNN
 F 4 "SW1980-ND" H 1700 2900 50  0001 C CNN "Digikey PN"
 F 5 "https://www.digikey.de/product-detail/de/omron-electronics-inc-emc-div/D2FS-F-N-A/SW1980-ND/4753386" H 1700 2900 50  0001 C CNN "Digikey Link"
@@ -670,18 +657,87 @@ Wire Notes Line
 $Comp
 L Device:R R?
 U 1 1 5ECDC043
-P 8850 1700
+P 8400 3550
 AR Path="/5ECDC043" Ref="R?"  Part="1" 
 AR Path="/5E937ACB/5ECDC043" Ref="R30"  Part="1" 
-F 0 "R30" V 8643 1700 50  0000 C CNN
-F 1 "470" V 8734 1700 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 8780 1700 50  0001 C CNN
-F 3 "~" H 8850 1700 50  0001 C CNN
-	1    8850 1700
+F 0 "R30" V 8193 3550 50  0000 C CNN
+F 1 "470" V 8284 3550 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 8330 3550 50  0001 C CNN
+F 3 "~" H 8400 3550 50  0001 C CNN
+	1    8400 3550
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	8700 1700 8600 1700
+	8250 3550 8150 3550
 Wire Wire Line
-	9000 1700 9100 1700
+	8550 3550 8650 3550
+$Comp
+L power:+3V3 #PWR?
+U 1 1 5EEA0028
+P 9150 2150
+AR Path="/5E98FCAF/5EEA0028" Ref="#PWR?"  Part="1" 
+AR Path="/5E937ACB/5EEA0028" Ref="#PWR05"  Part="1" 
+F 0 "#PWR05" H 9150 2000 50  0001 C CNN
+F 1 "+3V3" H 9165 2323 50  0000 C CNN
+F 2 "" H 9150 2150 50  0001 C CNN
+F 3 "" H 9150 2150 50  0001 C CNN
+	1    9150 2150
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:Q_PMOS_GSD Q?
+U 1 1 5EEA002E
+P 9050 2750
+AR Path="/5E98FCAF/5EEA002E" Ref="Q?"  Part="1" 
+AR Path="/5E937ACB/5EEA002E" Ref="Q10"  Part="1" 
+F 0 "Q10" H 9256 2796 50  0000 L CNN
+F 1 "NX2301P" H 9256 2705 50  0000 L CNN
+F 2 "" H 9250 2850 50  0001 C CNN
+F 3 "~" H 9050 2750 50  0001 C CNN
+	1    9050 2750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5EEA0034
+P 8750 2500
+AR Path="/5E98FCAF/5EEA0034" Ref="R?"  Part="1" 
+AR Path="/5E937ACB/5EEA0034" Ref="R35"  Part="1" 
+F 0 "R35" H 8680 2454 50  0000 R CNN
+F 1 "1M" H 8680 2545 50  0000 R CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 8680 2500 50  0001 C CNN
+F 3 "~" H 8750 2500 50  0001 C CNN
+	1    8750 2500
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	9150 2150 9150 2250
+Wire Wire Line
+	8850 2750 8750 2750
+Wire Wire Line
+	8750 2750 8750 2650
+Wire Wire Line
+	8750 2350 8750 2250
+Wire Wire Line
+	8750 2250 9150 2250
+Connection ~ 9150 2250
+Wire Wire Line
+	9150 2250 9150 2550
+Text HLabel 8200 2750 0    50   Input ~ 0
+BME_~PWR
+Wire Wire Line
+	8750 2750 8200 2750
+Connection ~ 8750 2750
+$Comp
+L power:PWR_FLAG #FLG03
+U 1 1 5F03E7D5
+P 9750 3050
+F 0 "#FLG03" H 9750 3125 50  0001 C CNN
+F 1 "PWR_FLAG" H 9750 3223 50  0000 C CNN
+F 2 "" H 9750 3050 50  0001 C CNN
+F 3 "~" H 9750 3050 50  0001 C CNN
+	1    9750 3050
+	1    0    0    -1  
+$EndComp
+Connection ~ 9750 3050
 $EndSCHEMATC

display/hardware/output.sch

@@ -181,7 +181,7 @@ U 1 1 5E9CA184
 P 2600 2150
 F 0 "R7" H 2670 2196 50  0000 L CNN
 F 1 "1K" H 2670 2105 50  0000 L CNN
-F 2 "" V 2530 2150 50  0001 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 2530 2150 50  0001 C CNN
 F 3 "~" H 2600 2150 50  0001 C CNN
 	1    2600 2150
 	1    0    0    -1  
@@ -192,7 +192,7 @@ U 1 1 5E9CA696
 P 2050 2700
 F 0 "R5" H 2120 2746 50  0000 L CNN
 F 1 "1K" H 2120 2655 50  0000 L CNN
-F 2 "" V 1980 2700 50  0001 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 1980 2700 50  0001 C CNN
 F 3 "~" H 2050 2700 50  0001 C CNN
 	1    2050 2700
 	0    -1   -1   0   
@@ -644,18 +644,16 @@ $EndComp
 $Comp
 L power:+3V3 #PWR0120
 U 1 1 5EB491CE
-P 3100 4850
-F 0 "#PWR0120" H 3100 4700 50  0001 C CNN
-F 1 "+3V3" H 3115 5023 50  0000 C CNN
-F 2 "" H 3100 4850 50  0001 C CNN
-F 3 "" H 3100 4850 50  0001 C CNN
-	1    3100 4850
+P 3100 4050
+F 0 "#PWR0120" H 3100 3900 50  0001 C CNN
+F 1 "+3V3" H 3115 4223 50  0000 C CNN
+F 2 "" H 3100 4050 50  0001 C CNN
+F 3 "" H 3100 4050 50  0001 C CNN
+	1    3100 4050
 	1    0    0    -1  
 $EndComp
 Text HLabel 2150 5350 0    50   Input ~ 0
 DISP_~BUSY
-Wire Wire Line
-	3100 4850 3100 4950
 Wire Wire Line
 	2150 5150 2650 5150
 Wire Wire Line
@@ -668,23 +666,23 @@ Wire Wire Line
 	3550 5250 3650 5250
 Wire Wire Line
 	3650 5150 3550 5150
-Text Notes 4150 4600 2    50   ~ 0
+Text Notes 4150 3900 2    50   ~ 0
 display
 Wire Notes Line
-	4250 4500 1650 4500
+	4250 3800 1650 3800
 Wire Notes Line
-	1650 4500 1650 5900
+	1650 3800 1650 5900
 Wire Notes Line
 	1650 5900 4250 5900
 Wire Notes Line
-	4250 5900 4250 4500
+	4250 5900 4250 3800
 $Comp
 L Device:R R6
 U 1 1 5ED0B8C1
 P 2400 5350
 F 0 "R6" H 2470 5396 50  0000 L CNN
 F 1 "1K" H 2470 5305 50  0000 L CNN
-F 2 "" V 2330 5350 50  0001 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 2330 5350 50  0001 C CNN
 F 3 "~" H 2400 5350 50  0001 C CNN
 	1    2400 5350
 	0    1    1    0   
@@ -702,4 +700,60 @@ Wire Wire Line
 Connection ~ 8050 2950
 Wire Wire Line
 	8050 2950 9300 2950
+$Comp
+L Device:Q_PMOS_GSD Q9
+U 1 1 5EE75778
+P 3000 4650
+F 0 "Q9" H 3206 4696 50  0000 L CNN
+F 1 "NX2301P" H 3206 4605 50  0000 L CNN
+F 2 "" H 3200 4750 50  0001 C CNN
+F 3 "~" H 3000 4650 50  0001 C CNN
+	1    3000 4650
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R34
+U 1 1 5EE824D3
+P 2700 4400
+F 0 "R34" H 2630 4354 50  0000 R CNN
+F 1 "1M" H 2630 4445 50  0000 R CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 2630 4400 50  0001 C CNN
+F 3 "~" H 2700 4400 50  0001 C CNN
+	1    2700 4400
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	3100 4050 3100 4150
+Wire Wire Line
+	3100 4850 3100 4900
+Wire Wire Line
+	2800 4650 2700 4650
+Wire Wire Line
+	2700 4650 2700 4550
+Wire Wire Line
+	2700 4250 2700 4150
+Wire Wire Line
+	2700 4150 3100 4150
+Connection ~ 3100 4150
+Wire Wire Line
+	3100 4150 3100 4450
+Text HLabel 2150 4650 0    50   Input ~ 0
+DISP_~PWR
+Wire Wire Line
+	2700 4650 2150 4650
+Connection ~ 2700 4650
+$Comp
+L power:PWR_FLAG #FLG02
+U 1 1 5F03B4C1
+P 3100 4900
+F 0 "#FLG02" H 3100 4975 50  0001 C CNN
+F 1 "PWR_FLAG" V 3100 5028 50  0000 L CNN
+F 2 "" H 3100 4900 50  0001 C CNN
+F 3 "~" H 3100 4900 50  0001 C CNN
+	1    3100 4900
+	0    1    1    0   
+$EndComp
+Connection ~ 3100 4900
+Wire Wire Line
+	3100 4900 3100 4950
 $EndSCHEMATC

display/hardware/power.sch

@@ -13,17 +13,6 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-$Comp
-L Device:Battery BT1
-U 1 1 5C046A78
-P 2400 4900
-F 0 "BT1" H 2508 4946 50  0000 L CNN
-F 1 "Battery" H 2508 4855 50  0000 L CNN
-F 2 "Connector_Wire:SolderWirePad_1x02_P3.81mm_Drill0.8mm" V 2400 4960 50  0001 C CNN
-F 3 "~" V 2400 4960 50  0001 C CNN
-	1    2400 4900
-	1    0    0    -1  
-$EndComp
 Text HLabel 8800 3900 2    50   Input ~ 0
 EN_5V
 Text HLabel 8800 2800 2    50   Output ~ 0
@@ -45,10 +34,6 @@ F 5 "296-35473-1-ND" H 3650 4800 50  0001 C CNN "Digikey"
 	1    3650 4800
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	2400 4700 2400 4400
-Wire Wire Line
-	2400 4400 3650 4400
 Wire Wire Line
 	3650 4400 3650 4500
 Wire Wire Line
@@ -169,7 +154,7 @@ U 1 1 5C04CECD
 P 6850 2600
 F 0 "L1" V 7040 2600 50  0000 C CNN
 F 1 "4.7uH" V 6949 2600 50  0000 C CNN
-F 2 "Inductor_SMD:L_Taiyo-Yuden_NR-40xx" H 6850 2600 50  0001 C CNN
+F 2 "" H 6850 2600 50  0001 C CNN
 F 3 "~" H 6850 2600 50  0001 C CNN
 F 4 "Taiyo Yuden  NRS4018T4R7MDGJ" H 6850 2600 50  0001 C CNN "Mfg. ID"
 F 5 "587-2893-1-ND" V 6850 2600 50  0001 C CNN "Digikey"
@@ -264,10 +249,9 @@ Wire Wire Line
 	6000 3800 6000 3500
 Connection ~ 6900 3800
 Wire Wire Line
-	4100 4400 4100 3000
+	3650 4400 3650 3900
 Wire Wire Line
-	4100 3000 6000 3000
-Connection ~ 3650 4400
+	3650 3000 6000 3000
 Connection ~ 6000 3000
 Connection ~ 6000 4400
 Wire Wire Line
@@ -302,9 +286,7 @@ Wire Notes Line
 	5300 5400 2850 5400
 Connection ~ 4700 4500
 Wire Wire Line
-	4100 4400 6000 4400
-Wire Wire Line
-	3650 4400 4100 4400
+	3650 4400 6000 4400
 Wire Notes Line
 	5700 4000 5700 2200
 Wire Notes Line
@@ -332,7 +314,7 @@ F 3 "~" V 4200 5000 50  0001 C CNN
 	1    4200 5000
 	0    1    1    0   
 $EndComp
-Connection ~ 4100 4400
+Connection ~ 3650 4400
 Wire Wire Line
 	4200 4800 4200 4900
 Connection ~ 4200 4800
@@ -360,15 +342,14 @@ Wire Wire Line
 $Comp
 L power:PWR_FLAG #FLG0104
 U 1 1 5EE31D89
-P 2400 4400
-F 0 "#FLG0104" H 2400 4475 50  0001 C CNN
-F 1 "PWR_FLAG" H 2400 4573 50  0000 C CNN
-F 2 "" H 2400 4400 50  0001 C CNN
-F 3 "~" H 2400 4400 50  0001 C CNN
-	1    2400 4400
+P 2400 3800
+F 0 "#FLG0104" H 2400 3875 50  0001 C CNN
+F 1 "PWR_FLAG" H 2400 3973 50  0000 C CNN
+F 2 "" H 2400 3800 50  0001 C CNN
+F 3 "~" H 2400 3800 50  0001 C CNN
+	1    2400 3800
 	1    0    0    -1  
 $EndComp
-Connection ~ 2400 4400
 Wire Wire Line
 	6800 4400 8800 4400
 Wire Wire Line
@@ -385,4 +366,51 @@ F 3 "~" H 2400 5200 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 Connection ~ 2400 5200
+$Comp
+L Device:Battery_Cell BT1
+U 1 1 5EE43BC8
+P 2400 4200
+F 0 "BT1" H 2518 4296 50  0000 L CNN
+F 1 "NiMH" H 2518 4205 50  0000 L CNN
+F 2 "" V 2400 4260 50  0001 C CNN
+F 3 "~" V 2400 4260 50  0001 C CNN
+	1    2400 4200
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:Battery_Cell BT2
+U 1 1 5EE43EF0
+P 2400 4600
+F 0 "BT2" H 2518 4696 50  0000 L CNN
+F 1 "NiMH" H 2518 4605 50  0000 L CNN
+F 2 "" V 2400 4660 50  0001 C CNN
+F 3 "~" V 2400 4660 50  0001 C CNN
+	1    2400 4600
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:Battery_Cell BT3
+U 1 1 5EE44377
+P 2400 5000
+F 0 "BT3" H 2518 5096 50  0000 L CNN
+F 1 "NiMH" H 2518 5005 50  0000 L CNN
+F 2 "" V 2400 5060 50  0001 C CNN
+F 3 "~" V 2400 5060 50  0001 C CNN
+	1    2400 5000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2400 4000 2400 3900
+Wire Wire Line
+	2400 3900 3650 3900
+Connection ~ 2400 3900
+Wire Wire Line
+	2400 3900 2400 3800
+Connection ~ 3650 3900
+Wire Wire Line
+	3650 3900 3650 3000
+Wire Wire Line
+	2400 4700 2400 4800
+Wire Wire Line
+	2400 4300 2400 4400
 $EndSCHEMATC