adapted SensorMessage Type to float

app/src/main/java/com/example/greenwatch/AccelerometerActivity.java

             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
+                    mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", mAccelerometerViewModel.getAccelerometerSensorMeanValue());
                 }
                 else {
-                    mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), false, "Accelerometer", 0);
+                    mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), false, "Accelerometer", 0.0f);
                 }
 
             }

app/src/main/java/com/example/greenwatch/AudiodetectionActivity.java

             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), true, "Microfon", (int) mMicrofonViewModel.getAmplitudeInDB());
+                    mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), true, "Microfon", mMicrofonViewModel.getAmplitudeInDB());
                 }
                 else {
-                    mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), false, "Microfon", (int) mMicrofonViewModel.getAmplitudeInDB());
+                    mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), false, "Microfon", mMicrofonViewModel.getAmplitudeInDB());
                 }
 
             }

app/src/main/java/com/example/greenwatch/AudiodetectionAndAccelerometerActivity.java

                 if (aBoolean) {
                     Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "onChangedTrue", Toast.LENGTH_LONG).show();
                     if (mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected() && !mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected()) {
-                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
+                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", mAudiodetectionAndAccelerometerViewModel.getAccelerometerSensorMeanValue());
                     }
                     else if (mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected() && !mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
-                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Audio", (int) mAudiodetectionAndAccelerometerViewModel.getAmplitudeInDB());
+                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Audio", mAudiodetectionAndAccelerometerViewModel.getAmplitudeInDB());
                     }
                     else if (mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected() && mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
-                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "2AudioAndAccelerometer", 10);
+                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "AudioAndAccelerometer", mAudiodetectionAndAccelerometerViewModel.getAmplitudeInDB());
                     }
                 }
                 else {

app/src/main/java/com/example/greenwatch/VideodetectionAndAccelerometerActivity.java

             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
                     if (mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected() && !mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected()) {
-                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
+                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", mVideodetectionAndAccelerometerViewModel.getAccelerometerSensorMeanValue());
                     }
                     else if (mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected() && !mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
-                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Video", 10);
+                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Video", 1.0f);
                     }
                     else if (mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected() && mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected()) {
-                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "2VideoAndAccelerometer", 10);
+                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "VideoAndAccelerometer", mVideodetectionAndAccelerometerViewModel.getAccelerometerSensorMeanValue());
                     }
                 }
                 else {
-                    mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "VideoAndAccelerometer", 0);
+                    mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "VideoAndAccelerometer", 0.0f);
                 }
             }
         });

app/src/main/java/com/example/greenwatch/models/Device.java

     private String deviceID;
     private boolean sensorStatus;
     private String sensorType;
-    private int sensorMassage;
+    private float sensorMassage;
 
-    public Device(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public Device(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, float sensorMassage) {
         this.timeStamp = timeStamp;
         this.deviceID = deviceID;
         this.sensorStatus = sensorStatus;
         return sensorStatus;
     }
 
-    public void setSensorMassage(int sensorMassage) {
+    public void setSensorMassage(float sensorMassage) {
         this.sensorMassage = sensorMassage;
     }
 
-    public int getSensorMassage() {
+    public float getSensorMassage() {
         return sensorMassage;
     }
 }

app/src/main/java/com/example/greenwatch/repositories/DeviceRepository.java

         return startAlarmRecording;
     }
 
-    public void createNewDevice(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, int sensorMassage){
+    public void createNewDevice(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, float sensorMassage){
         Device newDevice = new Device(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
         if (sensorStatus) {
             setAlarmHistoryDeviceList(newDevice);
         String deviceID = messageString[1];
         boolean sensorStatus = convertSensorStatus(messageString[2]);
         String sensorType = messageString[3];
-        int sensorMassage = Integer.valueOf(messageString[4]);
+        float sensorMassage = Float.valueOf(messageString[4]);
 
         if (deviceID.equals(checkDeviceID(localDeviceUUID))) {
             return;
         return localDeviceUUID;
     }
 
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
         String checkedDeviceID = checkDeviceID(deviceID);
         Device device = connectedDevicesList.get(checkedDeviceID);
         if(device != null) {
         return "";
     }
 
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
         String checkedDeviceID = checkDeviceID(deviceID);
         Device device = connectedDevicesList.get(checkedDeviceID);
         if(device != null) {
         }
     }
 
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
         String checkedDeviceID = checkDeviceID(deviceID);
         Device device = connectedDevicesList.get(checkedDeviceID);
         if(device != null) {

app/src/main/java/com/example/greenwatch/sensors/AccelerometerSensor.java

             mAccelerometerAlarmDetected.setValue(false);
         }
     }
+
+    public float getAccelerometerSensorMeanValue() {
+        return meanValue;
+    }
 }

app/src/main/java/com/example/greenwatch/viewmodels/AccelerometerViewModel.java

         mAccelerometerSensor.checkAlarmCondition();
     }
 
+    public float getAccelerometerSensorMeanValue() {
+        return mAccelerometerSensor.getAccelerometerSensorMeanValue();
+    }
+
     public LiveData<Boolean> getAccelerometerAlarmDetected() {
         return mAccelerometerAlarmDetected;
     }
     }
 
     @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
         mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
     }
 
     }
 
     @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
         mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
     }
 
     @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
         return mDeviceRepository.getSensorMassage(deviceID);
     }
 

app/src/main/java/com/example/greenwatch/viewmodels/AudiodetectionAndAccelerometerViewModel.java

         mAccelerometerSensor.checkAlarmCondition();
     }
 
+    public float getAccelerometerSensorMeanValue() {
+        return mAccelerometerSensor.getAccelerometerSensorMeanValue();
+    }
+
     public LiveData<Boolean> getAudiodetectionAndAccelerometerAlarmDetected() {
         setMutableLiveDataMicrofondetectionAndAccelerometerAlarmDetected();
         return mAudiodetectionAndAccelerometerAlarmDetected;
     }
 
     @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
         mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
     }
 
     }
 
     @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
         mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
     }
 
     @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
         return mDeviceRepository.getSensorMassage(deviceID);
     }
 

app/src/main/java/com/example/greenwatch/viewmodels/MainActivityViewModel.java

     }
 
     @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
         mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
     }
 
     }
 
     @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
         mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
     }
 
     @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
         return mDeviceRepository.getSensorMassage(deviceID);
     }
 

app/src/main/java/com/example/greenwatch/viewmodels/MicrofonViewModel.java

     }
 
     @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
         mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
     }
 
     }
 
     @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
         mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
     }
 
     @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
         return mDeviceRepository.getSensorMassage(deviceID);
     }
 

app/src/main/java/com/example/greenwatch/viewmodels/VideodetectionAndAccelerometerViewModel.java

         mAccelerometerSensor.checkAlarmCondition();
     }
 
+    public float getAccelerometerSensorMeanValue() {
+        return mAccelerometerSensor.getAccelerometerSensorMeanValue();
+    }
+
     public void bindImageAnalysis(ProcessCameraProvider cameraProvider, LifecycleOwner lifecycleOwner, Context context) {
         mCameraSensor.bindImageAnalysis(cameraProvider, lifecycleOwner, context);
     }
     }
 
     @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
         mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
     }
 
     }
 
     @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
         mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
     }
 
     @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
         return mDeviceRepository.getSensorMassage(deviceID);
     }
 

app/src/main/java/com/example/greenwatch/viewmodels/VideodetectionViewModel.java

     }
 
     @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
         mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
     }
 
     }
 
     @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
         mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
     }
 
     @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
         return mDeviceRepository.getSensorMassage(deviceID);
     }
 

app/src/main/java/com/example/greenwatch/viewmodels/ViewModelInterface.java

     LiveData<List<Device>> getConnectedDeviceList();
     LiveData<List<Device>> getAlarmHistoryList();
     LiveData<Boolean> getStartAlarmRecording();
-    void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage);
+    void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage);
     void setTimeStamp(String deviceID, String timeStamp);
     String getTimeStamp(String deviceID);
     void setDeviceID(String deviceID, String newDeviceID);
     boolean getSensorStatus(String deviceID);
     void setSensorType(String deviceID, String sensorType);
     String getSensorType(String deviceID);
-    void setSensorMassage(String deviceID, int sensorMessage);
-    int getSensorMassage(String deviceID);
+    void setSensorMassage(String deviceID, float sensorMessage);
+    float getSensorMassage(String deviceID);
     String getLocalDeviceUUID();
     String getSystemTimeStamp();
 }

app/src/main/res/values/strings.xml

     <string name="sensor_status_placeholder">Sensorstatus: %s</string>
     <string name="deviceID_placeholder">Sensor-ID: %s</string>
     <string name="sensor_time_stamp_placeholder">Timestamp: %s</string>
-    <string name="sensor_message_placeholder">Sensormessage: %d</string>
+    <string name="sensor_message_placeholder">Sensormessage: %f</string>
 </resources>