From 610fb12bb348a13fc44cc37c7d5eff3ba7086ce1 Mon Sep 17 00:00:00 2001 From: Mikayla Date: Mon, 26 Aug 2024 13:52:47 +0000 Subject: [PATCH 1/3] actions dependency version updates --- .github/workflows/check.yml | 2 +- .github/workflows/manifest.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 9caba85..8adb100 100644 --- 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/luacheck@v1.1.0 with: diff --git a/.github/workflows/manifest.yml b/.github/workflows/manifest.yml index 2e5c5f8..35bce7a 100644 --- a/.github/workflows/manifest.yml +++ b/.github/workflows/manifest.yml @@ -29,13 +29,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Setup Pages - uses: actions/configure-pages@v3 + uses: actions/configure-pages@v5 - name: Setup Python - uses: actions/setup-python@v3.1.3 + uses: actions/setup-python@v5 # 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 +54,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 +69,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 From 705494bb7ee76946d0c3293d62e0e11809a4b044 Mon Sep 17 00:00:00 2001 From: Mikayla Date: Mon, 26 Aug 2024 13:55:13 +0000 Subject: [PATCH 2/3] specify python version --- .github/workflows/manifest.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/manifest.yml b/.github/workflows/manifest.yml index 35bce7a..b9a91db 100644 --- a/.github/workflows/manifest.yml +++ b/.github/workflows/manifest.yml @@ -32,6 +32,8 @@ jobs: uses: actions/configure-pages@v5 - name: Setup Python uses: actions/setup-python@v5 + with: + python-version: '3.10' # Generate manifest + shields files for main branch - name: Checkout main id: checkout-main From 035a26cc079e5edf064951514817c3a357dee98d Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Wed, 28 Aug 2024 21:01:04 -0400 Subject: [PATCH 3/3] #543 reset remote sequence numbers when linking --- coordinator/coordinator.lua | 1 + coordinator/startup.lua | 2 +- pocket/pocket.lua | 2 ++ pocket/startup.lua | 2 +- reactor-plc/plc.lua | 1 + reactor-plc/startup.lua | 2 +- rtu/rtu.lua | 1 + rtu/startup.lua | 2 +- 8 files changed, 9 insertions(+), 4 deletions(-) diff --git a/coordinator/coordinator.lua b/coordinator/coordinator.lua index e6c7671..651a5bc 100644 --- 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 index 8fb6173..4be0949 100644 --- 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 index a8867fb..db0ae8b 100644 --- a/pocket/pocket.lua +++ b/pocket/pocket.lua @@ -439,11 +439,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 index 9bb49d7..a6953b1 100644 --- 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 index 36cb8ed..eee2bc6 100644 --- 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 index f1cdae2..0f83ef4 100644 --- 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 index daf9f22..dc398b2 100644 --- 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 index b978164..57911a0 100644 --- 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