search

Pyrrha-Platform / Pyrrha-Mobile-App

This repository contains the Pyrrha (created by Prometeo) solution mobile application that targets smartphones paired with the sensor device and smartwatch carried by the firefighters.
Apache License 2.0
5 stars 4 forks source link

Merge branch 'master' of https://github.com/Code-and-Response/Promete… #13

Closed mrodrise closed 3 years ago

mrodrise commented 3 years ago

…o-Mobile-App

Conflicts: app/src/main/AndroidManifest.xml app/src/main/java/com/prometeo/BluetoothLeService.java app/src/main/java/com/prometeo/DeviceControlActivity.java app/src/main/java/com/prometeo/DeviceScanActivity.java app/src/main/java/com/prometeo/ScanDevice_old.java app/src/main/java/com/prometeo/ui/home/HomeFragment.java app/src/main/res/values/strings.xml