Merge branch 'devel' into pocket-alpha-dev

MikaylaFischler · Aug 29, 2024 · 672a9c8 · 672a9c8
2 parents 3c10e28 + 035a26c
commit 672a9c8
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v3.5.1
+        uses: actions/checkout@v4
       - name: Luacheck
         uses: lunarmodules/[email protected]
         with:

diff --git a/.github/workflows/manifest.yml b/.github/workflows/manifest.yml
@@ -29,13 +29,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v5
       - name: Setup Python
-        uses: actions/[email protected]
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10' 
       # Generate manifest + shields files for main branch
       - name: Checkout main
         id: checkout-main
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: 'main'
           clean: false
@@ -54,7 +56,7 @@ jobs:
       - name: Checkout devel
         id: checkout-devel
         if: success() || failure()
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: 'devel'
           clean: false
@@ -69,11 +71,11 @@ jobs:
       - name: Upload artifacts
         id: upload-artifacts
         if: ${{ (success() || failure()) && (steps.manifest-main.outcome == 'success' || steps.manifest-latest.outcome == 'success' || steps.manifest-devel.outcome == 'success') }}
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           # Upload manifest JSON
           path: 'deploy/'
       - name: Deploy to GitHub Pages
         if: ${{ (success() || failure()) && steps.upload-artifacts.outcome == 'success' }}
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4
diff --git a/coordinator/coordinator.lua b/coordinator/coordinator.lua
@@ -296,6 +296,7 @@ function coordinator.comms(version, nic, sv_watchdog)
 
     -- attempt connection establishment
     local function _send_establish()
+        self.sv_r_seq_num = nil
         _send_sv(PROTOCOL.SCADA_MGMT, MGMT_TYPE.ESTABLISH, { comms.version, version, DEVICE_TYPE.CRD })
     end
 

diff --git a/coordinator/startup.lua b/coordinator/startup.lua
@@ -19,7 +19,7 @@ local renderer    = require("coordinator.renderer")
 local sounder     = require("coordinator.sounder")
 local threads     = require("coordinator.threads")
 
-local COORDINATOR_VERSION = "v1.5.6"
+local COORDINATOR_VERSION = "v1.5.7"
 
 local CHUNK_LOAD_DELAY_S = 30.0
 

diff --git a/pocket/pocket.lua b/pocket/pocket.lua
@@ -442,11 +442,13 @@ function pocket.comms(version, nic, sv_watchdog, api_watchdog, nav)
 
     -- attempt supervisor connection establishment
     local function _send_sv_establish()
+        self.sv.r_seq_num = nil
         _send_sv(MGMT_TYPE.ESTABLISH, { comms.version, version, DEVICE_TYPE.PKT })
     end
 
     -- attempt coordinator API connection establishment
     local function _send_api_establish()
+        self.api.r_seq_num = nil
         _send_crd(MGMT_TYPE.ESTABLISH, { comms.version, version, DEVICE_TYPE.PKT, comms.api_version })
     end
 

diff --git a/pocket/startup.lua b/pocket/startup.lua
@@ -20,7 +20,7 @@ local pocket    = require("pocket.pocket")
 local renderer  = require("pocket.renderer")
 local threads   = require("pocket.threads")
 
-local POCKET_VERSION = "v0.11.8-alpha"
+local POCKET_VERSION = "v0.11.9-alpha"
 
 local println = util.println
 local println_ts = util.println_ts

diff --git a/reactor-plc/plc.lua b/reactor-plc/plc.lua
@@ -735,6 +735,7 @@ function plc.comms(version, nic, reactor, rps, conn_watchdog)
 
     -- attempt to establish link with supervisor
     function public.send_link_req()
+        self.r_seq_num = nil
         _send_mgmt(MGMT_TYPE.ESTABLISH, { comms.version, version, DEVICE_TYPE.PLC, config.UnitID })
     end
 

diff --git a/reactor-plc/startup.lua b/reactor-plc/startup.lua
@@ -18,7 +18,7 @@ local plc       = require("reactor-plc.plc")
 local renderer  = require("reactor-plc.renderer")
 local threads   = require("reactor-plc.threads")
 
-local R_PLC_VERSION = "v1.8.6"
+local R_PLC_VERSION = "v1.8.7"
 
 local println = util.println
 local println_ts = util.println_ts

diff --git a/rtu/rtu.lua b/rtu/rtu.lua
@@ -378,6 +378,7 @@ function rtu.comms(version, nic, conn_watchdog)
     -- send establish request (includes advertisement)
     ---@param units table
     function public.send_establish(units)
+        self.r_seq_num = nil
         _send(MGMT_TYPE.ESTABLISH, { comms.version, version, DEVICE_TYPE.RTU, _generate_advertisement(units) })
     end
 

diff --git a/rtu/startup.lua b/rtu/startup.lua
@@ -31,7 +31,7 @@ local sna_rtu      = require("rtu.dev.sna_rtu")
 local sps_rtu      = require("rtu.dev.sps_rtu")
 local turbinev_rtu = require("rtu.dev.turbinev_rtu")
 
-local RTU_VERSION = "v1.10.6"
+local RTU_VERSION = "v1.10.7"
 
 local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE
 local RTU_UNIT_HW_STATE = databus.RTU_UNIT_HW_STATE