siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed calibration code and added method checkAlarm

Browse Source
This commit is contained in:
Leon Market 2023-06-14 22:28:05 +02:00
parent 9e5b669986
commit 402b73e4bd
1 changed files with 1 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
app/src/main/java/com/example/ueberwachungssystem/Beschleunigungssensor.java
View File

@ -113,82 +113,11 @@ public class Beschleunigungssensor extends AppCompatActivity implements SensorEv
} }
} }
} }
int i = 0;
boolean stopp_mal = false;
@Override @Override
public void onSensorChanged(SensorEvent event) public void onSensorChanged(SensorEvent event)
{ {
checkAlarm(event); checkAlarm(event);
//Alter Code, erstmal wild mit if statement ausgeschlossen
if (stopp_mal) {
if (i<numberOfValues) {
calibrationMatrix[0][i] = event.values[0];
calibrationMatrix[1][i] = event.values[1];
calibrationMatrix[2][i] = event.values[2];
i++;
}
double sumX = 0;
double sumY = 0;
double sumZ = 0;
for (int j = 0; j<numberOfValues;j++){
sumX += calibrationMatrix[0][j];
sumY += calibrationMatrix[1][j];
sumZ += calibrationMatrix[2][j];
}
double averageX = sumX/numberOfValues;
double averageY = sumY/numberOfValues;
double averageZ = sumZ/numberOfValues;
String sb2 = "t=" + event.timestamp +
"\nx=" + event.values[0] + // Wert liegend: x = 0.04
"\ny=" + event.values[1] + // Wert liegend: y = 0.44
"\nz=" + event.values[2] + // Wert liegend: z = 9.90 = Erdbeschleunigung
"\nlin_x=" + linear_acceleration[0] +
"\nlin_x=" + linear_acceleration[1] +
"\nlin_x=" + linear_acceleration[2] +
"\naverageX=" + averageX +
"\naverageY=" + averageY +
"\naverageZ=" + averageZ +
"\ni=" + i;
double schwelle = 5.0;
if (alarm = false) {
if (averageX + schwelle < event.values[0]) {
alarm = true;
}
}
if (alarm = false) {
if (averageY + schwelle < event.values[1]) {
alarm = true;
}
}
if (alarm = false) {
if (averageZ + schwelle < event.values[2]) {
alarm = true;
}
}
if (alarm = true) {
if (averageX + schwelle > event.values[0]) {
alarm = false;
}
if (averageY + schwelle > event.values[1]) {
alarm = false;
}
if (averageZ + schwelle > event.values[2]) {
alarm = false;
}
}
logger.clearLog();
logger.log(sb2);
}
} }
@Override @Override
@ -196,20 +125,3 @@ public class Beschleunigungssensor extends AppCompatActivity implements SensorEv
{ {
} }
} }
//Sample code for deque usage. Might be not useful.
class MovingAverage {
int size, windowSum = 0, count = 0;
Deque queue = new ArrayDeque<Integer>();
public MovingAverage(int size) {
this.size = size;
}
public double next(int val) {
++count;
// calculate the new sum by shifting the window
queue.add(val);
int tail = count > size ? (int)queue.poll() : 0;
windowSum = windowSum - tail + val;
return windowSum * 1.0 / Math.min(size, count);
}
}