Skip to content

Commit b907c02

Browse files
committed
Upgrade Concentratord + Gateway Bridge and remove reset scripts.
The latest Concentratord has built-in support for triggering the reset pin.
1 parent a817077 commit b907c02

File tree

13 files changed

+22
-167
lines changed

13 files changed

+22
-167
lines changed
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ SRC_URI = "\
88
file://chirpstack-concentratord.default \
99
file://chirpstack-concentratord.init \
1010
file://chirpstack-concentratord.monit \
11-
file://sx1301-reset.init \
12-
file://sx1302-reset.init \
1311
"
1412

1513
inherit update-rc.d
@@ -24,9 +22,6 @@ do_install() {
2422
install -d ${D}${sysconfdir}/monit.d
2523
install -d ${D}${sysconfdir}/default
2624

27-
install -m 0755 sx1301-reset.init ${D}${sysconfdir}/init.d/sx1301-reset
28-
install -m 0755 sx1302-reset.init ${D}${sysconfdir}/init.d/sx1302-reset
29-
3025
install -m 0755 chirpstack-concentratord.init ${D}${sysconfdir}/init.d/chirpstack-concentratord
3126
install -m 0644 chirpstack-concentratord.monit ${D}${sysconfdir}/monit.d/chirpstack-concentratord
3227
install -m 0644 chirpstack-concentratord.default ${D}${sysconfdir}/default/chirpstack-concentratord
Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,2 @@
1-
# reset the LoRa concentrator on Concentratord start
2-
CONCENTRATOR_RESET="no"
3-
4-
# reset pin
5-
CONCENTRATOR_RESET_PIN=17
6-
7-
# power enable pin
8-
CONCENTRATOR_POWER_EN_PIN=18
9-
101
# concentratord version
112
CONCENTRATORD_VERSION="sx1301"

layers/chirpstack/meta-chirpstack/recipes-chirpstack/chirpstack-concentratord/files/chirpstack-concentratord.init

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,39 +18,8 @@ if [ ! -f "${DAEMON_CONF_GLOBAL}" ] || [ ! -f "${DAEMON_CONF_BAND}" ] || [ ! -f
1818
exit 1
1919
fi
2020

21-
do_concentrator_start() {
22-
if [ "$CONCENTRATOR_RESET" != "yes" ]; then
23-
return;
24-
fi
25-
26-
case "$CONCENTRATORD_VERSION" in
27-
"sx1301")
28-
/etc/init.d/sx1301-reset start
29-
;;
30-
"sx1302")
31-
/etc/init.d/sx1302-reset start
32-
;;
33-
esac
34-
}
35-
36-
do_concentrator_stop() {
37-
if [ "$CONCENTRATOR_RESET" != "yes" ]; then
38-
return;
39-
fi
40-
41-
case "$CONCENTRATORD_VERSION" in
42-
"sx1301")
43-
/etc/init.d/sx1301-reset stop
44-
;;
45-
"sx1302")
46-
/etc/init.d/sx1302-reset stop
47-
;;
48-
esac
49-
}
50-
5121
do_start() {
5222
echo "Starting ${NAME}"
53-
do_concentrator_start
5423

5524
start-stop-daemon \
5625
--start \
@@ -62,7 +31,6 @@ do_start() {
6231

6332
do_stop() {
6433
echo "Stopping ${NAME}"
65-
do_concentrator_stop
6634

6735
start-stop-daemon \
6836
--stop \

layers/chirpstack/meta-chirpstack/recipes-chirpstack/chirpstack-concentratord/files/sx1301-reset.init

Lines changed: 0 additions & 43 deletions
This file was deleted.

layers/chirpstack/meta-chirpstack/recipes-chirpstack/chirpstack-concentratord/files/sx1302-reset.init

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)