Skip to content

Commit ea94d29

Browse files
ccrisanccrisan
committed
Enhance Linxdot RK3566 support
1 parent 9c4da34 commit ea94d29

8 files changed

+140
-15
lines changed

‎.github/workflows/openfleet-file-update.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
fi
2626
2727
echo "FLEET=$FLEET" >> $GITHUB_ENV
28-
28+
2929
- name: Trigger PR action in ${{ env.FLEET }} repo
3030
uses: peter-evans/repository-dispatch@v2
3131
with:

‎.github/workflows/push-to-prod-nebraos-cloud-draft.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
miner="${{ matrix.sbc }}"
4343
repo="helium-$miner"
4444
45-
if [[ "$miner" == "nebra-indoor1" ]] || [[ "$miner" == "nebra-indoor2" ]] || [[ "$miner" == "nebra-outdoor1" ]] || [[ "$miner" == "nebra-outdoor2" ]] || [[ "$miner" == "bobcat-px30" ]] || [[ "$miner" == "bobcat-rk3566" ]] ; then
45+
if [[ "$miner" == "nebra-indoor1" ]] || [[ "$miner" == "nebra-indoor2" ]] || [[ "$miner" == "nebra-outdoor1" ]] || [[ "$miner" == "nebra-outdoor2" ]] || [[ "$miner" == "bobcat-px30" ]] || [[ "$miner" == "bobcat-rk3566" ]] || [[ "$miner" == "linxdot-rk3566" ]] ; then
4646
variant="$miner"
4747
elif [[ "$miner" == "og" ]] ; then
4848
variant="helium-fl1"

‎.github/workflows/push-to-prod-nebraos-cloud.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
miner="${{ matrix.sbc }}"
4949
repo="helium-$miner"
5050
51-
if [[ "$miner" == "nebra-indoor1" ]] || [[ "$miner" == "nebra-indoor2" ]] || [[ "$miner" == "nebra-outdoor1" ]] || [[ "$miner" == "nebra-outdoor2" ]] || [[ "$miner" == "bobcat-px30" ]] || [[ "$miner" == "bobcat-rk3566" ]] ; then
51+
if [[ "$miner" == "nebra-indoor1" ]] || [[ "$miner" == "nebra-indoor2" ]] || [[ "$miner" == "nebra-outdoor1" ]] || [[ "$miner" == "nebra-outdoor2" ]] || [[ "$miner" == "bobcat-px30" ]] || [[ "$miner" == "bobcat-rk3566" ]] || [[ "$miner" == "linxdot-rk3566" ]] ; then
5252
variant="$miner"
5353
elif [[ "$miner" == "og" ]] ; then
5454
variant="helium-fl1"

‎.github/workflows/push-to-testnet-nebraos-cloud-draft.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
fleet="helium-testnet-og"
5555
repo="helium-og"
5656
repo2="None"
57-
elif [[ "$miner" == "bobcat-px30" ]] || [[ "$miner" == "bobcat-rk3566" ]] ; then
57+
elif [[ "$miner" == "bobcat-px30" ]] || [[ "$miner" == "bobcat-rk3566" ]] || [[ "$miner" == "linxdot-rk3566" ]] ; then
5858
variant="$miner"
5959
fleet="helium-testnet-$miner"
6060
repo="helium-$miner"
@@ -122,7 +122,7 @@ jobs:
122122
tag: TESTNET-${{ env.LATEST_GA }}-${{ env.day }}
123123
overwrite: true
124124
body: "TESTNET: This is helium-miner-software release TESTNET-${{ env.LATEST_GA }}-${{ env.day }}"
125-
125+
126126
- name: Trigger build action in ${{ env.REPO }} repo
127127
uses: peter-evans/repository-dispatch@v2
128128
with:

‎.github/workflows/push-to-testnet-nebraos-cloud.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
fleet="helium-testnet-og"
6161
repo="helium-og"
6262
repo2="None"
63-
elif [[ "$miner" == "bobcat-px30" ]] || [[ "$miner" == "bobcat-rk3566" ]] ; then
63+
elif [[ "$miner" == "bobcat-px30" ]] || [[ "$miner" == "bobcat-rk3566" ]] || [[ "$miner" == "linxdot-rk3566" ]] ; then
6464
variant="$miner"
6565
fleet="helium-testnet-$miner"
6666
repo="helium-$miner"
@@ -128,7 +128,7 @@ jobs:
128128
tag: TESTNET-${{ env.LATEST_GA }}-${{ env.day }}
129129
overwrite: true
130130
body: "TESTNET: This is helium-miner-software release TESTNET-${{ env.LATEST_GA }}-${{ env.day }}"
131-
131+
132132
- name: Trigger build action in ${{ env.REPO }} repo
133133
uses: peter-evans/repository-dispatch@v2
134134
with:

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ In the future, we also plan to add [Nebra dashboard](https://dashboard.nebra.com
182182
- [Controllino / Conelcom](https://github.com/NebraLtd/helium-controllino)
183183
- [Pisces (P100)](https://github.com/NebraLtd/helium-pisces)
184184
- [Linxdot (RasPi CM4 version)](https://github.com/NebraLtd/helium-linxdot)
185-
- [Linxdot (ROCK / Radxa CM3 version)](https://github.com/NebraLtd/helium-linxdot-rkcm3)
185+
- [Linxdot (RK3566 version)](https://github.com/NebraLtd/helium-linxdot-rk3566)
186186
- [Helium OG (RasPi 3 and RasPi 4 version)](https://github.com/NebraLtd/helium-og)
187187
- [Pycom (RasPi CM4 version)](https://github.com/NebraLtd/helium-pycom)
188188
- [Cotx (X3)](https://github.com/NebraLtd/helium-cotx)
@@ -192,7 +192,7 @@ In the future, we also plan to add [Nebra dashboard](https://dashboard.nebra.com
192192
- [Finestra / Mimiq](https://github.com/NebraLtd/helium-finestra)
193193
- [Rising HF](https://github.com/NebraLtd/helium-risinghf)
194194
- [Midas](https://github.com/NebraLtd/helium-midas)
195-
- [Bobcat](https://github.com/NebraLtd/helium-bobcat-px30)
195+
- [Bobcat PX30](https://github.com/NebraLtd/helium-bobcat-px30)
196196

197197
Are you a hotspot manufacturer that wants to add support for your existing or upcoming hotspots? A hotspot owner wanting to help add support for aditional hardware variants? We are always looking to add additional devices here and would be more than happy to discuss integration and collaboration. We also accept contributions and you can read more about how to contribute [below](#how-to-add-new-type-of-hotspots). If you have any questions or want to discuss this in more detail then please reach out to us via [GitHub Issues](https://github.com/NebraLtd/helium-miner-software/issues) or by creating a ticket on [our support site](https://support.nebra.com).
198198

‎balena/workflows/build-open-fleet.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515
bobcat-px30: 2.115.3
1616
balena-bobcat-rk3566-image: 2023.08.15
1717
bobcat-rk3566: 2.115.3
18-
balena-linxdot-rk3566-image: 2023.10.12
18+
balena-linxdot-rk3566-image: 2023.10.16
1919
linxdot-rk3566: 2.115.3
2020
cloud: nebra-cloud
2121

@@ -48,13 +48,13 @@ jobs:
4848
echo "Upstream Branch: $UPSTREAM_BRANCH"
4949
5050
- uses: actions/checkout@v3
51-
with:
51+
with:
5252
ref: ${{ env.BRANCH }}
5353

5454
- uses: actions/setup-python@v4
5555
with:
56-
python-version: '3.11'
57-
56+
python-version: '3.11'
57+
5858
- name: Generate Docker Compose
5959
run: |
6060
mkdir templates
@@ -68,7 +68,7 @@ jobs:
6868
6969
miner="$(echo ${{ github.event.repository.name }} | cut -d '-' -f2-)"
7070
echo "Repo: $miner"
71-
if [[ "$miner" =~ "nebra" ]] || [[ "$miner" =~ "bobcat" ]] ; then
71+
if [[ "$miner" =~ "nebra" ]] || [[ "$miner" =~ "bobcat" ]] || [[ "$miner" =~ "linxdot" ]] ; then
7272
variant="$miner"
7373
elif [[ "$miner" == "og" ]] ; then
7474
variant="helium-fl1"
@@ -82,7 +82,7 @@ jobs:
8282
FIRMWARE_SHORT_HASH=${{ env.FIRMWARE_SHORT_HASH }}
8383
8484
python gen_docker_compose_by_variant.py "$variant" -o docker-compose.yml
85-
85+
8686
- name: Determine if Raspberry Pi 3
8787
if: env.BRANCH == 'master'
8888
run: |

‎docker-compose.yml

+125
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
version: '2'
2+
3+
services:
4+
5+
gateway-config:
6+
image: nebraltd/hm-config:arm64-c01e889
7+
depends_on:
8+
- dbus-session
9+
- helium-miner
10+
- diagnostics
11+
environment:
12+
- FIRMWARE_VERSION=v1.0.2-42
13+
- FIRMWARE_SHORT_HASH=FFFFF4
14+
- DBUS_SYSTEM_BUS_ADDRESS=unix:path=/host/run/dbus/system_bus_socket
15+
- DBUS_SESSION_BUS_ADDRESS=unix:path=/session/dbus/session_bus_socket
16+
restart: on-failure
17+
privileged: true
18+
cap_add:
19+
- NET_ADMIN
20+
volumes:
21+
- miner-storage:/var/data
22+
- dbus:/session/dbus
23+
- nebra:/var/nebra
24+
labels:
25+
io.balena.features.sysfs: 1
26+
io.balena.features.kernel-modules: 1
27+
io.balena.features.dbus: 1
28+
stop_signal: SIGINT
29+
30+
packet-forwarder:
31+
image: nebraltd/hm-pktfwd:a79d9a7
32+
depends_on:
33+
- multiplexer
34+
restart: always
35+
privileged: true
36+
volumes:
37+
- pktfwdr:/var/pktfwd
38+
- nebra:/var/nebra
39+
environment:
40+
- FIRMWARE_VERSION=v1.0.2-42
41+
- FIRMWARE_SHORT_HASH=FFFFF4
42+
labels:
43+
io.balena.features.sysfs: 1
44+
io.balena.features.procfs: 1
45+
46+
multiplexer:
47+
image: nebraltd/hm-multiplexer:a1fc09b
48+
restart: always
49+
depends_on:
50+
- helium-miner
51+
labels:
52+
io.balena.features.sysfs: 1
53+
io.balena.features.procfs: 1
54+
volumes:
55+
- nebra:/var/nebra
56+
environment:
57+
- FIRMWARE_VERSION=v1.0.2-42
58+
- FIRMWARE_SHORT_HASH=FFFFF4
59+
expose:
60+
- "1681"
61+
62+
helium-miner:
63+
image: nebraltd/hm-gatewayrs:arm64-1bd542e
64+
depends_on:
65+
- diagnostics
66+
cap_add:
67+
- SYS_RAWIO
68+
privileged: true
69+
restart: always
70+
expose:
71+
- "1680"
72+
- "4467"
73+
ports:
74+
- "44158:44158/tcp"
75+
environment:
76+
- FIRMWARE_VERSION=v1.0.2-42
77+
- FIRMWARE_SHORT_HASH=FFFFF4
78+
volumes:
79+
- pktfwdr:/var/pktfwd
80+
- miner-storage:/var/data
81+
- nebra:/var/nebra
82+
83+
diagnostics:
84+
image: nebraltd/hm-diag:arm64-16b483c
85+
depends_on:
86+
- dbus-session
87+
environment:
88+
- FIRMWARE_VERSION=v1.0.2-42
89+
- FIRMWARE_SHORT_HASH=FFFFF4
90+
- DIAGNOSTICS_VERSION=16b483c
91+
- DBUS_SYSTEM_BUS_ADDRESS=unix:path=/host/run/dbus/system_bus_socket
92+
volumes:
93+
- pktfwdr:/var/pktfwd
94+
- miner-storage:/var/data
95+
- watchdog-log:/var/watchdog
96+
- nebra:/var/nebra
97+
ports:
98+
- "80:80"
99+
cap_add:
100+
- SYS_RAWIO
101+
restart: always
102+
privileged: true
103+
labels:
104+
io.balena.features.sysfs: 1
105+
io.balena.features.procfs: 1
106+
io.balena.features.dbus: 1
107+
io.balena.features.supervisor-api: 1
108+
io.balena.features.balena-api: 1
109+
110+
dbus-session:
111+
image: balenablocks/dbus:rpi-0.0.2
112+
restart: always
113+
volumes:
114+
- dbus:/session/dbus
115+
environment:
116+
- DBUS_ADDRESS=unix:path=/session/dbus/session_bus_socket
117+
- FIRMWARE_VERSION=v1.0.2-42
118+
- FIRMWARE_SHORT_HASH=FFFFF4
119+
120+
volumes:
121+
miner-storage:
122+
pktfwdr:
123+
dbus:
124+
nebra:
125+
watchdog-log:

0 commit comments

Comments
 (0)