Skip to content

Multiple cycles triggered in short window. #1096

New issue

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

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

Already on GitHub? # to your account

Merged
merged 1 commit into from
Oct 13, 2019
Merged

Multiple cycles triggered in short window. #1096

merged 1 commit into from
Oct 13, 2019

Conversation

ps2
Copy link
Collaborator

@ps2 ps2 commented Sep 8, 2019

Fix issue with PumpManager ble update coming in right after cgm update arrives, causing two loops to be run in rapid succession.

@ps2 ps2 merged commit 66c8773 into dev Oct 13, 2019
ivalkou pushed a commit to ivalkou/Loop that referenced this pull request Oct 15, 2019
dthornley pushed a commit to dthornley/Loop that referenced this pull request Oct 21, 2019
dthornley added a commit to dthornley/Loop that referenced this pull request Dec 29, 2019
commit a11b593
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Thu Dec 26 15:49:31 2019 +0300

    Show last MB event in settings

commit 8773d77
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Dec 25 17:34:33 2019 +0300

    Microbolus.Event

commit 519609c
Merge: 626630e 62952ae
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 19:30:11 2019 +0300

    Merge branch 'dev-ivan' into microboluses

    # Conflicts:
    #	Loop.xcconfig
    #	Loop/Views/MicrobolusView.swift
    #	LoopCore/Microbolus.swift

commit 62952ae
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 19:28:15 2019 +0300

    Set default partial application rate to 0.3

commit 310ffac
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 19:13:17 2019 +0300

    add 'Not Limited' option to max sizes of MB

commit 626630e
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 13:53:43 2019 +0300

    The view is divided into small parts.

commit 1ff5463
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 13:53:43 2019 +0300

    The view is divided into small parts.

commit 3f688b1
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 13:23:53 2019 +0300

    MicrobolusView refactored

commit 1a991ec
Merge: 74ef344 a098d6a
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 13:26:18 2019 +0300

    Merge branch 'dev' of https://github.com/LoopKit/Loop into dev-ivan

commit db44386
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 13:23:53 2019 +0300

    MicrobolusView refactored

commit 491458d
Merge: 2abf5db a098d6a
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 12:55:02 2019 +0300

    Merge branch 'dev' of https://github.com/LoopKit/Loop into microboluses

commit 2abf5db
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sun Dec 22 12:41:30 2019 +0300

    Clear marketing version

commit b7d2c43
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sun Dec 22 12:35:13 2019 +0300

    Clear signing

commit 74ef344
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 17:02:26 2019 +0300

    bump version

commit 56bcbb5
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 16:59:50 2019 +0300

    Partial bolus application UI setting

commit 641f83f
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 15:55:03 2019 +0300

    partialApplication parameter (default 0.5)

commit a40bfa6
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 16:59:50 2019 +0300

    Partial bolus application UI setting

commit e79049b
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 15:55:03 2019 +0300

    partialApplication parameter (default 0.5)

commit f238db4
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 15:29:47 2019 +0300

    Override `hasFinished` check

commit 7a24458
Merge: 09a082d 650ffd4
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 15:42:12 2019 +0300

    Merge branch 'dev' of https://github.com/LoopKit/Loop into dev-ivan

    # Conflicts:
    #	Loop.xcconfig

commit f13327a
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 15:39:39 2019 +0300

    Revert CURRENT_PROJECT_VERSION

commit 275923f
Merge: 07d63e1 650ffd4
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 15:38:15 2019 +0300

    Merge branch 'dev' of https://github.com/LoopKit/Loop into microboluses

commit 07d63e1
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 15:29:47 2019 +0300

    Override `hasFinished` check

commit c9b97dd
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Dec 20 13:07:03 2019 +0300

    Cleenup unused code

commit 9888b57
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Dec 20 12:59:18 2019 +0300

    Remove Settings.bundle

commit 03a7f86
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Dec 20 12:57:49 2019 +0300

    Remove NightscoutAPIClient

commit 86bff4e
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Dec 20 12:50:15 2019 +0300

    Revert "Current time line on charts (LoopKit#6)"

    This reverts commit 10f581e.

commit 09a082d
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Dec 18 20:32:51 2019 +0300

    Disabled pickers fixed

commit d4841ed
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Dec 18 18:39:49 2019 +0300

    bump version

commit 8498438
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Dec 18 18:31:33 2019 +0300

    adaptiveRateNonlinear switch in settings

commit d36f713
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Dec 18 17:51:17 2019 +0300

    Fix binding and update UI

commit bbb0538
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Tue Dec 17 16:25:40 2019 +0300

    busines logic and UI

commit 31974cb
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 14 18:33:32 2019 +0300

    model and view

commit 0d28665
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 7 15:04:51 2019 +0300

    bump version

commit 61308c8
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 7 14:00:55 2019 +0300

    Remove UIApplication.protectedDataDidBecomeAvailableNotification

commit 82243de
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 7 13:55:49 2019 +0300

    Cancel MB if already bolusing

commit 7fa7357
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 30 17:16:50 2019 +0300

    Microbolus refactoring

commit f464c52
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 30 16:20:53 2019 +0300

    NS Client updated

commit c2e028f
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 30 15:54:02 2019 +0300

    Do not open bolus screen after carbs changed

commit 381d957
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 30 15:45:50 2019 +0300

    Limit MB if current glucose below target

commit dc8b19e
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 30 15:30:06 2019 +0300

    update version

commit 8d42217
Merge: 16edb41 d2d9487
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 30 15:18:07 2019 +0300

    Merge branch 'LoopKit-dev' into dev-ivan

    # Conflicts:
    #	Cartfile.resolved

commit d2d9487
Merge: a24eeb5 ac31e0b
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 30 15:16:26 2019 +0300

    Merge branch 'dev' of https://github.com/LoopKit/Loop into LoopKit-dev

commit 16edb41
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 23 17:10:31 2019 +0300

    Bolus recommendation notice cancels a microbolus

commit bc10d13
Merge: 8cddb00 22543b8
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 23 16:01:04 2019 +0300

    Merge branch 'empty-settings-fix' into dev-ivan

    # Conflicts:
    #	Cartfile.resolved

commit 22543b8
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 23 16:00:02 2019 +0300

    Fixed loss of settings after reboot.

commit 8cddb00
Merge: 10f581e e1bcfd4
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 23 15:36:48 2019 +0300

    Merge branch 'current-time-lines' into dev-ivan

    # Conflicts:
    #	Cartfile.resolved

commit e1bcfd4
Author: Ivan <zloyfey@gmail.com>
Date:   Sat Nov 23 14:57:05 2019 +0300

    Current time line on charts (LoopKit#6)

commit a24eeb5
Merge: 430d9ab 49412b6
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 23 15:29:38 2019 +0300

    Merge branch 'dev' of https://github.com/LoopKit/Loop into LoopKit-dev

    # Conflicts:
    #	Cartfile.resolved

commit b0869d0
Merge: 430d9ab 49412b6
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 23 15:28:48 2019 +0300

    Merge branch 'dev' of https://github.com/LoopKit/Loop into LoopKit-dev

    # Conflicts:
    #	Cartfile.resolved

commit 10f581e
Author: Ivan <zloyfey@gmail.com>
Date:   Sat Nov 23 14:57:05 2019 +0300

    Current time line on charts (LoopKit#6)

commit 0c25618
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Nov 15 14:37:22 2019 +0300

    Revert "revert notification names"

    This reverts commit ad62a80.

commit f4b6aaa
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Nov 15 14:16:25 2019 +0300

    update cartfile

commit 959fe30
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Nov 13 17:26:27 2019 +0300

    MB with COB and without COB work independently

commit ad62a80
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Tue Nov 12 11:31:21 2019 +0300

    revert notification names

commit c9ee230
Merge: 0194ea2 430d9ab
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Tue Nov 12 11:23:57 2019 +0300

    Merge branch 'dev' into dev-ivan

    # Conflicts:
    #	Cartfile.resolved

commit 0194ea2
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Tue Nov 12 11:22:48 2019 +0300

    Cartfile.resolved

commit 430d9ab
Author: Pete Schwamb <pete@schwamb.net>
Date:   Thu Nov 7 00:26:24 2019 -0600

    Notification names changed in LoopKit (LoopKit#1165)

    * Notification names changed in LoopKit

    * Bump carthage revs

commit abed78f
Author: David Thornley <david.thornley@darnt.com>
Date:   Mon Nov 11 11:26:27 2019 +0100

    Add ability to define a lower limit before performing the bolus (LoopKit#4)

    * Log what is being recommended.

    * Fix typos

    * Add a user configurable minimum bolus limit to allow the user to prevent the delivering of very small 0.05 unit boluses

    * Update message and the display format of the values for minimum units to deliver

commit 2a2b02e
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 9 15:01:21 2019 +0300

    Fix texts

commit 1fb94ef
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Thu Nov 7 19:50:39 2019 +0300

    Safe Mode refactored

commit 06021b8
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Thu Nov 7 16:16:32 2019 +0300

    nonlinear-carb-model

commit e755e1c
Author: Ivan Valkou <ivalkou@gmail.com>
Date:   Wed Nov 6 22:47:13 2019 +0300

    Revert "Carb Absorption Model UI"

    This reverts commit 1a94f7f.

commit 1a94f7f
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Nov 6 20:56:34 2019 +0300

    Carb Absorption Model UI

commit ca202c8
Author: Ivan Valkou <ivalkou@gmail.com>
Date:   Sun Nov 3 01:31:10 2019 +0300

    Microboluses Safe Mode

commit f646063
Author: Ivan Valkou <ivalkou@gmail.com>
Date:   Sat Nov 2 13:20:46 2019 +0300

    Add 15 min control clucose chek

commit 785a909
Author: Ivan Valkou <ivalkou@gmail.com>
Date:   Sat Nov 2 11:05:20 2019 +0300

    Fix MB without COM

commit 7ee1917
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Nov 1 21:41:17 2019 +0300

    Bump version

commit a4ebeb1
Author: Ivan <zloyfey@gmail.com>
Date:   Fri Nov 1 21:37:48 2019 +0300

    Microbolus screen (LoopKit#3)

    * draft UI

    * New Microboluses Screen

commit 9fdd8c2
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Thu Oct 31 11:56:03 2019 +0300

    build version changed

commit 5e158aa
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Oct 30 17:59:49 2019 +0300

    disable Microboluses if closed loop disabled

commit 13db3d2
Author: Ivan Valkou <ivalkou@gmail.com>
Date:   Tue Oct 29 21:18:09 2019 +0300

    misprint fixed

commit 2d843b6
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Oct 28 18:07:45 2019 +0300

    little refactor

commit f7047f3
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Oct 28 16:51:35 2019 +0300

    fix 0 bolus bug

commit 3d17aa2
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Oct 28 12:11:35 2019 +0300

    spikeapp scheme supported

commit c621ec1
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sun Oct 27 16:47:27 2019 +0300

    Fix version & skip bolus screen on Watch

commit b7b1374
Merge: 5f9df78 91a834f
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sun Oct 27 15:10:18 2019 +0300

    Merge branch 'dev' into dev-ivan

commit 91a834f
Merge: fa494fe 3aa8e6e
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sun Oct 27 15:09:21 2019 +0300

    Merge branch 'LoopKit-dev' into dev

commit 3aa8e6e
Merge: fa494fe 9407f8c
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sun Oct 27 15:08:56 2019 +0300

    Merge branch 'dev' of https://github.com/LoopKit/Loop into LoopKit-dev

    # Conflicts:
    #	Cartfile.resolved

commit 5f9df78
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Oct 25 16:40:06 2019 +0300

    rewrite loop()

commit 82fc9b6
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Oct 25 11:47:19 2019 +0300

    Max Microbolus Size title

commit 2deafd3
Author: Ivan Valkou <ivalkou@gmail.com>
Date:   Thu Oct 24 22:14:06 2019 +0300

    Microbolus refactoring

commit 4205e97
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Thu Oct 24 19:48:19 2019 +0300

    do not show bolus screen if microboluses is enabled

commit e40731e
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Thu Oct 24 18:58:03 2019 +0300

    Fix explanation of MB

commit c3f0cb8
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Thu Oct 24 18:51:38 2019 +0300

    Microboluses in settings

commit 56f151f
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Thu Oct 24 13:37:58 2019 +0300

    Micro Boluses!

commit 6190e2d
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Oct 23 20:07:12 2019 +0300

    NSAllowsArbitraryLoads

commit d349c8f
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Oct 23 16:38:16 2019 +0300

    Cartfile update

commit 43e4d8c
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Oct 23 16:36:03 2019 +0300

    NightscoutAPIClient added

commit fa494fe
Author: Pete Schwamb <pete@schwamb.net>
Date:   Sun Oct 13 11:00:22 2019 -0500

    Remote overrides (LoopKit#1131)

    * Allow overrides to be enabled via APNs

    * Update to NS sent notifications

    * Cleanup prints

    * Query override history for NS upload

    * Bump submodule revs

    * Handle indefinite duration override treatment uploads

    * Use separate representation for indefinite duration treatments

    * Bump cartfile rev

    * Send any override changes when uploading loop status

    * Bump carthage revisions

    * Bump carthage revision

    * Fix typo, and log device token

    * Carthage dependency revisions

commit d653500
Author: Pete Schwamb <pete@schwamb.net>
Date:   Sun Oct 13 09:28:16 2019 -0500

    New strategy for asset overrides. Fixes popup warnings (LoopKit#1145)

    * New strategy for asset overrides. Fixes popup warnings

    * Add DefaultAssets.xcassets back to WatchApp target

commit af99248
Author: Pete Schwamb <pete@schwamb.net>
Date:   Sun Oct 13 08:58:10 2019 -0500

    Fix issue with PumpManager ble update coming in right after cgm update arrives (LoopKit#1096)

commit 255a7de
Author: katie disimone <kdisimone@mac.com>
Date:   Sun Oct 13 06:53:42 2019 -0700

    display - for HUD CGM when value is >15 min old (LoopKit#1140)

commit 2c948ec
Author: katie disimone <kdisimone@mac.com>
Date:   Sun Oct 13 06:42:28 2019 -0700

    hide the saved API secret by default in NS services display (LoopKit#1142)
dthornley added a commit to dthornley/Loop that referenced this pull request Jan 2, 2020
commit a11b593
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Thu Dec 26 15:49:31 2019 +0300

    Show last MB event in settings

commit 8773d77
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Dec 25 17:34:33 2019 +0300

    Microbolus.Event

commit 519609c
Merge: 626630e 62952ae
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 19:30:11 2019 +0300

    Merge branch 'dev-ivan' into microboluses

    # Conflicts:
    #	Loop.xcconfig
    #	Loop/Views/MicrobolusView.swift
    #	LoopCore/Microbolus.swift

commit 62952ae
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 19:28:15 2019 +0300

    Set default partial application rate to 0.3

commit 310ffac
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 19:13:17 2019 +0300

    add 'Not Limited' option to max sizes of MB

commit 626630e
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 13:53:43 2019 +0300

    The view is divided into small parts.

commit 1ff5463
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 13:53:43 2019 +0300

    The view is divided into small parts.

commit 3f688b1
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 13:23:53 2019 +0300

    MicrobolusView refactored

commit 1a991ec
Merge: 74ef344 a098d6a
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 13:26:18 2019 +0300

    Merge branch 'dev' of https://github.com/LoopKit/Loop into dev-ivan

commit db44386
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 13:23:53 2019 +0300

    MicrobolusView refactored

commit 491458d
Merge: 2abf5db a098d6a
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Dec 23 12:55:02 2019 +0300

    Merge branch 'dev' of https://github.com/LoopKit/Loop into microboluses

commit 2abf5db
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sun Dec 22 12:41:30 2019 +0300

    Clear marketing version

commit b7d2c43
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sun Dec 22 12:35:13 2019 +0300

    Clear signing

commit 74ef344
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 17:02:26 2019 +0300

    bump version

commit 56bcbb5
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 16:59:50 2019 +0300

    Partial bolus application UI setting

commit 641f83f
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 15:55:03 2019 +0300

    partialApplication parameter (default 0.5)

commit a40bfa6
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 16:59:50 2019 +0300

    Partial bolus application UI setting

commit e79049b
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 15:55:03 2019 +0300

    partialApplication parameter (default 0.5)

commit f238db4
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 15:29:47 2019 +0300

    Override `hasFinished` check

commit 7a24458
Merge: 09a082d 650ffd4
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 15:42:12 2019 +0300

    Merge branch 'dev' of https://github.com/LoopKit/Loop into dev-ivan

    # Conflicts:
    #	Loop.xcconfig

commit f13327a
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 15:39:39 2019 +0300

    Revert CURRENT_PROJECT_VERSION

commit 275923f
Merge: 07d63e1 650ffd4
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 15:38:15 2019 +0300

    Merge branch 'dev' of https://github.com/LoopKit/Loop into microboluses

commit 07d63e1
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 21 15:29:47 2019 +0300

    Override `hasFinished` check

commit c9b97dd
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Dec 20 13:07:03 2019 +0300

    Cleenup unused code

commit 9888b57
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Dec 20 12:59:18 2019 +0300

    Remove Settings.bundle

commit 03a7f86
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Dec 20 12:57:49 2019 +0300

    Remove NightscoutAPIClient

commit 86bff4e
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Dec 20 12:50:15 2019 +0300

    Revert "Current time line on charts (LoopKit#6)"

    This reverts commit 10f581e.

commit 09a082d
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Dec 18 20:32:51 2019 +0300

    Disabled pickers fixed

commit d4841ed
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Dec 18 18:39:49 2019 +0300

    bump version

commit 8498438
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Dec 18 18:31:33 2019 +0300

    adaptiveRateNonlinear switch in settings

commit d36f713
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Dec 18 17:51:17 2019 +0300

    Fix binding and update UI

commit bbb0538
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Tue Dec 17 16:25:40 2019 +0300

    busines logic and UI

commit 31974cb
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 14 18:33:32 2019 +0300

    model and view

commit 0d28665
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 7 15:04:51 2019 +0300

    bump version

commit 61308c8
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 7 14:00:55 2019 +0300

    Remove UIApplication.protectedDataDidBecomeAvailableNotification

commit 82243de
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Dec 7 13:55:49 2019 +0300

    Cancel MB if already bolusing

commit 7fa7357
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 30 17:16:50 2019 +0300

    Microbolus refactoring

commit f464c52
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 30 16:20:53 2019 +0300

    NS Client updated

commit c2e028f
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 30 15:54:02 2019 +0300

    Do not open bolus screen after carbs changed

commit 381d957
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 30 15:45:50 2019 +0300

    Limit MB if current glucose below target

commit dc8b19e
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 30 15:30:06 2019 +0300

    update version

commit 8d42217
Merge: 16edb41 d2d9487
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 30 15:18:07 2019 +0300

    Merge branch 'LoopKit-dev' into dev-ivan

    # Conflicts:
    #	Cartfile.resolved

commit d2d9487
Merge: a24eeb5 ac31e0b
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 30 15:16:26 2019 +0300

    Merge branch 'dev' of https://github.com/LoopKit/Loop into LoopKit-dev

commit 16edb41
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 23 17:10:31 2019 +0300

    Bolus recommendation notice cancels a microbolus

commit bc10d13
Merge: 8cddb00 22543b8
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 23 16:01:04 2019 +0300

    Merge branch 'empty-settings-fix' into dev-ivan

    # Conflicts:
    #	Cartfile.resolved

commit 22543b8
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 23 16:00:02 2019 +0300

    Fixed loss of settings after reboot.

commit 8cddb00
Merge: 10f581e e1bcfd4
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 23 15:36:48 2019 +0300

    Merge branch 'current-time-lines' into dev-ivan

    # Conflicts:
    #	Cartfile.resolved

commit e1bcfd4
Author: Ivan <zloyfey@gmail.com>
Date:   Sat Nov 23 14:57:05 2019 +0300

    Current time line on charts (LoopKit#6)

commit a24eeb5
Merge: 430d9ab 49412b6
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 23 15:29:38 2019 +0300

    Merge branch 'dev' of https://github.com/LoopKit/Loop into LoopKit-dev

    # Conflicts:
    #	Cartfile.resolved

commit b0869d0
Merge: 430d9ab 49412b6
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 23 15:28:48 2019 +0300

    Merge branch 'dev' of https://github.com/LoopKit/Loop into LoopKit-dev

    # Conflicts:
    #	Cartfile.resolved

commit 10f581e
Author: Ivan <zloyfey@gmail.com>
Date:   Sat Nov 23 14:57:05 2019 +0300

    Current time line on charts (LoopKit#6)

commit 0c25618
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Nov 15 14:37:22 2019 +0300

    Revert "revert notification names"

    This reverts commit ad62a80.

commit f4b6aaa
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Nov 15 14:16:25 2019 +0300

    update cartfile

commit 959fe30
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Nov 13 17:26:27 2019 +0300

    MB with COB and without COB work independently

commit ad62a80
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Tue Nov 12 11:31:21 2019 +0300

    revert notification names

commit c9ee230
Merge: 0194ea2 430d9ab
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Tue Nov 12 11:23:57 2019 +0300

    Merge branch 'dev' into dev-ivan

    # Conflicts:
    #	Cartfile.resolved

commit 0194ea2
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Tue Nov 12 11:22:48 2019 +0300

    Cartfile.resolved

commit 430d9ab
Author: Pete Schwamb <pete@schwamb.net>
Date:   Thu Nov 7 00:26:24 2019 -0600

    Notification names changed in LoopKit (LoopKit#1165)

    * Notification names changed in LoopKit

    * Bump carthage revs

commit abed78f
Author: David Thornley <david.thornley@darnt.com>
Date:   Mon Nov 11 11:26:27 2019 +0100

    Add ability to define a lower limit before performing the bolus (LoopKit#4)

    * Log what is being recommended.

    * Fix typos

    * Add a user configurable minimum bolus limit to allow the user to prevent the delivering of very small 0.05 unit boluses

    * Update message and the display format of the values for minimum units to deliver

commit 2a2b02e
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sat Nov 9 15:01:21 2019 +0300

    Fix texts

commit 1fb94ef
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Thu Nov 7 19:50:39 2019 +0300

    Safe Mode refactored

commit 06021b8
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Thu Nov 7 16:16:32 2019 +0300

    nonlinear-carb-model

commit e755e1c
Author: Ivan Valkou <ivalkou@gmail.com>
Date:   Wed Nov 6 22:47:13 2019 +0300

    Revert "Carb Absorption Model UI"

    This reverts commit 1a94f7f.

commit 1a94f7f
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Nov 6 20:56:34 2019 +0300

    Carb Absorption Model UI

commit ca202c8
Author: Ivan Valkou <ivalkou@gmail.com>
Date:   Sun Nov 3 01:31:10 2019 +0300

    Microboluses Safe Mode

commit f646063
Author: Ivan Valkou <ivalkou@gmail.com>
Date:   Sat Nov 2 13:20:46 2019 +0300

    Add 15 min control clucose chek

commit 785a909
Author: Ivan Valkou <ivalkou@gmail.com>
Date:   Sat Nov 2 11:05:20 2019 +0300

    Fix MB without COM

commit 7ee1917
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Nov 1 21:41:17 2019 +0300

    Bump version

commit a4ebeb1
Author: Ivan <zloyfey@gmail.com>
Date:   Fri Nov 1 21:37:48 2019 +0300

    Microbolus screen (LoopKit#3)

    * draft UI

    * New Microboluses Screen

commit 9fdd8c2
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Thu Oct 31 11:56:03 2019 +0300

    build version changed

commit 5e158aa
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Oct 30 17:59:49 2019 +0300

    disable Microboluses if closed loop disabled

commit 13db3d2
Author: Ivan Valkou <ivalkou@gmail.com>
Date:   Tue Oct 29 21:18:09 2019 +0300

    misprint fixed

commit 2d843b6
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Oct 28 18:07:45 2019 +0300

    little refactor

commit f7047f3
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Oct 28 16:51:35 2019 +0300

    fix 0 bolus bug

commit 3d17aa2
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Mon Oct 28 12:11:35 2019 +0300

    spikeapp scheme supported

commit c621ec1
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sun Oct 27 16:47:27 2019 +0300

    Fix version & skip bolus screen on Watch

commit b7b1374
Merge: 5f9df78 91a834f
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sun Oct 27 15:10:18 2019 +0300

    Merge branch 'dev' into dev-ivan

commit 91a834f
Merge: fa494fe 3aa8e6e
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sun Oct 27 15:09:21 2019 +0300

    Merge branch 'LoopKit-dev' into dev

commit 3aa8e6e
Merge: fa494fe 9407f8c
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Sun Oct 27 15:08:56 2019 +0300

    Merge branch 'dev' of https://github.com/LoopKit/Loop into LoopKit-dev

    # Conflicts:
    #	Cartfile.resolved

commit 5f9df78
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Oct 25 16:40:06 2019 +0300

    rewrite loop()

commit 82fc9b6
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Fri Oct 25 11:47:19 2019 +0300

    Max Microbolus Size title

commit 2deafd3
Author: Ivan Valkou <ivalkou@gmail.com>
Date:   Thu Oct 24 22:14:06 2019 +0300

    Microbolus refactoring

commit 4205e97
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Thu Oct 24 19:48:19 2019 +0300

    do not show bolus screen if microboluses is enabled

commit e40731e
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Thu Oct 24 18:58:03 2019 +0300

    Fix explanation of MB

commit c3f0cb8
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Thu Oct 24 18:51:38 2019 +0300

    Microboluses in settings

commit 56f151f
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Thu Oct 24 13:37:58 2019 +0300

    Micro Boluses!

commit 6190e2d
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Oct 23 20:07:12 2019 +0300

    NSAllowsArbitraryLoads

commit d349c8f
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Oct 23 16:38:16 2019 +0300

    Cartfile update

commit 43e4d8c
Author: Ivan Valkou <zloyfey@gmail.com>
Date:   Wed Oct 23 16:36:03 2019 +0300

    NightscoutAPIClient added

commit fa494fe
Author: Pete Schwamb <pete@schwamb.net>
Date:   Sun Oct 13 11:00:22 2019 -0500

    Remote overrides (LoopKit#1131)

    * Allow overrides to be enabled via APNs

    * Update to NS sent notifications

    * Cleanup prints

    * Query override history for NS upload

    * Bump submodule revs

    * Handle indefinite duration override treatment uploads

    * Use separate representation for indefinite duration treatments

    * Bump cartfile rev

    * Send any override changes when uploading loop status

    * Bump carthage revisions

    * Bump carthage revision

    * Fix typo, and log device token

    * Carthage dependency revisions

commit d653500
Author: Pete Schwamb <pete@schwamb.net>
Date:   Sun Oct 13 09:28:16 2019 -0500

    New strategy for asset overrides. Fixes popup warnings (LoopKit#1145)

    * New strategy for asset overrides. Fixes popup warnings

    * Add DefaultAssets.xcassets back to WatchApp target

commit af99248
Author: Pete Schwamb <pete@schwamb.net>
Date:   Sun Oct 13 08:58:10 2019 -0500

    Fix issue with PumpManager ble update coming in right after cgm update arrives (LoopKit#1096)

commit 255a7de
Author: katie disimone <kdisimone@mac.com>
Date:   Sun Oct 13 06:53:42 2019 -0700

    display - for HUD CGM when value is >15 min old (LoopKit#1140)

commit 2c948ec
Author: katie disimone <kdisimone@mac.com>
Date:   Sun Oct 13 06:42:28 2019 -0700

    hide the saved API secret by default in NS services display (LoopKit#1142)
@ps2 ps2 deleted the double-update-fix branch January 15, 2020 16:00
novalegra pushed a commit to novalegra/Loop that referenced this pull request Jan 31, 2020
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant