Philoul
ac3baab3f3
Merge remote-tracking branch 'Nightscout/dev' into UserEntryImprovement
2021-03-23 15:42:03 +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
Philoul
c3d593f7ae
Start implementation of Source
2021-03-21 19:14:42 +01:00
Philoul
0d68290a8c
Merge remote-tracking branch 'Nightscout/dev' into UserEntryImprovement
2021-03-21 16:33:54 +01:00
Milos Kozak
8c59b7dc14
missing migration
2021-03-21 15:49:56 +01:00
Philoul
4f5132d189
Merge remote-tracking branch 'Nightscout/dev' into UserEntryImprovement
2021-03-21 15:29:48 +01:00
Milos Kozak
8ec991c3d7
LoopPluginTest without powermock
2021-03-21 14:05:05 +01:00
Philoul
f24be5beff
CSV format improved
...
Previously one line per ValueWithUnit (one columns for value and one column for units) and one Action could be recorded in several lines according to number of ValueWithUnits
Now one line for one Action, and we have one column for each unit
2021-03-21 14:03:15 +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
Philoul
accfc24332
Optimize Actions
2021-03-17 22:45:08 +01:00
Andy Rozman
3d725daed4
- added format codes for logging
2021-03-17 16:03:51 +00:00
Andy Rozman
84bf6028de
- made some changes so that I can test data locally within AAPS
...
- changed some code, just so that visualization in log is little better
- if there are bytes skipped there is error message now displayed in log
2021-03-17 14:12:28 +00:00
Andy Rozman
a87613d41e
- fix 418, BolusWizardSetup record was not correctly decoded which made problem in history
2021-03-17 13:18:10 +00:00
Philoul
2b6f060eae
Translate TT_Reason (UserEntry and csv export)
2021-03-17 12:05:25 +01:00
Milos Kozak
09d7ab01fb
Merge pull request #421 from nightscout/MilosKozak-patch-1
...
Update issue templates
2021-03-17 10:27:57 +01:00
Milos Kozak
db19ef21ec
Update issue templates
2021-03-17 10:26:43 +01:00
Milos Kozak
253db21073
Merge pull request #416 from Philoul/Statistic_percentage
...
Stats: inRange percentage to always get a sum equal to 100%
2021-03-17 09:45:37 +01:00
Philoul
919a718a81
Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
# core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
2021-03-17 08:55:26 +01:00
