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

638 commits

Author SHA1 Message Date
Andy Rozman
7aa4716870 - changed all ui files to conform to androidx classes/implementation 2019-07-05 16:04:54 +01:00
Andy Rozman
992f69daaa medtronic-0.12.0-SNAPSHOT 
- Merge branch 'dev' into medtronic_andy
 2019-07-05 14:18:28 +01:00
Milos Kozak
9a76f3386d androidx transition 2019-05-16 13:57:37 +02:00
Andy Rozman
ad17c66b1b Merge branch 'dev' into medtronic_andy 2019-04-10 17:05:56 +01:00
Milos Kozak
e7d7a37aeb LINT: input type 2019-04-08 18:13:47 +02:00
Milos Kozak
3b1d96ecc9 LINT: xml 2019-04-08 17:03:18 +02:00
Milos Kozak
a339e0cf28 LINT: xml 2019-04-08 16:39:41 +02:00
Milos Kozak
190b9408bd fixed package name 2019-04-08 15:38:20 +02:00
Andy Rozman
8bf284f86d - Changes made in CGMS 
- Finished support for Bolus history mapping
- fixed 20 crashalytics errors
 2019-04-07 22:27:18 +01:00
Andy Rozman
bd3529e650 Merge branch 'dev' into medtronic_andy 2019-03-31 20:03:49 +01:00
Milos Kozak
381ae67829
Merge pull request #1420 from tanja3981/improvement/#1269 
[2.0] Improvement: Allow some objectives to go back.
 2019-03-19 23:42:38 +01:00
Andy Rozman
8594525d2c Merge branch 'dev' into ench_1455_custom_actions 2019-03-08 23:49:56 +00:00
Tanja Schmidt
a5d1905be8 Allow some objectives to go back. 2019-03-06 19:03:42 +01:00
Andy Rozman
011aaf5336 Moved medtronic to correct package 2019-03-02 20:39:14 +00:00
Andy Rozman
f7395c7a2c Changes after merge, compilable, but medtronic is still in old structure. 2019-03-02 20:24:53 +00:00
Andy Rozman
289902633e Merge branch 'dev' into medtronic_andy 2019-03-02 18:20:37 +00:00
Milos Kozak
d9a9c933bc package refactor 2019-02-28 23:16:50 +01:00
Milos Kozak
395faa7dc9 pumps package refactor 2019-02-26 20:38:27 +01:00
Andy Rozman
b0fe8fc5aa Merge branch 'dev' into ench_1455_custom_actions 2019-02-20 23:41:09 +00:00
Andy Rozman
5aa5d9f749 Merge branch 'dev' into medtronic_andy 2019-02-16 20:50:36 +00:00
Andy Rozman
72eae6e6b8 - refactored commands, removed version out of it 
- finished Medtronic History Dialog (middle button)
- refactored Set/Get Basal functionality
 2019-02-07 22:41:05 +00:00
TebbeUbben
cc189d360f Merge remote-tracking branch 'nico/dev-wip' into dev-nico 2019-02-02 16:58:21 +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
2770a49869 Local Insight driver 2019-01-18 22:40:22 +01:00
Andy Rozman
9c08bfb8bf [0.6] 
- bolus finalized: added delay before bolus is delivered (configurable 5, 10, 15s) and if cancel is issued, after
delay, and bolus was already sent to pump, message is displayed saying that you need to manually stop the pump
to cancel bolus
- BLE Scanner refactored and finished (removed un-needed code)
- fixed 5 most common Crashalytics errors found
- fixed Basal Profile problem (I hope)
 2019-01-15 20:08:31 +00:00
Andy Rozman
8fc694e812 Merge branch 'dev' into medtronic_andy 2019-01-04 22:24:44 +01:00
Andy Rozman
56eaacb3a2 [0.6] 
Configuration:
- added delay for Bolus delivery
- added choice for decoding (done on RL or in software)

Code:
- encoding DailyTotals for 522 and 523
- some minor fixes reported by Crashalytics
- refactoring history
- added history display
- changes to delivering Bolus (canceling)
- started adding 6b4b hardware decoding
 2019-01-04 14:02:10 +01:00
Nico Schmitz
9e03f0f8ca Update to current dev branch 2018-12-11 14:51:26 +01:00
triplem
eea79c5d0f fixes PR#1550 2018-11-08 21:14:44 +01:00
Andy Rozman
3fdbc0400e Files missed on previous checkin. 2018-11-06 17:39:16 +00:00
Andy Rozman
75d3f3b4bc Merge branch 'dev' into medtronic_andy (2.0i - 24.10.2018) 2018-10-24 12:18:20 +01:00
Andy Rozman
f228475617 Merge the code from RileyLinkAAPS 
- First real results with Pump History (not complete yet)
- Set Basal Profile changes (not complete yet)
- version set to medtronic-0.4.0-SNAPSHOT
 2018-10-24 11:25:18 +01:00
Andy Rozman
48e4a041f8 - First changes for CustomActions 
- changed PumpInterface to add CustomActions
  - added class CustomActions and CustomActionType
  - changed all PumpImplementations to use new methods
  - started changing ActionsFragment (most should be done)
 2018-09-20 17:23:36 +01:00
Sebastian Lenz
6323f2dd49 fixed typo 2018-09-16 18:32:51 +02:00
Andy Rozman
da75ed643d Merge branch 'dev' into medtronic_andy and some minor changes to make it compilable 2018-09-14 18:14:45 +01:00
Milos Kozak
69544f67b5 nsclient arrow layout update 2018-09-11 19:50:35 +02:00
Milos Kozak
8a92bed479 tratments layout improvement 2018-09-11 19:29:51 +02:00
Milos Kozak
f5e7d28aa6 fix WizardInfoDialog 2nd 2018-09-01 23:34:35 +02:00
Milos Kozak
2c5837a235 Merge branch 'virtual_pump_Bug863' of https://github.com/andyrozman/AndroidAPS into andyrozman-virtual_pump_Bug863 2018-08-23 17:53:28 +02:00
Milos Kozak
653a98fd5b better layout for nsclient mode 2018-08-21 23:19:04 +02:00
Milos Kozak
414c3416dd WizardInfoDialog 2018-08-20 19:32:18 +02:00
Nico Schmitz
5386c7db4a Update to upstream/dev and resolve conflicts 2018-08-19 14:37:42 +02:00
Andy Rozman
c9d35696cf - various changes 
- reformatting everything
 2018-08-10 16:13:40 +01:00
Milos Kozak
4bfd851bf6
Merge pull request #1297 from MilosKozak/overview-flexbox 
overview flexbox
 2018-08-04 09:02:19 +02:00
AdrianLxM
77a3972f6a overview flexbox 2018-08-03 16:07:15 +02:00
Milos Kozak
70e2b64adf rename Time -> Time offset in eCarbs dialog 2018-08-03 13:04:58 +02:00
Milos Kozak
a01d9924eb
Merge branch 'dev' into sens 2018-08-02 15:22:45 +02:00
Milos Kozak
3bcd656c14 Maintenance plugin cleanup 2018-08-02 15:19:13 +02:00
Markus M. May
8f5869d806 Add sens data to small height overview as well 2018-08-01 20:48:36 +02:00
Markus M. May
38ac294a3c Add sens data to overview for normal overview 2018-08-01 20:40:34 +02:00