Commit graph

544 commits

Author SHA1 Message Date
Milos Kozak e6c8ecdc2f 2.4-dev-b 2019-08-15 15:32:01 +02:00
Milos Kozak d467d679df
Merge pull request #1928 from triplem/firebase_events_test
disable firebase for tests
2019-08-08 19:27:37 +02:00
Milos Kozak fa9bc3af97 2.4-dev-a 2019-08-07 23:05:33 +02:00
Milos Kozak b653b5096d remove butterknife from gradle 2019-08-07 23:05:05 +02:00
triplem c9f054bd47 disable firebase for tests 2019-08-01 21:20:17 +02:00
Sebastian Lenz 62f3fc022f newer version of weekdaysselector, fixes #1904 2019-07-28 20:07:31 +02:00
Milos Kozak 1baec16c4b remove unneeded semicolons 2019-07-26 23:21:01 +02:00
Milos Kozak 09270f36bf
Merge branch 'dev' into automation 2019-07-25 16:17:16 +02:00
Milos Kozak c4ba821dc1
Merge branch 'dev' into automation 2019-07-14 20:00:42 +02:00
Milos Kozak 8c2c2b21ea
Merge branch 'dev' into medtronic_andy_merge 2019-07-14 19:50:07 +02:00
Milos Kozak 6d2e159edb
retrofit version 2019-07-14 12:27:21 +01:00
Milos Kozak 8686560ec8 reset version 2019-07-13 23:14:52 +02:00
Milos Kozak 968bccaacc Merge branch 'dev' into tidepool 2019-07-13 17:45:34 +02:00
Milos Kozak 4f903cd53d
Merge branch 'dev' into medtronic_andy_merge 2019-07-13 16:17:12 +02:00
Milos Kozak adf1a0da66 libraries update 2019-07-13 16:16:43 +02:00
Andy Rozman a5a36332f3 Prepared for PR 2019-07-12 19:29:36 +01:00
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
Andy Rozman 4088b38883 - minor change in code
- renamed version to 0.11, preparing for tag
2019-07-05 12:21:49 +01:00
Milos Kozak 1bb314406c remove duplicates in gradle 2019-07-05 00:24:39 +01:00
Milos Kozak 9706f68be2 automation -> jetpack 2019-07-05 00:21:31 +01:00
Andy Rozman 7713270524 medtronic-0.11.12-SNAPSHOT
- another look at duplicate bolus problem. This should have fixed the problem, if we still get duplicated, we will
have to investigate NS angle
2019-07-05 00:15:45 +01:00
Milos Kozak c0345ce56c
Merge branch 'dev' into automation 2019-07-04 23:37:36 +01:00
Andy Rozman 38f13cd6db medtronic-0.11.11-SNAPSHOT
- #152 fixed double bolus problem: code is now looking for AAPS Events that happened within 2 minutes.
2019-07-04 13:24:46 +01:00
Andy Rozman be5c79f370 medtronic-0.11.10-SNAPSHOT
- #151 - when searching for AAPS events (treatments, TempBasals) we don't look at +/- 5 min anymore, just +/- 40s
2019-07-02 17:20:36 +01:00
Andy Rozman 08cae9a3bb medtronic-0.11.9-SNAPSHOT
- #150 BolusWizard512 problems
2019-07-01 12:00:50 +01:00
Milos Kozak 323c282b9f Tidepool in engineering mode only 2019-06-30 15:38:30 +02:00
Andy Rozman 982a5001b3 medtronic-0.11.8-SNAPSHOT
- #147 - Prevent update of tive if over 24h
- #148 - Pump History Dialog has filter
- #146 - Battery not updated every hour
- #149 - If BasalProfile fails its never retried
2019-06-29 16:24:47 +01:00
Andy Rozman f0b8aefc14 medtronic-0.11.6-SNAPSHOT
- fixed problem with GettingBasal
- fixed problem with writing data into logs
2019-06-26 23:02:35 +01:00
Andy Rozman 570e93273c medtronic-0.11.5-SNAPSHOT
- little more cleanup
- removed code that reads 1.5 days history on every start
2019-06-26 13:26:03 +01:00
Andy Rozman 32fad688fc Merge branch 'dev' into medtronic_andy 2019-06-25 14:50:41 +01:00
Andy Rozman 2a680cd8e9 medtronic-0.11.3-SNAPSHOT:
- fix for problem with TBRs
- added code to prevent crashing if it comes to error by parsing (will possibly be removed later) or modified
- fixed problem with configuration parsing (returns error/or rather retries if configuration is too short)
- added validation for BasalProfiles... might need to extend that though...
2019-06-25 14:18:52 +01:00
Andy Rozman 5878a33ac7 Medtronic-0.11.2-SNAPSHOT
- #122 - TBRs processing
- #139 - Set Time in Pump
- #126 - Calculate Battery
- #140 - Be aware of Time/TZ changes
2019-06-23 00:01:11 +01:00
Milos Kozak 256e73dab4 Merge branch 'sdk28' of https://github.com/MilosKozak/AndroidAPS into sdk28 2019-06-19 16:41:43 +02:00
Milos Kozak b518ad8963 bump 2.4-dev + min sdk 23 2019-06-19 16:41:20 +02:00
Andy Rozman 654b8ab0f6 0.11.1-SNAPSHOT
- fix to suspend code
2019-06-18 21:37:21 +01:00
Andy Rozman c460d1d3ef - Process Suspend delivery items 2019-06-16 20:12:10 +01:00
Andy Rozman 1290457b5a Changed version number 2019-06-16 18:41:23 +01:00
Andy Rozman 00f141aa03 Medtronic 0.10.6:
- Fix Superbolus problem #138
- Fix Disconnect problem #136
- Fix Clear Bolus Block #137
- Fix problem with history DalyTotal515 (for RaulAC)
- Clean code from driver
- Fix RileyLink status, before Pump initialized #130
- Fixed basal profile rounding #134
2019-06-15 19:52:20 +01:00
Johannes Mockenhaupt 1b0d6ff413
Reflect name of Kotlin class. 2019-06-15 18:13:45 +02:00
Andy Rozman a19d71df89 0.10.5-SNAPSHOT
- added custom comnand for reseting RL configuration
- removed guava Splitter and use my own code
- remove old unsused code
2019-06-09 16:58:23 +01:00
Milos Kozak ccf49b5e5a rx lib update 2019-06-07 12:50:59 +02:00
Milos Kozak 4a07e01b7d fix NPE 2019-06-03 22:07:38 +02:00
Milos Kozak b3d3ec8a27 remove lombok 2019-06-03 21:17:21 +02:00
Milos Kozak 048ea4d489 Tidepool test UI 2019-06-03 00:03:06 +02:00
Milos Kozak e2364561ed transform to kotlin, cleanup, sort 2019-06-02 16:24:51 +02:00
Andy Rozman 43c472da17 0.10.4-SNAPSHOT
- fixed Tune up
- displaying power
2019-06-01 22:18:30 +01:00
Milos Kozak 42ceaac0f7 remove activeandroid 2019-06-01 22:29:57 +02:00
Milos Kozak 6f4d79bca8 fix copy paste errors 2019-06-01 18:51:41 +02:00
Milos Kozak 9b1acf6958 add missing classes. convert to use AAPS data 2019-06-01 18:40:33 +02:00
Milos Kozak dd637021f7 tidepool xdrip port 2019-06-01 00:48:37 +02:00
Andy Rozman 26d02c0062 0.10.3-SNAPSHOT
- fix for error
2019-05-18 18:25:40 +01:00
Andy Rozman a897a72142 0.10.2-SNAPSHOT
- added functionality so that encoding can be changed on the fly
- chnaged TretmentService, rewrote method for createOrUpdate entry (fix for #125)
2019-05-18 14:49:44 +01:00
triplem 767276ebbb fork tests 2019-05-18 09:40:06 +02:00
Milos Kozak cafb11f15a fix kotlin warning 2019-05-16 19:00:44 +02:00
AdrianLxM b173c1e793
download task 2019-05-16 15:54:29 +02:00
Milos Kozak 9a76f3386d androidx transition 2019-05-16 13:57:37 +02:00
Milos Kozak e2dd781a20 formating 2019-05-16 00:56:00 +02:00
Milos Kozak c73ddf6cc7 update roboelectric 2019-05-16 00:24:44 +02:00
Milos Kozak 8c00a9fade wear libraries update 2019-05-16 00:21:32 +02:00
Andy Rozman fe73eba2a2 0.10.1-SNAPSHOT
- Bolus Wizard entries (CH) is processed
- Better RSSI calculation for Tunning
- #124: Added retries to pump command (extended current retry functionality) that should take care of this problem
- Removed all un-needed logging and brining it under correct logging context (PUMP, PUMPCOMM, PUMPBTCOMM)
- added RileyLink Hardware encoding
2019-05-15 23:04:44 +01:00
Milos Kozak 12260779e6 supportLibraryVersion 28 2019-05-15 23:39:11 +02:00
Milos Kozak 1ccb895ff9 update libraries 2019-05-15 23:33:56 +02:00
Milos Kozak 5a478578e0 targetsdk 28 2019-05-15 23:26:07 +02:00
Andy Rozman ff55b7290d changed version number from 0.9.7-SNAPSHOT to 0.9 2019-05-08 11:10:26 +01:00
Andy Rozman 2ae7d0a292 - fixed problem with TDD
- added new command/action for Reset RileyLink (not working yet)
- added Hardware encoding for RileyLink
2019-05-05 17:22:10 +01:00
Andy Rozman cff20f78c8 - added functionality to map TBRs to Pump History Records (similar to Bolus)
- changed log size to 5 MB (as it was before)
2019-05-04 20:34:46 +01:00
Andy Rozman 5cca0b821b Some gradle changes and fixes after merge. 2019-05-02 23:27:49 +01:00
Milos Kozak 3ab2a142d1 Merge remote-tracking branch 'origin/dev' into automation 2019-05-02 22:27:54 +02:00
Andy Rozman 26f837397d Merge branch 'dev' into medtronic_andy 2019-05-02 20:51:55 +01:00
Milos Kozak 197f3bb691 Merge branch 'master' into dev 2019-04-29 10:32:51 +02:00
AdrianLxM 6fd8d7ae3c
not language dependent git command 2019-04-25 20:42:34 +02:00
Milos Kozak 8b18a7ffb3
German git 2019-04-25 18:59:10 +02:00
Milos Kozak 0bab2e6c11 2.3.1-dev 2019-04-25 14:19:39 +02:00
Milos Kozak 5a6536c99c
Merge branch 'master' into gradlegit 2019-04-25 13:45:01 +02:00
AdrianLxM 4d66e0c1be
2.3 bump 2019-04-25 00:32:40 +02:00
Milos Kozak 5f32eea488
Merge branch 'dev' into automation 2019-04-21 10:39:24 +02:00
Milos Kozak 715a59bfba
Merge pull request #1749 from MilosKozak/update-checker
Update checker
2019-04-18 22:26:18 +02:00
Milos Kozak 4ae7efc75f Merge branch 'dev' into automation 2019-04-16 21:08:08 +02:00
Milos Kozak ee4fdcd640 Test for uncommited changes in gradle 2019-04-16 11:15:40 +02:00
Andy Rozman c7f6eb79f0 - fixes for Bolus problems 2019-04-12 21:20:09 +01:00
Milos Kozak 1286aabb5b log remote 2019-04-11 10:16:52 +02:00
Andy Rozman 8345d48250 gradle fix 2019-04-10 16:43:01 +01:00
Andy Rozman 7392eaeb58 - gradle fixes
- remove formatting changes
- moved plugins/general/overview/Dialogs/ to plugins/general/overview/dialogs/
- fixing treatment changes that are received from NS, and extending copying of data to ignore pumpId
2019-04-10 16:24:16 +01:00
AdrianLxM 6c0853d49a kotlin support 2019-04-10 00:33:05 +02:00
Andy Rozman 26a50bbbc4 - gradle fix, that might fix ClassNotFound Exception with Wear
- fix for duplicated entries
- trying to fix overwriting of data from NS (not done yet)
2019-04-09 23:14:06 +01:00
AdrianLxM 5a66f28337
only one wear lib needed 2019-04-09 22:25:16 +02:00
Andy Rozman 2397c8e0d2 - fixes to bolus decoding
- PumpType set MedtronicCapabilities
2019-04-08 22:42:02 +01:00
Andy Rozman 03b3bf7388 Merge branch 'dev' into medtronic_andy 2019-04-07 23:48:20 +01: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
Milos Kozak e8b46e7880
Merge branch 'firebase' into dev 2019-04-07 23:15:09 +02:00
Milos Kozak 9dc95e4ef1 remove sightparser-release 2019-04-07 23:08:55 +02:00
Milos Kozak cc959c8aaa add back constraint-layout 2019-04-07 23:06:36 +02:00
Milos Kozak 92bdee581b 2.2.3-dev 2019-04-07 20:10:19 +02:00
Milos Kozak 9297b5546f bump 2.2.2 2019-04-07 19:19:21 +02:00
AdrianLxM 6378d0a6bf
Merge branch 'dev' into 221-fix 2019-04-07 18:16:42 +02:00
AdrianLxM 430738d706 2.2.1 2019-04-07 17:18:27 +02:00
Milos Kozak fbd9e3e501 Firebase integration 2019-04-04 17:15:45 +02:00
Andy Rozman e028c78844 Added constraints-layout dependency back (removed by 2.2) 2019-03-31 22:29:59 +01:00
Andy Rozman 3489f4a746 Merge branch 'medtronic_andy' of https://github.com/andyrozman/AndroidAPS into medtronic_andy 2019-03-31 20:13:14 +01:00
Andy Rozman bd3529e650 Merge branch 'dev' into medtronic_andy 2019-03-31 20:03:49 +01:00
Andy Rozman eb85cd2588 Merge branch 'dev' into medtronic_andy 2019-03-30 22:06:43 +00:00
Andy Rozman afcedc83d1 0.8.2
- done some fixes according to Crashalytics (most common problem from last month)
- extended custom actions, to have enabled flag, and if entry is enabled=false button is not added. Added EventCustomActionsChanged event that can refresh custom actions
- #111 - do not put multiple statuses into queue
- #110 - set driver busy if wake up and tune is running
- #104 - when bolus is delivering driver is set to busy, and custom action was added to remove this block
2019-03-30 18:36:50 +00:00
Milos Kozak f1f1be160b put back constraint layout library 2019-03-30 16:03:08 +01:00
Milos Kozak cabdb1d2fb Merge branch 'dev' into automation 2019-03-30 15:47:23 +01:00
Milos Kozak 361ffa91c8 revert changes and disable test 2019-03-30 11:11:44 +01:00
Milos Kozak 7f7e2eeb46 2.2.1-dev 2019-03-29 08:33:26 +01:00
AdrianLxM 97430a00b1
2.2 2019-03-28 22:47:13 +01:00
Nico Schmitz fc7e65c4d1 Update to recent upstream/dev 2019-03-22 23:08:13 +01:00
Nico Schmitz 91e4b01f10 Display actions and merge recent upstream/dev
- Add ActionListAdapter
- Add ChooseActionDialog
- Merge upstream/dev branch
2019-03-19 19:08:46 +01:00
Andy Rozman f7c4db35b5 Merge branch 'dev' into wear_upgrade 2019-03-12 22:46:38 +00:00
Andy Rozman be9039d8b0 Minor changes 2019-03-12 22:41:52 +00:00
Andy Rozman 6fcb1ce230 Medtronic 0.8.1-SNAPSHOT
- wear changes
- refactoring of decoder
- started work on bolus, tbr, resumes
2019-03-10 19:08:54 +00:00
Milos Kozak e8a41b01b7 bump 2.1.3-dev 2019-03-07 11:07:48 +01:00
Andy Rozman 6e500c1e75 On both sides changed BIND_LISTENER in manifest and added a lot of logging, some might be commented out.
On AAPS side:
- added some capabilites
- fully refactored SendToDataLayerThread (copied from xdrip)
- updated code
- all tasks are now executed on Executor (and not by itself) - main problem that some data was not sent

On Wear side:
- added capabilities and refactored code in ListenerService (by looking at xdrip code)
2019-03-06 23:38:18 +00:00
Milos Kozak 6c19e91abc bump 2.1.2 2019-03-05 21:26:30 +01:00
Milos Kozak 5cf9516012 fix gradle files 2019-03-05 20:44:51 +01:00
Andy Rozman 5a8b5f3e7b Merge branch 'dev' into medtronic_andy 2019-03-03 23:35:12 +00:00
AdrianLxM f28d763ada
version bump 2.1.1 2019-03-02 22:25:13 +01: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 668a45b1ad bump 2.1 2019-03-02 15:56:11 +01:00
Milos Kozak 5938c5659b Pumpcontrol icon 2019-03-02 14:37:53 +01:00
Andy Rozman a441a7e35e Release 0.7
- finished decoding DailyTotals records
- fixed some of most common bugs from Crashalytics
2019-02-20 15:28:14 +00:00
Milos Kozak 9f66e0b96e Fabric update 2019-02-19 18:03:18 +01:00
Milos Kozak 1e37ce5ba7 bump 2.1-dev 2019-02-19 17:10:33 +01:00
Andy Rozman 5aa5d9f749 Merge branch 'dev' into medtronic_andy 2019-02-16 20:50:36 +00:00
Andy Rozman 78abf7299a 0.7.0
- refactored BasalProfile functionality
- extended SetProfile command
- fixed processing of settings for 554
2019-01-31 23:09:39 +00:00
TebbeUbben 0f2ac24fc2 Remove insight tag from build version 2019-01-31 17:34:15 +01:00
TebbeUbben b5daa8f297 Change build version 2019-01-19 13:52:23 +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 a9200e9e3e changed gradle build version 2018-12-09 22:00:22 +00:00
Andy Rozman b4ce95902b 0.5.1
- Added history reading and parsing
- Added evaulation of history data (still work in progress)
- Added custom actions (#1455), so that we can manually do "Wake Up and Tune" (new button in actions)
- Started decoding DailyTotals records (need TDD for bolus and basal).
2018-11-05 16:49:59 +00:00
Milos Kozak 8d9cc0cea6
version "2.0" 2018-11-02 23:22:37 +01:00
Andy Rozman 5b9bd2adfc [0.4.1-SNAPSHOT]
- little change in scanning
- added error checking into RadioResponse and BasalProfile, also added events
- disabled quick scan
- synchronized RileyLink state changes
- proofed MedtronicConverter
- fixed 10 errors found on fabric
- fixed SetBasalProfile, after merge
2018-10-27 14:04:46 +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
Andy Rozman 88b75d3496 [0.3] RELEASE
- WakeAndTune fixed, it runs in separate thread (in task)
- Fixed Frequency scan results
- fixing connection statuses
- postprocessing fixed/extended with MedtronicUIResponseType
- Basal profile fixes
2018-10-21 22:11:55 +01:00
Andy Rozman 594012aab6 [0.3.1]
- changed build version for easier checks
2018-10-20 13:50:40 +01:00
Andy Rozman ca536ee97e [0.3.1]
- removed code that sends wakeup on every command
- added checking if device is present
- fixed reading data when no data present (PostProcessingUI)
- work done on showing hardware in configuration (added RileyLinkSelectPreference)
- fixing configuration (in wizard)
2018-10-20 13:24:36 +01:00
Milos Kozak d921182055 2.0i-dev 2018-10-06 22:12:06 +02:00
Milos Kozak 23a91b3838 2.0h-dev 2018-09-25 17:56:16 +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 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 0552a3f1ed 2.0g-dev 2018-09-09 12:24:03 +02:00
Milos Kozak 980e4998e2 send HEAD to fabric 2018-08-27 20:19:30 +02:00
Milos Kozak 2e03c3a298 2.0f-dev 2018-08-25 19:23:17 +02:00
Milos Kozak 9610ef54da 2.0e-dev 2018-08-20 15:14:04 +02:00
Milos Kozak 74f2866fb5 2.0d-dev 2018-08-17 15:22:30 +02:00
Milos Kozak fff2e84608 remove g5uploader flavor 2018-08-07 21:45:35 +02:00
Milos Kozak fcf47ecc03 NSClient2 flavor 2018-08-07 21:07:43 +02:00
Milos Kozak ddff05da75
Merge pull request #1262 from triplem/logshipper
Logshipper
2018-08-02 14:40:54 +02:00
Milos Kozak c0a3eb67ba check for new version on github 2018-08-01 23:03:01 +02:00
Markus M. May 3306e14ca1 Merge branch 'dev' into logshipper 2018-08-01 20:42:05 +02:00
Milos Kozak 5fc2535bcd 2.0c-dev 2018-07-31 22:08:35 +02:00
Markus M. May 883bbf46e1 use fragment insteaad of activity, move pref im/export to maintenance plugin 2018-07-30 22:56:00 +02:00
Andy Rozman 1b8ceb83cf Merge branch 'dev' into medtronic_andy 2018-07-26 16:48:52 +01:00
Milos Kozak 6f29bd6a9a bump 2.0b-dev 2018-07-24 00:46:42 +02:00
Milos Kozak 2e1d473243 bump 2.0a-dev 2018-07-22 10:01:59 +02:00
TebbeUbben da9d586326 Also set round icon if available 2018-06-14 19:43:16 +02:00
TebbeUbben f77e903721 Revert "Use icon for all build configurations"
This reverts commit e194e0d
2018-06-14 19:39:00 +02:00
TebbeUbben e194e0dc48 Use icon for all build configurations 2018-06-13 20:26:46 +02:00
TebbeUbben 9e0dc9bfe5 New launcher icon 2018-06-13 20:23:40 +02:00
Andy Rozman 9bae53e53a - update on initial checkin (code is now same as in RileyLinkAAPS on 10.June - most command working)
- it will take some time until code is actually integrated into AAPS, but at least now all files are available
2018-06-10 21:50:50 +01: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
Johannes Mockenhaupt d0492462a4
Add time to build version. 2018-05-13 12:32:45 +02:00
Andy Rozman 41205d4ba7 Merge branch 'dev' into riley_link_medtronic 2018-05-07 12:11:38 +01:00
AdrianLxM 714eca483e
revert gradle to dev 2018-05-04 20:16:12 +02:00
AdrianLxM 7190bccf20 release candidate 3 2018-05-04 19:24:05 +02:00
AdrianLxM 93c3a3d624 Merge branch 'dev' into aaps20_rc3 2018-05-04 19:21:39 +02:00
Milos Kozak 4539756455 Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard 2018-05-03 22:02:12 +02:00
Milos Kozak dea5ff0080 styles cleanup 2018-05-03 22:01:59 +02:00
Milos Kozak d1958a3e2d
Merge branch 'dev' into startupwizard 2018-05-03 21:31:55 +02:00
Andy Rozman 421946269a Merge branch 'dev' into riley_link_medtronic 2018-05-03 17:23:23 +01:00
Milos Kozak 8419f8d0e9 update socket.io to 1.0.0 2018-05-02 18:49:40 +02:00
Andy Rozman 4b121ae892 - copied roundtrip2 project into here (for easier use), some of it might be reused
- added PumpCommon
- added PumpMedtronic
2018-05-01 22:44:53 +01:00
AdrianLxM e70791dc2f
gradle rc2 2018-05-01 18:07:08 +02:00
AdrianLxM faa09f8505 2.0 rc1 2018-04-28 19:49:55 +02:00
Milos Kozak 883da922e5 1.60e-dev 2018-04-20 22:14:54 +02:00
Milos Kozak b554d641a7 setupwizard template 2018-04-20 17:27:31 +02:00
Milos Kozak 83421c7266 show tests in travis 2018-04-11 16:23:35 +02:00
Milos Kozak ca01fcc270 1.60d-dev 2018-04-07 09:35:21 +02:00
Markus M. May 79094a92f9 Provide newer support libraries, compile with 27 and target 25 2018-04-04 22:46:44 +02:00
Markus M. May 3e792ebfe3 Downgrade supportLibVersion 2018-04-04 21:53:37 +02:00
Markus M. May b7840fb5b5 Revert compileSdkVersion as well 2018-04-04 21:44:23 +02:00
Markus M. May c3bec7e7a6 Revert targetSdkVersion 2018-04-04 21:38:47 +02:00
Markus M. May 9006721873 Version bump butterknife plugin 2018-04-02 22:43:20 +02:00
Milos Kozak c06b89e8e4 targetSdkVersion 27 2018-04-02 12:03:41 +02:00
Markus M. May 0bf84d4fa2 Break build on linting 2018-04-01 20:53:53 +02:00
Markus M. May 297c288e6a Disable abortOnError on linting 2018-04-01 20:49:02 +02:00
Markus M. May 5ef062c22f inital gradle update 2018-04-01 20:49:02 +02:00
Milos Kozak c57d14aa05 MainAppTest 2018-03-31 15:00:32 +02:00
Milos Kozak bcb733e42c Plugins refactor 2018-03-31 00:36:03 +02:00
Milos Kozak 5c5b8ee2f0 DetailedBolusInfo test & fix 2018-03-26 13:25:53 +02:00
Milos Kozak 482d4f4454 1.60b-dev 2018-03-26 11:07:50 +02:00
Milos Kozak 22d617cbc0 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-23 20:53:44 +01:00
Milos Kozak 4502ed6807 1.60a-dev 2018-03-23 20:53:25 +01:00
Milos Kozak 51ca4cc8c6 show failed tests at the end of travis log 2018-03-21 07:41:03 +01:00
Milos Kozak 326229ebbb limitClosedLoop & remove openloop flavor 2018-03-19 17:06:22 +01:00
Milos Kozak f7621c4cc5 Profile tests 2018-03-18 15:02:21 +01:00
Milos Kozak 7961a9f00a ver 1.60-dev 2018-03-18 10:36:38 +01:00
Milos Kozak d25855295d travis 2nd try 2018-03-13 23:48:14 +01:00
Markus M. May b10f8f2fe1 Add environment variable to handle testCoverage 2018-03-13 19:24:08 +01:00
Johannes Mockenhaupt bf2e567f9c
Moar buttons. 2018-02-18 11:06:36 +01:00
Milos Kozak d92a7e8ef1 Merge branch 'history' into dev 2018-02-11 23:46:20 +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
Milos Kozak 1471d2bcd5
Merge pull request #639 from triplem/cleanup_libs
Remove jniLibs, download on build
2018-02-04 18:18:39 +01: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
Milos Kozak 411add616b
Merge pull request #632 from jamorham/dev
Add Insight Pump Plugin
2018-02-02 09:21:57 +01:00
Markus M. May b7ec90ca07 Remove java file object 2018-02-01 21:25:37 +01:00
Markus M. May 6d8c0770c3 Rework copying of libs 2018-02-01 21:11:28 +01:00
Markus M. May 629b626306 Download jniLibs as dependency, delete on clean (in gradle) 2018-02-01 20:09:29 +01:00
Milos Kozak f3769521a5 bump 1.59-dev 2018-02-01 10:25:28 +01:00
Milos Kozak 2157022735 bump 1.58 2018-01-31 23:21:02 +01:00
Milos Kozak af3b77e646 history browser initial work 2018-01-29 22:48:47 +01:00
Milos Kozak 1eba5b79b8 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-01-29 13:28:36 +01:00
Jamorham 2c9cd89ff3
Add unit test 2018-01-26 22:44:12 +00:00
Johannes Mockenhaupt 3100447167
Disable release build checks until wear lib upgrade (#620). 2018-01-26 15:57:26 +01:00
Milos Kozak 8d792a24db bump 1.57a-dev 2018-01-25 11:21:27 +01:00
Milos Kozak bd5c7c396f sdk27 & butterknife 2018-01-24 21:54:24 +01:00
Jamorham 7a4bc3b694
Initial bits for Insight Pump 2018-01-24 14:18:31 +00:00
Milos Kozak 44381288f4 bump 1.57-dev 2018-01-14 17:12:18 +01:00
Milos Kozak 89b7b9c24a better log build verison to Fabric 2018-01-14 17:11:39 +01:00
Markus M. May f5cc2debd7 Cleanup gradle build files 2018-01-13 21:34:38 +01:00
AdrianLxM 51ca0e0d12
Update build.gradle 2018-01-11 14:14:53 +01:00
Milos Kozak a430a7d70d coverage 2018-01-10 23:31:31 +01:00
kuchjir e5b21ccc3e added BolusWizardTest 2018-01-07 22:16:08 +01:00
Milos Kozak 31975396a2 use joda-time 2017-12-22 02:55:40 +01:00
Milos Kozak 5a12d15c8c upgrade build tools 2017-12-03 21:15:12 +01:00
Milos Kozak 7fc9efde40 G5 offline/uploader 2017-11-29 16:07:26 +01:00
Milos Kozak b4187c84ed bump 1.56-dev 2017-11-28 20:51:54 +01:00
Milos Kozak bf4ffaed8f bump 1.55 2017-11-28 20:31:31 +01:00
Milos Kozak 440be77de0
Merge pull request #488 from jotomo/events
Event logging
2017-11-01 18:29:14 +01:00
Johannes Mockenhaupt 8ad223e5e1
Add base event class. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt f7a46d386e
Remove j2v8. 2017-10-16 21:52:06 +02:00
Johannes Mockenhaupt d77fa9b0cf
Revert "NDK filters to work around j2v8 vs. libBleCommandUtil issue."
This reverts commit 7c04787004.
2017-10-16 21:48:08 +02:00
AdrianLxM 2a8ab96fe3 Merge pull request #461 from AdrianLxM/rhinoAMA
Rhino ama
2017-10-15 22:39:54 +02:00
Johannes Mockenhaupt 7c04787004
NDK filters to work around j2v8 vs. libBleCommandUtil issue.
j2v8 only provides files for x86 and arm-v7a while libBleCommandUtil
provides x64 libs as well. This fails to load since x86 & x64 can't be mixed
and Android ends up loading libBleCommandUtil's x64 variant (on a x64
device) and then failing since there's no x64 version of j2v8.

This excludes all libBleCommandUtil ibs except those that match j2v8.

Revert this when we switch away from j2v8.

(cherry picked from commit 09036dc)
2017-10-15 11:19:34 +02:00
AdrianLxM 7f2451934c first rhino 2017-10-15 02:52:57 +02:00
AdrianLxM 746d71bcff remove wear flavours 2017-10-12 18:24:48 +02:00
AdrianLxM f751638a7f enabling wearcontrols from preferences 2017-10-12 18:01:10 +02:00
Milos Kozak 58ed0416d1 fix conflict 2017-10-03 22:33:35 +02:00
Milos Kozak ba54dacffb 1.54-dev 2017-09-25 19:51:05 +02:00
Milos Kozak fdc3c49a2a fix merge conflits 2017-09-18 22:03:26 +02:00
Milos Kozak cd7c7733ea bump 1.53 2017-09-18 21:59:01 +02:00
Milos Kozak ed6cabe7fa initial RS work 2017-09-13 00:35:03 +02:00