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

4570 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tebbe Ubben 515b0d251a Merge remote-tracking branch 'remotes/origin/dev' into dev 2018-02-06 00:13:28 +01:00
Simon Pauwels 5093b7b815
Merge pull request #26 from jotomo/combo-scripter-v2 
feb 6
 2018-02-06 00:06:51 +01:00
Johannes Mockenhaupt c781601cbb
Commit missing string. 2018-02-06 00:04:24 +01:00
Johannes Mockenhaupt 743685f8e5
Merge pull request #51 from jotomo/history-timestamps 
History timestamps
 2018-02-06 00:01:03 +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
Tebbe Ubben ac3b15135e Merge remote-tracking branch 'remotes/origin/dev' into dev 2018-02-05 18:58:17 +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
Milos Kozak 94a6794504
Merge pull request #661 from MilosKozak/move-rhino-lib 
move rhino to external lib
 2018-02-04 21:51:04 +01:00
Johannes Mockenhaupt 5be9bf5a87
Combo: add unit test for calculateFakeBolusDate. 2018-02-04 20:43:31 +01:00
Johannes Mockenhaupt 4937018a9c
Add test options to build.gradle to unbreak unit tests. 2018-02-04 20:40:24 +01:00
Tebbe Ubben 3a5bd0139b Merge branch 'dev' of https://github.com/jamorham/AndroidAPS into dev 2018-02-04 20:16:45 +01:00
Jamorham 1d169bc27f
Better calculation for Absolute basal from Tebbe 2018-02-04 19:14:02 +00:00
Simon Pauwels bf8ff5a718
Merge pull request #25 from jotomo/combo-scripter-v2 
feb 4
 2018-02-04 20:11:14 +01:00
Milos Kozak 1471d2bcd5
Merge pull request #639 from triplem/cleanup_libs 
Remove jniLibs, download on build
 2018-02-04 18:18:39 +01:00
Milos Kozak f094b5cb64
Merge pull request #658 from bogdangorescu/patch-2 
RO translation
 2018-02-04 18:00:37 +01:00
Milos Kozak 6f7e6b04b5
Merge pull request #659 from jotomo/graph-target-line 
Graph target line
 2018-02-04 17:58:47 +01:00
Bog Dan 8c858d2b2d
RO translation - without translatable="false" 
Removed  translatable="false"
 2018-02-04 17:55:59 +02:00
Tebbe Ubben 38fff9219a Merge remote-tracking branch 'remotes/origin/dev' into dev 2018-02-04 14:06:14 +01:00
Jamorham 501ca5c597
Fix for some TBR cancels getting through 2018-02-04 12:57:10 +00:00
AdrianLxM 316c3da46c
use default repo for rhino 2018-02-04 08:24:12 +01:00
AdrianLxM 1bac0e573d move rhino to external lib 2018-02-04 07:27:02 +01:00
Johannes Mockenhaupt 8c25bc4002
Answers cleanup. 2018-02-04 01:29:27 +01:00
Johannes Mockenhaupt 6b4b044cd6
Remove nested layout for better performance. 2018-02-04 00:36:08 +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
Bog Dan 27bf66b501
RO translation 
Added RO translation
 2018-02-04 01:24:18 +02: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
Tebbe Ubben 33ea34243a Merge remote-tracking branch 'remotes/milos/dev' into dev 2018-02-03 20:37:47 +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