Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

6

600SeriesAndroidUploader
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Incidents

Snippets Groups Projects

7e9ab5c8

Commit 7e9ab5c8 authored 7 years ago by Pogman Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #10 from pazaan/develop

sync up with pazaan

parents f16d3df3 699b64b5

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/info/nightscout/android/medtronic/MainActivity.java 1 addition, 1 deletion

.../java/info/nightscout/android/medtronic/MainActivity.java
app/src/main/java/info/nightscout/android/medtronic/MedtronicCnlReader.java 1 addition, 1 deletion

...info/nightscout/android/medtronic/MedtronicCnlReader.java
app/src/main/java/info/nightscout/android/medtronic/message/CloseConnectionRequestMessage.java 1 addition, 2 deletions

...roid/medtronic/message/CloseConnectionRequestMessage.java
app/src/main/java/info/nightscout/android/medtronic/message/PumpStatusRequestMessage.java 1 addition, 2 deletions

...t/android/medtronic/message/PumpStatusRequestMessage.java
app/src/main/java/info/nightscout/android/medtronic/message/PumpTimeRequestMessage.java 1 addition, 2 deletions

...out/android/medtronic/message/PumpTimeRequestMessage.java
app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java 3 additions, 4 deletions

.../android/medtronic/service/MedtronicCnlIntentService.java
app/src/main/java/info/nightscout/android/model/medtronicNg/PumpStatusEvent.java 0 additions, 3 deletions

...nightscout/android/model/medtronicNg/PumpStatusEvent.java
app/src/main/java/info/nightscout/android/upload/nightscout/NightScoutUpload.java 1 addition, 1 deletion

...ightscout/android/upload/nightscout/NightScoutUpload.java
app/src/main/res/layout/activity_status.xml 0 additions, 81 deletions

app/src/main/res/layout/activity_status.xml
app/src/main/res/values/strings.xml 0 additions, 25 deletions

app/src/main/res/values/strings.xml

with 9 additions and 122 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment