toni/Dirigent
1
0
Fork 0
Code Issues 17 Pull Requests Releases 2 Wiki Activity

puhh. this is a big commit

Browse Source 
- change the complete file sending / receiving process between phone and watch, we now use channels instead of simple messages. this is recommentad by google, due to some changes in google play services.
- made some smaller changes in the ui, for file saving and saving of sensordata for evaluation purposes
- edited the manifest and gradle script for play store.
- made some change for a better performance for he huawei watch
This commit is contained in:
toni
2018-04-13 11:52:12 +02:00
parent 4dd9dde6fb
commit cad85f8593
22 changed files with 132 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
matlab/AutoCorrMethodNew_Watch.m
View File

@@ -42,7 +42,8 @@
%files = dir(fullfile('../../measurements/lgWear/', '*.csv'));
files = dir(fullfile('../../measurements/wearR/', '*.csv'));
%files = dir(fullfile('../../measurements/wearR/', '*.csv'));
files = dir(fullfile('../../measurements/peter_failed/', '*.csv'));
for file = files'
@@ -51,7 +52,7 @@ for file = files'
%draw the raw acc data
m_idx = [];
m_idx = (measurements(:,2)==2);
m_idx = (measurements(:,2)==10);
m = measurements(m_idx, :);
%Interpolate to generate a constant sample rate to 250hz (4ms per sample)
@@ -76,13 +77,15 @@ for file = files'
figure(3);
plot(m(:,1),m(:,5)) %z
legend("z", "location", "eastoutside");
waitforbuttonpress();
%save timestamps
timestamps = m(:,1);
data = m(:,3); %only z
%TODO: Different window sizes for periods under 16.3 s
window_size = 4096; %about 2 seconds using 2000hz, 16.3 s using 250hz
window_size = 2048; %about 2 seconds using 2000hz, 16.3 s using 250hz
overlap = 256;
bpm_per_window_ms = [];
bpm_per_window = [];