Andy Rozman
|
b0fe8fc5aa
|
Merge branch 'dev' into ench_1455_custom_actions
|
2019-02-20 23:41:09 +00:00 |
|
|
Andy Rozman
|
8b3b1e67ea
|
First implementation
|
2019-02-20 22:57:31 +00:00 |
|
|
Milos Kozak
|
582101a3e9
|
Merge pull request #1639 from MilosKozak/fixes
Fix applying basal constraints in non APS mode
|
2019-02-19 18:24:16 +01:00 |
|
|
Milos Kozak
|
95297a6292
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2019-02-19 16:26:35 +01:00 |
|
|
Milos Kozak
|
1f3696608e
|
Tomato BGSource plugin
|
2019-02-19 16:26:16 +01:00 |
|
|
TebbeUbben
|
71f73210c9
|
Send dismiss event in main thread
|
2019-02-17 22:02:51 +01:00 |
|
|
TebbeUbben
|
8f7a29bd7a
|
Only show notification after three timeouts during handshake
|
2019-02-17 22:01:01 +01:00 |
|
|
TebbeUbben
|
5fb0fe62f4
|
Remove timeout during handshake notification when connection was successful
|
2019-02-17 21:58:17 +01:00 |
|
|
TebbeUbben
|
361cc158e8
|
Timeout during handshake notification
|
2019-02-16 20:28:49 +01:00 |
|
|
TebbeUbben
|
d2b0665af1
|
Merge branch 'master' into insight-dev2
|
2019-02-12 15:01:29 +01:00 |
|
|
TebbeUbben
|
e49cc10e1c
|
Log exceptions that occur in alert service
|
2019-02-12 14:57:14 +01:00 |
|
|
TebbeUbben
|
a4312acb3e
|
Incremental recovery duration
|
2019-02-12 14:54:27 +01:00 |
|
|
TebbeUbben
|
c564cc2214
|
Reuse socket of failed connection
|
2019-02-12 14:36:56 +01:00 |
|
|
TebbeUbben
|
ee704c3988
|
Merge branch 'master' into insight-dev
|
2019-02-10 00:05:43 +01:00 |
|
|
TebbeUbben
|
4a11723a61
|
Fix zero-temp for pump stopped periods
|
2019-02-10 00:03:59 +01:00 |
|
|
TebbeUbben
|
7a4d721c29
|
Fix bolus progress dialog with bolus cancel
|
2019-02-09 23:50:12 +01:00 |
|
|
TebbeUbben
|
4146c8a770
|
Don't send final bolus event after bolus cancel
|
2019-02-09 23:14:57 +01:00 |
|
|
TebbeUbben
|
a8a182dc9d
|
Change way of checking operating mode during bolus delivery
|
2019-02-09 23:12:36 +01:00 |
|
|
TebbeUbben
|
0b1e181662
|
Quick wizard fix 2
|
2019-02-09 23:06:11 +01:00 |
|
|
TebbeUbben
|
05aa369bae
|
Merge branch 'master' into insight-dev
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
|
2019-02-09 22:52:01 +01:00 |
|
|
TebbeUbben
|
f5d65e044c
|
Fix wear bolus for Insight
|
2019-02-09 22:49:38 +01:00 |
|
|
TebbeUbben
|
7035b9a5f2
|
Fix Quick Wizard for Insight pump
|
2019-02-09 22:47:45 +01:00 |
|
|
TebbeUbben
|
2ad4670f07
|
Refresh overview when pump is unpaired
|
2019-02-09 22:43:05 +01:00 |
|
|
TebbeUbben
|
7a7bebc5fe
|
Return false in isConnected and isConnecting when connection lock is not held.
|
2019-02-09 22:30:41 +01:00 |
|
|
TebbeUbben
|
317f171286
|
Fetch pump status after pairing
|
2019-02-09 22:25:07 +01:00 |
|
|
TebbeUbben
|
baac836d64
|
Don't read past history events when pump is newly paired.
|
2019-02-09 22:14:10 +01:00 |
|
|
TebbeUbben
|
e4fd293027
|
Stop fetching bolus progress when pump has switched operating mode
(e.g. because of an empty cartridge)
|
2019-02-09 22:08:49 +01:00 |
|
|
TebbeUbben
|
c5241b6cad
|
Remove unneeded variable
|
2019-02-09 22:04:09 +01:00 |
|
|
Milos Kozak
|
f540c70f22
|
Merge branch 'dev' into G6
|
2019-02-08 19:11:38 +01:00 |
|
|
TebbeUbben
|
c730d3244f
|
Log app error codes
|
2019-02-04 23:56:24 +01:00 |
|
|
TebbeUbben
|
183e9a321e
|
Add getReservoirLevel() and getBatteryLevel() to LocalInsightPlugin
|
2019-02-02 17:02:03 +01:00 |
|
|
TebbeUbben
|
cc189d360f
|
Merge remote-tracking branch 'nico/dev-wip' into dev-nico
|
2019-02-02 16:58:21 +01:00 |
|
|
Milos Kozak
|
5988910d2c
|
Merge branch 'insight' into dev
|
2019-02-02 12:56:33 +01:00 |
|
|
AdrianLxM
|
3c029906db
|
Merge pull request #1593 from MilosKozak/AdrianLxM-patch-1
Wear bug with Insight-pump: ignore rounding deviations
|
2019-02-02 12:31:37 +01:00 |
|
|
TebbeUbben
|
71c4c411b2
|
Fix race condition for bolus cancel
|
2019-02-02 11:41:16 +01:00 |
|
|
TebbeUbben
|
a282124497
|
Return pump enact failure when base basal ist 0 duration execution of setTempBasalAbsolute
|
2019-02-02 01:38:01 +01:00 |
|
|
TebbeUbben
|
1ffd63c83a
|
Hide operating mode button by default
|
2019-02-02 01:14:27 +01:00 |
|
|
TebbeUbben
|
b0f72fc736
|
Only update first basal profile
|
2019-02-02 01:11:26 +01:00 |
|
|
TebbeUbben
|
9b45c6b291
|
Only enable Insight driver in engineering mode
|
2019-01-31 13:09:40 +01:00 |
|
|
TebbeUbben
|
d1f7086651
|
Merge branch 'master' into insight-dev
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
|
2019-01-31 13:08:33 +01:00 |
|
|
TebbeUbben
|
2cde70e584
|
Update status of final bolusing event as well
|
2019-01-30 20:37:35 +01:00 |
|
|
TebbeUbben
|
827d26a39a
|
Insight history fix
|
2019-01-30 20:25:48 +01:00 |
|
|
TebbeUbben
|
e23657bfe5
|
Set alertActivity to null onDestroy
|
2019-01-27 23:02:57 +01:00 |
|
|
TebbeUbben
|
68f4a20c2b
|
Final bolusing event
|
2019-01-27 16:40:56 +01:00 |
|
|
TebbeUbben
|
0c93679ed2
|
Fix initial EventOverviewBolusProgress
|
2019-01-26 09:32:29 +01:00 |
|
|
TebbeUbben
|
5475d9bceb
|
Withdraw connection request when deleting pairing
|
2019-01-25 22:55:15 +01:00 |
|
|
TebbeUbben
|
53f7cf0dcf
|
Revert "Improve connection routine"
This reverts commit 8116a24
|
2019-01-25 22:53:35 +01:00 |
|
|
TebbeUbben
|
8116a24fc6
|
Improve connection routine
|
2019-01-25 22:32:22 +01:00 |
|
|
TebbeUbben
|
ffc1db3c95
|
Add short status
|
2019-01-25 22:28:36 +01:00 |
|
|
TebbeUbben
|
6ac02f96cb
|
Fix NullPointerException
|
2019-01-22 13:55:38 +01:00 |
|
|
TebbeUbben
|
f6d829e575
|
Fix silent alert canceling
|
2019-01-19 15:18:41 +01:00 |
|
|
TebbeUbben
|
7724092843
|
Fix TBR logging
|
2019-01-19 15:15:56 +01:00 |
|
|
TebbeUbben
|
eb96209950
|
Disable old Insight driver
|
2019-01-19 11:59:17 +01:00 |
|
|
TebbeUbben
|
258034ca8d
|
Don't refresh status twice when setting TBR
Return duration in TBR PumpEnactResult
|
2019-01-19 11:54:05 +01:00 |
|
|
TebbeUbben
|
2a126783b7
|
Upload JSON status
|
2019-01-19 06:31:11 +01:00 |
|
|
TebbeUbben
|
356feb5be0
|
Only cancel TBR if needed
|
2019-01-19 06:09:11 +01:00 |
|
|
TebbeUbben
|
f0a2307517
|
Fix race condition in alert service
|
2019-01-19 05:36:02 +01:00 |
|
|
TebbeUbben
|
437dee288e
|
Make TBR emulation setting working
|
2019-01-19 05:02:00 +01:00 |
|
|
TebbeUbben
|
65400560dd
|
Properly show TBR duration in fragment
|
2019-01-19 03:08:14 +01:00 |
|
|
TebbeUbben
|
4d213eae7d
|
Fix disconnect routine
|
2019-01-19 00:58:08 +01:00 |
|
|
TebbeUbben
|
cc364a0cec
|
Read configuration for getting active basal profile instead of using status result
|
2019-01-19 00:47:32 +01:00 |
|
|
TebbeUbben
|
f27ace7568
|
Fix PumpStoppedException while fetching status
|
2019-01-19 00:43:58 +01:00 |
|
|
TebbeUbben
|
85ae946296
|
Indicate in fragment if cartridge is not inserted
|
2019-01-19 00:41:29 +01:00 |
|
|
TebbeUbben
|
58a8845ec3
|
Don't update fragment of destroying view
|
2019-01-18 23:44:26 +01:00 |
|
|
TebbeUbben
|
2770a49869
|
Local Insight driver
|
2019-01-18 22:40:22 +01:00 |
|
|
AdrianLxM
|
11b8b83651
|
ignore rounding deviations
|
2019-01-04 19:27:44 +01:00 |
|
|
Milos Kozak
|
2b9b3b4f16
|
Eversense support
|
2018-12-11 21:56:57 +01:00 |
|
|
Nico Schmitz
|
9e03f0f8ca
|
Update to current dev branch
|
2018-12-11 14:51:26 +01:00 |
|
|
Milos Kozak
|
8610dcc21d
|
G5 2018 app version support
|
2018-12-10 19:35:01 +01:00 |
|
|
Milos Kozak
|
40ad066346
|
Fix applying basal constraints in non APS mode
|
2018-12-09 10:45:56 +01:00 |
|
|
triplem
|
2693797bbd
|
fix duplication of resume and reconnect
|
2018-12-07 22:36:22 +01:00 |
|
|
Nico Schmitz
|
49b0e3ab71
|
Add EditTriggerDialog
|
2018-12-05 21:22:32 +01:00 |
|
|
TebbeUbben
|
e075a73c87
|
Add unit to Careportal bgcheck entries
|
2018-12-01 16:52:46 +01:00 |
|
|
TebbeUbben
|
dfe1e032be
|
Complete G6 plugin
|
2018-12-01 16:51:12 +01:00 |
|
|
Milos Kozak
|
a4c690e7c2
|
G6 register plugin
|
2018-12-01 10:51:53 +01:00 |
|
|
Milos Kozak
|
d664136b6e
|
G6 overview button support
|
2018-12-01 00:26:04 +01:00 |
|
|
Milos Kozak
|
946b2bfd12
|
Initial G6 support
|
2018-12-01 00:16:15 +01:00 |
|
|
Milos Kozak
|
d750438cd3
|
Merge pull request #1488 from schmitzn/fix-switem
Simplify SWItem.generateLayout()
|
2018-11-29 15:25:38 +01:00 |
|
|
Milos Kozak
|
b8a83216a7
|
Merge pull request #1556 from gregorybel/gregorybel-android-auto3
Gregorybel: Add android auto
|
2018-11-29 15:24:31 +01:00 |
|
|
Milos Kozak
|
b1606d2452
|
Merge pull request #1551 from triplem/pr_1550
Total Basal in NS Profile
|
2018-11-25 22:40:03 +01:00 |
|
|
gregorybel
|
a23b820f3e
|
create 3 special lines for android auto in order to simplify view and give a more natural text to speech
|
2018-11-19 22:16:47 +01:00 |
|
|
Milos Kozak
|
b6cd214006
|
Merge pull request #1562 from MilosKozak/fixes
Fixes
|
2018-11-19 19:55:34 +01:00 |
|
|
Milos Kozak
|
bc41814946
|
Merge pull request #1358 from quizzmaster/fix1318
Notifications about tbr suggestions. Fixes #1318
|
2018-11-18 22:39:27 +01:00 |
|
|
Milos Kozak
|
8110bef68f
|
Merge pull request #1540 from jotomo/upstream-1480
Profile switch name mangling for NS up/download
|
2018-11-18 22:37:57 +01:00 |
|
|
Milos Kozak
|
6e1a01e9d3
|
Merge pull request #1543 from triplem/suspend_with_loop_disabled
Allow disconnection/suspend of pump even while Loop is deactivated
|
2018-11-18 21:24:39 +01:00 |
|
|
Grégory Beloncle
|
3310c6d618
|
Update PersistentNotificationPlugin.java
- remove double call from addMessage
- add comments
|
2018-11-14 11:07:00 +01:00 |
|
|
Grégory Beloncle
|
7497eade82
|
Update PersistentNotificationPlugin.java
add comments regarding intents
|
2018-11-14 10:54:43 +01:00 |
|
|
gregorybel
|
9124788c4e
|
first commit
|
2018-11-12 22:38:49 +01:00 |
|
|
Milos Kozak
|
abb1dd956c
|
Fix sending SMS in Android 8
|
2018-11-12 19:00:06 +01:00 |
|
|
triplem
|
eea79c5d0f
|
fixes PR#1550
|
2018-11-08 21:14:44 +01:00 |
|
|
Roumen Georgiev
|
4ac687cc72
|
change constraint to isLoopInvocationAllowed
|
2018-11-06 13:40:56 +02:00 |
|
|
Roumen Georgiev
|
f0b5643044
|
revert
|
2018-11-06 11:45:29 +02:00 |
|
|
Roumen Georgiev
|
707a9e62d8
|
revert dev changes
|
2018-11-06 11:40:08 +02:00 |
|
|
Roumen Georgiev
|
43a61f312a
|
WIP DstHelper
|
2018-11-06 11:25:39 +02:00 |
|
|
Milos Kozak
|
d9b9c2f5f8
|
Merge pull request #1538 from triplem/prepare_db_update
enable downgrading to enable future db updates
|
2018-11-05 16:39:29 +01:00 |
|
|
Milos Kozak
|
0abdd1488f
|
Merge pull request #1539 from jotomo/overview-ui-blocking
Overview: don't block the UI waiting for IobCob thread.
|
2018-11-05 16:39:05 +01:00 |
|
|
triplem
|
6ef777f411
|
enable downgrading to enable future db updates
|
2018-11-04 20:50:55 +01:00 |
|
|
triplem
|
c2d1506451
|
allow to reconnect
|
2018-11-04 19:34:46 +01:00 |
|
|
triplem
|
4cd9b19868
|
REname pump reconnection
|
2018-11-04 19:29:44 +01:00 |
|
|
triplem
|
e524c43138
|
Show only one resume
|
2018-11-04 19:23:58 +01:00 |
|
|
triplem
|
7a77571803
|
update logic
|
2018-11-04 19:06:19 +01:00 |
|
|
triplem
|
c4bbb62d0b
|
Initial implementation 2
|
2018-11-04 18:51:24 +01:00 |
|
|
Milos Kozak
|
fd2893e934
|
Merge pull request #1525 from MilosKozak/dev2_1
[WIP] 2.1 code
|
2018-11-03 21:25:34 +01:00 |
|
|
Milos Kozak
|
fda934c3cb
|
limit logging for 2.0
|
2018-11-02 23:24:57 +01:00 |
|
|
Milos Kozak
|
5a5d89563f
|
Fix BolusProgressDialog
|
2018-11-02 19:04:16 +01:00 |
|
|
Milos Kozak
|
0a545dc92b
|
Merge pull request #1532 from MilosKozak/dev
Dev
|
2018-11-02 10:40:11 +01:00 |
|
|
Milos Kozak
|
23a58c2fc1
|
== -> equals
|
2018-11-01 07:54:29 +01:00 |
|
|
Milos Kozak
|
b73cbacbf5
|
fix NPE
|
2018-10-31 08:05:57 +01:00 |
|
|
Milos Kozak
|
ca27843dd7
|
fix NPE
|
2018-10-31 08:02:16 +01:00 |
|
|
Milos Kozak
|
62aa49dd5b
|
fix loading BGs <39 #2
|
2018-10-30 21:25:34 +01:00 |
|
|
Milos Kozak
|
871b9b6b3d
|
fix loading BGs <39
|
2018-10-30 21:24:53 +01:00 |
|
|
Nico Schmitz
|
75d0bd9761
|
Fix tests
|
2018-10-29 21:34:03 +01:00 |
|
|
Nico Schmitz
|
04574d759f
|
Improve dialogs. Add JSON serialization for actions and events.
|
2018-10-29 21:24:30 +01:00 |
|
|
AdrianLxM
|
667cbe0b12
|
Get device name before setting up the callback
In case the callback is very quick, the name might not have been set yet?
|
2018-10-28 20:35:37 +01:00 |
|
|
Milos Kozak
|
d54651e916
|
cache midnight time calculation
|
2018-10-28 12:21:35 +01:00 |
|
|
Milos Kozak
|
00349527e1
|
calculate IobCobThread execution time
|
2018-10-28 11:47:12 +01:00 |
|
|
Milos Kozak
|
05dcb58f0a
|
check for future timestamp while loading history (RS,Rv2)
|
2018-10-28 11:24:59 +01:00 |
|
|
Nico Schmitz
|
0364d3c039
|
Refactor code. Some minor fixes.
|
2018-10-25 22:08:04 +02:00 |
|
|
Nico Schmitz
|
7698923fe8
|
Clean up code. Improve ux.
|
2018-10-25 21:12:26 +02:00 |
|
|
Nico Schmitz
|
c40dc583a3
|
Fix trigger order when merging connectors
|
2018-10-25 01:01:50 +02:00 |
|
|
Nico Schmitz
|
8dc40fb795
|
Change trigger composition logic
|
2018-10-24 23:37:14 +02:00 |
|
|
Nico Schmitz
|
d863e39046
|
Add changeConnector()
|
2018-10-24 23:13:55 +02:00 |
|
|
triplem
|
43fcfaf5d6
|
solve #1449
|
2018-10-24 20:46:22 +02:00 |
|
|
Andy Rozman
|
07eef5adae
|
Added Notification types needed for Medtronic
Added Notification types needed for Medtronic (reserving this two numbers)
|
2018-10-24 12:45:54 +01:00 |
|
|
AdrianLxM
|
5465e8f5aa
|
try to catch bad devicenames
|
2018-10-19 10:31:57 +02:00 |
|
|
Nico Schmitz
|
7659f58776
|
Fix tests
|
2018-10-16 01:57:59 +02:00 |
|
|
Nico Schmitz
|
6fb4de6752
|
Bugfix json serialization
|
2018-10-16 01:49:11 +02:00 |
|
|
Nico Schmitz
|
3f5d795e15
|
Fix bug in TriggerConnector.shouldRun()
|
2018-10-16 01:33:08 +02:00 |
|
|
Nico Schmitz
|
2e4f18794f
|
Add ChooseTriggerDialog
|
2018-10-16 00:07:13 +02:00 |
|
|
Nico Schmitz
|
f98d40f71b
|
Work on automation plugin.
- Add MainApp.dpToPx() helper function
- Remove trigger layout resources
- Generate trigger layout programmatically
- Improve ux (when composing trigger logic)
- Refactoring
|
2018-10-15 23:20:06 +02:00 |
|
|
Milos Kozak
|
fee3b33d81
|
Merge pull request #1499 from jotomo/upstream-1482+1489
Combo: allow records created by the combo to be merged with existing records.
|
2018-10-14 23:33:08 +02:00 |
|
|
Milos Kozak
|
6ae98e5177
|
add comment
|
2018-10-14 22:55:21 +02:00 |
|
|
Johannes Mockenhaupt
|
c326e7a483
|
Overview: don't block the UI waiting for IobCob thread.
|
2018-10-14 16:24:07 +02:00 |
|
|
Johannes Mockenhaupt
|
b0fcbf3013
|
Update JavaDoc.
|
2018-10-14 14:36:05 +02:00 |
|
|
Milos Kozak
|
26cb25893e
|
remove fabric logging for SMS
|
2018-10-14 12:01:14 +02:00 |
|
|
Milos Kozak
|
cc25520770
|
ignore SMS starting #
|
2018-10-14 11:58:19 +02:00 |
|
|
Milos Kozak
|
bedb79c461
|
Merge branch 'dev' into smsrefactor
|
2018-10-14 11:16:14 +02:00 |
|
|
Milos Kozak
|
903504d72d
|
SMSPlugin refactor & cleanup
|
2018-10-14 10:55:11 +02:00 |
|
|
Milos Kozak
|
94ef8f4a76
|
Merge branch 'dev' into smsrefactor
|
2018-10-14 09:55:51 +02:00 |
|
|
Johannes Mockenhaupt
|
4f896fccdb
|
Refactor and clean up.
|
2018-10-13 20:56:40 +02:00 |
|
|
Johannes Mockenhaupt
|
51315fc942
|
GH#1480: Improve conversion of incoming NS-PS name.
|
2018-10-13 20:38:26 +02:00 |
|
|
Milos Kozak
|
9309729ca1
|
Merge pull request #1502 from jotomo/upstream-1501
[For review] Correct off-by-one error calculating average.
|
2018-10-13 18:19:57 +02:00 |
|
|
Milos Kozak
|
c1bbaab8e1
|
allow UAM only if oref1 sensitivity plugin is selected
|
2018-10-13 18:07:01 +02:00 |
|
|
Milos Kozak
|
94233d28e1
|
fix sms command LOOP SUSPEND
|
2018-10-13 17:31:10 +02:00 |
|
|
Milos Kozak
|
ea1e78b169
|
prepare new classes
|
2018-10-13 16:50:47 +02:00 |
|
|
Milos Kozak
|
5c9baa31f3
|
fix different colors BG vs target range
|
2018-10-13 14:27:09 +02:00 |
|
|
Milos Kozak
|
9ee329b7db
|
log bucketed_data(0)
|
2018-10-13 11:40:19 +02:00 |
|
|
Milos Kozak
|
20fa8ed371
|
fix fallback to createBucketedDataRecalculated
|
2018-10-13 09:59:25 +02:00 |
|
|
Johannes Mockenhaupt
|
682b56198a
|
Queue: correct removal of queued command by type.
|
2018-10-12 16:30:45 +02:00 |
|
|
Johannes Mockenhaupt
|
c17ed80a34
|
Correct off-by-one error calculating average.
|
2018-10-12 16:05:32 +02:00 |
|