|
|
@@ -9,13 +9,16 @@ public class DetectionReport { |
|
|
|
public String timeStamp; |
|
|
|
public String detectionType; |
|
|
|
public float detectedValue; |
|
|
|
public String detectorID; |
|
|
|
public boolean detectionState; |
|
|
|
//public String detectorID; |
|
|
|
|
|
|
|
public DetectionReport(String detectorID, String detectionType, float detectedAmplitude) { |
|
|
|
public DetectionReport(boolean detectionState, String detectionType, float detectedAmplitude) { |
|
|
|
this.timeStamp = String.valueOf(Calendar.getInstance().getTime()); |
|
|
|
this.detectionType = detectionType; |
|
|
|
this.detectedValue = detectedAmplitude; |
|
|
|
this.detectorID = detectorID; |
|
|
|
this.detectionState = detectionState; |
|
|
|
|
|
|
|
//this.detectorID = detectorID; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@@ -24,9 +27,9 @@ public class DetectionReport { |
|
|
|
String time = "Time: " + "[" + this.timeStamp + "]"; |
|
|
|
String type = "Type: " + "[" + this.detectionType + "]"; |
|
|
|
String value = "Value: " + "[" + this.detectedValue + "]"; |
|
|
|
String id = "ID: " + "[" + this.detectorID + "]"; |
|
|
|
//String id = "ID: " + "[" + this.detectorID + "]"; |
|
|
|
|
|
|
|
return String.join("\t", time, type, value, id); |
|
|
|
return String.join("\t", time, type, value); |
|
|
|
} |
|
|
|
|
|
|
|
/** Debug Report */ |