bobcat rk3566 (#859)

* bobcat rk3566 * Update build-open-fleet.yml * Update update-files.yml * Update build-open-fleets.yml * Update openfleet-file-update.yml * Update push-to-prod-nebraos-cloud-draft.yml * Update push-to-prod-nebraos-cloud.yml * Update push-to-testnet-nebraos-cloud-draft.yml * Update push-to-testnet-nebraos-cloud.yml
NebraLtd · Aug 4, 2023 · 411e7e7 · 411e7e7
1 parent bc1449e
commit 411e7e7
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 20 deletions.
diff --git a/.github/workflows/build-open-fleets.yml b/.github/workflows/build-open-fleets.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sbc: [nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rkcm3, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30]
+        sbc: [nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rkcm3, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30, bobcat-rk3566]
     steps:
       - name: Generate repo name
         run: |

diff --git a/.github/workflows/openfleet-file-update.yml b/.github/workflows/openfleet-file-update.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sbc: [hnt_openfleet_template, nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rkcm3, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30]
+        sbc: [hnt_openfleet_template, nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rkcm3, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30, bobcat-rk3566]
     steps:
       - name: Generate repo name
         run: |

diff --git a/.github/workflows/push-to-prod-nebraos-cloud-draft.yml b/.github/workflows/push-to-prod-nebraos-cloud-draft.yml
@@ -10,7 +10,7 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
-        sbc: [nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rkcm3, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30]
+        sbc: [nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rkcm3, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30, bobcat-rk3566]
 
     steps:
       - name: Checkout
@@ -42,7 +42,7 @@ jobs:
           miner="${{ matrix.sbc }}"
           repo="helium-$miner"
 
-          if [[ "$miner" == "nebra-indoor1" ]] || [[ "$miner" == "nebra-indoor2" ]] || [[ "$miner" == "nebra-outdoor1" ]] || [[ "$miner" == "nebra-outdoor2" ]] || [[ "$miner" == "bobcat-px30" ]] ; then
+          if [[ "$miner" == "nebra-indoor1" ]] || [[ "$miner" == "nebra-indoor2" ]] || [[ "$miner" == "nebra-outdoor1" ]] || [[ "$miner" == "nebra-outdoor2" ]] || [[ "$miner" == "bobcat-px30" ]] || [[ "$miner" == "bobcat-rk3566" ]] ; then
             variant="$miner"
           elif [[ "$miner" == "og" ]] ; then
             variant="helium-fl1"

diff --git a/.github/workflows/push-to-prod-nebraos-cloud.yml b/.github/workflows/push-to-prod-nebraos-cloud.yml
@@ -16,7 +16,7 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
-        sbc: [nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rkcm3, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30]
+        sbc: [nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rkcm3, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30, bobcat-rk3566]
 
     steps:
       - name: Checkout
@@ -48,7 +48,7 @@ jobs:
           miner="${{ matrix.sbc }}"
           repo="helium-$miner"
 
-          if [[ "$miner" == "nebra-indoor1" ]] || [[ "$miner" == "nebra-indoor2" ]] || [[ "$miner" == "nebra-outdoor1" ]] || [[ "$miner" == "nebra-outdoor2" ]] || [[ "$miner" == "bobcat-px30" ]] ; then
+          if [[ "$miner" == "nebra-indoor1" ]] || [[ "$miner" == "nebra-indoor2" ]] || [[ "$miner" == "nebra-outdoor1" ]] || [[ "$miner" == "nebra-outdoor2" ]] || [[ "$miner" == "bobcat-px30" ]] || [[ "$miner" == "bobcat-rk3566" ]] ; then
             variant="$miner"
           elif [[ "$miner" == "og" ]] ; then
             variant="helium-fl1"

diff --git a/.github/workflows/push-to-testnet-nebraos-cloud-draft.yml b/.github/workflows/push-to-testnet-nebraos-cloud-draft.yml
@@ -10,7 +10,7 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
-        sbc: [raspi, rockpi, rak, finestra, sensecap, og, controllino, pisces, cotx, pantherx1, linxdot, linxdot-rkcm3, syncrobit, syncrobit-rkcm3, pycom, risinghf, midas, bobcat-px30]
+        sbc: [raspi, rockpi, rak, finestra, sensecap, og, controllino, pisces, cotx, pantherx1, linxdot, linxdot-rkcm3, syncrobit, syncrobit-rkcm3, pycom, risinghf, midas, bobcat-px30, bobcat-rk3566]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -54,7 +54,7 @@ jobs:
             fleet="helium-testnet-og"
             repo="helium-og"
             repo2="None"
-          elif [[ "$miner" == "bobcat-px30" ]] ; then
+          elif [[ "$miner" == "bobcat-px30" ]] || [[ "$miner" == "bobcat-rk3566" ]] ; then
             variant="$miner"
             fleet="helium-testnet-$miner"
             repo="helium-$miner"

diff --git a/.github/workflows/push-to-testnet-nebraos-cloud.yml b/.github/workflows/push-to-testnet-nebraos-cloud.yml
@@ -16,7 +16,7 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
-        sbc: [raspi, rockpi, rak, finestra, sensecap, og, controllino, pisces, cotx, pantherx1, linxdot, linxdot-rkcm3, syncrobit, syncrobit-rkcm3, pycom, risinghf, midas, bobcat-px30]
+        sbc: [raspi, rockpi, rak, finestra, sensecap, og, controllino, pisces, cotx, pantherx1, linxdot, linxdot-rkcm3, syncrobit, syncrobit-rkcm3, pycom, risinghf, midas, bobcat-px30, bobcat-rk3566]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -60,7 +60,7 @@ jobs:
             fleet="helium-testnet-og"
             repo="helium-og"
             repo2="None"
-          elif [[ "$miner" == "bobcat-px30" ]] ; then
+          elif [[ "$miner" == "bobcat-px30" ]] || [[ "$miner" == "bobcat-rk3566" ]] ; then
             variant="$miner"
             fleet="helium-testnet-$miner"
             repo="helium-$miner"

diff --git a/balena/balena.yml.bobcat-rk3566 b/balena/balena.yml.bobcat-rk3566
@@ -0,0 +1,35 @@
+name: nebra-helium-bobcat-rk3566
+type: sw.application
+description: >-
+  Manage your Bobcat RK3566 (2GB RAM) Helium Miner remotely using Nebra and balenaCloud.
+post-provisioning: >-
+  ## Usage instructions
+
+
+  Once your device joins the fleet you'll need to allow some time for it to download the application and start forwarding packets to the Helium Network.
+
+
+  For detailed instructions on how to use Nebra Helium Bobcat RK3566 (2GB RAM) check out [our GitHub repo](https://github.com/NebraLtd/helium-bobcat-rk3566).
+
+
+  For support you can [open an issue](https://github.com/NebraLtd/helium-bobcat-rk3566/issues) on the repo or reach out to us via one of the methods listed [on our support page](https://helium.nebra.com).
+assets:
+  repository:
+    type: blob.asset
+    data:
+      url: "https://github.com/NebraLtd/helium-bobcat-rk3566"
+  logo:
+    type: blob.asset
+    data:
+      url: >-
+        https://cdn.shopify.com/s/files/1/0071/2281/3001/files/Nebra-Icon-Blue_bb758eaa-b10d-4ea6-a55e-babd69135b69.png?v=1620938774
+data:
+  applicationEnvironmentVariables:
+    - FREQ: "N/A (Non Nebra Miner)"
+    - VARIANT: COMP-BOBCATRK3566
+  applicationConfigVariables:
+    - RESIN_OVERRIDE_LOCK: 1
+  defaultDeviceType: bobcat-rk3566
+  supportedDeviceTypes:
+    - rockpro64
+version: 0.0.1
diff --git a/balena/workflows/build-open-fleet.yml b/balena/workflows/build-open-fleet.yml
@@ -11,8 +11,10 @@ env:
   raspberrypi4-64: 3.1.1
   raspberrypicm4-ioboard: 2.112.12
   rockpi-4b-rk3399: 2.108.25+rev1
-  balena-bobcat-image: 2023.07.17
+  balena-bobcat-px30-image: 2023.07.17
   bobcat-px30: 2.115.3
+  balena-bobcat-rk3566-image: 2023.08.02
+  bobcat-rk3566: 2.115.3
   cloud: nebra-cloud
 
 jobs:
@@ -138,8 +140,18 @@ jobs:
         if: github.event.repository.name == 'helium-bobcat-px30' && env.BRANCH == 'master'
         with:
           repo: 'NebraLtd/balena-bobcat-px30'
-          version: 'tags/${{ env.balena-bobcat-image }}'
-          file: 'balena-image-bobcat-px30-${{ env.balena-bobcat-image }}.img.zip'
+          version: 'tags/${{ env.balena-bobcat-px30-image }}'
+          file: 'balena-image-bobcat-px30-${{ env.balena-bobcat-px30-image }}.img.zip'
+          target: 'images/balena-base-${{ github.event.repository.name }}.img.zip'
+          token: ${{ secrets.MR_BUMP }}
+
+      - name: Download Bobcat RK3566 base Balena OS image
+        uses: dsaltares/fetch-gh-release-asset@master
+        if: github.event.repository.name == 'helium-bobcat-rk3566' && env.BRANCH == 'master'
+        with:
+          repo: 'NebraLtd/balena-bobcat-rk3566'
+          version: 'tags/${{ env.balena-bobcat-rk3566-image }}'
+          file: 'balena-image-bobcat-px30-${{ env.balena-bobcat-rk3566-image }}.img.zip'
           target: 'images/balena-base-${{ github.event.repository.name }}.img.zip'
           token: ${{ secrets.MR_BUMP }}
 
@@ -189,6 +201,9 @@ jobs:
           elif [ ${{ github.event.repository.name }} == 'helium-bobcat-px30' ] ; then
             balena_os="isg-503"
             balena_os_version="${{ env.bobcat-px30 }}"
+          elif [ ${{ github.event.repository.name }} == 'helium-bobcat-rk3566' ] ; then
+            balena_os="rockpro64"
+            balena_os_version="${{ env.bobcat-rk3566 }}"
           elif [ ${{ env.ROCKPI }} == 'YES' ] ; then
             balena_os="rockpi-4b-rk3399"
             balena_os_version="${{ env.rockpi-4b-rk3399 }}"
@@ -204,7 +219,7 @@ jobs:
           fi
 
           if $NODRYRUN ; then
-            if [ ${{ github.event.repository.name }} != 'helium-bobcat-px30' ] ; then
+            if [ ${{ github.event.repository.name }} != 'helium-bobcat-px30' ] && [ ${{ github.event.repository.name }} != 'helium-bobcat-rk3566' ]; then
               # Download the base image
               balena os download "$balena_os" \
                 -o "$base_image_path" \
@@ -266,7 +281,7 @@ jobs:
           fi
 
           if $NODRYRUN ; then
-            if  [ ${{ github.event.repository.name }} != 'helium-bobcat-px30' ] ; then
+            if  [ ${{ github.event.repository.name }} != 'helium-bobcat-px30' ] && [ ${{ github.event.repository.name }} != 'helium-bobcat-rk3566' ]; then
               balena os configure "$image_path" \
                 --fleet "nebraltd/$fleet_name" \
                 --config-network ethernet \
@@ -300,8 +315,8 @@ jobs:
             sudo balena config inject $final_json_filename --drive "$image_path"
           fi
 
-          if  [ ${{ github.event.repository.name }} == 'helium-bobcat-px30' ] ; then
-            # Overwrite device type from "bobcat-px30" to "isg-503"
+          if  [ ${{ github.event.repository.name }} == 'helium-bobcat-px30' ] || [ ${{ github.event.repository.name }} == 'helium-bobcat-rk3566' ]; then
+            # Overwrite device type from bobcat specific to balena specific
             if $VERBOSE ; then
               echo "Overwriting device-type"
             fi
@@ -311,7 +326,13 @@ jobs:
               loop_dev=$(losetup -l | grep $(basename "${image_path}") | cut -d ' ' -f 1)
               tmpdir=$(mktemp -d)
               sudo mount ${loop_dev}p1 ${tmpdir}
-              sudo sed -i 's/"slug": "bobcat-px30"/"slug": "isg-503"/' ${tmpdir}/device-type.json
+
+              if  [ ${{ github.event.repository.name }} == 'helium-bobcat-px30' ]; then
+                sudo sed -i 's/"slug": "bobcat-px30"/"slug": "isg-503"/' ${tmpdir}/device-type.json
+              elif [ ${{ github.event.repository.name }} == 'helium-bobcat-rk3566' ]; then
+                sudo sed -i 's/"slug": "bobcat-rk3566"/"slug": "rockpro64"/' ${tmpdir}/device-type.json
+              fi
+
               sudo umount ${tmpdir}
               sudo losetup -d ${loop_dev}
             fi

diff --git a/balena/workflows/update-files.yml b/balena/workflows/update-files.yml
@@ -46,7 +46,7 @@ jobs:
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/config/config.txt.syncrobit -O config.txt
           elif [ $miner == 'risinghf' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/config/config.txt.risinghf -O config.txt
-          elif [ $miner == 'nebra-indoor2' ] || [ $miner == 'nebra-outdoor2' ] || [ $miner == 'linxdot-rkcm3' ] || [ $miner == 'syncrobit-rkcm3' ] || [ $miner == 'bobcat-px30' ] ; then
+          elif [ $miner == 'nebra-indoor2' ] || [ $miner == 'nebra-outdoor2' ] || [ $miner == 'linxdot-rkcm3' ] || [ $miner == 'syncrobit-rkcm3' ] || [ $miner == 'bobcat-px30' ] || [ $miner == 'bobcat-rk3566' ] ; then
             echo "No config.txt file needed - not RasPi based."
           else
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/config/config.txt.rak -O config.txt
@@ -105,7 +105,7 @@ jobs:
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/config/config.txt.syncrobit -O config.txt
           elif [ $miner == 'risinghf' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/config/config.txt.risinghf -O config.txt
-          elif [ $miner == 'nebra-indoor2' ] || [ $miner == 'nebra-outdoor2' ] || [ $miner == 'linxdot-rkcm3' ] || [ $miner == 'syncrobit-rkcm3' ] || [ $miner == 'bobcat-px30' ] ; then
+          elif [ $miner == 'nebra-indoor2' ] || [ $miner == 'nebra-outdoor2' ] || [ $miner == 'linxdot-rkcm3' ] || [ $miner == 'syncrobit-rkcm3' ] || [ $miner == 'bobcat-px30' ] || [ $miner == 'bobcat-rk3566' ] ; then
             echo "No config.txt file needed - not RasPi based."
           else
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/config/config.txt.rak -O config.txt