Milos Kozak
8ec346cd35
specify glucoseUnit, DB++
2021-03-09 22:11:30 +01:00
Andrei Vereha
034cbef215
Merge pull request #19 from 0pen-dash/andrei/encryption
...
andrei/encryption
2021-03-09 21:52:25 +01:00
Philoul
f3787304f8
Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_DevMerge
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
# database/schemas/info.nightscout.androidaps.database.AppDatabase/4.json
2021-03-09 21:50:17 +01:00
Philoul
01a1321cbb
Clean and simplify code
...
Add comment in UserEntry (data type for each Unit)
2021-03-09 21:09:59 +01:00
Andrei Vereha
c337b52aa0
dash/ble: support both 1 and 2 byte command
...
It seems that the PDM is sending 1 byte commands and the POD answers
with 2 byte commands.
Add logging for decrypted responses.
I think `eqos` means that we are expecting an ACK for the last message.
Read (and log for now) a pending message if the POD is trying to sending it back while we want
to send a command.
2021-03-08 22:52:04 +01:00
Andrei Vereha
db51b762ca
dash ble: disconnect on errors
2021-03-08 22:52:04 +01:00
Andrei Vereha
64aa05f7f9
dash en/decrypt test: add comment about failing test
2021-03-08 22:52:04 +01:00
Andrei Vereha
923d8d33ef
dash eap: bugfix
...
Shift the MSB of the lenght by 1 byte, not one bit.
2021-03-08 22:52:04 +01:00
Andrei Vereha
7dd8fc1bf6
dash/ble: ktlintFormat
2021-03-08 22:52:04 +01:00
Andrei Vereha
e7a9e24093
dash: start using podState for BLE
...
implement disconnect()
various fixes after testing with a real pod(cmd is 2 bytes, message
joining, etc)
2021-03-08 22:52:04 +01:00
Andrei Vereha
4046828567
format: ktlint
2021-03-08 22:52:04 +01:00
Andrei Vereha
c71433ad1a
format: remove trailing commao
2021-03-08 22:52:04 +01:00
Andrei Vereha
5211d4ddc6
dash ble: implement sessions and sending commands
...
Tested with the fake pod:
```
DEBU[0185] got command. CRC: 82b2. Type: 7 :: GET_VERSION
DEBU[0185] got command. CRC: 0003. Type: 3 :: SET_UNIQUE_ID
DEBU[0186] got command. CRC: 019a. Type: 19 :: PROGRAM_ALERTS
DEBU[0186] got command. CRC: 0385. Type: 19 :: PROGRAM_ALERTS
DEBU[0187] got command. CRC: 81f3. Type: 1a :: PROGRAM_INSULIN
DEBU[0187] got command. CRC: 8178. Type: e :: GET_STATUS
```
2021-03-08 22:52:04 +01:00
Andrei Vereha
5647007190
dash/ble: remove retries for connect for now
...
It's easier to debug for now if we stop on the first issue/error
2021-03-08 22:52:04 +01:00
Andrei Vereha
9c586c4942
dash encryption: add encryption and decryption for messsages
2021-03-08 22:52:04 +01:00
Milos Kozak
2ef91e6814
Merge pull request #405 from nightscout/careportal
...
Careportal -> Room
2021-03-08 22:27:26 +01:00
Philoul
f3d6fff565
Add Export CSV in Maintenance Fragment
2021-03-08 21:42:16 +01:00
Milos Kozak
2ac2a4c2d9
fit TT in Automation
2021-03-08 20:41:42 +01:00
Milos Kozak
c28fb465fb
Merge remote-tracking branch 'ns/dev' into careportal
2021-03-08 20:27:53 +01:00
Milos Kozak
91e323b5f5
New Crowdin updates ( #388 )
...
* New translations exam.xml (Portuguese)
* New translations validator.xml (Slovak)
* New translations alert_descriptions.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations alert_titles.xml (Tamil)
* New translations alert_descriptions.xml (Tamil)
* New translations alert_codes.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations validator.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations exam.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations objectives.xml (Tamil)
* New translations exceptions.xml (Tamil)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations exam.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Dutch)
* New translations strings.xml (Romanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (German)
* New translations validator.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Hebrew)
* New translations objectives.xml (Hebrew)
* New translations strings.xml (Czech)
* New translations strings.xml (Italian)
* New translations strings.xml (Portuguese)
* New translations alert_titles.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations exam.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations validator.xml (French)
* New translations alert_descriptions.xml (French)
* New translations alert_titles.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (German)
* New translations strings.xml (French)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (Czech)
* New translations strings.xml (Italian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (French)
* New translations alert_descriptions.xml (Swedish)
* New translations alert_titles.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations exam.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
2021-03-08 20:22:45 +01:00
Milos Kozak
6c072dbe6e
Merge pull request #402 from nightscout/adrian/cleanup-glucosestatus
...
Refactor GlucoseStatusProvider out of GlucoseStatus
2021-03-08 20:20:10 +01:00
Milos Kozak
8db8edc3f6
Careportal -> Room
2021-03-08 20:10:02 +01:00
Philoul
f7f6f4b7c1
Merge branch 'User_Entry_ValueWithUnits' into UE_ExportXML
2021-03-08 18:22:50 +01:00
Philoul
816fd531a2
Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits
2021-03-08 18:21:57 +01:00
AdrianLxM
d13d6a7fff
glucose status provider test fix
2021-03-07 22:38:18 +01:00
Milos Kozak
cb29e7a33c
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-03-07 22:04:51 +01:00
AdrianLxM
3cb07c215e
Refactor GlucoseStatusProvider out of GlucoseStatus
2021-03-07 20:22:03 +01:00
Milos Kozak
bcfa449ec8
lints
2021-03-07 19:26:08 +01:00
Milos Kozak
9345276f94
Merge pull request #398 from Tornado-Tim/fix-LGS-constraint
...
Fix Low Glucose Constraint
2021-03-07 18:20:22 +01:00
Milos Kozak
b575c1b34c
Merge pull request #400 from andyrozman/bug138_tbr_for_high_values
...
Bug138 tbr for high values
2021-03-07 18:19:29 +01:00
Milos Kozak
658f565cf2
Notofocation -> kt
2021-03-07 17:46:21 +01:00
Milos Kozak
20cabd00bb
more kotlin conversion
2021-03-07 15:31:05 +01:00
Milos Kozak
563bee2faf
PumpDescription -> kt
2021-03-07 15:19:51 +01:00
Philoul
cc889cfa0a
Remove Action.colorID, and modify Group for NS REFRESH
2021-03-07 15:11:36 +01:00
Philoul
c931c8d25a
Careportal Remove Duration ValueWithUnit if empty
2021-03-07 15:07:35 +01:00
Milos Kozak
54ad6caf83
interfaces -> kt
2021-03-07 14:37:05 +01:00
Milos Kozak
fcb4d00ba2
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-03-07 14:22:53 +01:00
Milos Kozak
b9e50885a8
Constraint -> kt
2021-03-07 14:22:50 +01:00
Milos Kozak
2ea423c704
PumpEnactResult -> kt
2021-03-07 13:31:11 +01:00
Milos Kozak
00ee60ff1e
Intervals -> kt
2021-03-07 11:05:33 +01:00
Philoul
46cc4d9e85
Careportal Remove Duration ValueWithUnit if empty
2021-03-07 10:52:42 +01:00
Philoul
c259aa345c
Csv format (not xml) modified to Excel default
...
remove unnecessary " and use ; as separator
2021-03-07 10:43:33 +01:00
Andrei Vereha
bef32e70c1
Merge pull request #18 from 0pen-dash/eap-aka
...
EAP AKA session establishment
2021-03-07 10:22:42 +01:00
Philoul
6096825f4c
Formatage xml 1ère version
2021-03-07 03:09:30 +01:00
Andy Rozman
4232679c06
- small change (removed unneeded code)
2021-03-07 00:57:13 +00:00
Andy Rozman
2738cf7fce
- TBR was incorrectly interpretted for high TBR values
2021-03-07 00:46:53 +00:00
Milos Kozak
021d70bbe6
Merge pull request #399 from Philoul/Fix_Carbs_Layout
...
Fix Carbs Layout
2021-03-07 00:58:23 +01:00
Milos Kozak
72176edfb9
core -> kt, move tests to core
2021-03-07 00:49:18 +01:00
Milos Kozak
9b78839f5d
typo
2021-03-06 23:18:57 +01:00
Philoul
cf83d20e13
Merge branch 'User_Entry_ValueWithUnits' into UE_ExportXML
...
# Conflicts:
# core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt
# database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
2021-03-06 22:31:39 +01:00
