Closed marionbarker closed 2 months ago
It is probably easiest to test using a fresh download to a new folder. Otherwise you may have "debris" left-over from other branches.
If you choose to use the same folder, clean the build folder and close Xcode workspace. Make sure you only have Trio.xcworkspace folder available (no other *.xcworkspace folder should exist.) Then open Xcode again. It is possible you may also need to clean derived data ('rm -rf ~/Library/Developer/Xcode/DerivedData').
The Browser Build test was successful.
I started to build in Xcode but stopped it a few seconds after hitting build/run, realizing I should test in Fastlane first. I checked Apple Developer and the org.nightscout.TEAMID.Trio identifier was created by Xcode but not the other three. I did not delete the alive branch, but I built via Fastlane which was successful.
I did notice icon names are off, so I'll put together a PR for that shortly.
I noticed there are still a lot of iAPS
references in localized files. Tomorrow (Tuesday) I'll go through and update those, making sure the original string they're localizing matches.
Localizations has been pushed.
I still see these iaps
and Oi
references in the repo, though. Do these need to be updated elsewhere as well? Should I go ahead and just rename them all to Trio
?
Localizations has been pushed.
I still see these
iaps
andOi
references in the repo, though. Do these need to be updated elsewhere as well? Should I go ahead and just rename them all toTrio
?
Perhaps @avouspierre could take a look at this? He is about to refactor something, possibly connected to some of this.
The ones in main.swift are used for a parser that only @itsmojo uses. I suggest you leave those alone for now. I don’t know about the others.
The use of iaps & iAPS in OmniBLE/OmniBLEParser/main.swift applies to iAPS & Trio as well as any other FreeAPS based app with a Loop style pumpManager. Here's my suggested changes to this file to handle the general case correctly and which will avoid using a specific app name like iAPS or Trio.
diff --git a/OmniBLEParser/main.swift b/OmniBLEParser/main.swift
index 63a5ad0..c763f56 100644
--- a/OmniBLEParser/main.swift
+++ b/OmniBLEParser/main.swift
@@ -134,7 +134,7 @@ func parseSimulatorLogLine(_ line: String) {
// 2023-09-02T00:29:04-0700 [DeviceManager] DeviceDataManager.swift - deviceManager(_:logEventForDeviceIdentifier:type:message:completion:) - 563 - DEV: Device message: 17b3931b08030e01008205
// 2023-09-02T00:29:04-0700 [DeviceManager] DeviceDataManager.swift - deviceManager(_:logEventForDeviceIdentifier:type:message:completion:) - 563 - DEV: Device message: 17b3931b0c0a1d1800b48000000683ff017d
-func parseIAPSLogLine(_ line: String) {
+func parseFreeAPSLogLine(_ line: String) {
let components = line.components(separatedBy: .whitespaces)
let hexString = components[components.count - 1]
@@ -163,7 +163,7 @@ func parseDashPDMLogLine(_ line: String) {
func usage() {
print("Usage: [-q] file...")
print("Set the Xcode Arguments Passed on Launch using Product->Scheme->Edit Scheme...")
- print("to specify the full path to Loop Report, Xcode log, RPi pod sim log, iAPS log, or DASH PDM log file(s) to parse.\n")
+ print("to specify the full path to Loop Report, Xcode log, RPi pod sim log, FreeAPS log, or DASH PDM log file(s) to parse.\n")
exit(1)
}
@@ -207,10 +207,10 @@ for arg in CommandLine.arguments[1...] {
// 2023-09-02T00:29:04-0700 [DeviceManager] DeviceDataManager.swift - deviceManager(_:logEventForDeviceIdentifier:type:message:completion:) - 563 - DEV: Device message: 17b3931b08030e01008205
// 2023-09-02T00:29:04-0700 [DeviceManager] DeviceDataManager.swift - deviceManager(_:logEventForDeviceIdentifier:type:message:completion:) - 563 - DEV: Device message: 17b3931b0c0a1d1800b48000000683ff017d
case Regex("Device message: [0-9a-fA-F]+$"):
- // Don't mistakenly match an iaps xcode log file line as an iaps log file line
+ // Don't mistakenly match an FreeAPS xcode log file line as an FreeAPS log file line
// 2023-10-28 22:37:24.584982-0700 FreeAPS[6030:4151040] [DeviceManager] DeviceDataManager.swift - deviceManager(_:logEventForDeviceIdentifier:type:message:completion:) - 563 DEV: Device message: 17eed3be3824191c494e532e2800069406024c0001f4010268000000060279a404f005021e040300000001ca
if !line.contains(" FreeAPS") {
- parseIAPSLogLine(line)
+ parseFreeAPSLogLine(line)
}
case Regex("I PodComm pod command: "):
@itsmojo , will you make the change in OmniBLE, so we can update our submodule?
https://github.com/search?q=repo%3ALoopKit%2FOmniBLE%20iAPS&type=code
I don't think OmniBLE is a blocker at all, so if it doesn't get updated before everything else in this PR is approved we can just update the submodule link whenever that happens.
I just amended the Localization commit to include FAX converts.
I have one more commit ready to go for StateiAPSResults
and TestFileStorageOiAPS
, but would like to add the fix for Info
to it before pushing it. Anyone know anything about that one?
After that, I think I can add my ✅
The OmniBLEParser/main.swift change to remove iAPS is not a blocker. I will attempt to create a PR for this as I suggested, but it might take me awhile to do this and I don't even know if I have the needed permissions.
I have permissions to create a branch in Loopkit OmniBLE with changes and can make the PR. Then Trio just needs to update using either the SHA from PR branch or from dev depending on how long it takes to get the PR reviewed. I will DM with @itsmojo to make this happen.
@MikePlante1 :
The first line (BGTaskSchedulerPermittedIdentifiers) could be removed because we didn't use a background task with remote notification. I tested (in my current branch) without and seems OK.
CFBundleURLName is useful for garmin app when you link garmin connect to the app. You could change it with dynamic variable. You could use BUNDLE_IDENTIFIER as a URL.
Thanks avouspierre!
With that piece in place, I think we're good to merge this into dev now.
I guess I can't add myself as a reviewer since I began this PR; if I could, I would approve this PR.
I tested the latest version using Xcode onto a test phone with Trio on it. Fresh download. commit: 08e6a801 (HEAD -> trio-rename, origin/trio-rename, origin/HEAD) scrub old name from code
After testing, I reviewed the modification to README.md by Magnus and accepted the PR. There is no need to test again as this is a documentation change only.
I'll build now :)
The following steps were used to update the app name to Trio.
Each step used one or two atomic commits to make it easy to follow for reviewers.
Testing: