caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
4358 commits 1 branch 20 tags 140 MiB
Commit graph

3031 commits

Author SHA1 Message Date
Markus M. May b5969d4279 Minor cleanup based on feedback of jomoto 2018-02-15 20:33:03 +01:00
AdrianLxM a23c76f473
Merge branch 'dev' into smb-wear2 2018-02-14 15:03:45 +01:00
AdrianLxM c821ef97d8 option to enable wear/SMB notifications 2018-02-14 15:02:04 +01:00
AdrianLxM 7270b0b2f5 no wear vibrations on SMB 2018-02-14 14:59:26 +01:00
Milos Kozak bf6e3a9061 run calculation after interval change 2018-02-14 07:47:22 +01:00
Johannes Mockenhaupt df4ad822fc
Make new behaviour configurable, default on. 
(cherry picked from commit f807592)
 2018-02-13 20:44:58 +01:00
Johannes Mockenhaupt 1cd4e72541
Create NS-anouncements for error dialogs and local alerts. 
(cherry picked from commit 0df796d)
 2018-02-13 20:44:50 +01:00
Johannes Mockenhaupt c5e0eb9968
Don't disconnect after history read when queue is busy. 
Temporary hack, ComboPlugin.runCommand will still run commands
synchronously.
 2018-02-13 20:44:36 +01:00
Johannes Mockenhaupt aae9f7d153
Show notification to check pump date if last bolus is older than 24h. 2018-02-13 20:44:36 +01:00
Johannes Mockenhaupt 3ff56c7fa2
Disable unfinished dialogs. 2018-02-13 19:30:48 +01:00
Milos Kozak 4cdadaf0c4 IobCobPlugin specify loading time 2018-02-13 19:12:02 +01:00
Milos Kozak 31d493d8ae Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-02-13 18:38:55 +01:00
Milos Kozak 3e06b6a4ed
Merge pull request #687 from jotomo/error-announcements 
Create NS-anouncements for error dialogs and local alerts.
 2018-02-13 18:08:14 +01:00
Johannes Mockenhaupt f8075927f2
Make new behaviour configurable, default on. 2018-02-13 00:34:24 +01:00
Jamorham d3bf4fd026
History intent updates for Asclepius compatibility 2018-02-12 21:27:35 +00:00
Milos Kozak a6a937ba20 IobCobCalculatorPlugin as a param for GraphData 2018-02-12 20:07:39 +01:00
Milos Kozak 0ab2d5ba38 unstatic IobCobCalculatorPlugin 2018-02-12 19:49:08 +01:00
Johannes Mockenhaupt 0df796d3f4
Create NS-anouncements for error dialogs and local alerts. 2018-02-12 15:42:58 +01:00
Milos Kozak 97834e3fef Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-02-12 13:44:57 +01:00
Milos Kozak 5d408daefd remove displaying deviation slope 2018-02-12 13:42:50 +01:00
Johannes Mockenhaupt b6c5326524
NotificationStore: clean up access to store, avoid potential deadlock. 2018-02-12 12:43:23 +01:00
Johannes Mockenhaupt ee1efa4f7f
NotificationStore: add synchronisation when accessing internal store. 2018-02-12 11:15:59 +01:00
Milos Kozak d92a7e8ef1 Merge branch 'history' into dev 2018-02-11 23:46:20 +01:00
Milos Kozak fa2e46fbe5 remove CPP profile 2018-02-11 23:02:21 +01:00
Milos Kozak 943205c782 HardLimits refactor 2018-02-11 22:41:10 +01:00
Milos Kozak 5dd0f70686
Merge pull request #682 from jotomo/insight-hide-your-constraint 
Only show Insight as pump plugin in config tab.
 2018-02-11 21:09:54 +01:00
Johannes Mockenhaupt e80559c948
Only show insight as pump plugin in config tab. 2018-02-11 19:51:03 +01:00
Milos Kozak e4891683b5 fix NPE in profile 2018-02-11 14:40:07 +01:00
Milos Kozak 23396ed80b
Merge pull request #675 from triplem/configbuilder 
Refactoring ConfigBuilder - cleanup fragment visibility
 2018-02-10 23:48:07 +01:00
Johannes Mockenhaupt d40a4bf57e
Merge pull request #55 from AdrianLxM/comborc01 
links unten in über
 2018-02-10 15:19:17 +01:00
Milos Kozak 359b8401b2
Merge pull request #678 from jamorham/dev 
Updates to Insight plugin
 2018-02-10 15:13:35 +01:00
AdrianLxM c5057f3d5a remove unused import 2018-02-10 14:55:29 +01:00
AdrianLxM 4587a47840 add links to about 2018-02-10 14:53:43 +01:00
Johannes Mockenhaupt 573c818eb7
Combo: Answer detected TBR mismatches. 2018-02-10 14:33:44 +01:00
Jamorham 046de51496
Insight few small changes 2018-02-10 09:29:23 +00:00
Markus M. May a1bb67d425 Refactoring ConfigBuilder - cleanup fragment visibility 2018-02-08 22:23:48 +01:00
Johannes Mockenhaupt 1985ed379d
Add mute button to error dialog. 
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.

(cherry picked from commit 43755f0)
 2018-02-08 22:18:38 +01:00
Johannes Mockenhaupt 7fa51a9248
Revert: Combo: retry twice to establish connection before giving up. 
Only increases number of failed connection attempts.
 2018-02-08 22:15:36 +01:00
Milos Kozak 538f70a725
Merge pull request #669 from MilosKozak/AdrianLxM-bolusDelivered 
Don't treat an extended bolus as bolus if it emulates basal
 2018-02-08 21:08:10 +01:00
Milos Kozak 5c7c430ee4
Merge pull request #673 from jotomo/bolus-error-dialog-sound 
Bolus error dialog / sound
 2018-02-08 21:07:21 +01:00
Milos Kozak 6f487aded5
Merge pull request #674 from jotomo/ext-bolus-query-race-condition 
Avoid race condition using active extended bolus.
 2018-02-08 21:06:26 +01:00
Johannes Mockenhaupt f888e0d7ab
Avoid race condition using active extended bolus. 
(cherry picked from commit 5b7c0cc)
 2018-02-08 20:44:42 +01:00
Johannes Mockenhaupt 483ecadede
Fix dutch translation for Combo's last bolus, minor cleanup. 
(cherry picked from commit c0cf06a)
 2018-02-07 22:53:59 +01:00
Johannes Mockenhaupt 46ea4be4eb
ComboFragment: display last bolus regardless of age. 
(cherry picked from commit 197874e)
 2018-02-07 22:51:15 +01:00
Johannes Mockenhaupt 6b36dd27d8
Don't create a cancel record for requests to cancel a TBR when none is running. 
(cherry picked from commit a46b475)
 2018-02-07 22:08:16 +01:00
Johannes Mockenhaupt 43755f071d
Add mute button to error dialog. 
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.
 2018-02-07 20:32:09 +01:00
Johannes Mockenhaupt 6fb5f5bad4
Check result.success when hard cancelling TBR. 
(cherry picked from commit 654f984)
 2018-02-07 15:30:02 +01:00
Jamorham bda1866c6d
Do our own history merging for TBRs 2018-02-07 13:36:06 +00:00
AdrianLxM 599b04c4ff
Don't treat an extended bolus as bolus if it emulates basal 2018-02-06 19:31:04 +01:00
Johannes Mockenhaupt c781601cbb
Commit missing string. 2018-02-06 00:04:24 +01:00
Johannes Mockenhaupt e9f0fa3c04
Warn when finding multiple boluses in the same minute with same amount. 
Not much can be done if the user manages to bolus multiple boluses
within the same minute, with the same amount. This should almost
never happen, but if it does, at least warn the user one of those
boluses isn't accounted for wrt to IOB.
 2018-02-05 23:58:19 +01:00
Johannes Mockenhaupt a861afa208
Log bolus amount when saving to DB failed. 2018-02-05 23:19:43 +01:00
AdrianLxM 0c0f68d510
Merge pull request #666 from MilosKozak/AdrianLxM-VPdefault 
Don't enable Insight by default
 2018-02-05 23:16:48 +01:00
Johannes Mockenhaupt 5b21844423
Did it again. 2018-02-05 23:14:25 +01:00
Johannes Mockenhaupt e812c7119f
Fix setting 'pumpHistoryChanged'. 2018-02-05 23:14:25 +01:00
Johannes Mockenhaupt f07017a4f6
Document global state variables. 2018-02-05 23:14:25 +01:00
Jamorham 693c3ef8ad
Store in history exactly what we enact 2018-02-05 22:11:26 +00:00
AdrianLxM 8e69573710
Merge pull request #668 from savek-cc/careportal-bg-update 
fix display unit when updating careportal entry for historic bg value
 2018-02-05 22:47:46 +01:00
Timm Korte 9713836e69 fix display unit when updating careportal entry for historic bg value 2018-02-05 22:35:08 +01:00
Jamorham 6a9b293e49
Improved TBR cancelling 2018-02-05 14:39:55 +00:00
AdrianLxM 36608559af
Don't enable Insight by default 2018-02-05 14:11:54 +01:00
Jamorham 44ba10e00c
Insight treat 100% TBR from absolute as cancel 2018-02-05 11:33:00 +00:00
Milos Kozak 9fd8ad8705
Merge pull request #665 from jotomo/graph-target-line-fix 
Graph: fix rendering target line for ranges from profiles.
 2018-02-04 22:32:33 +01:00
Johannes Mockenhaupt b5c35dea71
Graph: fix rendering target line for ranges from profiles. 2018-02-04 22:01:30 +01:00
Milos Kozak 4b061d1a51
Merge pull request #652 from savek-cc/careportal-bg-update 
update bg for treatment in the past via careportal
 2018-02-04 21:54:33 +01:00
Jamorham 1d169bc27f
Better calculation for Absolute basal from Tebbe 2018-02-04 19:14:02 +00:00
Jamorham 501ca5c597
Fix for some TBR cancels getting through 2018-02-04 12:57:10 +00:00
Johannes Mockenhaupt 8c25bc4002
Answers cleanup. 2018-02-04 01:29:27 +01:00
Johannes Mockenhaupt f573265bc2
Add target line to graph. 
Uses the middle if a range is specified to show what the loop
aims for.
 2018-02-04 00:34:14 +01:00
Johannes Mockenhaupt 87771e8753
A few fixes. 2018-02-03 23:44:17 +01:00
Johannes Mockenhaupt 956a611af4
Fix checking/updating history. 
(cherry picked from commit 5413a0f)
 2018-02-03 22:07:42 +01:00
Johannes Mockenhaupt 2a5c28cf6b
ReadQuickInfoCommand: only read as many boluses as are available. 
(cherry picked from commit 7857abb)
 2018-02-03 22:07:41 +01:00
Johannes Mockenhaupt 183edfcc09
When checking for changed pump history, compare the last two records. 
This ensures changes are also detected if a bolus was added on the
pump within the same minute of the previous record.
 2018-02-03 20:03:30 +01:00
Johannes Mockenhaupt 1e8e2a59fd
ReadHistoryCommand: fetch records including the requested timestamp. 
To ensure we retrieve records with the same timestamp.
 2018-02-03 19:56:27 +01:00
Johannes Mockenhaupt 6fded4c1bd
ComboPlugin.deliverBolus: avoid creating boluses within the same minute. 2018-02-03 19:32:00 +01:00
Johannes Mockenhaupt 72e4cd29c4
Extend ReadQuickInfoCommand to read more history records. 
Also remove switch to forego quick info, which really isn't the cause
of the infamous bug, but is now required with the updated history
check logic against timestamp dups.

(cherry picked from commit 18aa827)
 2018-02-03 19:31:01 +01:00
Johannes Mockenhaupt ec4280bc2e
Fix creating a seconds-based bolus record based on minute and bolus. 
(cherry picked from commit f8848be)
 2018-02-03 19:26:35 +01:00
Johannes Mockenhaupt f6c5b95904
Merge remote-tracking branch 'origin/master' into combo-scripter-v2 
* origin/master:
  Revert "Update strings.xml"
  bump 1.58
  Update strings.xml
  Add issue template.
  Enhance insulin plugin test
  filter null BT devices
  BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
  BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
  ES translations
  Dana plugin refactoring
  KO language cleanup
  Update strings.xml
  Update strings.xml
  Bg translation
  add RO language
  CS translations
  ButterKnife to Dana fragment
  bump 1.57a-dev
  Add a unit test for Insulin Plugin

# Conflicts:
#	app/build.gradle
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values-nl/strings.xml
#	app/src/main/res/values/strings.xml
 2018-02-03 16:45:29 +01:00
Johannes Mockenhaupt 435c4dee85
Create Answer events when adding bolus to DB fails. 
(cherry picked from commit 947ea4f)
 2018-02-03 16:33:52 +01:00
Johannes Mockenhaupt 6c9effd027
Minor cleanup to reduce merge noise. 
(cherry picked from commit 4015f73)
 2018-02-03 16:33:50 +01:00
Timm Korte c33232108d remote unused import 2018-02-03 14:57:36 +01:00
Timm Korte c4a5285c24 update bg for treatment in the past via careportal 2018-02-03 12:00:59 +01:00
AdrianLxM b21fac92e9
revert min_5m_carbimpact to int 2018-02-02 22:46:52 +01:00
AdrianLxM 4f05917467
autosens deactivated -> 1 2018-02-02 22:45:18 +01:00
Milos Kozak 0832ae9491
Merge pull request #648 from jotomo/do-not-loop-for-smb-treatment-change 
Do not loop for SMB treatment change
 2018-02-02 22:26:49 +01:00
Johannes Mockenhaupt 5adaff6bc6
Don't run loop on treatment change if it's an SMB. 2018-02-02 21:27:05 +01:00
Johannes Mockenhaupt eedd2ee28b
Add bg/treatment to EventNewBG/EventTreatmentChange. 2018-02-02 19:04:28 +01:00
Jamorham 8e2fe7eaec
Insight ConstraintsInterface and Mstatus response type 2018-02-02 15:09:20 +00:00
Milos Kozak 9797f6e5f4 fix NPE 2018-02-02 15:33:19 +01:00
Milos Kozak bb21f2ae7b fix NPE 2018-02-02 15:31:25 +01:00
Milos Kozak d9cfe15b87 fix rendering absolute basal line 2018-02-02 14:44:56 +01:00
Johannes Mockenhaupt a07a4beaf8
Combo: update timestampOfLastKnownPumpBolusRecord after bolusing. 2018-02-02 11:59:11 +01:00
Milos Kozak 6312b81e10 Merge branch 'smb060' into dev 2018-02-02 10:51:13 +01:00
Johannes Mockenhaupt 1f06d801a2
Combo: retry twice to establish connection before giving up. 
(cherry picked from commit a16560a)
 2018-02-02 10:06:04 +01:00
Milos Kozak 411add616b
Merge pull request #632 from jamorham/dev 
Add Insight Pump Plugin
 2018-02-02 09:21:57 +01:00
Milos Kozak 72eed13932 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-02-02 09:17:51 +01:00
Milos Kozak 727ace4cc1 check for NPE 2018-02-02 09:17:26 +01:00
Johannes Mockenhaupt 26e7834093
Clean up, no behavioral changes and a bigger bed. 2018-02-02 00:40:24 +01:00
Milos Kozak c953086e3d Merge branch 'smb-events' into 'smb060' 
Let IobCob handle EventNewBg and loop act on IobCob result.

See merge request MilosKozak/AndroidAPS!379
 2018-02-01 22:13:59 +00:00
Milos Kozak 36cb4fc474 recover deviation slope calculation 2018-02-01 22:57:58 +01:00
Jamorham cdb3bc24c2
Use Config.DANAR to enable Insight 2018-02-01 21:37:21 +00:00
AdrianLxM 96668cbf9b
check for null profile 2018-02-01 18:45:48 +01:00
Jamorham b3c0daaeae
Enable isRefillingCapable 2018-02-01 17:39:28 +00:00
Milos Kozak 416c9f817b fix smb iob calculation 2018-02-01 17:12:19 +01:00
Milos Kozak d088bfccc8 remove unused microBolusInsulin 2018-02-01 16:35:04 +01:00
Jamorham 6a12b0a931
Use bolus id for history entry 2018-02-01 14:37:16 +00:00
Jamorham 73ea3628b2
Extracted insight strings 2018-02-01 10:33:54 +00:00
Milos Kozak fa46798fdf remove unused microBolusIOB 2018-02-01 10:57:05 +01:00
Milos Kozak e779dbf221 fix merge conflict 2018-02-01 10:29:00 +01:00
Jamorham 7f73c59530
Nightscout + UI performance improvements 2018-01-31 14:23:22 +00:00
Johannes Mockenhaupt c62ca89931
Fix adding a partial bolus to treatments. 2018-01-31 14:00:59 +01:00
Johannes Mockenhaupt b32351145a
Fix 'last bolus' not being displayed on start. 2018-01-31 13:55:25 +01:00
Johannes Mockenhaupt 98d666098b
Remove now unused PumpState.delivered field. 2018-01-31 13:54:42 +01:00
Johannes Mockenhaupt 1ba3a85655
Add DetailedBolusInfo.copy() method. 2018-01-31 13:54:15 +01:00
Johannes Mockenhaupt 1aee181f62
RuffyScripter: fix reading basal rate when no TBR is active 2018-01-31 12:54:25 +01:00
Johannes Mockenhaupt 344984e201
Fix recording partially delivered boluses. 2018-01-31 12:36:41 +01:00
Johannes Mockenhaupt 5bb8bdde3e
BolusCommand: don't check pump history on cancel, ComboPlugin.deliverBolus has that responsibility now. 2018-01-31 11:59:30 +01:00
Jamorham d07d9d309e
Implement additional methods 2018-01-31 09:53:31 +00:00
Johannes Mockenhaupt 8be8f961ae
Answer ruffy warnings. 
(cherry picked from commit b73a822)
 2018-01-31 02:02:02 +01:00
Johannes Mockenhaupt 4defd40023
RuffyScripter: clean up answers. 
(cherry picked from commit 0c30e1b)
 2018-01-31 01:35:31 +01:00
Jamorham ce0650a495
Check remote protocol version 2018-01-31 00:33:10 +00:00
Jamorham c3b07d2a0f
Match library refactoring 2018-01-31 00:31:55 +00:00
Johannes Mockenhaupt 6108e9f17a
Fix basal rate check. 2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt 1107d00571
Fix pump state display during init. 
(cherry picked from commit 3967c4b)
 2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt 6981c0fec6
Pump needs rest. 
(cherry picked from commit 2e88fb9)
 2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt 154902acdc
Fix ReadHistoryCommand not reading errors, TDDs. 2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt e790c87940
Cleanups and strings. 2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt 34db941c29
Remove unused code to import TBRs from the pump. 2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt 3db7aedb06
Fix activity indicator during on-connect-checks. 2018-01-31 00:09:38 +01:00
Johannes Mockenhaupt c7cccf3220
Read quick info first when checking history. 2018-01-31 00:08:39 +01:00
Johannes Mockenhaupt ecd16c26b8
ComboFragment: disable buttons when running. 2018-01-31 00:04:17 +01:00
Johannes Mockenhaupt d08958e43f
Remove dead ruffyscripter code. 2018-01-30 23:16:45 +01:00
Johannes Mockenhaupt a8cca7fcea
Remove duplication in ruffyscripter commands. 2018-01-30 23:16:27 +01:00
Milos Kozak fada51c380
Merge pull request #597 from triplem/test 
Add a unit test for Insulin Plugin
 2018-01-30 22:47:33 +01:00
Markus M. May f68d8f1626 Cleanup Refactoring 2018-01-30 19:33:10 +01:00
AdrianLxM 3a0d5d73f8
filter null BT devices 2018-01-30 01:02:21 +01:00
Jamorham ff0256345f
Display more live pump data 2018-01-29 22:55:53 +00:00
Milos Kozak af3b77e646 history browser initial work 2018-01-29 22:48:47 +01:00
Jamorham ef2189fec6
Insight faux cancel tbr option 2018-01-29 21:31:06 +00:00
Markus M. May 2a1bfe1f6c merge changes on foodhelper 2018-01-29 22:23:20 +01:00
Markus M. May 9a7e57f0a0 rename event to stay in compliance to naming conventions 2018-01-29 22:20:18 +01:00
Markus M. May 147448afca #557 - Encapsulate food plugin 2018-01-29 22:20:18 +01:00
Markus M. May 7d669fbeb8 Make food working, adopt category selection slightly 2018-01-29 22:20:18 +01:00
Markus M. May a78652f737 This needs to get reverted, but for testing purposes... 2018-01-29 22:20:18 +01:00
Markus M. May f31eabcefe Minor update to show off the possiblities for the refactoring. This is just a short step, major improvements are still to come. 2018-01-29 22:20:18 +01:00
Markus M. May 9cb019f5ca #557 - showoff of possible refactorings - see REFACTOR.md for additonal details 2018-01-29 22:20:18 +01:00
Johannes Mockenhaupt 216359312a
Minor non-code tweaks. 2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt 2468f23e97
ComboFragment: i18n last bolus. 2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt 5fbd9097d8
Rename ReadReservoirLevelAndLastBolus to ReadQuickInfoCommand. 2018-01-29 20:02:17 +01:00
Johannes Mockenhaupt 739e52dc47
Remove CommandResult.lastBolus in favour of CR.history.bolusHistory. 2018-01-29 20:01:53 +01:00
Roumen Georgiev 5e24289387 show output in mmol like in AMA 2018-01-29 16:43:45 +00:00
Johannes Mockenhaupt 3adda9bf6e
Clean up bolus delivery code. 2018-01-29 13:18:49 +01:00
Milos Kozak c2dc3f9848 Merge branch 'danas' into smb060 2018-01-29 12:01:53 +01:00
Milos Kozak d6f9dd819c Merge branch 'smb-misc' into 'smb060' 
Smb misc

See merge request MilosKozak/AndroidAPS!381
 2018-01-29 10:50:27 +00:00
Milos Kozak e55f88a255 Merge branch 'smb-apsresult' into 'smb060' 
Clean up parsing OpenAPS result and applying it

See merge request MilosKozak/AndroidAPS!383
 2018-01-29 10:46:40 +00:00
Milos Kozak 4cef8db54b Dana plugin refactoring 2018-01-29 11:24:03 +01:00
Johannes Mockenhaupt 038ea06abc
Log history reads. 
(cherry picked from commit 7326f29)
 2018-01-29 10:08:28 +01:00
Johannes Mockenhaupt 449dbd79f7
Rename TBR to 'temp basal' 2018-01-29 03:14:10 +01:00
Johannes Mockenhaupt 6fa1badcdb
Clean up parsing of SMB result and applying the requests. 2018-01-29 03:13:57 +01:00
Johannes Mockenhaupt 0655e4e676
SMB: clean up APSResult.toSpanned a bit. 
(cherry picked from commit 10d7c79)
 2018-01-29 03:13:57 +01:00
Johannes Mockenhaupt b1fd66aae5
Make TreatmentsPlugin.getLastBolusTime robust. 
Ignore carb-only treatments, ignore future records.

(cherry picked from commit cba015e)
 2018-01-29 03:05:12 +01:00
Jamorham 742ee5b762
Insight plugin updates 2018-01-28 23:16:30 +00:00
Johannes Mockenhaupt 2b995a8a73
RufyfScripter: log active/previous command in error routines. 2018-01-28 23:56:27 +01:00
Johannes Mockenhaupt 864100299d
Set activity indicator for refresh button. 2018-01-28 23:39:57 +01:00
Johannes Mockenhaupt 262fdf92c8
Check pump basal rate matches cached profile, force re-read otherwise. 2018-01-28 23:39:53 +01:00
Jamorham 07cdee0533
Insight CancelBolusTaskRunner refactor 2018-01-28 22:35:26 +00:00
Johannes Mockenhaupt 9f5ffc6646
Actually do something with the basal rate profile after force-reading. 2018-01-28 23:23:44 +01:00
Jamorham c019b4c533
Insight Cstatus add success helper 2018-01-28 22:04:21 +00:00
Jamorham cbe827ac07
Add History Receivers 2018-01-28 22:03:40 +00:00
Jamorham 9a8521b809
Insight Live History 2018-01-28 21:52:58 +00:00
Jamorham e704f130bc
Add Insight HistoryLogAdapter 2018-01-28 21:52:18 +00:00
Johannes Mockenhaupt eb7ec24335
Don't read pump TBR history. 2018-01-28 22:33:05 +01:00
Johannes Mockenhaupt 3fde47d283
Move ruffyscripter to combo plugin package. 2018-01-28 22:16:58 +01:00
Johannes Mockenhaupt 6c4c662c31
Remove RuffyCommandsV1Impl. 2018-01-28 22:14:31 +01:00
Johannes Mockenhaupt 10d2b8739f
Log commands to Fabric. 2018-01-28 22:10:11 +01:00
Johannes Mockenhaupt 34af5bc20b
Source code from ruffyscripter, ruffy-spi modules. 2018-01-28 22:03:32 +01:00
Johannes Mockenhaupt 6609eb6be5
Cleanup. 2018-01-28 21:56:56 +01:00
Johannes Mockenhaupt 302d3494d2
Covering 105% of all failure cases. 2018-01-28 19:53:44 +01:00
Johannes Mockenhaupt 3b7045227e
Only check reservoir level before bolus if data is available. 2018-01-28 19:04:46 +01:00
Johannes Mockenhaupt bd87a893c2
Best effort to handle multiple boluses within the same minute. 
(cherry picked from commit cc9094f)
 2018-01-28 18:59:07 +01:00
Johannes Mockenhaupt 3a95c3c4d9
More work for bolusing with pump history records. 
(cherry picked from commit 4bc3e42)
 2018-01-28 17:06:16 +01:00
Johannes Mockenhaupt 8c27b32d07
Let "Initializing" be a pump state, not an action. 2018-01-28 15:48:17 +01:00
Johannes Mockenhaupt cd385a3217
ComboFragment: deal with resevoir levels being available or not. 2018-01-28 15:43:50 +01:00
Johannes Mockenhaupt e3abe04545
Bring back last bolus to combo fragment. 
(cherry picked from commit 108349e)
 2018-01-28 15:30:36 +01:00
Johannes Mockenhaupt 5de588b540
Enable reading reservoir level units. 
This partially reverts commit b4998feee1.
 2018-01-28 15:27:59 +01:00
Johannes Mockenhaupt b3a60eb5ab
Initial work on basing boluses on pump history. 2018-01-28 15:22:41 +01:00
Johannes Mockenhaupt 3be65319d7
AlarmSoundService: don't set volume to 100% if music is playing. 
Have mercy with my ears.
 2018-01-27 20:12:17 +01:00
Johannes Mockenhaupt db5ee7067a
PumpEnactResult.toSpanned: add SMBs, handle SMB-only enact. 2018-01-27 19:58:37 +01:00
Johannes Mockenhaupt 7e264b1bfd
Let IobCob handle EventNewBg and loop act its result. 2018-01-27 19:04:03 +01:00
Milos Kozak b4d13c727e let nsclient bg source be with advanced filtering temporary 2018-01-27 15:07:15 +01:00
Milos Kozak 5b11c5630c hide deviation slope graphs 2018-01-27 14:47:35 +01:00
Milos Kozak 296d5059d6 SMB options in preferences 2018-01-27 14:47:04 +01:00
Jamorham b831fd7dfb
Insight Temporary basal absolute 2018-01-26 22:34:43 +00:00
Jamorham f036ca4547
Attempt to eliminate duplicate connectors 2018-01-26 22:27:04 +00:00
Jamorham 3150e7d00f
Add double rounding helper 2018-01-26 22:26:29 +00:00
Milos Kozak b2d9ad8986 Merge branch 'dev' into smb060 2018-01-26 22:49:25 +01:00
Jamorham 0966bea1e8
InsightPumpFragment: add redundant casting for travis 2018-01-26 17:17:04 +00:00
Jamorham ee0a53976f
StatusItemViewAdapter add redundant casting for travis 2018-01-26 17:10:43 +00:00
Jamorham f30efd0224
Insight fragment use status list 2018-01-26 16:59:14 +00:00
Jamorham 076685992c
Insight status list and connector 2018-01-26 16:58:19 +00:00
Jamorham f2cfc3cdbd
Update helpers 2018-01-26 16:56:09 +00:00
Milos Kozak e5d20ca996 ButterKnife to Dana fragment 2018-01-26 17:18:40 +01:00
Jamorham 31b0ce21e5
StatusItem ui elements 2018-01-26 16:12:37 +00:00
Johannes Mockenhaupt 3d1f8c0893
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Disable release build checks until wear lib upgrade (#620).
  Rv2,RS: use safe carb diff 30s
 2018-01-26 16:19:45 +01:00
Milos Kozak d8a6c0d111 Rv2,RS: use safe carb diff 30s 2018-01-26 15:47:45 +01:00
Johannes Mockenhaupt 61bb6aa1ba
Combo: declare as not supporting carb infos. 2018-01-26 13:53:50 +01:00
Johannes Mockenhaupt 372e435761
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Fix format specifiers in Spanish translation, add MainApp.gs(id, args).
  travis accept license manually
  Push carbs only to pumps supporting storing carbs.
  travis to 27.0.2
  sdk27 & butterknife
 2018-01-26 13:53:42 +01:00
Johannes Mockenhaupt 4a1970926c
Cleanup. 2018-01-26 13:53:17 +01:00
Milos Kozak 98e850b1b3 Merge branch 'dev' into smb060 2018-01-26 11:54:09 +01:00
Jamorham 8fa0de19c2
Insight async add wake locking 2018-01-26 10:31:11 +00:00
Jamorham 11fcfb88d4
More helper methods 2018-01-26 10:29:56 +00:00
Milos Kozak 6be2988e31
Merge pull request #619 from MilosKozak/sdk27 
Sdk27
 2018-01-26 10:14:21 +01:00
Milos Kozak 3c1e18d5d2
Merge pull request #617 from jotomo/push-carbs-to-supported-pumps-only 
Push carbs only to pumps supporting storing carbs.
 2018-01-26 10:10:16 +01:00
Jamorham 4be1f52254
Cancels for TBR + extended 2018-01-25 23:21:11 +00:00
Jamorham 8ee75c5c72
Try to get missing status 2018-01-25 23:20:14 +00:00
Jamorham 07d17ede5f
Lower reconnect threshold 2018-01-25 21:26:11 +00:00
Jamorham d421ceffa6
Insight automatic reconnector 2018-01-25 20:55:55 +00:00
Jamorham c8ba4076c6
Update Helpers 2018-01-25 20:55:02 +00:00
Johannes Mockenhaupt 0067eb75d5
Fix format specifiers in Spanish translation, add MainApp.gs(id, args). 2018-01-25 20:28:21 +01:00
Johannes Mockenhaupt 5dcf214d08
Fix German translation. 2018-01-25 20:10:21 +01:00
Jamorham 54e2f7a712
Current work in progress 2018-01-25 17:30:16 +00:00
Jamorham 8cf159a6a7
Insight async callback handling 2018-01-25 17:23:57 +00:00
Johannes Mockenhaupt 947203b107
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  fix not attached to the activity
  check for no profile
  check for no profile
  Fix namespace errors.
  Add missing ids to other overview layouts.
  Overview: make checkbox labels toggle state as well.
  minimum of 30 min for unreachable alert
 2018-01-25 16:06:22 +01:00
Johannes Mockenhaupt ed1226ae67
Push carbs only to pumps supporting storing carbs. 2018-01-25 13:22:01 +01:00
Milos Kozak ca01168474
Merge pull request #611 from MilosKozak/min_unreachable 
minimum of 30 min for unreachable alert
 2018-01-25 11:24:09 +01:00
Milos Kozak 1ba793304f
Merge pull request #616 from jotomo/check-that-box 
Overview: make checkbox labels toggle state as well.
 2018-01-25 11:23:06 +01:00
Milos Kozak 893c64e2e4 fix not attached to the activity 2018-01-25 11:17:23 +01:00
Milos Kozak a3e6794138 check for no profile 2018-01-25 11:09:58 +01:00
Milos Kozak 7be0bfb27e check for no profile 2018-01-25 11:06:35 +01:00
Johannes Mockenhaupt c469edb5a3
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2018-01-25 03:28:06 +01:00
Johannes Mockenhaupt f7ed34532a
Fabric-Log combo init to get an idea of user count. 2018-01-25 03:28:06 +01:00
Jamorham c85854fe93
initial InsightPumpPlugin rough and untested 2018-01-24 21:12:12 +00:00
Milos Kozak bd5c7c396f sdk27 & butterknife 2018-01-24 21:54:24 +01:00
Jamorham 979dc2d5e2
More pieces for Insight Pump 2018-01-24 16:51:05 +00:00
Milos Kozak 801182eccd fix cob calculation for history records 2018-01-24 17:03:45 +01:00
Jamorham 7a4bc3b694
Initial bits for Insight Pump 2018-01-24 14:18:31 +00:00
Johannes Mockenhaupt 3a02f01374
Overview: make checkbox labels toggle state as well. 2018-01-24 14:10:17 +01:00
Johannes Mockenhaupt 01d49f9e52
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  fix storing food to the database
  remove forgotten log
  delete all dbrequests from query
 2018-01-24 02:15:45 +01:00
Johannes Mockenhaupt ae1707ead3
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  log RS history
  RS: reset isConnected & isConnecting on error
  RS BLE modifications
 2018-01-24 02:06:02 +01:00
Milos Kozak 8a45422135 Merge branch 'dev' into cobthread 2018-01-24 00:00:23 +01:00
Milos Kozak b6f3fae487 fix storing food to the database 2018-01-23 23:14:39 +01:00
Milos Kozak 9663dd499e remove forgotten log 2018-01-23 23:01:04 +01:00
Milos Kozak d4ddfbb942 Merge branch 'dev' into cobthread 2018-01-23 22:04:42 +01:00
Milos Kozak c2a7747167 use getAutosensData(toTime) in oref0 sensitivity 2018-01-23 22:02:17 +01:00
Milos Kozak de7789bec0 delete all dbrequests from query 2018-01-23 21:43:48 +01:00
Milos Kozak 48211aaa30 cob calculation thread 2018-01-23 20:58:48 +01:00
Milos Kozak 9c78595c80 log RS history 2018-01-23 18:19:18 +01:00
Milos Kozak d6201eec17
Merge pull request #563 from MilosKozak/jellyRS 
WIP: RS BLE modifications
 2018-01-23 13:58:47 +01:00
Milos Kozak 4d474ddbdb RS: reset isConnected & isConnecting on error 2018-01-23 13:59:33 +01:00
Johannes Mockenhaupt 0eba153d8a
Combo: add 'base basal rate' to fragment. 
(cherry picked from commit 2873da5)
 2018-01-23 02:13:11 +01:00
Johannes Mockenhaupt b7f8913cae
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Careportal DB browser
  fix rendering treatments with duration
  more autosens logging
  cancel extending bolus on pump disconnection
  set maxiob=0 only for objective 4
  fix stopping bolus connection error
 2018-01-23 02:04:02 +01:00
Milos Kozak 52e4496add Careportal DB browser 2018-01-22 21:49:01 +01:00
Milos Kozak d033407ba7 fix rendering treatments with duration 2018-01-22 19:12:22 +01:00
Milos Kozak f835c272ad more autosens logging 2018-01-22 17:18:18 +01:00
Milos Kozak f5a2c5bcd2 cancel extending bolus on pump disconnection 2018-01-21 23:38:24 +01:00
Milos Kozak ef2a565c18 set maxiob=0 only for objective 4 2018-01-21 23:20:41 +01:00
Milos Kozak 1c65a88e49 fix stopping bolus connection error 2018-01-21 22:51:30 +01:00
AdrianLxM 3962808626 minimum of 30 min for unreachable alert 2018-01-21 19:05:04 +01:00
Johannes Mockenhaupt 0553754d8f
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  synchronized access to basal_v
 2018-01-21 17:01:27 +01:00
Milos Kozak fa48720f0e Merge branch 'dev' into smb060 2018-01-21 15:58:54 +01:00
Milos Kozak eedc38fbcf synchronized access to basal_v 2018-01-21 15:56:07 +01:00
Johannes Mockenhaupt 8fda1a678f
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  better handling of wrong profiles
 2018-01-21 14:13:46 +01:00
Milos Kozak e5ede788ba Merge branch 'dev' into smb060 2018-01-21 13:38:21 +01:00
Milos Kozak 060895b33f better handling of wrong profiles 2018-01-21 13:37:38 +01:00
Johannes Mockenhaupt 20c218ae9a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Overview: move checkboxes before label.
  fix pump unreachable for virtual pump
  getLastAutosensData improvement and logging
  remove readstatus prior every command
  bump 1.57-dev
  better log build verison to Fabric

# Conflicts:
#	app/build.gradle
 2018-01-19 21:05:37 +01:00
Milos Kozak 97e0aaa380 fix pump unreachable for virtual pump 2018-01-16 23:28:09 +01:00
Milos Kozak 7fdc146b91 getLastAutosensData improvement and logging 2018-01-16 19:28:25 +01:00
Milos Kozak 54ac28bdf9 typo fix 2018-01-15 16:56:30 +01:00
Johannes Mockenhaupt 0569addc55
Set enableSMB_always if using a non-noisy BG source. 2018-01-15 14:03:37 +01:00
Johannes Mockenhaupt 0e4c72e790
Fix check for DexcomG5 Bg source. 2018-01-15 13:58:25 +01:00
Milos Kozak 91a6c7a96c Merge branch 'dev' into smb060 2018-01-15 12:46:50 +01:00
Johannes Mockenhaupt 723bcc4ee3
Remove 'queued activities' from ComboFragment. 
(cherry picked from commit 57a4449)
 2018-01-15 11:11:58 +01:00
Milos Kozak 5a00b68f68 remove readstatus prior every command 2018-01-14 21:42:36 +01:00
Milos Kozak 99d83a60f4 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-01-14 17:12:35 +01:00
Milos Kozak 89b7b9c24a better log build verison to Fabric 2018-01-14 17:11:39 +01:00
Johannes Mockenhaupt d54b99c559
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Cleanup gradle build files
  Add null check in ConfigBuildPlugin.getTempBasalFromHistory.
  Avoid race condition checking for an active TBR.
  Steampunk watch face: Chart readability improvement; point size increases when chert is highly zoomed in (less than 3 hours shown).

# Conflicts:
#	app/build.gradle
 2018-01-13 23:18:44 +01:00
Milos Kozak fdbd2a2cb1
Merge pull request #596 from jotomo/tbr-active-check-race-condition 
Avoid race condition checking for an active TBR.
 2018-01-13 22:43:41 +01:00
Johannes Mockenhaupt be8534db51
Add strings for the Combo pump, including some renames. 
Some virtualpump_* strings have been renamed to pump_* since they're
now used for multiple pumps.
 2018-01-11 21:47:30 +01:00
Johannes Mockenhaupt 27dcb40f48
Add null check in ConfigBuildPlugin.getTempBasalFromHistory. 2018-01-10 22:44:18 +01:00
Markus M. May d4365a2352 Add a unit test for Insulin Plugin 2018-01-10 22:11:20 +01:00
Johannes Mockenhaupt b4998feee1
Disable reading reservoir level units. 2018-01-10 15:05:17 +01:00
Johannes Mockenhaupt 06d949cd82
Avoid race condition checking for an active TBR. 2018-01-10 10:48:44 +01:00
Johannes Mockenhaupt 9a74b0fb95
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  fix canceling temp in open loop mode. credits to @warstar2187
  prevent basal updated messages on virtual pump
  added BolusWizardTest
  prefill profile switch JSON from local store if not exists
  PARTIAL_WAKE_LOCK for NSClientService
 2018-01-09 20:59:37 +01:00
Milos Kozak 70e22487b2 fix canceling temp in open loop mode. credits to @warstar2187 2018-01-09 19:47:32 +01:00
Milos Kozak 1ce6f32c39 Merge branch 'dev' into smb060 2018-01-09 19:45:45 +01:00
Milos Kozak bdd1a85d26 fix canceling temp in open loop mode. credits to @warstar2187 2018-01-09 19:44:42 +01:00
Milos Kozak 7e625918ac Merge branch 'dev' into smb060 2018-01-08 14:27:39 +01:00
Milos Kozak d7dfe8942e prevent basal updated messages on virtual pump 2018-01-08 14:27:27 +01:00
Milos Kozak 144315ba61 pass enableSMB_always to determinebasal 2018-01-08 14:19:21 +01:00
Milos Kozak db3369865a Merge branch 'dev' into smb060 2018-01-08 14:09:23 +01:00
Milos Kozak 6ebd6bcdc0 Merge branch 'nsc' into dev 2018-01-08 14:09:02 +01:00
Milos Kozak fbb120673f Merge branch 'dev' into smb060 2018-01-07 15:32:14 +01:00
Milos Kozak 1ff99c4814 prefill profile switch JSON from local store if not exists 2018-01-07 15:29:50 +01:00
Johannes Mockenhaupt 968431d931
i18n reservoir unit. 2018-01-07 13:02:50 +01:00
Milos Kozak ab89e16acd PARTIAL_WAKE_LOCK for NSClientService 2018-01-07 12:09:23 +01:00
Johannes Mockenhaupt d72c243140
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  check 30min interval only for basal rates
 2018-01-07 11:38:51 +01:00
Johannes Mockenhaupt 117b79619b
Check reservoir level before bolus and abort if not enough left. 2018-01-07 11:27:28 +01:00
Johannes Mockenhaupt 836abd74ab
Read reservoir level. 2018-01-07 11:21:56 +01:00
Milos Kozak 8cf69006b2 check 30min interval only for basal rates 2018-01-07 11:13:02 +01:00
Johannes Mockenhaupt 3369d84de8
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  basal updated notification
  Dialogs usability tweaks
 2018-01-06 16:27:02 +01:00
AdrianLxM 6c53fd11e9
Merge pull request #586 from MilosKozak/basalupdate-notif 
basal updated notification
 2018-01-06 09:10:00 +01:00
AdrianLxM 4dd238097f basal updated notification 2018-01-06 07:37:39 +01:00
AdrianLxM b9ad3a71fd Dialogs usability tweaks 2018-01-06 06:52:30 +01:00
Johannes Mockenhaupt 3aafcc9854
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Cockpit watch face: Double-tap opens MainMenuActivity
  prevent processing incomplete profiles
  set defaults for display range
  actual bg in objective 1
  warn if wrong profile is detected
 2018-01-06 00:30:04 +01:00
Milos Kozak 144292576a
Merge branch 'dev' into watchfaces-steampunk 2018-01-05 11:36:48 +01:00
Milos Kozak aff0e6f5a8 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-01-04 23:12:40 +01:00
Milos Kozak b7df21c7d0 prevent processing incomplete profiles 2018-01-04 23:12:35 +01:00
Johannes Mockenhaupt ead299442a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  allow old data on the wf
  request new data on preference change
  accept local NS data broadcast even when ns_upload_only is selected
  remove logging
 2018-01-04 21:38:19 +01:00
Milos Kozak 955ecc6d64 set defaults for display range 2018-01-04 21:33:18 +01:00
AdrianLxM 95bca1a92d actual bg in objective 1 2018-01-04 18:53:38 +01:00
AdrianLxM 468426bd31
Merge pull request #581 from MilosKozak/watchfaces-steampunk 
request new data on preference change
 2018-01-04 17:41:30 +01:00
AdrianLxM c3d14b506d allow old data on the wf 2018-01-04 16:20:49 +01:00
Milos Kozak d7200d1e8e warn if wrong profile is detected 2018-01-04 11:06:57 +01:00
Milos Kozak 4643cdc3b9 accept local NS data broadcast even when ns_upload_only is selected 2018-01-04 09:45:17 +01:00
Milos Kozak ed3f076bd7 Merge branch 'dev' into smb060 2018-01-03 22:40:34 +01:00
Milos Kozak de1475dbba remove logging 2018-01-03 22:28:48 +01:00
Milos Kozak 230ec7177b Merge branch 'dev' into smb060 2018-01-03 21:22:38 +01:00
Johannes Mockenhaupt bf25af8c42
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Check activity != null before drawing graph.
 2018-01-03 21:18:12 +01:00
Johannes Mockenhaupt f09d68ad59
Check activity != null before drawing graph. 2018-01-03 20:58:49 +01:00
Milos Kozak ff5d42522c Merge branch 'dev' into smb060 2018-01-03 20:31:36 +01:00
Johannes Mockenhaupt abdad220f6
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  improve GUI response
  narrower temp basal line for steampunk watchface
  darker and gracile steampunk-chart
  Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen - xml files.
  Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen.
  move steampunk md to main dir
  Addition of a file linking to the location of the Steampunk source photoshop file. File is not included in the repository as it exceeds Github's 25 mb limit.
  Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial).
  Steampunk watch face - unit testing complete.
  Steampunk watchface: Updated graphics for more accuracy / brighter background, enabled double-tap, corrected issue when changing from mg/dL to mmol/L (glucose would show as "low").
  Steampunk watchface (moto360 support - ignores the chin)
  Steampunk watchface (mmol support) Includes delta granularity in the watch preferences.
  Steampunk watchface (interim commit)
  Steampunk watch face addition of mmol/L drawable
  Steampunk watch face layout changes
  Steampunk watch face (for testing)
  Steampunk watch face (not yet functional)
  Steampunk watch face (not yet functional)
 2018-01-03 20:16:50 +01:00
Milos Kozak 094737adde improve GUI response 2018-01-03 19:59:18 +01:00
AdrianLxM 0b76290091
Merge pull request #578 from andrew-warrington/watchfaces 
Steampunk watch face
 2018-01-03 19:58:40 +01:00
Johannes Mockenhaupt fd8f2c0801
Clean up unintended diversions from upstream. 2018-01-03 19:07:10 +01:00
Johannes Mockenhaupt 53a8cd4eac
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  missing file
  illegalState crash fix
  combo-bolus-fix
 2018-01-03 18:28:17 +01:00
AdrianLxM e0abd1b816 Merge remote-tracking branch 'andrewremote/watchfaces' into watchfaces-steampunk 2018-01-03 13:53:38 +01:00
AdrianLxM 28a52b3ab7
Merge pull request #574 from MilosKozak/illegalstate-fix 
illegalState crash fix
 2018-01-03 13:45:31 +01:00
Andrew Warrington 8b37826335 Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial). 2018-01-03 10:41:18 +01:00
AdrianLxM 1bbd9012cb
Merge pull request #37 from jotomo/the-clock-strikes-midnight 
Correctly infer pump date when crossing midnight. Fixes #35.
 2018-01-02 13:28:30 +01:00
Milos Kozak cc1cd675c7
Merge pull request #573 from MilosKozak/combo-bolus-fix 
combo-bolus-fix
 2018-01-02 10:05:20 +01:00
Andrew Warrington 7475b1ba3a Merge remote-tracking branch 'origin/dev' into watchfaces 2018-01-01 22:36:07 +01:00
Johannes Mockenhaupt cbf005a11e
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  another cob fix
 2018-01-01 15:07:34 +01:00
Milos Kozak d2753e0dad another cob fix 2018-01-01 14:38:37 +01:00
Johannes Mockenhaupt 1617d6698d
Update ComboPlugin for updated ContstraintsInterface. 2018-01-01 13:26:16 +01:00
Johannes Mockenhaupt 8fb8182f4f
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Objectives update
 2018-01-01 13:25:36 +01:00
AdrianLxM 3bfffdb1b0
brackets on string format 2018-01-01 01:23:30 +01:00
AdrianLxM 4a01b14b35 missing file 2017-12-31 16:51:44 +01:00
AdrianLxM e190f1b9ef illegalState crash fix 2017-12-31 16:44:13 +01:00
Milos Kozak d27d1b1821 Objectives update 2017-12-31 12:24:51 +01:00
Johannes Mockenhaupt 8ee95077a8
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  fix objective 1
  upload aps status and iob when loop is suspended
  fully offline CP
  Queue: synchronize creating queue thread to avoid multiple threads.
  Wear: No guard for RS
 2017-12-31 11:41:41 +01:00
Milos Kozak 458d812e2e fix objective 1 2017-12-31 11:07:21 +01:00
Milos Kozak fcbe8555a6 upload aps status and iob when loop is suspended 2017-12-31 10:22:18 +01:00
AdrianLxM d3127bc97b
Merge pull request #571 from MilosKozak/offline-treatments 
fully offline CP
 2017-12-31 09:52:29 +01:00
AdrianLxM 3a7fe56f64 combo-bolus-fix 2017-12-31 09:50:51 +01:00
Milos Kozak 7b0a4d2ce7
Merge pull request #570 from jotomo/queue-starts 
Queue: synchronize creating queue thread to avoid multiple threads.
 2017-12-31 09:27:27 +01:00
Johannes Mockenhaupt a6b938d98a
Correctly infer pump date when crossing midnight. Fixes #35. 
(cherry picked from commit bda2551)
 2017-12-31 00:27:41 +01:00
AdrianLxM 937872e80c fully offline CP 2017-12-30 23:01:25 +01:00
AdrianLxM fb2271e758
Merge pull request #568 from MilosKozak/AdrianLxM-patch-3 
Wear: No guard for RS
 2017-12-30 22:20:37 +01:00
Johannes Mockenhaupt 99f3fb6216
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  autofix error in profile
 2017-12-30 19:59:39 +01:00
Johannes Mockenhaupt 58d5c25703
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  missing cob fix
  missing inheritance
 2017-12-30 19:57:53 +01:00