Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
14a2203
first steps towards getting BLE working for Verisense
JongChern Sep 2, 2021
fd229b6
ok some basics working now
JongChern Sep 3, 2021
9e2843e
ok streaming working now
JongChern Sep 6, 2021
bc4cd90
adding blemanager verisense support
JongChern Sep 30, 2021
a1ad451
adding suppor for ble manager - Verisense
JongChern Oct 4, 2021
a8fd540
updates to get verisense working
JongChern Oct 4, 2021
8895ba4
updates
JongChern Oct 4, 2021
8f9b061
Fix issue in AA-252, disconnect does not work
Oct 6, 2021
3e7a1dd
update fix in AA-252 to be device specific
Oct 7, 2021
aeaa4ce
fix AA-253, listed plot signals inconsistent issue
Oct 8, 2021
bc7302a
Merge pull request #33 from ShimmerEngineering/AA-248_WW
JongChern Oct 12, 2021
ee5615f
AA-253, fix multi device streaming errors
Oct 14, 2021
d2352b3
update device configuration after write config in enable sensors tab
Oct 20, 2021
6e31c57
Add data sync function to shimmer service example
Oct 27, 2021
6ec853e
Small fix to the pager adapter
Oct 27, 2021
6d0c18d
update get uuid function and some small fix
Oct 27, 2021
8ea77c4
menu update for data sync function
Oct 28, 2021
a632040
Update payload index and add speed for data sync function
Nov 1, 2021
2aec17e
remove some unused code
Nov 1, 2021
bd4f898
Move the data sync fragment to between device configuration and plot …
Nov 1, 2021
e0458ea
Merge pull request #35 from ShimmerEngineering/AA-254
JongChern Nov 1, 2021
e419044
Merge pull request #34 from ShimmerEngineering/AA-253
JongChern Nov 1, 2021
81abe18
Add bin file directory text
Nov 2, 2021
212b631
Some update on the bin file directory text
Nov 2, 2021
d0324d3
change the implementation of bin file directory label
Nov 3, 2021
d2d9698
Merge pull request #37 from ShimmerEngineering/AA-254
JongChern Nov 4, 2021
645e4cc
update to bin file path
JongChern Nov 4, 2021
dc79d77
remove setBluetoothRadioState function in VerisenseDeviceAndroid class
Nov 10, 2021
127f655
add erase data and disable logging
Jun 7, 2022
6657c90
minor fix
Jun 7, 2022
2e16937
Update README.md
weiwentan23 Jun 7, 2022
28bd1b4
minor
Jul 19, 2022
ed3fe18
minor
Jul 19, 2022
28feff0
uprev library
JongChern Jul 20, 2022
67318bd
Merge branch 'AA-248' into AA-269
JongChern Jul 20, 2022
ad68a98
Merge remote-tracking branch 'origin/AA-248' into AA-254
JongChern Jul 20, 2022
216bfe6
Update MainActivity.java
JongChern Jul 20, 2022
32ec02b
update lib
JongChern Jul 21, 2022
432cd50
Merge pull request #38 from ShimmerEngineering/AA-254
JongChern Jul 21, 2022
6112431
Merge branch 'AA-248' into AA-257
JongChern Jul 21, 2022
fdee627
Merge branch 'AA-248' into AA-257
JongChern Jul 21, 2022
ae82e50
Merge branch 'AA-248' into AA-269
JongChern Jul 21, 2022
807b038
minor fix
Jul 21, 2022
c617237
update for tcs and some fixes
Jul 22, 2022
f2468e3
minor refactor
Jul 22, 2022
7a8d360
minor updates
Jul 22, 2022
10284dc
disable trial and participant textbox when data sync
Jul 22, 2022
5ec3313
minor update
Jul 28, 2022
d6df685
add set default setting
Jul 28, 2022
08f65a3
updates to lib version
JongChern Jul 28, 2022
f32c629
Merge branch 'AA-248' into AA-269
Jul 28, 2022
52ab18d
add data sync button and minor
Jul 29, 2022
3607cd6
Merge pull request #51 from ShimmerEngineering/AA-269
JongChern Aug 3, 2022
27441f2
set default config button only for verisense device
Aug 3, 2022
0028932
Merge pull request #52 from ShimmerEngineering/AA-269
JongChern Aug 5, 2022
c899377
Merge pull request #39 from ShimmerEngineering/AA-257
JongChern Oct 18, 2023
3bc0dbb
Merge branch 'master' into AA-248
JongChern Oct 18, 2023
a9f664e
Merge branch 'AA-248' of https://github.com/ShimmerEngineering/Shimme…
JongChern Oct 18, 2023
9e06471
fix made
JongChern Oct 18, 2023
c068f60
add speed test functionality
MAzalya Oct 20, 2023
9bc7e70
added multi verisense ble basic example
MAzalya Nov 20, 2023
2c70f56
add Shimmer3 BLE support
MAzalya Nov 30, 2023
0393629
more updates and tidy up
MAzalya Nov 30, 2023
16a5e7d
more commits
MAzalya Nov 30, 2023
cba7151
add setpreferredPhy, requires update targetsdkversion
MAzalya Dec 20, 2023
9067d86
add Readme, minor update to example macAddress
MAzalya Dec 22, 2023
d542a9a
added os version check for permissions
MAzalya Dec 22, 2023
6cc751e
Update README.md
ShimmerEngineering Dec 22, 2023
a8eceb4
Update README.md
ShimmerEngineering Dec 22, 2023
3c499b2
accel print update
MAzalya Dec 26, 2023
e5c6801
Merge remote-tracking branch 'origin/AA-274' into AA-274
MAzalya Dec 26, 2023
2fc6f30
update readme to enable LN Accel
MAzalya Dec 27, 2023
c4ea205
Merge pull request #66 from ShimmerEngineering/AA-274
JongChern Dec 27, 2023
d9507e7
remove idea folder
JongChern Dec 28, 2023
bc22da2
update gitignore
JongChern Dec 28, 2023
92dda18
Merge pull request #65 from ShimmerEngineering/AA-248_MA
JongChern Jan 2, 2024
e2eb95d
refactoring and readme update
MAzalya Jan 4, 2024
3c17857
Merge branch 'master' into AA-248
JongChern Jan 9, 2024
ba86528
minor fix
JongChern Jan 9, 2024
16abd36
minor fix
JongChern Jan 9, 2024
8e7c7fe
fixes made
JongChern Jan 9, 2024
b76cf65
speed test example now working
JongChern Feb 15, 2024
b0e016c
code restructure
JongChern Feb 19, 2024
6ddbf5e
add scanning and ui updates to speed test app
JongChern Feb 21, 2024
acd2de1
minor
JongChern Feb 26, 2024
714eea8
ok efficient data array example working now
JongChern Feb 26, 2024
634b3be
shimmer service example now working
JongChern Feb 26, 2024
5a9ae61
fixes made, will need to merge in AA-248
JongChern Feb 26, 2024
0e52d6b
merged in AA-248
JongChern Feb 27, 2024
da486cb
remove
JongChern Feb 27, 2024
d7ba0fd
fix speed test example
JongChern Feb 27, 2024
1c9b26b
verisense ble basic example now working
JongChern Feb 27, 2024
90e0c28
bluetoothmanagerexample now working
JongChern Feb 27, 2024
33d55ef
simplifying the gradle build files
JongChern Feb 27, 2024
39032f2
fix shimmer3blebasicexample and 3d orientation example
JongChern Feb 27, 2024
1e34852
fix to example
JongChern Feb 27, 2024
bb8a10b
add bluetooth permissions for speed test example
JongChern Feb 27, 2024
0bb6d5e
fixes made to only create service if BT permissions is available
JongChern Mar 1, 2024
4ed43ea
updates for logging
JongChern Mar 1, 2024
2af5de8
fix to logging due to new Android requirements
JongChern Mar 1, 2024
5839e02
various fixes made to logging
JongChern Mar 2, 2024
671eca0
fixes to bt scanning
JongChern Mar 4, 2024
40945c8
update made to accommodate verisense-00
JongChern Mar 4, 2024
929b47a
fix to verisense write to file
JongChern Mar 4, 2024
9cbe4c8
verisense example now working correctly on service example
JongChern Mar 5, 2024
bf1124a
minor fix to tab
JongChern Mar 6, 2024
002813c
Update MainActivity.java
JongChern Mar 6, 2024
41840be
AA-283 fix
JongChern Mar 8, 2024
03b49f5
more fixes made to examples
JongChern Mar 8, 2024
9ddecf3
Update Shimmer.java
JongChern Mar 11, 2024
5903168
Merge branch 'AA-279' into AA-283
JongChern Mar 11, 2024
482255c
fix to efficient example
JongChern Mar 11, 2024
d1b7f1c
minor update to gradle file
JongChern Mar 12, 2024
8c7735f
minor update to gradle file
JongChern Mar 12, 2024
4336511
added a disconnect button
JongChern Mar 13, 2024
66fee28
adding ble functionality to service example
JongChern Mar 13, 2024
4a25de6
fix made
JongChern Mar 13, 2024
19641c4
minor fix for ble
JongChern Mar 13, 2024
d8d4861
fixes made to verisense ble basic example
JongChern Mar 13, 2024
c78689a
functionality to set the sampling rate
JongChern Mar 14, 2024
d6e3506
improvements to the csv writer
JongChern Mar 14, 2024
5d171ea
more permission fixes
JongChern Mar 14, 2024
ccf972a
tidy up
JongChern Mar 14, 2024
4682bba
Fix to multiverisense example
JongChern Mar 14, 2024
902c89a
fix made to basic example
JongChern Mar 14, 2024
955f864
fix 3d orientation example
JongChern Mar 14, 2024
60a3bf3
add os version check to scan permission
MAzalya Mar 14, 2024
a02f40f
Merge remote-tracking branch 'origin/AA-279' into AA-279
MAzalya Mar 14, 2024
2abc154
add disconnect and stopstreaming btn to speedtestapp
MAzalya Mar 15, 2024
3a01528
now instream working
JongChern Mar 15, 2024
daf7880
Merge branch 'AA-279' of https://github.com/ShimmerEngineering/Shimme…
JongChern Mar 15, 2024
c91dd17
clean up and some fixes
JongChern Mar 15, 2024
cf48597
add PRR and update to allow instream cmds to be processed when connec…
JongChern Mar 18, 2024
d417eb7
remove unused import giving error
MAzalya Mar 19, 2024
3025c71
update to disconnect, connection lost
JongChern Mar 20, 2024
352d029
minor fix
JongChern Mar 20, 2024
1355479
multiple fixes to efficient data array example
JongChern Mar 21, 2024
b1c9e95
minor fix
JongChern Mar 21, 2024
78e7bfa
verisense support and various fixes
JongChern Mar 21, 2024
da05949
minor update
JongChern Mar 21, 2024
b754ec1
uprev Java API
JongChern Mar 22, 2024
3a691fe
updates to disconnect
JongChern Mar 26, 2024
d7abab9
Merge pull request #71 from ShimmerEngineering/AA-279_Disconnect_Fix
MAzalya Mar 26, 2024
e4b32a5
fix made for ble
JongChern Mar 26, 2024
4a63701
minor
JongChern Mar 26, 2024
301f1ee
minor fix
JongChern Mar 27, 2024
21640c7
updates to get verisense bin file working
JongChern Mar 28, 2024
7fc31ea
add PRR
JongChern Mar 29, 2024
644b9bd
switch to using clone for setting sampling rate
JongChern Mar 29, 2024
53ee666
minor updates
JongChern Apr 1, 2024
1fbcab4
Merge pull request #72 from ShimmerEngineering/AA-279-BLE_Config_Fix
JongChern Apr 1, 2024
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
96 changes: 96 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,100 @@
ShimmerAndroidInstrumentDriver/build/generated/mockable-android-19.jar
ShimmerAndroidInstrumentDriver/build/generated/mockable-android-21.jar
ShimmerAndroidInstrumentDriver/gradle.properties

# Built application files
*.apk
*.aar
*.ap_
*.aab

# Files for the ART/Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/
out/
# Uncomment the following line in case you need and you don't have the release build type files in your app
# release/

# 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/
misc.xml
deploymentTargetDropDown.xml
render.experimental.xml
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
.idea/jarRepositories.xml
# Android Studio 3 in .gitignore file.
.idea/caches
.idea/modules.xml
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
.idea/navEditor.xml

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

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

# 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

# Version control
vcs.xml

# lint
lint/intermediates/
lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/

# Android Profiling
*.hprof
gradle.properties
ShimmerAndroidInstrumentDriver/.idea/jarRepositories.xml
ShimmerAndroidInstrumentDriver/.idea/gradle.xml
107 changes: 81 additions & 26 deletions ShimmerAndroidInstrumentDriver/.gitignore
Original file line number Diff line number Diff line change
@@ -1,38 +1,93 @@
# Built application files
/**/build/
*.apk
*.aar
*.ap_
*.aab

# Crashlytics configuations
com_crashlytics_export_strings.xml
# Files for the ART/Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/
out/
# Uncomment the following line in case you need and you don't have the release build type files in your app
# release/

# Gradle files
.gradle/
build/

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

# Gradle generated files
.gradle/
# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Signing files
.signing/
# Android Studio Navigation editor temp files
.navigation/

# User-specific configurations
.idea/libraries/
# Android Studio captures folder
captures/

# IntelliJ
*.iml
.idea/
misc.xml
deploymentTargetDropDown.xml
render.experimental.xml
.idea/workspace.xml
.idea/tasks.xml
.idea/.name
.idea/compiler.xml
.idea/copyright/profiles_settings.xml
.idea/encodings.xml
.idea/misc.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
.idea/jarRepositories.xml
# Android Studio 3 in .gitignore file.
.idea/caches
.idea/modules.xml
.idea/scopes/scope_settings.xml
.idea/vcs.xml
*.iml
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
.idea/navEditor.xml

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

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

# 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

# Version control
vcs.xml

# lint
lint/intermediates/
lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/

# OS-specific files
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db
/ShimmerAndroidInstrumentDriver/gradle.properties
# Android Profiling
*.hprof
29 changes: 0 additions & 29 deletions ShimmerAndroidInstrumentDriver/.idea/codeStyles/Project.xml

This file was deleted.

29 changes: 0 additions & 29 deletions ShimmerAndroidInstrumentDriver/.idea/gradle.xml

This file was deleted.

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

This file was deleted.

Loading