From 04c40d97e82b3889d1aa476541ae338d699da20e Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 8 Jun 2017 16:33:49 +0200 Subject: [PATCH 1/8] Add SPBTLE-RF to rfcom BTLE module from ST --- library/rfcom.dcm | 6 +++ library/rfcom.lib | 122 ++++++++++++++++++++++++++++------------------ 2 files changed, 80 insertions(+), 48 deletions(-) diff --git a/library/rfcom.dcm b/library/rfcom.dcm index 0fad6b4a..aac26a71 100644 --- a/library/rfcom.dcm +++ b/library/rfcom.dcm @@ -94,6 +94,12 @@ K GSM GPRS Quad-Band SMS FAX F http://www.simcom.us/act_admin/supportfile/SIM900_HD_V1.01(091226).pdf $ENDCMP # +$CMP SPBTLE-RF +D Very Low Power network processor module for BLE v4.1 +K BLE bluetooth module low-power +F http://www.st.com/resource/en/datasheet/spbtle-rf.pdf +$ENDCMP +# $CMP TD1205 D High-Performance, Low-Current SIGFOX™ Gateway And GPS Receiver With Integrated Antennas K IOT SIGFOX GPS diff --git a/library/rfcom.lib b/library/rfcom.lib index 1b6c2bc6..3c0cddc2 100644 --- a/library/rfcom.lib +++ b/library/rfcom.lib @@ -68,9 +68,9 @@ A 0 550 112 -1534 -265 0 1 10 f -100 500 100 500 A 0 650 112 1534 265 0 1 10 f -100 700 100 700 A 100 600 224 1534 -1534 0 1 10 f -100 700 -100 500 S -600 1000 600 -1000 0 1 10 f -P 2 0 1 20 0 600 -50 550 N -P 2 0 1 20 0 600 -50 650 N -P 6 0 1 20 0 700 50 650 0 600 50 550 0 500 0 700 N +P 2 0 1 20 0 600 -50 550 N +P 2 0 1 20 0 600 -50 650 N +P 6 0 1 20 0 700 50 650 0 600 50 550 0 500 0 700 N X PIO8 1 800 -600 200 L 50 50 1 1 B X PIO9 2 800 -700 200 L 50 50 1 1 B X PIO10 3 800 -800 200 L 50 50 1 1 B @@ -130,12 +130,12 @@ A 100 600 224 1534 -1534 0 1 10 f -100 700 -100 500 S -800 1000 800 -1000 0 1 10 f S -800 1000 800 -1000 0 1 10 f S -800 1000 800 -1000 0 1 10 f -P 2 0 1 20 0 600 -50 550 N -P 2 0 1 20 0 600 -50 550 N -P 2 0 1 20 0 600 -50 650 N -P 2 0 1 20 0 600 -50 650 N -P 6 0 1 20 0 700 50 650 0 600 50 550 0 500 0 700 N -P 6 0 1 20 0 700 50 650 0 600 50 550 0 500 0 700 N +P 2 0 1 20 0 600 -50 550 N +P 2 0 1 20 0 600 -50 550 N +P 2 0 1 20 0 600 -50 650 N +P 2 0 1 20 0 600 -50 650 N +P 6 0 1 20 0 700 50 650 0 600 50 550 0 500 0 700 N +P 6 0 1 20 0 700 50 650 0 600 50 550 0 500 0 700 N X GND 1 -200 -1200 200 U 50 50 1 1 W X PVCC 2 200 1200 200 D 50 50 1 1 W X AIO0/SLEEPCLK 3 1000 400 200 L 50 50 1 1 B @@ -406,7 +406,7 @@ A 0 201 78 1087 -191 0 1 10 N -25 275 75 175 C 0 200 25 0 1 10 F S -450 650 450 -650 0 1 10 f S 450 -550 450 -550 0 1 0 N -P 2 0 1 10 0 175 0 50 N +P 2 0 1 10 0 175 0 50 N X CE 1 -600 0 150 R 50 50 1 1 I X CSN 2 -600 200 150 R 50 50 1 1 I X SCK 3 -600 300 150 R 50 50 1 1 I C @@ -447,7 +447,7 @@ A 175 101 78 1087 -191 0 1 10 N 150 175 250 75 C 175 100 25 0 1 10 F S -350 450 350 -450 0 1 10 f S 450 -750 450 -750 0 1 0 N -P 2 0 1 10 175 75 175 -50 N +P 2 0 1 10 175 75 175 -50 N X GND 1 0 -600 150 U 50 50 1 1 W X VCC 2 0 600 150 D 50 50 1 1 W X CE 3 -500 -200 150 R 50 50 1 1 I @@ -622,47 +622,47 @@ F3 "" 0 0 50 H I C CNN DRAW C -150 -550 150 0 0 0 N C 300 -750 141 0 0 0 N -T 0 300 290 35 0 0 0 amp Normal 0 C C -T 0 300 -765 40 0 0 0 Detect Normal 0 C C -T 0 300 325 35 0 0 0 IF Normal 0 C C -T 0 300 -350 35 0 0 0 Lim Normal 0 C C -T 0 -100 725 50 0 0 0 MIX Normal 0 C C -T 0 -150 -500 40 0 0 0 MUTE Normal 0 C C -T 0 -275 375 60 0 0 0 OSC Normal 0 C C -T 0 300 -700 40 0 0 0 QUAD Normal 0 C C -T 0 -50 0 40 0 0 0 RSSI Normal 0 C C -T 0 -150 -580 40 0 0 0 Switch Normal 0 C C +T 0 300 290 35 0 0 0 amp Normal 0 C C +T 0 300 -765 40 0 0 0 Detect Normal 0 C C +T 0 300 325 35 0 0 0 IF Normal 0 C C +T 0 300 -350 35 0 0 0 Lim Normal 0 C C +T 0 -100 725 50 0 0 0 MIX Normal 0 C C +T 0 -150 -500 40 0 0 0 MUTE Normal 0 C C +T 0 -275 375 60 0 0 0 OSC Normal 0 C C +T 0 300 -700 40 0 0 0 QUAD Normal 0 C C +T 0 -50 0 40 0 0 0 RSSI Normal 0 C C +T 0 -150 -580 40 0 0 0 Switch Normal 0 C C S -200 200 50 -250 0 0 0 N -P 3 0 0 0 -500 -750 150 -750 150 -750 N -P 3 0 0 0 -500 -350 -300 -500 -300 -500 f -P 3 0 0 0 -200 0 -500 0 -500 0 N -P 3 0 0 0 275 -450 275 -610 275 -610 f -P 3 0 0 0 325 -550 325 -610 325 -610 f -P 3 0 0 0 500 -750 450 -750 450 -750 N -P 3 0 0 0 500 -400 350 -400 350 -400 N -P 3 0 0 0 500 250 350 250 350 250 N -P 4 0 0 0 -500 -550 -300 -550 -300 -550 -300 -550 N -P 4 0 0 0 150 -400 150 -500 0 -500 0 -500 N -P 4 0 0 0 250 250 250 100 50 100 50 100 N -P 4 0 0 0 300 150 300 100 500 100 500 100 N -P 4 0 0 0 325 -550 175 -600 0 -600 0 -600 N -P 4 0 0 0 350 -300 350 -250 500 -250 500 -250 N -P 4 0 0 0 350 350 350 400 500 400 500 400 N -P 4 0 0 0 500 -550 325 -550 325 -450 325 -450 N -P 4 0 0 0 500 -100 250 -100 250 -300 250 -300 N -P 4 0 0 0 500 550 250 550 250 350 250 350 N -P 5 0 0 0 50 -100 150 -100 150 -400 250 -400 250 -400 N -P 5 0 0 0 400 -300 200 -300 300 -500 400 -300 400 -300 f -P 5 0 0 0 400 350 200 350 300 150 400 350 400 350 f +P 3 0 0 0 -500 -750 150 -750 150 -750 N +P 3 0 0 0 -500 -350 -300 -500 -300 -500 f +P 3 0 0 0 -200 0 -500 0 -500 0 N +P 3 0 0 0 275 -450 275 -610 275 -610 f +P 3 0 0 0 325 -550 325 -610 325 -610 f +P 3 0 0 0 500 -750 450 -750 450 -750 N +P 3 0 0 0 500 -400 350 -400 350 -400 N +P 3 0 0 0 500 250 350 250 350 250 N +P 4 0 0 0 -500 -550 -300 -550 -300 -550 -300 -550 N +P 4 0 0 0 150 -400 150 -500 0 -500 0 -500 N +P 4 0 0 0 250 250 250 100 50 100 50 100 N +P 4 0 0 0 300 150 300 100 500 100 500 100 N +P 4 0 0 0 325 -550 175 -600 0 -600 0 -600 N +P 4 0 0 0 350 -300 350 -250 500 -250 500 -250 N +P 4 0 0 0 350 350 350 400 500 400 500 400 N +P 4 0 0 0 500 -550 325 -550 325 -450 325 -450 N +P 4 0 0 0 500 -100 250 -100 250 -300 250 -300 N +P 4 0 0 0 500 550 250 550 250 350 250 350 N +P 5 0 0 0 50 -100 150 -100 150 -400 250 -400 250 -400 N +P 5 0 0 0 400 -300 200 -300 300 -500 400 -300 400 -300 f +P 5 0 0 0 400 350 200 350 300 150 400 350 400 350 f C -100 725 103 0 1 0 N S -500 850 500 -900 0 1 0 N S -400 500 -150 250 0 1 0 N -P 3 0 1 0 -500 300 -400 300 -400 300 N -P 3 0 1 0 -500 450 -400 450 -400 450 N -P 3 0 1 0 -500 650 -200 700 -200 700 N -P 4 0 1 0 -500 800 -200 750 -200 750 -200 750 N -P 4 0 1 0 -100 625 -100 375 -150 375 -150 375 N -P 6 0 1 0 0 725 200 725 200 750 500 750 500 750 500 750 N +P 3 0 1 0 -500 300 -400 300 -400 300 N +P 3 0 1 0 -500 450 -400 450 -400 450 N +P 3 0 1 0 -500 650 -200 700 -200 700 N +P 4 0 1 0 -500 800 -200 750 -200 750 -200 750 N +P 4 0 1 0 -100 625 -100 375 -150 375 -150 375 N +P 6 0 1 0 0 725 200 725 200 750 500 750 500 750 500 750 N X rf_in 1 -900 800 400 R 50 50 1 1 I X bypass 2 -900 650 400 R 50 50 1 1 I X OSC_2 3 -900 300 400 R 50 50 1 1 O @@ -766,6 +766,32 @@ X GND 59 1000 1500 200 L 50 50 1 1 W ENDDRAW ENDDEF # +# SPBTLE-RF +# +DEF SPBTLE-RF U 0 40 Y Y 1 F N +F0 "U" -650 700 50 H V C CNN +F1 "SPBTLE-RF" -450 600 50 H V C CNN +F2 "" -500 -100 50 V I C CNN +F3 "" -650 700 50 H I C CNN +$FPLIST + *SPBTLE* +$ENDFPLIST +DRAW +S -650 550 450 150 0 1 10 f +X EXT_LPCLK 1 600 300 150 L 50 50 1 1 N N +X GPIO2 2 -800 300 150 R 50 50 1 1 N N +X ANA_TEST 3 -200 0 150 U 50 50 1 1 N N +X SPI_IRQ 4 -800 500 150 R 50 50 1 1 O +X VIN 5 -100 700 150 D 50 50 1 1 W +X GND 6 -100 0 150 U 50 50 1 1 W +X SPI_CLK 7 600 200 150 L 50 50 1 1 I C +X SPI_MISO 8 600 500 150 L 50 50 1 1 O +X SPI_MOSI 9 600 400 150 L 50 50 1 1 I +X SPI_~CS 10 -800 400 150 R 50 50 1 1 I +X ~BT_RESET 11 -800 200 150 R 50 50 1 1 I +ENDDRAW +ENDDEF +# # TD1205 # DEF TD1205 U 0 40 Y Y 1 F N From 624ae68e562da4cc4e4e996b047269286580d105 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 8 Jun 2017 16:43:56 +0200 Subject: [PATCH 2/8] Added SPBTLE-RF0 As SPBTLE-RF alias --- library/rfcom.dcm | 8 +++++++- library/rfcom.lib | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/library/rfcom.dcm b/library/rfcom.dcm index aac26a71..b82b2bc9 100644 --- a/library/rfcom.dcm +++ b/library/rfcom.dcm @@ -95,11 +95,17 @@ F http://www.simcom.us/act_admin/supportfile/SIM900_HD_V1.01(091226).pdf $ENDCMP # $CMP SPBTLE-RF -D Very Low Power network processor module for BLE v4.1 +D Very Low Power network processor module for BLE v4.1, Hub capabilities K BLE bluetooth module low-power F http://www.st.com/resource/en/datasheet/spbtle-rf.pdf $ENDCMP # +$CMP SPBTLE-RF0 +D Very Low Power network processor module for BLE v4.1 +K BLE bluetooth module low-power +F http://www.st.com/resource/en/datasheet/spbtle-rf0.pdf +$ENDCMP +# $CMP TD1205 D High-Performance, Low-Current SIGFOX™ Gateway And GPS Receiver With Integrated Antennas K IOT SIGFOX GPS diff --git a/library/rfcom.lib b/library/rfcom.lib index 3c0cddc2..972ba40a 100644 --- a/library/rfcom.lib +++ b/library/rfcom.lib @@ -773,6 +773,7 @@ F0 "U" -650 700 50 H V C CNN F1 "SPBTLE-RF" -450 600 50 H V C CNN F2 "" -500 -100 50 V I C CNN F3 "" -650 700 50 H I C CNN +ALIAS SPBTLE-RF0 $FPLIST *SPBTLE* $ENDFPLIST From 804f92e694e12b2f5b64ba9404e442bafa1a3396 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 8 Jun 2017 17:01:11 +0200 Subject: [PATCH 3/8] Readability changes Pin mapping and component size modification to improve readability and esthetic --- library/rfcom.lib | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/library/rfcom.lib b/library/rfcom.lib index 972ba40a..553d14fe 100644 --- a/library/rfcom.lib +++ b/library/rfcom.lib @@ -778,18 +778,18 @@ $FPLIST *SPBTLE* $ENDFPLIST DRAW -S -650 550 450 150 0 1 10 f -X EXT_LPCLK 1 600 300 150 L 50 50 1 1 N N +S -650 550 450 50 0 1 10 f +X EXT_LPCLK 1 -800 200 150 R 50 50 1 1 N N X GPIO2 2 -800 300 150 R 50 50 1 1 N N -X ANA_TEST 3 -200 0 150 U 50 50 1 1 N N -X SPI_IRQ 4 -800 500 150 R 50 50 1 1 O +X ANA_TEST 3 -800 100 150 R 50 50 1 1 N N +X SPI_IRQ 4 600 500 150 L 50 50 1 1 O X VIN 5 -100 700 150 D 50 50 1 1 W -X GND 6 -100 0 150 U 50 50 1 1 W -X SPI_CLK 7 600 200 150 L 50 50 1 1 I C -X SPI_MISO 8 600 500 150 L 50 50 1 1 O -X SPI_MOSI 9 600 400 150 L 50 50 1 1 I -X SPI_~CS 10 -800 400 150 R 50 50 1 1 I -X ~BT_RESET 11 -800 200 150 R 50 50 1 1 I +X GND 6 -100 -100 150 U 50 50 1 1 W +X SPI_CLK 7 600 400 150 L 50 50 1 1 I C +X SPI_MISO 8 600 300 150 L 50 50 1 1 O +X SPI_MOSI 9 600 200 150 L 50 50 1 1 I +X SPI_~CS 10 600 100 150 L 50 50 1 1 I +X ~BT_RESET 11 -800 400 150 R 50 50 1 1 I ENDDRAW ENDDEF # From 95eb04918d6474c42d71a6e55fc26f21c9ba3381 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 8 Jun 2017 17:04:25 +0200 Subject: [PATCH 4/8] Centering anchor --- library/rfcom.lib | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/library/rfcom.lib b/library/rfcom.lib index 553d14fe..c512088e 100644 --- a/library/rfcom.lib +++ b/library/rfcom.lib @@ -769,27 +769,27 @@ ENDDEF # SPBTLE-RF # DEF SPBTLE-RF U 0 40 Y Y 1 F N -F0 "U" -650 700 50 H V C CNN -F1 "SPBTLE-RF" -450 600 50 H V C CNN -F2 "" -500 -100 50 V I C CNN -F3 "" -650 700 50 H I C CNN +F0 "U" -550 400 50 H V C CNN +F1 "SPBTLE-RF" -350 300 50 H V C CNN +F2 "" -400 -400 50 V I C CNN +F3 "" -550 400 50 H I C CNN ALIAS SPBTLE-RF0 $FPLIST *SPBTLE* $ENDFPLIST DRAW -S -650 550 450 50 0 1 10 f -X EXT_LPCLK 1 -800 200 150 R 50 50 1 1 N N -X GPIO2 2 -800 300 150 R 50 50 1 1 N N -X ANA_TEST 3 -800 100 150 R 50 50 1 1 N N -X SPI_IRQ 4 600 500 150 L 50 50 1 1 O -X VIN 5 -100 700 150 D 50 50 1 1 W -X GND 6 -100 -100 150 U 50 50 1 1 W -X SPI_CLK 7 600 400 150 L 50 50 1 1 I C -X SPI_MISO 8 600 300 150 L 50 50 1 1 O -X SPI_MOSI 9 600 200 150 L 50 50 1 1 I -X SPI_~CS 10 600 100 150 L 50 50 1 1 I -X ~BT_RESET 11 -800 400 150 R 50 50 1 1 I +S -550 250 550 -250 0 1 10 f +X EXT_LPCLK 1 -700 -100 150 R 50 50 1 1 N N +X GPIO2 2 -700 0 150 R 50 50 1 1 N N +X ANA_TEST 3 -700 -200 150 R 50 50 1 1 N N +X SPI_IRQ 4 700 200 150 L 50 50 1 1 O +X VIN 5 0 400 150 D 50 50 1 1 W +X GND 6 0 -400 150 U 50 50 1 1 W +X SPI_CLK 7 700 100 150 L 50 50 1 1 I C +X SPI_MISO 8 700 0 150 L 50 50 1 1 O +X SPI_MOSI 9 700 -100 150 L 50 50 1 1 I +X SPI_~CS 10 700 -200 150 L 50 50 1 1 I +X ~BT_RESET 11 -700 100 150 R 50 50 1 1 I ENDDRAW ENDDEF # From c3f910a97dff5c2e05d11cb4e61999a329830c42 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 8 Jun 2017 17:06:53 +0200 Subject: [PATCH 5/8] fixing fields alignment --- library/rfcom.lib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/rfcom.lib b/library/rfcom.lib index c512088e..9a244387 100644 --- a/library/rfcom.lib +++ b/library/rfcom.lib @@ -769,8 +769,8 @@ ENDDEF # SPBTLE-RF # DEF SPBTLE-RF U 0 40 Y Y 1 F N -F0 "U" -550 400 50 H V C CNN -F1 "SPBTLE-RF" -350 300 50 H V C CNN +F0 "U" -550 400 50 H V L CNN +F1 "SPBTLE-RF" -550 300 50 H V L CNN F2 "" -400 -400 50 V I C CNN F3 "" -550 400 50 H I C CNN ALIAS SPBTLE-RF0 From 661bc9a586272d21ee5fff92a580c0cfc8a8a015 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 13 Jun 2017 09:57:22 +0200 Subject: [PATCH 6/8] Edited footprint fields, set NC pin into visibles --- library/rfcom.lib | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/library/rfcom.lib b/library/rfcom.lib index 9a244387..d5576def 100644 --- a/library/rfcom.lib +++ b/library/rfcom.lib @@ -771,25 +771,25 @@ ENDDEF DEF SPBTLE-RF U 0 40 Y Y 1 F N F0 "U" -550 400 50 H V L CNN F1 "SPBTLE-RF" -550 300 50 H V L CNN -F2 "" -400 -400 50 V I C CNN +F2 "RF_Modules:ST_SPBTLE" 450 -450 50 H I C CNN F3 "" -550 400 50 H I C CNN ALIAS SPBTLE-RF0 $FPLIST - *SPBTLE* + ST*SPBTLE* $ENDFPLIST DRAW -S -550 250 550 -250 0 1 10 f -X EXT_LPCLK 1 -700 -100 150 R 50 50 1 1 N N -X GPIO2 2 -700 0 150 R 50 50 1 1 N N -X ANA_TEST 3 -700 -200 150 R 50 50 1 1 N N +S -550 250 550 -350 0 1 10 f +X EXT_LPCLK/NC 1 -700 0 150 R 50 50 1 1 I +X GPIO2/NC 2 -700 200 150 R 50 50 1 1 B +X ANA_TEST/NC 3 -700 -100 150 R 50 50 1 1 I X SPI_IRQ 4 700 200 150 L 50 50 1 1 O X VIN 5 0 400 150 D 50 50 1 1 W -X GND 6 0 -400 150 U 50 50 1 1 W -X SPI_CLK 7 700 100 150 L 50 50 1 1 I C -X SPI_MISO 8 700 0 150 L 50 50 1 1 O -X SPI_MOSI 9 700 -100 150 L 50 50 1 1 I -X SPI_~CS 10 700 -200 150 L 50 50 1 1 I -X ~BT_RESET 11 -700 100 150 R 50 50 1 1 I +X GND 6 0 -500 150 U 50 50 1 1 W +X SPI_CLK 7 700 0 150 L 50 50 1 1 I C +X SPI_MISO 8 700 -100 150 L 50 50 1 1 O +X SPI_MOSI 9 700 -200 150 L 50 50 1 1 I +X SPI_~CS 10 700 -300 150 L 50 50 1 1 I +X ~BT_RESET 11 -700 -300 150 R 50 50 1 1 I ENDDRAW ENDDEF # From c4c5c4ff33ee0db1e66949ae1a1bfaf8c0ba001b Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 14 Jun 2017 08:40:58 +0200 Subject: [PATCH 7/8] Enlarged component and made NC more clear Also switched pin places --- library/rfcom.dcm | 2 +- library/rfcom.lib | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/library/rfcom.dcm b/library/rfcom.dcm index b82b2bc9..8a6fe58c 100644 --- a/library/rfcom.dcm +++ b/library/rfcom.dcm @@ -29,7 +29,7 @@ F http://www.ti.com/lit/ds/symlink/cc1200.pdf $ENDCMP # $CMP CC2520 -D 2.4 GHz ZigBee/IEEE 802.15.4 RF transceiver +D 2.4 GHz ZigBee/IEEE 802.15.4 RF transceiver K 2.4GHz rf transceiver ZigBee 802.15.4 F http://www.ti.com/lit/gpn/cc2520 $ENDCMP diff --git a/library/rfcom.lib b/library/rfcom.lib index d5576def..ae0e2055 100644 --- a/library/rfcom.lib +++ b/library/rfcom.lib @@ -769,27 +769,27 @@ ENDDEF # SPBTLE-RF # DEF SPBTLE-RF U 0 40 Y Y 1 F N -F0 "U" -550 400 50 H V L CNN -F1 "SPBTLE-RF" -550 300 50 H V L CNN -F2 "RF_Modules:ST_SPBTLE" 450 -450 50 H I C CNN +F0 "U" -550 500 50 H V L CNN +F1 "SPBTLE-RF" -550 400 50 H V L CNN +F2 "RF_Modules:ST_SPBTLE" 500 -550 50 H I C CNN F3 "" -550 400 50 H I C CNN ALIAS SPBTLE-RF0 $FPLIST ST*SPBTLE* $ENDFPLIST DRAW -S -550 250 550 -350 0 1 10 f -X EXT_LPCLK/NC 1 -700 0 150 R 50 50 1 1 I -X GPIO2/NC 2 -700 200 150 R 50 50 1 1 B -X ANA_TEST/NC 3 -700 -100 150 R 50 50 1 1 I -X SPI_IRQ 4 700 200 150 L 50 50 1 1 O -X VIN 5 0 400 150 D 50 50 1 1 W -X GND 6 0 -500 150 U 50 50 1 1 W -X SPI_CLK 7 700 0 150 L 50 50 1 1 I C -X SPI_MISO 8 700 -100 150 L 50 50 1 1 O -X SPI_MOSI 9 700 -200 150 L 50 50 1 1 I -X SPI_~CS 10 700 -300 150 L 50 50 1 1 I -X ~BT_RESET 11 -700 -300 150 R 50 50 1 1 I +S -650 350 650 -450 0 1 10 f +X NC/EXT_LPCLK 1 -800 -100 150 R 50 50 1 1 I +X NC/GPIO2 2 -800 -200 150 R 50 50 1 1 B +X NC/ANA_TEST 3 -800 -300 150 R 50 50 1 1 I +X SPI_IRQ 4 800 200 150 L 50 50 1 1 O +X VIN 5 0 500 150 D 50 50 1 1 W +X GND 6 0 -600 150 U 50 50 1 1 W +X SPI_CLK 7 800 0 150 L 50 50 1 1 I C +X SPI_MISO 8 800 -100 150 L 50 50 1 1 O +X SPI_MOSI 9 800 -200 150 L 50 50 1 1 I +X SPI_~CS 10 800 -300 150 L 50 50 1 1 I +X ~BT_RESET 11 -800 200 150 R 50 50 1 1 I ENDDRAW ENDDEF # From 02d926ee1fcb6b216047b455913d80ca78d603f6 Mon Sep 17 00:00:00 2001 From: Julien FAUCHER Date: Tue, 3 Oct 2017 18:24:36 +0200 Subject: [PATCH 8/8] Resolve conflicts --- library/rfcom.dcm | 36 ++++++++++ library/rfcom.lib | 171 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 207 insertions(+) diff --git a/library/rfcom.dcm b/library/rfcom.dcm index 8a6fe58c..39b88309 100644 --- a/library/rfcom.dcm +++ b/library/rfcom.dcm @@ -58,6 +58,12 @@ K IOT LoRa SIGFOX F http://www.nemeus.fr/resources/uploads/2015/04/MM002-xx-EU_datasheet_v0.11.pdf $ENDCMP # +$CMP MOD-nRF8001 +D Bluetooth Low Energy module based on nRF8001 chipset +K Bluetooth Low Energy nRF8001 +F https://www.olimex.com/Products/Modules/RF/MOD-nRF8001/ +$ENDCMP +# $CMP NRF24L01 D Ultra low power 2.4GHz RF Transceiver, QFN20 4x4mm K Low Power RF Transciever @@ -88,6 +94,18 @@ K Bluetooth Module F http://ww1.microchip.com/downloads/en/DeviceDoc/rn-42-ds-v2.32r.pdf $ENDCMP # +$CMP RXM-GPS-FM +D Module GPS Low Power, 14mA tracking, 22 channels +K gps low-power +F https://linxtechnologies.com/wp/wp-content/uploads/rxm-gps-fm.pdf +$ENDCMP +# +$CMP RXM-GPS-RM +D Module GPS Low Power, 14mA tracking, 22 channels +K gps low-power +F https://linxtechnologies.com/wp/wp-content/uploads/rxm-gps-rm.pdf +$ENDCMP +# $CMP SIM900 D GSM Quad-Band Communication Module, GPRS, Audio Engine, AT Command Set K GSM GPRS Quad-Band SMS FAX @@ -106,6 +124,18 @@ K BLE bluetooth module low-power F http://www.st.com/resource/en/datasheet/spbtle-rf0.pdf $ENDCMP # +$CMP SX1272 +D 860 MHz to 1020 MHz Low Power Long Range Transceiver, spreading factor from 6 to 12, LoRA, QFN-28 +K low-power lora transceiver +F http://www.semtech.com/images/datasheet/sx1272.pdf +$ENDCMP +# +$CMP SX1273 +D 860 MHz to 1020 MHz Low Power Long Range Transceiver, spreading factor from 6 to 9, LoRA, QFN-28 +K low-power lora transceiver +F http://www.semtech.com/images/datasheet/sx1272.pdf +$ENDCMP +# $CMP TD1205 D High-Performance, Low-Current SIGFOX™ Gateway And GPS Receiver With Integrated Antennas K IOT SIGFOX GPS @@ -130,6 +160,12 @@ K IQRF common transceiver, GMSK modulation F http://iqrf.org/weben/downloads.php?id=337 $ENDCMP # +$CMP UL865 +D Telit 3G Module (GSM/GPRS/UMTS/HSPA), 3.8V, Digital voice and SMS, I2S, USB 2.0, UART, SPI. Manufacturer package +K gsm 3g gprs umts hspa +F http://www.telit.com/fileadmin/user_upload/products/Downloads/3G/Telit_UL865_Hardware_User_Guide_r8.pdf +$ENDCMP +# $CMP XBee_SMT D Digi Xbee SMT RF module K Digi XBee diff --git a/library/rfcom.lib b/library/rfcom.lib index ae0e2055..a1676406 100644 --- a/library/rfcom.lib +++ b/library/rfcom.lib @@ -388,6 +388,32 @@ X PA7-IO/SPI-MOSI 19 1200 -400 100 L 50 50 1 1 B ENDDRAW ENDDEF # +# MOD-nRF8001 +# +DEF MOD-nRF8001 U 0 40 Y Y 1 F N +F0 "U" -300 500 50 H V C CNN +F1 "MOD-nRF8001" 300 -500 50 H V C CNN +F2 "" 50 50 50 H I C CNN +F3 "" 50 0 50 H I C CNN +$FPLIST + MOD?nRF8001* +$ENDFPLIST +DRAW +S -350 450 350 -450 0 1 10 f +X 3V3 1 0 600 150 D 50 50 1 1 W +X GND 2 0 -600 150 U 50 50 1 1 W +X RST 3 -500 200 150 R 50 50 1 1 I +X RXD 4 -500 -100 150 R 50 50 1 1 I +X TXD 5 -500 -200 150 R 50 50 1 1 O +X SCK 6 500 -300 150 L 50 50 1 1 I +X REQN 7 500 -200 150 L 50 50 1 1 I +X MOSI 8 500 -100 150 L 50 50 1 1 I +X MISO 9 500 0 150 L 50 50 1 1 O +X RDYN 10 500 200 150 L 50 50 1 1 O +X ACTIVE 11 500 300 150 L 50 50 1 1 O +ENDDRAW +ENDDEF +# # NRF24L01 # DEF NRF24L01 U 0 40 Y Y 1 F N @@ -612,6 +638,43 @@ X GND 29 -100 -1000 100 U 50 50 1 1 W ENDDRAW ENDDEF # +# RXM-GPS-RM +# +DEF RXM-GPS-RM U 0 40 Y Y 1 F N +F0 "U" -200 600 50 H V R CNN +F1 "RXM-GPS-RM" -200 500 50 H V R CNN +F2 "RF_Modules:Linx_RXM-GPS" 600 -500 50 H I C CNN +F3 "" 300 -300 50 H I C CNN +ALIAS RXM-GPS-FM +$FPLIST + Linx*RXM?GPS* +$ENDFPLIST +DRAW +S -450 450 450 -450 0 1 10 f +X NC 1 -600 400 150 R 50 50 1 1 N N +X NC 2 -600 300 150 R 50 50 1 1 N N +X 1PPS 3 600 0 150 L 50 50 1 1 O +X TX 4 -600 -300 150 R 50 50 1 1 O +X RX 5 -600 -200 150 R 50 50 1 1 I +X NC 6 -600 0 150 R 50 50 1 1 N N +X NC 7 -600 -100 150 R 50 50 1 1 N N +X ~RESET 8 -600 100 150 R 50 50 1 1 I +X NC 9 -600 -400 150 R 50 50 1 1 N N +X NC 10 600 400 150 L 50 50 1 1 N N +X GND 20 0 -600 150 U 50 50 1 1 P N +X VBCKUP 11 100 600 150 D 50 50 1 1 W +X GND 21 0 -600 150 U 50 50 1 1 P N +X VCC 12 -100 600 150 D 50 50 1 1 W +X GND 22 0 -600 150 U 50 50 1 1 P N +X NC 13 600 300 150 L 50 50 1 1 N N +X NC 14 600 200 150 L 50 50 1 1 N N +X NC 15 600 100 150 L 50 50 1 1 N N +X NC 16 600 -100 150 L 50 50 1 1 N N +X GND 18 0 -600 150 U 50 50 1 1 W +X RFIN 19 -600 200 150 R 50 50 1 1 I +ENDDRAW +ENDDEF +# # SA605D # DEF SA605D U 0 0 Y Y 1 F N @@ -793,6 +856,51 @@ X ~BT_RESET 11 -800 200 150 R 50 50 1 1 I ENDDRAW ENDDEF # +# SX1272 +# +DEF SX1272 U 0 40 Y Y 1 F N +F0 "U" -600 1000 50 H V L CNN +F1 "SX1272" -600 900 50 H V L CNN +F2 "Housings_DFN_QFN:QFN-28-1EP_6x6mm_Pitch0.65mm" 0 -300 50 H I C CNN +F3 "" 0 -200 50 H I C CNN +ALIAS SX1273 +$FPLIST + QFN*1EP*6x6mm*Pitch0.65mm* +$ENDFPLIST +DRAW +S -450 850 450 -950 0 1 10 f +X VBAT1 1 -200 1000 150 D 50 50 1 1 W +X VR_ANA 2 100 1000 150 D 50 50 1 1 W +X VR_DIG 3 200 1000 150 D 50 50 1 1 W +X XTA 4 -600 600 150 R 50 50 1 1 B +X XTB 5 -600 500 150 R 50 50 1 1 B +X RESET 6 -600 400 150 R 50 50 1 1 I +X NC 7 -600 200 150 R 50 50 1 1 N N +X NC 8 -600 100 150 R 50 50 1 1 N N +X DIO0 9 600 100 150 L 50 50 1 1 B +X DIO1 10 600 0 150 L 50 50 1 1 B +X ~CS~ 20 -600 -800 150 R 50 50 1 1 I +X DIO2 11 600 -100 150 L 50 50 1 1 B +X RF_MOD/NC 21 600 -600 150 L 50 50 1 1 O +X DIO3 12 600 -200 150 L 50 50 1 1 B +X GND 22 100 -1100 150 U 50 50 1 1 P N +X DIO4 13 600 -300 150 L 50 50 1 1 B +X RXTX 23 600 -700 150 L 50 50 1 1 O +X DIO5 14 600 -400 150 L 50 50 1 1 B +X RFO 24 -600 0 150 R 50 50 1 1 I +X VBAT2 15 -100 1000 150 D 50 50 1 1 W +X RFI 25 -600 -100 150 R 50 50 1 1 O +X GND 16 100 -1100 150 U 50 50 1 1 W +X GND 26 100 -1100 150 U 50 50 1 1 P N +X SCK 17 -600 -500 150 R 50 50 1 1 I +X PA_BOOST 27 600 400 150 L 50 50 1 1 w +X MISO 18 -600 -600 150 R 50 50 1 1 O +X VR_PA 28 600 300 150 L 50 50 1 1 w +X MOSI 19 -600 -700 150 R 50 50 1 1 I +X EP 29 -100 -1100 150 U 50 50 1 1 W +ENDDRAW +ENDDEF +# # TD1205 # DEF TD1205 U 0 40 Y Y 1 F N @@ -876,6 +984,69 @@ X GND 9 -100 -600 100 U 50 50 1 1 W ENDDRAW ENDDEF # +# UL865 +# +DEF UL865 U 0 40 Y Y 1 F N +F0 "U" -700 1800 50 H V L CNN +F1 "UL865" -700 1700 50 H V L CNN +F2 "RF_Modules:Telit_xL865" 0 -2600 50 H I C CNN +F3 "" 0 -500 50 H I C CNN +$FPLIST + *Telit*xL865* +$ENDFPLIST +DRAW +S -750 1650 750 -2050 0 1 10 f +X C109/DCD/GPO 1 -900 -900 150 R 50 50 1 1 O +X C125/RING/GPO 2 -900 -1000 150 R 50 50 1 1 O +X C107/DSR/GPO 3 -900 -1100 150 R 50 50 1 1 O +X C108/DTR/GPI 4 -900 -1200 150 R 50 50 1 1 I +X C105/RTS/GPI 5 -900 -1300 150 R 50 50 1 1 I +X C106/CTS/GPO 6 -900 -1400 150 R 50 50 1 1 O +X C103/TXD 7 -900 -1500 150 R 50 50 1 1 I +X C104/RXD 8 -900 -1600 150 R 50 50 1 1 O +X SIMVCC 9 -900 900 150 R 50 50 1 1 w +X SIMRST 10 -900 800 150 R 50 50 1 1 O +X NC 20 900 -800 150 L 50 50 1 1 N N +X VRTC 30 900 1000 150 L 50 50 1 1 w +X GPIO3/DVI_TX 40 -900 200 150 R 50 50 1 1 B +X SIMCLK 11 -900 700 150 R 50 50 1 1 O +X NC 21 900 -900 150 L 50 50 1 1 N N +X NC 31 900 -1300 150 L 50 50 1 1 N N +X GPIO2/JDR/DVI_RX 41 -900 300 150 R 50 50 1 1 B +X SIMIO 12 -900 600 150 R 50 50 1 1 B +X NC 22 900 -1000 150 L 50 50 1 1 N N +X GND 32 100 -2200 150 U 50 50 1 1 W +X GPIO1/DVI_WA0 42 -900 400 150 R 50 50 1 1 B +X ADC_IN1 13 -900 -1800 150 R 50 50 1 1 I +X AGND 23 -100 -2200 150 U 50 50 1 1 W +X GND 33 100 -2200 150 U 50 50 1 1 P N +X V_AUX/PWRMON 43 900 900 150 L 50 50 1 1 w +X ADC_IN2 14 -900 -1900 150 R 50 50 1 1 I +X NC 24 900 -1200 150 L 50 50 1 1 N N +X ANTENNA 34 900 -500 150 L 50 50 1 1 B +X RXD_AUX/SPI_MISO 44 -900 -600 150 R 50 50 1 1 B +X DAC_OUT1 15 900 -1900 150 L 50 50 1 1 O +X SPI_CLK 25 -900 -500 150 R 50 50 1 1 B +X GND 35 100 -2200 150 U 50 50 1 1 P N +X TXD_AUX/SPI_MOSI 45 -900 -700 150 R 50 50 1 1 B +X VUSB 16 -900 1300 150 R 50 50 1 1 I +X GPIO8/STAT_LED 26 -900 -300 150 R 50 50 1 1 B +X GND 36 100 -2200 150 U 50 50 1 1 P N +X GND 46 100 -2200 150 U 50 50 1 1 P N +X USB_D- 17 -900 1200 150 R 50 50 1 1 B +X GPIO7/SPI_MRDY 27 -900 -200 150 R 50 50 1 1 B +X VBATT_PA 37 100 1800 150 D 50 50 1 1 W +X ~RESET 47 -900 1500 150 R 50 50 1 1 I +X USB_D+ 18 -900 1100 150 R 50 50 1 1 B +X GPIO6/SPI_SRDY 28 -900 -100 150 R 50 50 1 1 B +X VBATT 38 -100 1800 150 D 50 50 1 1 W +X NC 48 900 -1400 150 L 50 50 1 1 N N +X NC 19 900 -700 150 L 50 50 1 1 N N +X GPIO5 29 -900 0 150 R 50 50 1 1 B +X GPIO4/DVI_CLK 39 -900 100 150 R 50 50 1 1 B +ENDDRAW +ENDDEF +# # XBee_SMT # DEF XBee_SMT U 0 40 Y Y 1 F N