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

676 commits

Author SHA1 Message Date
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
Nico Schmitz 49b0e3ab71 Add EditTriggerDialog 2018-12-05 21:22:32 +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
Nico Schmitz 04574d759f Improve dialogs. Add JSON serialization for actions and events. 2018-10-29 21:24:30 +01: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
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
Nico Schmitz c60aae8630 Work on implementation for automation plugin. 
- Use butterknife
- Import weekdays selector
- Implement layout for trigger connection and trigger time
- Implement view holders
- Implement adapters
- Implement dummy code for quick testings
- Refactor code
 2018-09-25 00:00:09 +02: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
Nico Schmitz b5f30a0f46 Add some content to automation plugin fragment 2018-09-19 22:29:35 +02:00
Milos Kozak d317ec94ad AutomationPlugin 2018-09-18 10:05:19 +02: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
Milos Kozak c6bc15e311
Merge branch 'dev' into virtual_pump_Bug863 2018-08-01 11:57:48 +02:00
Markus M. May 9f90d31f35 Merge latest dev changes 2018-07-30 19:39:38 +02:00
Milos Kozak 073b522b93 user defined level of logging 2018-07-30 17:04:43 +02:00
Milos Kozak 75bb38ba1f move activities to new package 2018-07-29 00:08:28 +02:00
Markus M. May f70909d6c6 Refactore logshipper to maintenance, move funcs from menu to plugin 2018-07-28 22:45:40 +02:00
Andy Rozman 1b8ceb83cf Merge branch 'dev' into medtronic_andy 2018-07-26 16:48:52 +01:00
Andy Rozman 318436f417 - some changes from RileyLinkAAPS project: 
- refactored RfSpy and underlaying classes so that we can read Version (which is not encoded and has no CRC)
   - added functionality to be able to recover RL if BT is disabled and re-enabled
   - some minor refactorings here and there
- TBR enabled
- Bolus delivery
- Medtronic Pump Plugin is working (able to deliver TBRs and Bolus), there are still a lot of things to work on but we have base implementation here...
 2018-07-26 16:31:23 +01:00
Markus M. May c34104b906 move log shipment to own plugin 2018-07-25 22:00:58 +02:00
Milos Kozak 7e2d3fd8be historybrowser, rendering optimizations 2018-07-24 00:46:08 +02:00
Milos Kozak 782e7939bc history browser: remove seek bar until gets implemented 2018-07-17 23:00:45 +02:00
Milos Kozak 917ddf0cbe CS translations 2018-07-02 15:04:09 +02:00
Nico Schmitz 2ce38702e2
Merge branch 'dev' into dev-wip 2018-07-01 22:44:11 +02:00
Milos Kozak cf8bf419e2
Merge pull request #1147 from TebbeUbben/cb-fix 
Config builder cleanup
 2018-06-24 17:29:29 +02:00
TebbeUbben 2b5631e1e7 Config builder cleanup 2018-06-24 15:13:06 +02:00
Milos Kozak a3fafa521b nsclient for phones layout 2018-06-23 22:17:54 +02:00
Milos Kozak a4b3b7b2e9 Clean AndroidAPS started button 2018-06-23 20:28:20 +02:00
Milos Kozak 586665e19f nsclient table mode improvements 2018-06-23 18:24:04 +02:00
Johannes Mockenhaupt 41ce9677df
Remove duplicate string. 2018-06-21 09:57:35 +02:00
Johannes Mockenhaupt 6002c747e6
Treatments tab: add button (if applicable) to delete future treatments. 2018-06-21 00:38:22 +02:00
Nico Schmitz f46a81a7be Add overview_statuslights to overview_fragment_smallheight.xml 2018-06-17 21:02:42 +02:00
Andy Rozman 47427ec68e - integration started 
- states visible
- command framework added
- we get currect profile and compare it with AAPS profile
- setProfile command is disabled, if pumps profile is different we get warning
- bolus is enabled and working
- get remaining reservoir level
 2018-06-16 18:13:29 +01:00
Nico Schmitz 87d7fed75b Remove margin of status light layout 2018-06-16 14:03:45 +02:00
Nico Schmitz aa4f506961 Update to current upstream/dev branch 2018-06-16 02:51:33 +02:00
Tebbe Ubben 1e4c7178f4
Merge branch 'dev' into dev 2018-06-15 21:10:33 +02:00
Nico Schmitz 1604b53327 Fix bugs, refactor code and add preferences 2018-06-14 20:49:58 +02:00
Nico Schmitz 18c6bdd4ef Improve layout xml 2018-06-13 21:35:21 +02:00
Nico Schmitz 217583d601 Use getBatteryLevel() for BAT status. Refactor code and layout. 2018-06-13 19:58:52 +02:00
Nico Schmitz f28fca668f Integrate info fields from swissalpine/dev-work 2018-06-13 00:07:13 +02:00
Nico Schmitz 5ba6f02b93 Remove reservoir TextView 2018-06-12 23:31:46 +02:00
Nico Schmitz 4ebc149783 Add changes of schmitzn/reservoir-view 2018-06-12 23:28:11 +02:00
Milos Kozak d051e081e2 Merge branch 'dev' into rsoption 2018-06-12 21:59:20 +02:00
TebbeUbben 005039effc Objectives styling 2018-06-09 22:07:41 +02:00
AdrianLxM 8106907a55 unify padding pills and pumpstatus 2018-06-09 13:53:11 +02:00
Milos Kozak 6344e88550
Merge pull request #1084 from TebbeUbben/dev 
Config builder styling
 2018-06-09 11:39:16 +02:00
TebbeUbben f9582d042f Don't restore CheckBoxes and RadioButtons automatically 2018-06-08 20:05:33 +02:00
swissalpine 5bf6057838
Update danar_fragment.xml 2018-06-08 19:22:36 +02:00
swissalpine 87ea018181
Update wear_fragment.xml 2018-06-08 19:22:03 +02:00
swissalpine 3c58b94a28
Update objectives_fragment.xml 2018-06-08 19:19:21 +02:00
swissalpine 5df03e4ea7
Update openapsama_fragment.xml 2018-06-08 19:07:04 +02:00
swissalpine ab599a452b
Update loop_fragment.xml 2018-06-08 19:06:16 +02:00
swissalpine a926c4db86
Update combopump_fragment.xml 2018-06-08 19:05:34 +02:00
swissalpine 76505e0229
Update careportal_fragment.xml 2018-06-08 19:04:31 +02:00
swissalpine 7bd2f629bf
Update bgsource_fragment.xml 2018-06-08 19:02:20 +02:00
TebbeUbben 38526d64c6 These should not be changed 2018-06-07 23:24:10 +02:00
TebbeUbben e25ebbdafa Protection against callback looping 2018-06-07 23:23:10 +02:00
TebbeUbben 13cb4c28ed ConfigBuilder styling 2018-06-07 22:54:27 +02:00
Milos Kozak 6a4bb8a719 layout cleanup 2018-06-06 17:58:59 +02:00
AdrianLxM 32f4a08fa6 slightly more padding on top buttons/fields 2018-06-05 13:26:43 +02:00
Roumen Georgiev 4a481bf294
Merge branch 'dev' into dev 2018-06-05 12:45:00 +03:00
Roumen Georgiev c1b69404d0 files renamed and added icon 2018-06-05 12:19:47 +03:00
TebbeUbben 80e9d769e4 Compact version of toolbar 2018-06-04 21:34:21 +02:00
Roumen Georgiev 1147c28f04 use numberPicker instead of editText 2018-06-04 10:23:01 +03:00
TebbeUbben 6c1ccebb4a Moved padding to Toolbar 2018-06-03 23:42:10 +02:00
TebbeUbben 263275659a TabLayout + NavigationDrawer 2018-06-03 23:28:04 +02:00
Roumen Georgiev 9569fbf183
Merge branch 'dev' into dev 2018-06-01 12:02:41 +03:00
Roumen Georgiev da89ea1643 some formatting 2018-05-31 16:47:58 +03:00
Roumen Georgiev 39e704645b create userOptionsActivity class 2018-05-31 14:45:26 +03:00
Milos Kozak 7e57c30ecf SW Exit label 2018-05-25 13:00:08 +02:00
Milos Kozak 35c07d1e60 SW scroll to the top on activity create 2018-05-24 00:13:59 +02:00
Milos Kozak b57683eaf5 SW rename package 2018-05-20 21:55:53 +02:00
Andy Rozman e8f860be8b - copied RL code 
- copied Medtronic code
- added BLE Scan
- added RL Stats activity
- added RL configuration display
 2018-05-20 20:53:55 +01:00
Milos Kozak 7714aa9138 Merge branch 'dev' into startupwizard 2018-05-20 14:18:58 +02:00