Commit graph

3038 commits

Author SHA1 Message Date
Andrew Warrington dcf79c710c Update following testing! Bug fixes:
- Detailed IOB always shown in older watch faces (fixed)
- Cockpit: Loop graphic stays red once set (fixed)

Design changes:
- AAPSv2: Changed spacing of status and cob/time/iob lines to use layout_weight instead of padding (more dynamic)
- Removed decimal point in delta strings when BG is in mg/dL to gain space so everything fits with all options switched on. This will affect older watch faces.
- Changed to 1 decimal point in BGI to gain space. This will affect older watches as well.
- Changed order of preferences to match screen layout more closely

New features:
- Exposed BGI as an individual item in dataMap & added to BaseWatchFace + AAPSv2
2017-11-28 09:24:52 +01:00
Johannes Mockenhaupt 1a00f8c661
Treatments tab: display extended bolus tab if active pump supports it or if there are any extended bolus records. 2017-11-24 21:28:34 +01:00
Andrew Warrington d1fbaa29c9 Ready for review. Summary of all changes to date: New watch faces AAPSv2 and AAPS(Cockpit) work on both round and rectangular screens. Tested on Asus Zenwatch 3, Moto 360 42mm, and Sony Smart Watch 3. New watch settings included, to add/remove individual data items from the display. WatchUpdaterService and BaseWatchFace both updated to enable switching on and off of individual data items. 2017-11-22 22:46:43 +01:00
Milos Kozak a13661400f DanaRv2 queue & pump autodection 2017-11-22 22:09:58 +01:00
Milos Kozak 8818afe033 KoreanDanaR queue 2017-11-22 20:11:25 +01:00
Milos Kozak dfd0218a6a Merge branch 'dev' into queue 2017-11-22 19:44:16 +01:00
Milos Kozak a9f1acf7a7
Merge pull request #502 from jotomo/combo-extractions
Combo extractions
2017-11-22 19:36:59 +01:00
Milos Kozak d3288da468
Merge pull request #503 from jotomo/disabling-ongoing-notification
Cancel ongoing notification when plugin is disabled.
2017-11-22 19:36:28 +01:00
Johannes Mockenhaupt e28e5685f6
Cancel ongoing notification when plugin is disabled. 2017-11-22 19:13:56 +01:00
Johannes Mockenhaupt 1e4070e862
Fix typo in fragment name. 2017-11-22 11:34:23 +01:00
Johannes Mockenhaupt 5690772946
Nitpicky symmetry. 2017-11-22 11:33:26 +01:00
Johannes Mockenhaupt d202976251
PersistentNotification unregister workaround. 2017-11-22 11:32:41 +01:00
Johannes Mockenhaupt 9442c56eb8
Make PumpEnactResult fluent. 2017-11-22 11:30:48 +01:00
Johannes Mockenhaupt 60324ac6c6
Minor code cleanup. 2017-11-22 11:30:38 +01:00
Milos Kozak 62527ab33b
Merge pull request #500 from jotomo/prevent-gaps-in-tbr
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires bef…
2017-11-22 10:52:15 +01:00
Milos Kozak 63dbe2bd52
Merge pull request #501 from jotomo/hide-stop-button-once-pressed
BolusProgressDialog: hide stop button once pressed.
2017-11-22 10:51:39 +01:00
Johannes Mockenhaupt a8a7d47da2
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration. 2017-11-22 00:22:02 +01:00
Johannes Mockenhaupt b49a4c57ba
BolusProgressDialog: hide stop button once pressed. 2017-11-22 00:20:50 +01:00
Milos Kozak 252c0b3db9 DanaR queue driver 2017-11-21 23:00:53 +01:00
Milos Kozak f134163a76 Merge branch 'dev' into queue 2017-11-21 22:31:56 +01:00
Milos Kozak a6bf18244a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-11-21 22:31:22 +01:00
Milos Kozak ca44ae9a0b fix RU translation 2017-11-21 22:31:02 +01:00
Milos Kozak 4007049118 use MIN_DIA instead of DEFAULT_DIA 2017-11-21 22:29:50 +01:00
Milos Kozak d2cba61354 allign dana plugin code 2017-11-21 19:27:43 +01:00
Milos Kozak 3ab235f829 refactor pump interface out of ConfigBuilder, remove handlers 2017-11-20 23:39:12 +01:00
Milos Kozak 21ae42d37b Merge branch 'dev' into queue 2017-11-20 17:50:49 +01:00
Milos Kozak d37acdaba0
Merge pull request #498 from MilosKozak/dev2
Dev2
2017-11-20 17:46:50 +01:00
Milos Kozak 1335887957 Merge branch 'dev' into dev2 2017-11-20 17:40:45 +01:00
Milos Kozak 2f0599fbc7 missing return 2017-11-20 17:38:06 +01:00
Milos Kozak d8d8b150b6 Merge branch 'dev2' into queue 2017-11-20 17:34:03 +01:00
Milos Kozak 973b9d50c1 Merge branch 'dev' into dev2 2017-11-20 17:28:15 +01:00
Milos Kozak 0f0f39dfb4 log profiles if different 2017-11-20 17:26:03 +01:00
Milos Kozak 777aedd5db fix setting of TRB when low basal rate is running 2017-11-20 15:25:44 +01:00
Milos Kozak 297617467e fix format and add test for fromISODateString 2017-11-20 13:34:13 +01:00
Milos Kozak d8798e0bcf use mills from status if available 2017-11-20 13:23:25 +01:00
Andrew Warrington 78dd6d165b Addition of the "airplane cockpit" watch face -- unfinished. This commit is not yet ready to be merged into dev as more work is required for compatibility with multiple watches. 2017-11-19 22:14:28 +01:00
Andrew Warrington bc485a4783 Refactor of BaseWatchFace.java in order to allow greater flexibility in presenting or removing data from various watch faces.
Inclusion of Home2 ("AAPSv2") watch face for round.
2017-11-15 23:07:44 +01:00
Milos Kozak c5cd0e38ab
Merge pull request #496 from jotomo/fix-prefs-npe
Fix prefs NPE
2017-11-13 07:32:23 +01:00
Johannes Mockenhaupt e0df4646f9
Remove dead code. 2017-11-13 01:12:23 +01:00
Johannes Mockenhaupt 5839ad6a93
Ctors Android-style. 2017-11-13 01:12:15 +01:00
Johannes Mockenhaupt 9a4acbe052
Fix NPE initialising MyPreferencesFragment. 2017-11-13 01:12:05 +01:00
Andrew Warrington 45a26da8b3 Inclusion of the new watch face "AAPSv2" which: 1) has larger text, 2) shows COB, 3) allows to choose between showing phone battery level (AAPS) or rig battery level (OpenAPS) via watch Settings menu.
Most changes are either minor or are completely new files. The largest changes were to the WatchUpdaterService.java, which required several new blocks of code in order to expose COB, IOB, and current temp basal independently of the main status string.
2017-11-12 21:46:32 +01:00
Milos Kozak 7374545046 refactor all deliverTreatment 2017-11-12 00:08:25 +01:00
Milos Kozak 620a54a31b bolus from wizard to queue 2017-11-11 23:44:30 +01:00
Milos Kozak c7faf2a5e7 bolus progress dialog during connection 2017-11-11 23:03:31 +01:00
Milos Kozak 25aa5094a4 alarm for failed bolus 2017-11-11 22:32:00 +01:00
Milos Kozak a5227fc773 add bolus sound 2017-11-11 16:20:34 +01:00
Milos Kozak 86b11edd58 RS connection and status reading 2017-11-11 14:05:29 +01:00
Milos Kozak a186ce6468 more command queue code 2017-11-10 00:27:18 +01:00
Milos Kozak d40e0c97c4 simplify active pump access where possible 2017-11-08 23:40:54 +01:00