Commit graph

10845 commits

Author SHA1 Message Date
Philoul f08eefbf9c Fix Scale 2021-04-14 23:30:04 +02:00
Philoul 015ec3a937 Merge branch 'dev' into test_sec_scale 2021-04-14 22:32:35 +02:00
Philoul 591e9bab89 100% for 0 value 2021-04-14 22:31:49 +02:00
Milos Kozak e2983dc5fb
Merge pull request #465 from Philoul/dev_Fix_PluginType
Fix Plugin Type for BGSource in PluginStore.kt
2021-04-13 15:37:55 +02:00
Milos Kozak 8b321b9b5b
Merge pull request #457 from robertrub/dev
Update strings.xml
2021-04-10 18:24:32 +02:00
Philoul 8bba73a6ca Fix Plugin Type for BGSource in PluginStore.kt
I don't know if it could have side effect...
2021-04-08 11:24:10 +02:00
Philoul f74cd6796f Same Color for DEV and BGI in menu + SEN value * 100 2021-04-05 10:44:52 +02:00
Robrub 6cf621d90a
Update strings.xml
Minor change : Omnipod needs 80U to be primed and not 85U. I've tested this many times with an insulin pen.
2021-04-03 11:38:15 +02:00
Milos Kozak 7ca9caba18
Merge pull request #445 from nightscout/adrian/wear-tests
load Action String Handler
2021-03-30 19:38:12 +02:00
Milos Kozak 903ed1134b
Merge pull request #448 from andyrozman/bug423_historyProblem
Bug423 history problem
2021-03-30 19:37:41 +02:00
Andy Rozman e3a75a55eb Merge branch 'dev' into bug423_historyProblem 2021-03-28 20:45:19 +01:00
Andy Rozman bd72473253 - checked all PumpHistoryEntryType entries and removed most of the ones that are not in go code from Eric
- fixed problem with BGReceived512
2021-03-28 20:42:15 +01:00
AdrianLxM 57f9fa0730 correct call of teardown wear plugin 2021-03-27 22:49:22 +01:00
AdrianLxM b077b1d5b1 load Action String Handler 2021-03-27 22:47:45 +01:00
Milos Kozak 906fc35da5
Merge pull request #434 from Philoul/FixMigration6to7
Fix Migration 6 to 7
2021-03-21 22:31:13 +01:00
Milos Kozak f491bdd127 gradle-6.8.2 2021-03-21 20:00:55 +01:00
Philoul e762efeaa6 Fix Migration 6 to 7 2021-03-21 19:42:32 +01:00
Milos Kozak 3d08683e57
Merge pull request #428 from nightscout/adrian/automation-rework
automation elements without injector
2021-03-21 19:40:18 +01:00
Milos Kozak 8c59b7dc14 missing migration 2021-03-21 15:49:56 +01:00
Milos Kozak 8ec991c3d7 LoopPluginTest without powermock 2021-03-21 14:05:05 +01:00
Milos Kozak ed30e2bf10 fix NPE 2021-03-21 13:52:15 +01:00
Milos Kozak 87ab4fda0e NSSgv -> kt 2021-03-21 13:50:06 +01:00
Milos Kozak 3d48636429
Merge pull request #431 from nightscout/food
Food & NSClient refactor
2021-03-21 09:55:01 +01:00
Milos Kozak 69f8195bbe 2.8.2.1-dev-e 2021-03-20 23:17:05 +01:00
Milos Kozak 70c08d0fe8 Merge remote-tracking branch 'ns/dev' into food 2021-03-20 20:40:51 +01:00
Milos Kozak 415729f243 bypass Intents on NS received data 2021-03-20 20:31:44 +01:00
Milos Kozak 7f95144564
Merge pull request #429 from Philoul/FixCarePortalNoteNull
Allow null notes in UserEntryLogger
2021-03-20 18:38:00 +01:00
Milos Kozak 23a3b45671
Merge pull request #430 from andyrozman/fr420_rl_battery_level
Feature request 420 - RL battery level
2021-03-20 18:37:13 +01:00
Andy Rozman 238b466c24 - change log 2021-03-20 13:57:16 +00:00
Milos Kozak 98c7508383 NSClientMbgWorker 2021-03-20 14:51:10 +01:00
Milos Kozak e53c91fc58 DataWorker, NSDeviceStatus -> kt 2021-03-20 12:30:57 +01:00
Philoul fdbd7f63e5 Null notes managed in uel.log 2021-03-20 09:36:06 +01:00
Philoul 59abe42032 Timestamp before type for consistency of presentation in TreatmentsUserEntryFragment (Careportal Removed) 2021-03-20 09:27:46 +01:00
AdrianLxM fd2c072799 automation elements without injector 2021-03-20 01:27:04 +01:00
Andy Rozman 3fde3a03a8 - Merge branch 'dev' into fr420_rl_battery_level
- fixing problem with logging, had to wrap them in String.format for this to work
- fixed problem with uploading event to nightscout, there was exception because entry was added where glucose value was not set
2021-03-19 23:34:53 +00:00
AdrianLxM a0c9ab7de0 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-03-19 23:37:12 +01:00
AdrianLxM 3a3e75fd92 update gradle 2021-03-19 23:36:57 +01:00
AdrianLxM 6a8a7bd467
Merge pull request #427 from nightscout/adrianbrian/extract-nsupload
use UploadQueue through interface
2021-03-19 23:36:28 +01:00
Philoul 68b8525935 Accept null notes (from Careportal) 2021-03-19 23:14:45 +01:00
Milos Kozak 8be3ccc989 return proper result from Worker 2021-03-19 22:41:19 +01:00
Andy Rozman 2c6f64b71f - fixed log support, it still used {} as data placeholders, which doesn't work with aapsLogger 2021-03-19 20:50:58 +00:00
AdrianLxM 7d2e364c77 use UploadQueue through interface 2021-03-19 21:35:09 +01:00
Milos Kozak a2fbab02f9 food -> Room 2021-03-19 18:49:34 +01:00
Milos Kozak 3d4d27439a
Merge pull request #425 from nightscout/pull/393
User entry logging
2021-03-19 12:51:36 +01:00
Milos Kozak 05745f6867 fix test 2021-03-19 12:21:52 +01:00
Milos Kozak 8736f6db7e Merge branch 'dev' into pull/393 2021-03-19 11:42:59 +01:00
Milos Kozak ec1262727b
Merge pull request #422 from andyrozman/bug418_historyFix_BolusWizardRecordProblem
Bug418 history fix bolus wizard record problem
2021-03-18 23:18:14 +01:00
Philoul afa64d0111 Try to fix test, Probably a bit better but doesn't work 2021-03-18 23:01:31 +01:00
Philoul 400f55f3d9 Remove TT_Reason unit (now the same than TherapyEvent Unit that include all enum key translated with Translator)
Fix TT Custom missing
2021-03-18 11:15:45 +01:00
Andy Rozman ba8c436136 - added battery display, should be done 2021-03-18 00:08:04 +00:00