From 0efdad5c77d7c8d4868a88f6d23ebd262fbbc61b Mon Sep 17 00:00:00 2001 From: VladStanciu <164793313+VladStanciu@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:01:35 +0300 Subject: [PATCH 01/14] Update build_loop.yml --- .github/workflows/build_loop.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index 697c291b5..b53031a19 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -1,3 +1,17 @@ +diff --git a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift b/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift +index d5c0b46..b1745a1 100644 +--- a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift ++++ b/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift +@@ -215,7 +215,8 @@ public final class G7Sensor: G7BluetoothManagerDelegate { + } + + /// The Dexcom G7 advertises a peripheral name of "DXCMxx", and later reports a full name of "Dexcomxx" +- if name.hasPrefix("DXCM") { ++ /// Dexcom One+ peripheral name start with "DX02" ++ if name.hasPrefix("DXCM") || name.hasPrefix("DX02"){ + // If we're following this name or if we're scanning, connect + if let sensorName = sensorID, name.suffix(2) == sensorName.suffix(2) { + return .makeActive name: 4. Build Loop run-name: Build Loop ${{ github.ref_name }} on: From eddd83ed922cad7a1b43fabdd1729791cd3413eb Mon Sep 17 00:00:00 2001 From: VladStanciu <164793313+VladStanciu@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:08:10 +0300 Subject: [PATCH 02/14] Update build_loop.yml --- .github/workflows/build_loop.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index b53031a19..c62302096 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -2,9 +2,6 @@ diff --git a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift b/G7SensorKit/G index d5c0b46..b1745a1 100644 --- a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift +++ b/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift -@@ -215,7 +215,8 @@ public final class G7Sensor: G7BluetoothManagerDelegate { - } - /// The Dexcom G7 advertises a peripheral name of "DXCMxx", and later reports a full name of "Dexcomxx" - if name.hasPrefix("DXCM") { + /// Dexcom One+ peripheral name start with "DX02" From cfa1d0c6802cc7ddb679485ee1fbdd80cf96794b Mon Sep 17 00:00:00 2001 From: VladStanciu <164793313+VladStanciu@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:12:46 +0300 Subject: [PATCH 03/14] Update build_loop.yml --- .github/workflows/build_loop.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index c62302096..7f82e16ea 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -1,14 +1,8 @@ -diff --git a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift b/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift -index d5c0b46..b1745a1 100644 --- a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift +++ b/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift - /// The Dexcom G7 advertises a peripheral name of "DXCMxx", and later reports a full name of "Dexcomxx" - if name.hasPrefix("DXCM") { + /// Dexcom One+ peripheral name start with "DX02" + if name.hasPrefix("DXCM") || name.hasPrefix("DX02"){ - // If we're following this name or if we're scanning, connect - if let sensorName = sensorID, name.suffix(2) == sensorName.suffix(2) { - return .makeActive name: 4. Build Loop run-name: Build Loop ${{ github.ref_name }} on: From 82c3a100413d9bef113bd3429d37d796ab2c2382 Mon Sep 17 00:00:00 2001 From: VladStanciu <164793313+VladStanciu@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:24:35 +0300 Subject: [PATCH 04/14] Update build_loop.yml --- .github/workflows/build_loop.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index 7f82e16ea..697c291b5 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -1,8 +1,3 @@ ---- a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift -+++ b/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift -- if name.hasPrefix("DXCM") { -+ /// Dexcom One+ peripheral name start with "DX02" -+ if name.hasPrefix("DXCM") || name.hasPrefix("DX02"){ name: 4. Build Loop run-name: Build Loop ${{ github.ref_name }} on: From 838ad0a3b1eaae5c6449f29d76639a6f8ad0750c Mon Sep 17 00:00:00 2001 From: VladStanciu <164793313+VladStanciu@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:29:20 +0300 Subject: [PATCH 05/14] Update build_loop.yml --- .github/workflows/build_loop.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index 697c291b5..4fcbaa6ef 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -1,3 +1,5 @@ +--- a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift +- if name.hasPrefix("DXCM") { name: 4. Build Loop run-name: Build Loop ${{ github.ref_name }} on: From 0d94131bc1e25346cda6ab17636d4ae52497c3d6 Mon Sep 17 00:00:00 2001 From: VladStanciu <164793313+VladStanciu@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:32:30 +0300 Subject: [PATCH 06/14] Update build_loop.yml --- .github/workflows/build_loop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index 4fcbaa6ef..45f38c418 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -1,5 +1,3 @@ ---- a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift -- if name.hasPrefix("DXCM") { name: 4. Build Loop run-name: Build Loop ${{ github.ref_name }} on: @@ -69,3 +67,5 @@ jobs: path: | artifacts buildlog + --- a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift +- if name.hasPrefix("DXCM") { From 9f973c72ce5f5405a0d0c8af1a73e5e737f1340c Mon Sep 17 00:00:00 2001 From: VladStanciu <164793313+VladStanciu@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:34:41 +0300 Subject: [PATCH 07/14] Update build_loop.yml --- .github/workflows/build_loop.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index 45f38c418..e6892a88e 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -67,5 +67,4 @@ jobs: path: | artifacts buildlog - --- a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift -- if name.hasPrefix("DXCM") { + dexcom_one_plus/main_dexcomoneplus.patch From 9c37399aa13cc03589a913c332693882df6ea05d Mon Sep 17 00:00:00 2001 From: VladStanciu <164793313+VladStanciu@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:41:01 +0300 Subject: [PATCH 08/14] Update build_loop.yml From 41df13e6e24dc81c4ea0c1507f5afc65d91dd18f Mon Sep 17 00:00:00 2001 From: VladStanciu <164793313+VladStanciu@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:43:44 +0300 Subject: [PATCH 09/14] Update build_loop.yml --- .github/workflows/build_loop.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index e6892a88e..7475a4d6b 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -68,3 +68,18 @@ jobs: artifacts buildlog dexcom_one_plus/main_dexcomoneplus.patch +@@ -0,0 +1,14 @@ +diff --git a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift b/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift +index d5c0b46..b1745a1 100644 +--- a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift ++++ b/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift +@@ -215,7 +215,8 @@ public final class G7Sensor: G7BluetoothManagerDelegate { + } + + /// The Dexcom G7 advertises a peripheral name of "DXCMxx", and later reports a full name of "Dexcomxx" +- if name.hasPrefix("DXCM") { ++ /// Dexcom One+ peripheral name start with "DX02" ++ if name.hasPrefix("DXCM") || name.hasPrefix("DX02"){ + // If we're following this name or if we're scanning, connect + if let sensorName = sensorID, name.suffix(2) == sensorName.suffix(2) { + return .makeActive From ca1cf1b84e02aea48f7a218c5c2cf6bfc493564b Mon Sep 17 00:00:00 2001 From: VladStanciu <164793313+VladStanciu@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:50:41 +0300 Subject: [PATCH 10/14] Update build_loop.yml --- .github/workflows/build_loop.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index 7475a4d6b..c70c0f888 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -68,7 +68,6 @@ jobs: artifacts buildlog dexcom_one_plus/main_dexcomoneplus.patch -@@ -0,0 +1,14 @@ diff --git a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift b/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift index d5c0b46..b1745a1 100644 --- a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift From d00d63552be9fe52df516eb96280851ca32913f2 Mon Sep 17 00:00:00 2001 From: VladStanciu <164793313+VladStanciu@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:53:38 +0300 Subject: [PATCH 11/14] Update build_loop.yml --- .github/workflows/build_loop.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index c70c0f888..f80a902ee 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -68,7 +68,6 @@ jobs: artifacts buildlog dexcom_one_plus/main_dexcomoneplus.patch -diff --git a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift b/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift index d5c0b46..b1745a1 100644 --- a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift +++ b/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift From ede8f0fa3604afefe5884596d62cf76642044921 Mon Sep 17 00:00:00 2001 From: VladStanciu <164793313+VladStanciu@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:59:26 +0300 Subject: [PATCH 12/14] Update build_loop.yml --- .github/workflows/build_loop.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index f80a902ee..0d89c9b39 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -67,17 +67,4 @@ jobs: path: | artifacts buildlog - dexcom_one_plus/main_dexcomoneplus.patch -index d5c0b46..b1745a1 100644 ---- a/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift -+++ b/G7SensorKit/G7SensorKit/G7CGMManager/G7Sensor.swift -@@ -215,7 +215,8 @@ public final class G7Sensor: G7BluetoothManagerDelegate { - } - - /// The Dexcom G7 advertises a peripheral name of "DXCMxx", and later reports a full name of "Dexcomxx" -- if name.hasPrefix("DXCM") { -+ /// Dexcom One+ peripheral name start with "DX02" -+ if name.hasPrefix("DXCM") || name.hasPrefix("DX02"){ - // If we're following this name or if we're scanning, connect - if let sensorName = sensorID, name.suffix(2) == sensorName.suffix(2) { - return .makeActive + From a1b0932e29c5c3c78b0884a09064f04e0e789575 Mon Sep 17 00:00:00 2001 From: VladStanciu <164793313+VladStanciu@users.noreply.github.com> Date: Wed, 12 Jun 2024 23:33:55 +0300 Subject: [PATCH 13/14] Update build_loop.yml --- .github/workflows/build_loop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index 0d89c9b39..dfc07bd82 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -4,11 +4,11 @@ on: workflow_dispatch: ## Remove the "#" sign from the beginning of the line below to get automated builds on push (code changes in your repository) - #push: + push: ## Remove the "#" sign from the beginning of the two lines below to get automated builds every two months #schedule: - #- cron: '0 17 1 */2 *' # Runs at 17:00 UTC on the 1st in Jan, Mar, May, Jul, Sep and Nov. + - cron: '0 17 1 */2 *' Runs at 17:00 UTC on the 1st in Jan, Mar, May, Jul, Sep and Nov. jobs: secrets: From 401447540254ae2c1066aaff1da7ad92193dc31a Mon Sep 17 00:00:00 2001 From: VladStanciu <164793313+VladStanciu@users.noreply.github.com> Date: Wed, 12 Jun 2024 23:39:17 +0300 Subject: [PATCH 14/14] Update build_loop.yml --- .github/workflows/build_loop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index dfc07bd82..d8931bb66 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -7,8 +7,8 @@ on: push: ## Remove the "#" sign from the beginning of the two lines below to get automated builds every two months - #schedule: - - cron: '0 17 1 */2 *' Runs at 17:00 UTC on the 1st in Jan, Mar, May, Jul, Sep and Nov. + schedule: + - cron: '0 17 1 */2 *' # Runs at 17:00 UTC on the 1st in Jan, Mar, May, Jul, Sep and Nov. jobs: secrets: