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

259 commits

Author SHA1 Message Date
Milos Kozak d4d194f7f0 Merge branch 'dev' into smb 2017-12-04 23:30:24 +01:00
Milos Kozak f25334273a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-03 17:34:58 +01:00
Milos Kozak 0101bc0a81 parse more iso formats 2017-12-03 17:34:29 +01:00
Milos Kozak 622ac15c50 Merge branch 'dev' into smb, fix compile, add queue features 2017-12-01 18:13:05 +01:00
AdrianLxM 090127012c
Merge branch 'dev' into btwatchdog-pr 2017-12-01 14:03:44 +01:00
AdrianLxM 4b063a7766 fix SP for long with string-ressource-id 2017-12-01 13:49:50 +01:00
Milos Kozak 7fc9efde40 G5 offline/uploader 2017-11-29 16:07:26 +01:00
Milos Kozak d1aec1ff18 Localalerts settings by adrian 2017-11-28 21:48:46 +01:00
Milos Kozak 3ab235f829 refactor pump interface out of ConfigBuilder, remove handlers 2017-11-20 23:39:12 +01:00
Milos Kozak 973b9d50c1 Merge branch 'dev' into dev2 2017-11-20 17:28:15 +01:00
Milos Kozak 297617467e fix format and add test for fromISODateString 2017-11-20 13:34:13 +01:00
Milos Kozak a1c6704ae9 Merge branch 'dev2' into smb 2017-11-01 20:50:14 +01:00
AdrianLxM 9e8752b096
timeframe strings 2017-10-29 02:06:06 +02:00
Milos Kozak fe0376206e fix merge conflict 2017-10-24 11:46:27 +02:00
AdrianLxM 7ed7a2e8c4 Merge remote-tracking branch 'milosremote/dev' into smb-rhino 2017-10-21 17:06:57 +02:00
Milos Kozak 13184dcb51 food plugin 2017-10-17 20:55:23 +02:00
Milos Kozak 1994cd707c use customized name only for LocalProfile 2017-10-14 10:39:32 +02:00
AdrianLxM 869b3eff5f Spinner set selection delayed 2017-10-12 23:56:58 +02:00
AdrianLxM 4667a047ea add sum to basal in lp 2017-10-11 20:57:43 +02:00
AdrianLxM 339c33bd75 Spinner - selection events only after first touch 2017-10-11 19:25:09 +02:00
AdrianLxM 374983e1ae only inflate elements when needed 2017-10-11 07:59:41 +02:00
Johannes Mockenhaupt fa1c282699
Merge remote-tracking branch 'origin/dev' into smb 
* origin/dev: (28 commits)
  Singleton & Crashlytics logging part 2
  treatments in config builder
  Singleton & Crashlytics logging part 1
  checkboxes for NS-Client layouts
  overview checkboxes cutoff fix
  update NP value after manual entry
  restore preferences
  temp target presets
  Rv2 percent fix
  korean percent fix
  serialize reload of treatments
  getTempBasalFromHistory -> getRealTempBasalFromHistory
  Do not misinterpret a fake-extended as 0% temp.
  In one line
  Update danar_fragment.xml
  text identation
  Add files via upload
  Add files via upload
  Add files via upload
  Add files via upload
  ...

# Conflicts:
#	app/build.gradle
#	app/src/main/java/info/nightscout/androidaps/MainApp.java
 2017-10-07 21:33:22 +02:00
Milos Kozak 9e7c81613c Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile 2017-10-07 18:28:59 +02:00
Milos Kozak ef645ca600 fix merge conflict 2017-10-07 18:27:20 +02:00
Johannes Mockenhaupt da3f02648c
Use SpinnerHelper in TimeListEdit. 
Resolves the spinner's onItemSelected handler to back invoked
repeatedly on faster devices.
 2017-10-07 16:37:24 +02:00
AdrianLxM 1b5ef50eb2 update NP value after manual entry 2017-10-06 03:24:35 +02:00
Milos Kozak 3d58fe6bb5 cleanup 2017-10-04 23:24:56 +02:00
Milos Kozak 96edac5ddf LocalProfile fix 2017-10-04 23:17:19 +02:00
Milos Kozak 8bf5933c88 refactor TimeListEdit 2017-10-04 15:46:23 +02:00
Milos Kozak 8cecac0a7f more LocalProfile work 2017-10-02 19:57:41 +02:00
Milos Kozak 1a5b72f745 Fix time parsing 2017-10-02 17:38:45 +02:00
Milos Kozak 91b02d4d39 fill dialog refactor & code clean 2017-09-24 14:51:16 +02:00
Johannes Mockenhaupt ce2b1e4d10
Merge remote-tracking branch 'origin/dev' into smb 
* origin/dev: (40 commits)
  bump 1.53
  BG & IOB contribution on by default in wizard
  check for NaN
  Revert "Rounding issues visible in nightscout insulin field"
  Clarified boolean logic with parentheses :)
  loadEvents after bolus in separate thread
  use notification for bolus delivery failed message when window has been destroyed
  fix null pointer exception
  Added cases to accept both a.m./p.m. and AM/PM
  split JSON arrays to 50 elements
  Update strings.xml
  Changed rounding to use BigDecimals to avoid noisy long doubles in output
  Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts."
  Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called
  Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts.
  Removed unused imports
  Rounding fix
  VirtualPump: set PumpEnactResult.enacted.
  Use correct units for low/high from TT.
  Remove duplicate logging.
  ...

# Conflicts:
#	app/build.gradle
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java
#	app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
 2017-09-20 13:02:31 +02:00
Milos Kozak d7f8d75d06 Revert "Rounding issues visible in nightscout insulin field" 2017-09-18 21:24:22 +02:00
Milos Kozak a98d2e846f Merge pull request #419 from dylanleonard/feature_time_spinner_fix 
Time Spinner Local Profile Fix
 2017-09-18 21:06:34 +02:00
Dylan Leonard d8590fe8f1 Clarified boolean logic with parentheses :) 2017-09-18 15:04:46 -04:00
Milos Kozak c2afa328e3 Merge branch 'dev' into tt-in-wizard 2017-09-18 20:44:54 +02:00
Dylan Leonard 4f5987b72a Added cases to accept both a.m./p.m. and AM/PM 2017-09-18 14:20:28 -04:00
Wouter Lagerweij 02c2213545 Changed rounding to use BigDecimals to avoid noisy long doubles in output 2017-09-17 14:27:49 +02:00
Dylan Leonard 91f0c21306 Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called 2017-09-16 19:30:07 -04:00
Wouter Lagerweij aaa3f648d0 Removed unused imports 2017-09-17 00:56:00 +02:00
Wouter Lagerweij e350c8c3c3 Rounding fix 2017-09-17 00:53:16 +02:00
Johannes Mockenhaupt 07b04b8abf
Use correct units for low/high from TT. 2017-09-12 01:23:38 +02:00
Johannes Mockenhaupt 5c3ec9a086
Use SystemClock.sleep instead of Thread.sleep. 
Gets rid of all those pointless InterruptedException catching.

(cherry picked from commit 6acaa2b)
 2017-09-09 16:41:11 +02:00
Johannes Mockenhaupt c50fad81bb
Log exceptions in catch blocks rather than printing to console. 
The default code used by Android Studio when generating a
try/catch can be altered in Settings under
    Editor->File and Code Templates->Catch Statement body
to
    log.error("Unhandled exception", e);
to also do this for newly generated code.

(cherry picked from commit c2ae29f)

(cherry picked from commit 6031a25)
 2017-09-09 16:41:06 +02:00
Johannes Mockenhaupt b1e3b45ce9
Add temp target to Wizard dialog 
Also, store checkboxes' state as prefereces.

(cherry picked from commit 6e1c66e)
 2017-09-09 16:30:17 +02:00
Milos Kozak ec114c3b38 execute SMB 2017-08-21 08:41:34 +02:00
Milos Kozak 6ca44fce84 Merge pull request #367 from MilosKozak/profile-switch-buttons 
show notification on toast alarm
 2017-08-16 22:58:34 +02:00
AdrianLxM e61d7a4442 show notification on toast alarm 2017-08-16 21:37:33 +02:00
Milos Kozak b93a153b23 parse 12h format properly 2017-08-16 19:33:41 +02:00
Milos Kozak 2d2ccde6e4 log Bundle 2017-08-14 12:11:53 +02:00
Milos Kozak 066283a4b0 add SMB flag to treatments 2017-08-06 12:19:25 +02:00
Milos Kozak e295c8a2dc target range change confirm dialog 2017-08-05 18:09:19 +02:00
Milos Kozak 6828e11dd9 remove notes strings as well 2017-08-01 17:25:43 +02:00
Milos Kozak 6f9f72d849 remove notes from temp basal upload 2017-08-01 17:21:32 +02:00
AdrianLxM 5569b42ac3 wear wizard percentage 2017-07-26 09:58:51 +02:00
Johannes Mockenhaupt 80124e6d7b
Bolus wizard: use PumpDescription to round final bolus to a value compatible with the pump. 2017-07-14 23:52:16 +02:00
Milos Kozak e0e0a75519 allow ISO format with miliseconds 2017-07-02 12:49:25 +02:00
Milos Kozak 39c6ae5eae fix merge conflict 2017-06-30 09:35:20 +02:00
Milos Kozak c3876c730b numberpicker in wizard dialog 2017-06-27 23:16:23 +02:00
Milos Kozak ef4a1feda2 numberpicker in calibration dialog 2017-06-27 17:06:23 +02:00
Milos Kozak 9fb428c128 fix conflict 2017-06-27 13:52:47 +02:00
Milos Kozak 87fb969d9f ns openaps status 2017-06-26 17:21:39 +02:00
Milos Kozak 47a9d4b9c8 ns pump status 2017-06-26 12:44:03 +02:00
Milos Kozak 3f641f9c30 carbs absorption settings 2017-06-25 11:16:19 +02:00
Milos Kozak befdbefa49 fix zero parsing error 2017-06-20 19:58:43 +02:00
Milos Kozak 43231cc362 use System.currentTimeMillis() 2017-06-15 23:12:12 +02:00
Milos Kozak 26daffa692 use primitives in inner loops 2017-06-15 22:55:07 +02:00
Milos Kozak 5408562d84 use phone name in devicestatus 2017-06-15 09:45:10 +02:00
Milos Kozak ae2bbf76e5 fix duplicating carb entries 2017-06-14 19:49:01 +02:00
Milos Kozak afca896f23 optimize getUnits() & detecting faked extended 2017-06-13 12:08:30 +02:00
Milos Kozak 1de64f06c2 simplify danar activities, fix profiles 2017-06-12 23:31:50 +02:00
Milos Kozak 77659e20e7 ns alarms & getBasal fix 2017-06-11 17:22:54 +02:00
Milos Kozak 1153c33200 tempbasal & extendedbolus 3way sync 2017-06-08 18:15:17 +02:00
Milos Kozak 8fab76ee9b treatments synchronization improvement 2017-06-07 00:11:33 +02:00
Milos Kozak 6ca4811e8e profiles visualisation 2017-06-02 12:27:21 +02:00
Milos Kozak f267c85377 it compiles now with profiles 2017-06-02 10:25:49 +02:00
Milos Kozak 3861bece54 extended bolus dialog 2017-05-30 15:07:44 +02:00
Milos Kozak 358de54322 redesign uploading treatments to NS 2017-05-29 21:45:59 +02:00
Milos Kozak ec76908eca redesign uploading tb&eb to NS 2017-05-29 19:43:19 +02:00
Milos Kozak a066580896 handle faked tempbasals synchronization 2017-05-26 08:54:48 +02:00
Milos Kozak 6cd046459a original treatmens plugin removed, temp basals working 2017-05-22 20:58:05 +02:00
Milos Kozak 6004a17594 change database structures 2017-05-21 22:05:03 +02:00
Milos Kozak 6a6a02f212 Merge branch 'dev' into history 2017-05-12 23:04:39 +02:00
Milos Kozak 3f4cf57bbc make all Spiners centered 2017-05-12 23:04:14 +02:00
Milos Kozak 52177cead1 move part of PumpInterface to TreatmentInterface 2017-05-12 21:07:29 +02:00
Milos Kozak abdc1022bf merge bolus & basal into one plugin 2017-05-12 16:27:33 +02:00
Milos Kozak a0d31b2118 rename identical functions 2017-05-11 18:54:50 +02:00
Milos Kozak 23fd6a6c44 overlappingintervals 2017-05-10 14:00:46 +02:00
Milos Kozak 4dd9281276 remove actionbar 2017-04-29 20:16:50 +02:00
Milos Kozak 7534f54f19 trend in wizard off by default 2017-04-24 19:24:53 +02:00
Milos Kozak 935a9366d9 fix cob in wizard 2017-04-24 17:46:20 +02:00
Milos Kozak 04ae55ac63 exit app after import settings 2017-04-16 13:27:01 +02:00
Milos Kozak 2413fae0a9 1.32 superbolus & trend contribution in wizard 2017-04-14 14:50:18 +02:00
Milos Kozak f596050239 loop suspend menu 2017-04-05 21:39:39 +02:00
Milos Kozak d6f31820d9 request battery optimalization whitelisting 2017-03-31 09:21:40 +02:00
Milos Kozak af8e485250 log SafeParse 2017-03-05 20:12:30 +01:00
Milos Kozak b0c828c93e nsclient build variant 2017-02-23 20:00:33 +01:00
Milos Kozak 15d6de4701 age from product flavor to prefs 2017-02-22 20:29:41 +01:00
Milos Kozak 4b6276c0b1 uploader battery always in json 2017-02-21 13:45:33 +01:00
Milos Kozak d84632a8a4 uploader battery in device status 2017-02-20 08:32:10 +01:00
Milos Kozak f33ccf278b dbupdate/remove, saving queue 2017-02-17 21:24:30 +01:00
Milos Kozak 14e37246c2 nsclient gui and pausing tweaking 2017-02-17 18:14:33 +01:00
Milos Kozak 8a374f1b35 Shared preferences cleanup 2017-02-17 16:16:20 +01:00
Milos Kozak 71112a90e2 internal nsclient 2017-02-17 13:18:36 +01:00
Milos Kozak 2e4aec9916 settings password protected 2017-02-14 19:16:34 +01:00
AdrianLxM 6cb192b876 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into wear-bolus5 2017-02-11 18:09:22 +01:00
viktoria 0ffddcdefa Deprecation TimeListEdit - add design support libraries 2017-02-11 14:01:37 +01:00
viktoria a4591af392 Deprecation colors 2017-02-11 14:00:44 +01:00
AdrianLxM 638b9c263c Merge pull request #61 from MilosKozak/dev 
Dev
 2017-02-11 02:55:14 +01:00
Milos Kozak 2e40c7b605 sms calibrations 2017-02-10 21:20:55 +01:00
Milos Kozak 83667be8cc extract sending intent to a function 2017-02-10 17:25:32 +01:00
AdrianLxM 4220d7712a wear wizard working 2017-02-10 06:07:31 +01:00
Milos Kozak 90061c6f25 Show log 2017-02-09 22:29:21 +01:00
Milos Kozak 179511a833 fix conflicts 2017-01-29 22:41:01 +01:00
Milos Kozak 907de4da7b execution profiler 2017-01-29 22:37:25 +01:00
Milos Kozak 0e21b67a42 fix merge conflicts 2017-01-17 18:00:44 +01:00
Milos Kozak 61b1ee781f temp target treatment dialog & sync fix 2017-01-16 16:59:12 +01:00
Milos Kozak 68a127d804 make autosens configurable in settings, determinebasaladapter refactoring 2017-01-08 14:21:29 +01:00
Milos Kozak f707029560 fix conflict 2017-01-07 23:45:41 +01:00
Milos Kozak 38f397cd59 revert formating date 2017-01-07 23:26:28 +01:00
Milos Kozak 25a3b678e9 most new AMA code added 2017-01-06 22:42:37 +01:00
Milos Kozak 724a041341 refactor classes 2017-01-04 22:33:17 +01:00
Milos Kozak faf8e07248 renaming before adding AMA 2017-01-03 21:01:01 +01:00
Milos Kozak f3f6a911ae use android.text.format.DateUtils 2017-01-03 19:06:35 +01:00
Milos Kozak fded515ac1 fix TimeListEdit when fragment is restored 2017-01-01 20:22:23 +01:00
Milos Kozak 38a9c94258 Local Profile 2016-12-31 20:10:36 +01:00
Milos Kozak 0458ad65ce handle arrays separately 2016-12-31 14:52:23 +01:00
Milos Kozak 2e6c168adc TimeListEdit most work done 2016-12-31 13:11:32 +01:00
Milos Kozak e1c2e4c492 TimeListEdit initial work 2016-12-30 16:43:43 +01:00
Milos Kozak 6f8d828ec2 QuickWizard 2016-10-20 23:50:31 +02:00
Milos Kozak 9f1bbd35bd wizard calculation to extra file 2016-10-11 22:47:48 +02:00
Milos Kozak 1ced97ced6 progressive plusminus element 2016-08-08 16:03:03 +02:00
Milos Kozak 88698576a2 plusminis edit shows toast when hit limit 2016-08-08 10:08:30 +02:00
Milos Kozak ff2e9a82bc fix some crashes 2016-08-07 13:07:13 +02:00
Milos Kozak dbb0a6a659 danar fragment update, danar pump password, toast with sound 2016-08-02 18:39:14 +02:00
Milos Kozak 1c0edb151e DanaR NS history sync class 2016-07-21 00:18:45 +02:00
viktoria 11d26b9815 typo 2016-07-18 23:32:12 +02:00
Milos Kozak 82a16efcc2 bolus wizard full functionality 2016-07-16 22:37:10 +02:00
Milos Kozak c5d40b3a6c careportal eventtypes translations 2016-07-15 19:45:03 +02:00
Milos Kozak f2bdf4bcff better format of html aps result 2016-07-13 19:21:31 +02:00
Milos Kozak f7715a3409 xml reformating, some code cleaning 2016-07-11 17:49:09 +02:00
Milos Kozak 143d347841 most danar code there 2016-07-10 15:05:13 +02:00
Milos Kozak dc3eb80d52 basic danar comm 2016-07-08 00:17:02 +02:00
Milos Kozak ba015f1140 DanaR service 2016-07-07 10:34:20 +02:00
Milos Kozak 7c46407f81 AlarmService 2016-07-06 22:05:28 +02:00
Milos Kozak 9bd7363dbf fix accessing storage on android 6 2016-07-04 10:05:21 +02:00
viktoria 08e7a254de typo 2016-07-04 01:04:35 +02:00
Milos Kozak 48dba18721 fix doubled path in confirm message 2016-07-03 23:10:27 +02:00
Milos Kozak 5c2a9f85d4 create ISO date accepted by apple products 2016-07-03 22:40:41 +02:00