Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull from nightscout-dl - newer/supported usb-serial library, Gradle build, many other changes #18

Open
wants to merge 64 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
d3b7731
Added a gitignore
nightscout-dl Jun 6, 2018
e5603c1
rename typod manual
nightscout-dl Jun 6, 2018
cb3c36f
removing things that should be gitignored
nightscout-dl Jun 6, 2018
d1e6f0b
disable lint
nightscout-dl Jun 6, 2018
8d2d1af
Imported into Studio after sorting out gitignore.
koyli Jun 6, 2018
d23c45a
update build tools version to be compatible with latest gradle / sdk
koyli Jun 6, 2018
7b7e122
added log replayer to test over serial usb device; added serial usb d…
koyli Jun 7, 2018
e30ef7f
minor changes to clean up from Inspect Code warnings.
koyli Jun 9, 2018
e007044
cleaning up; remove code for manual calibration with delay, replace w…
koyli Jun 9, 2018
e15b8d3
Revert "cleaning up; remove code for manual calibration with delay, r…
koyli Jun 10, 2018
1e57e51
cleaning up; removing unnecessary code paths in parsing calibration i…
koyli Jun 10, 2018
e2962d5
added a few more log messages.
koyli Jun 10, 2018
3ebe6ff
just log messages changes
koyli Jun 10, 2018
b27a070
just log messages changes
koyli Jun 10, 2018
2a4f1ed
background colour changes
koyli Jun 10, 2018
294fb37
restore the writing of the CSV file, apparently it was needed - is ho…
koyli Jun 10, 2018
aea8739
reduce logging of internet connected test, log only failure.
koyli Jun 10, 2018
f4830a3
remove duplicate sensor display updating.
koyli Jun 10, 2018
fc7fd5a
remove unnecessary checks for EGV records that are not sensor records…
koyli Jun 10, 2018
3a78058
better log message for open-fail.
koyli Jun 11, 2018
02077fe
Replaced physicaloid with more active USB/serial package. Main reason…
koyli Jun 11, 2018
41489aa
Various tidying up. No behavioural change.
koyli Jun 14, 2018
264b324
Various tidying up. Removed other logging libraries, just use bugfender.
koyli Jun 14, 2018
cfe2148
tidying up reader of previous record.
koyli Jun 14, 2018
3ae3d2b
remove glucometer approval paths, untested and never enabled anyway.
koyli Jun 14, 2018
297f837
fix some lint/analyzer bugs
koyli Jun 14, 2018
e21a25c
fix some lint/analyzer bugs
koyli Jun 14, 2018
a790b02
remove unnecessary assignment of prefs, is already initialized
koyli Jun 14, 2018
58b9d69
use commit instead of apply for prefs
koyli Jun 14, 2018
dd847dd
Don't store last read in persistent settings. Has never been used (du…
koyli Jun 14, 2018
b6d696c
use apply instead of commit for settings, is better behaviour.
koyli Jun 14, 2018
48a8a24
don't store previousValue (raw), it is never read
koyli Jun 14, 2018
3f3e386
Remove unused function for approving glucometer value.
koyli Jun 14, 2018
b5da368
Don't load a dummy previousValue, when instant-calibrating without an…
koyli Jun 14, 2018
3418d17
tidy previous commit
koyli Jun 14, 2018
0379b9d
Store record date properly in the record, not a string or int.
koyli Jun 14, 2018
791b316
Make BGValue be a float not a string
koyli Jun 14, 2018
c07b174
remove various date setting things, replace with simpler
koyli Jun 15, 2018
3101dc3
another unused member
koyli Jun 16, 2018
8824c28
Remove pump records - we are never reading them (they are encrypted),…
koyli Jun 16, 2018
8e9edfc
More automatic clean up.
koyli Jun 16, 2018
3359633
remove pump request message sent bool
koyli Jun 16, 2018
6c64872
refactor GUI code, use adb.xml more.
koyli Jun 16, 2018
114703d
minor removals
koyli Jun 16, 2018
551fdbb
Big delete in the sensor message reader - use same logic/path throug…
koyli Jun 16, 2018
1ca0336
Only use ml/dl (not mmol/l) in back-end - too much confusion risk!
koyli Jun 16, 2018
b33bb62
Accept any current reading received 15-20 mins after calibration - do…
koyli Jun 16, 2018
aca150d
Attempting to get calibrating displaying correctly
koyli Jun 16, 2018
2cbf5d9
Make frontend robust in case of bad data;
koyli Jun 17, 2018
360d467
Rename readAndUpload to checkSerial, which is all it does.
koyli Jun 17, 2018
248185b
Don't bother sending historical failed-to-upload records.
koyli Jun 21, 2018
9978944
Fixes #1 - send dateString with all records.
koyli Jun 23, 2018
6f11948
don't both persisting the expected sort number
koyli Jun 23, 2018
2fd7260
removed reference to physicaloid - no longer used
nightscout-dl Jun 23, 2018
e7967aa
don't both persisting the expected sort number
koyli Jun 23, 2018
dfe98e7
Updating JDK+Gradle revisions.
koyli Apr 7, 2019
c6793d5
dropping the SDK versions back to 26 - Google play wants >= 26, but N…
koyli Apr 11, 2019
d5daf7b
Stop saving Context in this object, it's unnecessary and context has …
koyli Apr 11, 2019
e8a71af
Whitelist to allow running in spite of doze mode (https://developer.a…
koyli Apr 30, 2019
e71f539
Merge pull request #1 from nightscout-dl/master
dhermanns May 1, 2019
29a8dd1
Migrated the old apache httpclient to the newer java http client
dhermanns May 1, 2019
6a11497
Merge pull request #3 from dhermanns/master
nightscout-dl May 4, 2019
ccb83b1
Remove Wifi-hack - no reason to have it.
koyli May 4, 2019
375cab4
Remove Wifi-hack - no reason to have it.
koyli May 6, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# Built application files
*.apk
*.ap_

# Files for the ART/Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/
out/

# Gradle files
.gradle/
build/

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

# IntelliJ
*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
.idea/caches

# Keystore files
# Uncomment the following line if you do not want to check your keystore files in.
#*.jks

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild

# Google Services (e.g. APIs or Firebase)
google-services.json

# Freeline
freeline.py
freeline/
freeline_project_description.json

# fastlane
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md
29 changes: 29 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 41 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 0 additions & 19 deletions MedtronicUploader.iml

This file was deleted.

File renamed without changes.
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# MedtronicUploader

See "Medtronic_NigthScout_Manual.pdf"

Special thanks to https://github.com/ksksue/PhysicaloidLibrary
See "Medtronic_NightScout_Manual.pdf"

Medtronic Nightscout Uploader
Copyright (C) 2014 Medtronic Nightscout contributors
Copyright (C) 2014-2018 Medtronic Nightscout contributors

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -20,4 +18,4 @@ Medtronic Nightscout Uploader
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see <http://www.gnu.org/licenses/>.


15 changes: 8 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,16 @@ def gitVersionName = { ->

android {
compileSdkVersion 23
buildToolsVersion '26.0.2'
buildToolsVersion '28.0.3'

lintOptions {
abortOnError false
}

defaultConfig {
applicationId "com.nightscout.android"
minSdkVersion 21
targetSdkVersion 23
targetSdkVersion 26
versionCode gitVersionCode()
versionName gitVersionName()
useLibrary 'org.apache.http.legacy'
Expand All @@ -51,9 +55,6 @@ android {
}

dependencies {
compile files('libs/bugfender.jar')
compile files('libs/logback-android-1.1.1-3.jar')
compile files('libs/physicaloidlibrary.jar')
compile files('libs/slf4j-api-1.7.2.jar')

implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.github.felHR85:UsbSerial:4.5.2'
}
Binary file removed app/libs/logback-android-1.1.1-3.jar
Binary file not shown.
Binary file removed app/libs/physicaloidlibrary.jar
Binary file not shown.
Binary file removed app/libs/slf4j-api-1.7.2.jar
Binary file not shown.
23 changes: 12 additions & 11 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.nightscout.android"
android:versionCode="1"
android:versionName="1.0">
package="com.nightscout.android">
<uses-feature android:name="android.hardware.usb.host" />
<uses-sdk android:minSdkVersion="17" android:targetSdkVersion="21"/>
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
<uses-permission android:name="android.permission.VIBRATE"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"></uses-permission>
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"></uses-permission>
<uses-permission android:name="android.permission.WAKE_LOCK"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:largeHeap="true">
<uses-permission
android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
<application android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:largeHeap="true"
android:fullBackupContent="@xml/backup_descriptor">
<!-- I have set screenOrientation to "portrait" to avoid the restart of AsyncTasks when you rotate the phone -->
<activity
android:name=".dexcom.DexcomG4Activity"
Expand Down
Loading