drpuur/mini-beieli-pcb-cubecell
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

merge conflicting files

Browse Source
This commit is contained in:
jlehmann
2024-07-13 19:50:10 +02:00
parent 4d554229ee bf1372d09f
commit d0089ae3b9
42 changed files with 54915 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kicad-files/mini-beieli-pcb-cubecell.sch-bak
+256 -48
View File
@@ -5,14 +5,20 @@ $Descr A3 16535 11693
encoding utf-8
Sheet 1 1
Title "mini-beieli-pcb-cubecell"
<<<<<<< HEAD
Date "2020-10-23"
Rev "4.2"
=======
Date "2020-12-26"
Rev "5.1"
>>>>>>> new-master-imported-5.1-in-kicad8
Comp "nbit Informatik GmbH"
Comment1 ""
Comment2 ""
Comment3 ""
Comment4 ""
$EndDescr
<<<<<<< HEAD
Wire Wire Line
11500 4350 11350 4350
Wire Wire Line
@@ -205,6 +211,21 @@ Wire Wire Line
13600 3150 14100 3150
$Comp
L Qwiic_Scale-eagle-import:NAU7802SOIC U2
=======
$Comp
L Sensor:BME280 U1
U 1 1 5F40DD10
P 9450 7350
F 0 "U1" H 9000 7450 50 0000 R CNN
F 1 "BME280" H 9000 7350 50 0000 R CNN
F 2 "Package_LGA:Bosch_LGA-8_2.5x2.5mm_P0.65mm_ClockwisePinNumbering" H 10950 6900 50 0001 C CNN
F 3 "https://ae-bst.resource.bosch.com/media/_tech/media/datasheets/BST-BME280-DS002.pdf" H 9450 7150 50 0001 C CNN
1 9450 7350
1 0 0 -1
$EndComp
$Comp
L mini-beieli-pcb-cubecell-rescue:NAU7802SOIC-Qwiic_Scale-eagle-import U2
>>>>>>> new-master-imported-5.1-in-kicad8
U 1 1 5F41501D
P 14100 7250
F 0 "U2" H 13750 7750 70 0000 C CNN
@@ -216,9 +237,23 @@ F 3 "" H 14100 7250 50 0001 C CNN
$EndComp
Wire Wire Line
7000 0 8150 0
<<<<<<< HEAD
Wire Wire Line
14350 2950 14800 2950
Connection ~ 14350 2950
=======
$Comp
L power:GND #PWR0105
U 1 1 5F5682D4
P 3000 3100
F 0 "#PWR0105" H 3000 2850 50 0001 C CNN
F 1 "GND" V 3000 2950 50 0000 R CNN
F 2 "" H 3000 3100 50 0001 C CNN
F 3 "" H 3000 3100 50 0001 C CNN
1 3000 3100
1 0 0 -1
$EndComp
>>>>>>> new-master-imported-5.1-in-kicad8
Text Label 10500 7250 0 50 ~ 0
SCL
Text Label 10500 7450 0 50 ~ 0
@@ -260,10 +295,10 @@ Connection ~ 13450 7650
Wire Wire Line
13450 7650 13600 7650
$Comp
L Device:C C13
L Device:C C5
U 1 1 5F720CB8
P 12950 7600
F 0 "C13" H 13100 7650 50 0000 L CNN
F 0 "C5" H 13100 7650 50 0000 L CNN
F 1 "0.1uF" H 13100 7550 50 0000 L CNN
F 2 "Capacitor_SMD:C_0603_1608Metric" H 12988 7450 50 0001 C CNN
F 3 "~" H 12950 7600 50 0001 C CNN
@@ -277,10 +312,10 @@ Wire Wire Line
Wire Wire Line
13450 7750 13450 7650
$Comp
L Device:C C12
L Device:C C4
U 1 1 5F78BFC8
P 13250 7000
F 0 "C12" H 13050 7100 50 0000 L CNN
F 0 "C4" H 13050 7100 50 0000 L CNN
F 1 "0.1uF" H 12950 7000 50 0000 L CNN
F 2 "Capacitor_SMD:C_0603_1608Metric" H 13288 6850 50 0001 C CNN
F 3 "~" H 13250 7000 50 0001 C CNN
@@ -300,10 +335,10 @@ Wire Wire Line
Wire Wire Line
14950 6950 14950 6400
$Comp
L Device:C C11
L Device:C C3
U 1 1 5F7C8E30
P 14150 6550
F 0 "C11" H 13900 6600 50 0000 L CNN
F 0 "C3" H 13900 6600 50 0000 L CNN
F 1 "1uF" H 13850 6500 50 0000 L CNN
F 2 "Capacitor_SMD:C_0603_1608Metric" H 14188 6400 50 0001 C CNN
F 3 "~" H 14150 6550 50 0001 C CNN
@@ -323,10 +358,10 @@ Connection ~ 13550 6400
Wire Wire Line
13550 6400 14150 6400
$Comp
L Device:C C10
L Device:C C2
U 1 1 5F853CE7
P 12950 6550
F 0 "C10" H 13100 6600 50 0000 L CNN
F 0 "C2" H 13100 6600 50 0000 L CNN
F 1 "0.1uF" H 13100 6500 50 0000 L CNN
F 2 "Capacitor_SMD:C_0603_1608Metric" H 12988 6400 50 0001 C CNN
F 3 "~" H 12950 6550 50 0001 C CNN
@@ -375,58 +410,38 @@ A_GREEN
Wire Wire Line
12150 7150 12600 7150
$Comp
L Connector:Conn_01x02_Female SWITCH1
U 1 1 5FBE9AF3
P 4000 5100
F 0 "SWITCH1" H 4050 5100 50 0000 L CNN
F 1 "Conn_01x02_Female" H 4050 5000 50 0000 L CNN
F 2 "Connector_JST:JST_PH_B2B-PH-K_1x02_P2.00mm_Vertical" H 4000 5100 50 0001 C CNN
F 3 "~" H 4000 5100 50 0001 C CNN
1 4000 5100
1 0 0 -1
$EndComp
Wire Wire Line
3050 5100 3800 5100
$Comp
L Connector:Conn_01x02_Female SOLAR1
U 1 1 5FC3F569
P 4000 5550
F 0 "SOLAR1" H 4050 5550 50 0000 L CNN
F 1 "Conn_01x02_Female" H 4050 5450 50 0000 L CNN
F 2 "Connector_JST:JST_PH_B2B-PH-K_1x02_P2.00mm_Vertical" H 4000 5550 50 0001 C CNN
F 3 "~" H 4000 5550 50 0001 C CNN
1 4000 5550
P 9000 2050
F 0 "SOLAR1" H 9050 2050 50 0000 L CNN
F 1 "Conn_01x02_Female" H 9050 1950 50 0000 L CNN
F 2 "Connector_JST:JST_PH_B2B-PH-K_1x02_P2.00mm_Vertical" H 9000 2050 50 0001 C CNN
F 3 "~" H 9000 2050 50 0001 C CNN
1 9000 2050
1 0 0 -1
$EndComp
Wire Wire Line
3050 5550 3800 5550
$Comp
L power:GND #PWR0123
U 1 1 5FC5B972
<<<<<<< HEAD
P 3050 5650
F 0 "#PWR0123" H 3050 5400 50 0001 C CNN
F 1 "GND" H 2950 5500 50 0000 C CNN
F 2 "" H 3050 5650 50 0001 C CNN
F 3 "" H 3050 5650 50 0001 C CNN
1 3050 5650
=======
P 8050 2150
F 0 "#PWR0123" H 8050 1900 50 0001 C CNN
F 1 "GND" H 8100 1950 50 0000 C CNN
F 2 "" H 8050 2150 50 0001 C CNN
F 3 "" H 8050 2150 50 0001 C CNN
1 8050 2150
>>>>>>> new-master-imported-5.1-in-kicad8
1 0 0 -1
$EndComp
Wire Wire Line
3050 5650 3800 5650
NoConn ~ 13600 3350
NoConn ~ 13600 3750
NoConn ~ 13600 3850
NoConn ~ 13600 3950
NoConn ~ 13600 4150
NoConn ~ 13600 4350
NoConn ~ 13600 4450
NoConn ~ 13600 4550
Text Label 3050 5100 0 50 ~ 0
3.3V
Text Label 3050 5200 0 50 ~ 0
VIN
Wire Wire Line
3050 5200 3800 5200
8050 2150 8800 2150
$Comp
L Device:Net-Tie_2 NT1
U 1 1 6045DF23
@@ -444,18 +459,28 @@ Connection ~ 13450 7750
$Comp
L power:VS #PWR0107
U 1 1 606E613C
<<<<<<< HEAD
P 3050 5550
F 0 "#PWR0107" H 2850 5400 50 0001 C CNN
F 1 "VS" H 2950 5650 50 0000 C CNN
F 2 "" H 3050 5550 50 0001 C CNN
F 3 "" H 3050 5550 50 0001 C CNN
1 3050 5550
=======
P 8050 2050
F 0 "#PWR0107" H 7850 1900 50 0001 C CNN
F 1 "VS" H 8100 2250 50 0000 C CNN
F 2 "" H 8050 2050 50 0001 C CNN
F 3 "" H 8050 2050 50 0001 C CNN
1 8050 2050
>>>>>>> new-master-imported-5.1-in-kicad8
1 0 0 -1
$EndComp
Wire Wire Line
13450 7750 13450 8000
Wire Wire Line
12950 6700 13450 6700
<<<<<<< HEAD
Text Label 14050 3550 0 50 ~ 0
3.3V
Wire Wire Line
@@ -519,6 +544,23 @@ Wire Wire Line
13450 8000 14050 8000
Wire Wire Line
11350 4350 11350 4550
=======
Wire Wire Line
13450 8000 14050 8000
Connection ~ 9350 6750
$Comp
L power:GND #PWR0106
U 1 1 612B9B42
P 14950 8000
F 0 "#PWR0106" H 14950 7750 50 0001 C CNN
F 1 "GND" H 15000 7800 50 0000 C CNN
F 2 "" H 14950 8000 50 0001 C CNN
F 3 "" H 14950 8000 50 0001 C CNN
1 14950 8000
1 0 0 -1
$EndComp
Connection ~ 14950 8000
>>>>>>> new-master-imported-5.1-in-kicad8
Connection ~ 13450 6700
Wire Wire Line
13450 6700 14150 6700
@@ -526,6 +568,11 @@ Connection ~ 13450 7550
Text Label 13450 8000 0 50 ~ 0
AGND
Wire Wire Line
<<<<<<< HEAD
=======
10100 7650 10050 7650
Wire Wire Line
>>>>>>> new-master-imported-5.1-in-kicad8
10100 6550 10250 6550
$Comp
L Device:C C1
@@ -539,17 +586,21 @@ F 3 "~" H 8300 7300 50 0001 C CNN
1 0 0 -1
$EndComp
Wire Wire Line
<<<<<<< HEAD
10100 4550 11350 4550
Wire Wire Line
10100 3800 10100 4550
Connection ~ 11350 4550
Wire Wire Line
=======
>>>>>>> new-master-imported-5.1-in-kicad8
8300 7150 8300 6750
Wire Wire Line
10100 6750 10100 7650
Wire Wire Line
10100 6550 10100 6750
Connection ~ 10100 6750
<<<<<<< HEAD
$Comp
L Device:CP C7
U 1 1 5F72EE3C
@@ -586,6 +637,11 @@ Wire Wire Line
Wire Wire Line
11350 3650 11350 3850
Connection ~ 11350 3850
=======
Connection ~ 9550 6750
Wire Wire Line
9550 6750 10100 6750
>>>>>>> new-master-imported-5.1-in-kicad8
Wire Wire Line
13450 6700 13450 7550
Text Label 12150 8250 0 50 ~ 0
@@ -602,12 +658,49 @@ Wire Wire Line
12800 7350 13600 7350
Wire Wire Line
12150 8550 12800 8550
<<<<<<< HEAD
Text Label 6100 2550 0 50 ~ 0
VIN
Text Label 2900 2950 0 50 ~ 0
=======
Text Label 3300 3000 0 50 ~ 0
>>>>>>> new-master-imported-5.1-in-kicad8
SCL
Text Label 2900 3050 0 50 ~ 0
SDA
<<<<<<< HEAD
=======
Text Label 3300 3200 0 50 ~ 0
GPIO0
$Comp
L mini-beieli-pcb-cubecell-eagle-import:HTCC-AB01 HTCC-AB1
U 1 1 5F6D2856
P 3850 3950
F 0 "HTCC-AB1" H 4650 5900 50 0000 C CNN
F 1 "HTCC-AB01" H 4650 5800 50 0000 C CNN
F 2 "SUPERCAP:HTCC-AB01" V 4050 4850 50 0001 C CNN
F 3 "" V 4050 4850 50 0001 C CNN
1 3850 3950
1 0 0 -1
$EndComp
$Comp
L power:GND #PWR0101
U 1 1 5F8B4409
P 5850 2650
F 0 "#PWR0101" H 5850 2400 50 0001 C CNN
F 1 "GND" H 5900 2450 50 0000 C CNN
F 2 "" H 5850 2650 50 0001 C CNN
F 3 "" H 5850 2650 50 0001 C CNN
1 5850 2650
1 0 0 -1
$EndComp
Wire Wire Line
5850 2500 5850 2650
Text Label 3300 2800 0 50 ~ 0
VEXT
Wire Wire Line
3000 2500 3750 2500
>>>>>>> new-master-imported-5.1-in-kicad8
Text Label 9350 6450 0 50 ~ 0
VEXT
Text Label 14950 7050 0 50 ~ 0
@@ -619,9 +712,27 @@ Wire Wire Line
Wire Wire Line
5450 2550 6100 2550
Wire Wire Line
<<<<<<< HEAD
2900 2950 3250 2950
Wire Wire Line
2900 3050 3400 3050
=======
3300 2800 3750 2800
Wire Wire Line
3300 3000 3750 3000
Wire Wire Line
3300 3100 3750 3100
Wire Wire Line
3300 3200 3750 3200
NoConn ~ 3750 3300
NoConn ~ 3750 3400
NoConn ~ 3750 3500
Wire Wire Line
3000 2900 3750 2900
Connection ~ 3000 2900
Wire Wire Line
3000 2900 3000 3100
>>>>>>> new-master-imported-5.1-in-kicad8
Wire Wire Line
5650 7400 6050 7400
Text Label 6050 7400 0 50 ~ 0
@@ -714,12 +825,10 @@ F 10 "None" H 3300 7400 50 0001 L BNN "Field10"
1 3300 7400
0 1 1 0
$EndComp
Text Notes 10000 1550 0 118 ~ 24
Energy Harvesting (Solar/Supercap)
Text Notes 3500 1550 0 118 ~ 24
CubeCell (MCU/LoraWAN)
Text Notes 3000 4750 0 118 ~ 24
Solar/Switch Connector
Text Notes 8000 1550 0 118 ~ 24
Connectors
Text Notes 3000 6700 0 118 ~ 24
LoadCell Connector
Text Notes 7700 6000 0 118 ~ 24
@@ -728,6 +837,7 @@ Text Notes 13000 6000 0 118 ~ 24
ADC (NAU7802)
Wire Wire Line
12800 8550 12800 7350
<<<<<<< HEAD
$Comp
L mini-beieli-pcb-cubecell-eagle-import:HTCC-AM01 U3
U 1 1 5F867819
@@ -1207,4 +1317,102 @@ Connection ~ 14350 3900
Connection ~ 13850 3900
Text Label 14800 3350 0 50 ~ 0
ADC
=======
Text Label 3300 2600 0 50 ~ 0
VS
Wire Wire Line
3300 2600 3750 2600
NoConn ~ 3750 2700
$Comp
L power:PWR_FLAG #FLG0101
U 1 1 5FE71A37
P 8550 2050
F 0 "#FLG0101" H 8550 2125 50 0001 C CNN
F 1 "PWR_FLAG" H 8550 2250 50 0000 C CNN
F 2 "" H 8550 2050 50 0001 C CNN
F 3 "~" H 8550 2050 50 0001 C CNN
1 8550 2050
1 0 0 -1
$EndComp
Connection ~ 8550 2050
Wire Wire Line
8550 2050 8800 2050
Wire Wire Line
8050 2050 8550 2050
Text Notes 8000 1750 0 50 ~ 0
5.5V - 7V
$Comp
L Connector:Conn_01x02_Female SWITCH1
U 1 1 5FE8083E
P 9000 2800
F 0 "SWITCH1" H 9050 2800 50 0000 L CNN
F 1 "Conn_01x02_Female" H 9050 2700 50 0000 L CNN
F 2 "Connector_JST:JST_PH_B2B-PH-K_1x02_P2.00mm_Vertical" H 9000 2800 50 0001 C CNN
F 3 "~" H 9000 2800 50 0001 C CNN
1 9000 2800
1 0 0 -1
$EndComp
Wire Wire Line
8050 2900 8800 2900
$Comp
L Connector:Conn_01x02_Female LIPO1
U 1 1 5FE8567F
P 9000 3500
F 0 "LIPO1" H 9050 3500 50 0000 L CNN
F 1 "Conn_01x02_Female" H 9050 3400 50 0000 L CNN
F 2 "Connector_JST:JST_PH_B2B-PH-K_1x02_P2.00mm_Vertical" H 9000 3500 50 0001 C CNN
F 3 "~" H 9000 3500 50 0001 C CNN
1 9000 3500
1 0 0 -1
$EndComp
Wire Wire Line
8050 3600 8800 3600
Wire Wire Line
8050 3500 8800 3500
$Comp
L Connector_Generic:Conn_01x02 J3
U 1 1 5FEA044E
P 9200 4300
F 0 "J3" H 9300 4300 50 0000 L CNN
F 1 "Conn_01x02" H 9300 4200 50 0000 L CNN
F 2 "Connector_Wire:SolderWire-0.1sqmm_1x02_P3.6mm_D0.4mm_OD1mm" H 9200 4300 50 0001 C CNN
F 3 "~" H 9200 4300 50 0001 C CNN
1 9200 4300
1 0 0 -1
$EndComp
Text Notes 8900 3450 0 50 ~ 0
+
$Comp
L power:GND #PWR?
U 1 1 5FEAB739
P 8050 3600
F 0 "#PWR?" H 8050 3350 50 0001 C CNN
F 1 "GND" H 8100 3400 50 0000 C CNN
F 2 "" H 8050 3600 50 0001 C CNN
F 3 "" H 8050 3600 50 0001 C CNN
1 8050 3600
1 0 0 -1
$EndComp
$Comp
L power:GND #PWR?
U 1 1 5FEB0754
P 9000 4400
F 0 "#PWR?" H 9000 4150 50 0001 C CNN
F 1 "GND" H 9050 4200 50 0000 C CNN
F 2 "" H 9000 4400 50 0001 C CNN
F 3 "" H 9000 4400 50 0001 C CNN
1 9000 4400
1 0 0 -1
$EndComp
Text Notes 9000 4250 0 50 ~ 0
+
Wire Wire Line
9000 4300 7600 4300
Wire Wire Line
7600 4300 7600 2800
Wire Wire Line
7600 2800 8800 2800
Wire Wire Line
8050 2900 8050 3500
>>>>>>> new-master-imported-5.1-in-kicad8
$EndSCHEMATC