Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge alpha into dev #117

Merged
merged 154 commits into from
May 2, 2024
Merged

Merge alpha into dev #117

merged 154 commits into from
May 2, 2024

Conversation

bjornoleh
Copy link
Contributor

@bjornoleh bjornoleh commented Apr 16, 2024 •
edited by MikePlante1
Loading

List of PRs listed in this as of 16:40 UTC 2024-04-16

bjornoleh and others added 30 commits March 5, 2024 22:55
@bjornoleh
oref0: minimised and source files from open-iaps-oref dev 97b012a
5cdaa3e 
https://github.com/nightscout/open-iaps-oref/tree/97b012ab8e8f0062cecc9d2e02d915ef0124cd2e
@bjornoleh
oref0 branch: dev - git version: 47d2485
798fe84 
Last commits:
47d2485 Merge pull request #3 from nightscout/webpack-cp_patch-1
4f6de7c Update webpack-cp.sh
@bjornoleh
oref0 branch: dev - git version: acf203c
17e9465 
Last commits:
acf203c Merge pull request #6 from nightscout/webpack-cp_patch-1
1fda0fa webpack-cp.sh: Set apsDIR=../Open-iAPS, fix path for source files
@bjornoleh
Merge pull request #5 from nightscout/dev
58c0bef 
Merge dev into current-oref
@10nas @MikePlante1
live activity
c8b5cc3
@sethgagnon @MikePlante1
Fastfile changes to support Live Activity (#396)
5fdc18f 
adding in liveactivity identifier

forcing xcode 15.0.1 for creating certs
@10nas @MikePlante1
Live activity fixes (#397)
9b87635 
* fix mmol live activity, live activity off by default, re-create live activity always after it ended, better readability on lock screen

* typo

* lock screen cleanup

* fix padding, fix misaligned trailing dynamic island view

* camel case

* prevent unwanted hiding of live activity, update dynamic island padding

* also hide change label on stale live activity data

* update colors
@polscm32 @MikePlante1
add glucose graph in dynamic island....WiP
8b762cf
@polscm32 @MikePlante1
fix x axis for glucose graph in dynamic island
5be9d74
@polscm32 @MikePlante1
change order of glucose graph items in lock screen
a9b2096
@polscm32 @MikePlante1
style lockscreen widget
f63f447
@polscm32 @MikePlante1
add glucose bobble to lockscreen
7c03637
@polscm32 @MikePlante1
fix padding
62c9f7c
@polscm32 @MikePlante1
improve lockscreen widget
d358ad3
@polscm32 @MikePlante1
increase chart height
265251d
@polscm32 @MikePlante1
fix padding in lockscreenwidget
b5ff233 
fix incorrect timelabels in main chart
fix xGridLines that disappeared after last dev merge
@MikePlante1
fix type error after merge
424febc
@polscm32 @MikePlante1
various UI fixes
3ccf434
@polscm32 @MikePlante1
small fixes
3ac2c96
@bjornoleh
Use MKRingProgressView from swift package
2305dbf 
- use SPM as in LoopWorkspace 00f7b05 (05/06/2023)
- MKRingProgressView branch = master
- Deleted MKRingProgressView directory from Open-iAPS/Dependencies
- Committed changes to Package.resolved
- Committed an automated Swift package change to Dependencies/LibreTransmitter/LibreTransmitter/NotificationHelperOverride.swift
@bjornoleh
Add update_loopkit_dependencies.sh
1c42f62 
-copies LoopKit dependencies and git revisions to Open-iAPS/Dependencies
@bjornoleh
wip:does not build:Copied LoopKit dependencies from LoopWorkspace dev
6498856 
- LoopWorkspace dev ce74cf4 'Bring in OmniBLE updates' (Feb 21, 2024)
- Deleted Open-iAPS/Dependencies/rileylink_ios, and copied RileyLinkKit into /Dependencies
- Added RileyLinkKit to the Xcode workspace
- Add missing frameworks to projects: Link binary with libraries

	- OmniKit: RileyLinkKit, RileyLinkBLEKit, RileyLinkKitUI
	- OmniKitUI: OmniKit
	- LoopKitUI
G7SensorKit: LoopKitUI

- The update_loopkit_dependencies.sh script adds git references to Open-iAPS/Dependencies/LoopKit_dependencies.txt
@polscm32 @MikePlante1
use core data
658ca58
@polscm32 @MikePlante1
fix conversion in mmol/L for y axis labels in live activity charts
59af5be 
improve readability for lockscreen widget in light mode
@Jon-b-m @MikePlante1
Bolus from watch (#326)
a1c1160 
Use same calculator on Watch as on iPhone app.
@MikePlante1
Revert "Bolus from watch (#326)"
a591e65 
This reverts changes not related to coreData for LiveActivities from commit a1c1160.
@polscm32 @MikePlante1
Live Activity Graph
502411d 
* conditionally show glucose graph in different colors dependent of high and low glucose settings
* To Do: add setting for showing graph in lockscreen and/or just a minimalistic view
@polscm32 @MikePlante1
Various updates
98fcad4 
- Run calculation of total insulin on scope only on change of picker panel, on appearance of the app and on change of boluses
	* to do: fix tins not updating on Pump History change

- Dynamic Island updates
	* add cob to lockscreen widget
	* add iob to lockscreen widget and adjust padding/spacing
	* to do: fix delay of updating cob and iob

- Change gradient of custom background color
@MikePlante1
Revert "Various updates"
0d8af38 
This reverts changes not related to LiveActivities from commit 98fcad4.
@polscm32 @MikePlante1
add setting for live activity to display complex or simple view
570dd3a
bjornoleh and others added 12 commits April 25, 2024 23:15
@bjornoleh @marionbarker
Update submodule G7SensorKit AND MinimedKit to use appName
45c5bdd 
* G7SensorKit eba7d98...5051563 (5):
  > Merge pull request 3 from loopandlearn/use_appName

* MinimedKit aa82a18...4a6df31 (1):
  > add code change parallel to LoopKit MinimedKit PR 14 to use appName

git submodule
 a92e9752994e7b143cdb007d3c7bcba0c0cc9214 CGMBLEKit (v3.1-166-ga92e975)
+50515639919465e54e485ab29fd395b0eafd76e3 G7SensorKit (heads/main_rc)
 c01eba63e94e9f6f2841a8835680c4e39c61b18d LibreTransmitter (heads/main)
 2f535b3ca46825e82e0dd1b5ef9daccd53a3f0ca LoopKit (v3.0-1039-g2f535b3)
+4a6df31192cbbddf62ed36ad78b1ca29649bd851 MinimedKit (heads/main_rc)
 91abd9aba338903cc7bccd3a4c9df5dc4452cc1f OmniBLE (heads/dev)
 f51fe354ea6739ee09de922ed836d6844545b610 OmniKit (heads/main)
 a0e419da314d0ad42b41ccb04af73cd1fbf41257 RileyLinkKit (heads/dev)
 a2ccad72a55600c28549ab86ab1964c0d6558868 TidepoolService (heads/dev_rc)
 21d8657d727f26df76342188e580022bf4884714 dexcom-share-client-swift (v0.4.1-156-g21d8657)

Co-authored-by: Marion Barker <marionbarker@earthlink.net>
@bjornoleh
Merge pull request #128 from nightscout/submodule-updates-alpha
42b95ad 
Update submodule G7SensorKit and MinimedKit to use appName
@MikePlante1
*"Always Disable SMBs"
8bc49d3
@MikePlante1
Merge alpha into disable-smb-schedule
5fc2766 
Merge pull request #2 from nightscout/alpha
@marionbarker @bjornoleh
Rename FreeAPS.xcworkspace to Open-iAPS.xcworkspace
a78e53f
@marionbarker @bjornoleh
Fastlane renames for Open-iAPS: build lane, scheme and .ipa output name
64803da 
And updated the fastlane build action lane in build_Open-iAPS.yml

Co-authored-by: bjornoleh <bjorn.haugsgjerd@gmail.com>
@marionbarker
limit lane names to letters and underscores
1dbb6dd
@marionbarker
Update Gemfile.lock to bump Fastlane to 2.220.0
ec6c89d
@bjornoleh
Merge pull request #134 from marionbarker/fix-lane-upgrade-Fastlane
aecc223 
Fix lane upgrade fastlane
@marionbarker
fix token definition
a357edd
@bjornoleh
Merge pull request #135 from marionbarker/fix-token
c0193cd 
fix token definition
@bjornoleh
Merge pull request #127 from nightscout/rename_scheme
99effeb 
Rename FreeAPS X scheme to Open-iAPS
@marionbarker
Copy link
Contributor

2024-04-29 Successful Test:

  • I confirmed the submodules match what I expected.
  • Success: In local clone, did a git pull --recurse and it build onto test phone with no issues
  • Success: I used the build script to download and build onto test phone a fresh clone of alpha
  • Success: I synched my repo branch of alpha to nightscout
    • Success: Tested the Validate Secrets works for alpha branch
    • Deleted my alive branch
    • Success: Ran Build Open-iAPS long enough to confirm alive branch was recreated then canceled to save the minutes

bjornoleh and others added 3 commits May 1, 2024 13:22
@bjornoleh @MikePlante1
Update oref0 for #120 Rename smbIsAlwaysOff to smbIsScheduledOff
d317c53 
Includes open-iaps-oref PR 20 and PR 17 (console error fix)

 Last commits:
+5774155 Merge pull request 20 from MikePlante1/disable_smb_schedule
+e3a8d73 Merge pull request 17 from MikePlante1/console_error_refactor
+a29d9ce rename smbIsAlwaysOff to smbIsScheduledOff
+d898eb1 fix threshold console.error

Co-authored-by: Mike Plante <mikeplante1@gmail.com>
@MikePlante1
Merge pull request #4 from bjornoleh/disable-smb-schedule
9f5446a 
Update oref0 for #120 Rename smbIsAlwaysOff to smbIsScheduledOff
@bjornoleh
Merge pull request #120 from MikePlante1/disable-smb-schedule
aa55271 
Rename smbIsAlwaysOff to smbIsScheduledOff (alpha)
@bjornoleh
Copy link
Contributor Author

I don't think oiref should be added to dev until the disable SMB scheduling feature is fixed, as alpha's implementation is currently more broken than dev&main. More details in nightscout/open-iaps-oref#18 , nightscout/open-iaps-oref#19 , nightscout/open-iaps-oref#20

Perhaps we can keep it as it is, and make sure everything works before release? I trust this can be fixed soon too.

I think this can and should be fixed before merging into dev. Was planning on doing it tomorrow, but I'll see if I can squeeze it in tonight.

Fix PR'd in #120 and nightscout/open-iaps-oref#20

PR #120 is merged now. Does that mean alpha can be merged into dev now?

@MikePlante1
Copy link
Contributor

PR #120 is merged now. Does that mean alpha can be merged into dev now?

Yes, I think so.

@bjornoleh
Copy link
Contributor Author

Ok, would be great to have this merged today. Could we get a couple of more reviews in?

@Sjoerd-Bo3 Sjoerd-Bo3 merged commit 850c872 into dev May 2, 2024
@MikePlante1 MikePlante1 mentioned this pull request May 3, 2024
Merged
@MikePlante1 MikePlante1 deleted the alpha branch May 4, 2024 13:14
@MikePlante1 MikePlante1 restored the alpha branch May 4, 2024 13:35
@MikePlante1 MikePlante1 deleted the alpha branch May 4, 2024 13:51
@MikePlante1 MikePlante1 mentioned this pull request Jun 16, 2024
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MikePlante1 MikePlante1 MikePlante1 approved these changes

@marionbarker marionbarker marionbarker approved these changes

@Sjoerd-Bo3 Sjoerd-Bo3 Sjoerd-Bo3 approved these changes

@AndreasStokholm AndreasStokholm Awaiting requested review from AndreasStokholm AndreasStokholm is a code owner

@BrianWieder BrianWieder Awaiting requested review from BrianWieder

@dnzxy dnzxy Awaiting requested review from dnzxy dnzxy is a code owner

@polscm32 polscm32 Awaiting requested review from polscm32

@avouspierre avouspierre Awaiting requested review from avouspierre

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@bjornoleh @avouspierre @MikePlante1 @marionbarker @Sjoerd-Bo3 @10nas @sethgagnon @polscm32 @Jon-b-m @kylmcw