diff --git a/app/src/main/java/io/pslab/activity/SensorActivity.java b/app/src/main/java/io/pslab/activity/SensorActivity.java index 5e9021968..ea2d1ffcf 100644 --- a/app/src/main/java/io/pslab/activity/SensorActivity.java +++ b/app/src/main/java/io/pslab/activity/SensorActivity.java @@ -78,7 +78,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { sensorAddr.put(0x77, "BMP180"); sensorAddr.put(0x5A, "MLX90614"); sensorAddr.put(0x1E, "HMC5883L"); - sensorAddr.put(0x68, "MPU6050"); + sensorAddr.put(0x69, "MPU6050"); sensorAddr.put(0x40, "SHT21"); sensorAddr.put(0x39, "TSL2561"); sensorAddr.put(0x69, "MPU925x"); diff --git a/app/src/main/java/io/pslab/activity/SensorDataLoggerActivity.java b/app/src/main/java/io/pslab/activity/SensorDataLoggerActivity.java index d71c61681..f85434940 100644 --- a/app/src/main/java/io/pslab/activity/SensorDataLoggerActivity.java +++ b/app/src/main/java/io/pslab/activity/SensorDataLoggerActivity.java @@ -149,7 +149,7 @@ public void onItemClick(AdapterView parent, View view, int position, long id) sensorAddress.put(0x77, "BMP180"); sensorAddress.put(0x5A, "MLX90614"); sensorAddress.put(0x1E, "HMC5883L"); - sensorAddress.put(0x68, "MPU6050"); + sensorAddress.put(0x69, "MPU6050"); sensorAddress.put(0x40, "SHT21"); sensorAddress.put(0x39, "TSL2561"); } diff --git a/app/src/main/java/io/pslab/communication/SensorList.java b/app/src/main/java/io/pslab/communication/SensorList.java index 2ff102ba5..2d89dcb89 100644 --- a/app/src/main/java/io/pslab/communication/SensorList.java +++ b/app/src/main/java/io/pslab/communication/SensorList.java @@ -25,7 +25,7 @@ public SensorList() { sensorList.put(0x5A, new String[]{"MLX90614 PIR temperature"}); sensorList.put(0x1E, new String[]{"HMC5883L magnetometer", "LSM303 magnetometer"}); sensorList.put(0x77, new String[]{"BMP180/GY-68 altimeter", "MS5607", "MS5611"}); - sensorList.put(0x68, new String[]{"MPU-6050/GY-521 accel+gyro+temp", "ITG3200", "DS1307", "DS3231"}); + sensorList.put(0x69, new String[]{"MPU-6050/GY-521 accel+gyro+temp", "ITG3200", "DS1307", "DS3231"}); sensorList.put(0x69, new String[]{"ITG3200"}); sensorList.put(0x76, new String[]{"MS5607", "MS5611"}); sensorList.put(0x6B, new String[]{"LSM9DSO gyro"}); diff --git a/app/src/main/java/io/pslab/communication/sensors/MPU6050.java b/app/src/main/java/io/pslab/communication/sensors/MPU6050.java index ed286632e..af0cf2b27 100644 --- a/app/src/main/java/io/pslab/communication/sensors/MPU6050.java +++ b/app/src/main/java/io/pslab/communication/sensors/MPU6050.java @@ -25,7 +25,7 @@ public class MPU6050 { private int GR = 3; private int NUMPLOTS = 7; public String[] PLOTNAMES = {"Ax", "Ay", "Az,'Temp", "Gx", "Gy", "Gz"}; - private int ADDRESS = 0x68; + private int ADDRESS = 0x69; private String name = "Accel/gyro"; private ArrayList K = new ArrayList<>(); //K is the list of KalmanFilter object private I2C i2c; diff --git a/app/src/main/java/io/pslab/communication/sensors/MPU925x.java b/app/src/main/java/io/pslab/communication/sensors/MPU925x.java index f26bd6ea9..e7ca7af99 100644 --- a/app/src/main/java/io/pslab/communication/sensors/MPU925x.java +++ b/app/src/main/java/io/pslab/communication/sensors/MPU925x.java @@ -27,7 +27,7 @@ public class MPU925x { private int GR = 3; private int NUMPLOTS = 7; public String[] PLOTNAMES = new String[]{"Ax", "Ay", "Az", "Temp", "Gx", "Gy", "Gz"}; - private int ADDRESS = 0x68; + private int ADDRESS = 0x69; private int AK8963_ADDRESS = 0x0C; private int AK8963_CNTL = 0x0A; public String name = "Accel/gyro"; diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 3b86bf742..92cfadef9 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -10,6 +10,7 @@ توصيل الجهاز الادوات الإعدادات + التوثيق معلومات عنا شراء PSLab ردود الفعل @@ -284,6 +285,18 @@ GX Gy Gz + أحمر + أخضر + أزرق + مسح + إيماءة + ثاني أكسيد الكربون المكافئ + المركبات العضوية المتطايرة الكلية + مخطط - ضوء لوكس + مخطط - القرب + القرب + لوكس + لوكس مؤقت لمعان رطوبة diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 61363df69..36ab1b534 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -10,6 +10,7 @@ Połącz urządzenie Narzędzia Ustawienia + Dokumentacja O nas Kup PSLab Opinie & Błędy @@ -287,6 +288,18 @@ Gx Gy Gz + Czerwony + Zielony + Niebieski + Wyczyść + Gest + eCO2 + TVOC + Wykres - Natężenie światła + Wykres - Bliskość + Bliskość + lx + Luks Temp Luminancja Wilgotność diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e7ea2395b..91a4dff0a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -10,6 +10,7 @@ Подключение устройства Инструменты Settings + Документация О нас Купить PSLab Обратная связь @@ -288,6 +289,18 @@ Gx Gy Gz + Красный + Зелёный + Синий + Очистить + Жест + eCO2 + TVOC + График - Освещённость (Lux) + График - Близость + Близость + lx + Люкс Температуры Светимость Влажность diff --git a/app/src/main/res/values-si/string.xml b/app/src/main/res/values-si/string.xml index 73618b476..027f74e01 100644 --- a/app/src/main/res/values-si/string.xml +++ b/app/src/main/res/values-si/string.xml @@ -10,6 +10,7 @@ උපාංගය සම්බන්ධ කරන්න උපකරණ සැකසුම් + ලේඛන ගබඩාව අප ගැන PSLab මිලදී ගන්න දෝෂ හා ප්‍රතිචාර @@ -288,6 +289,18 @@ Gx Gy Gz + රතු + කොළ + නීල + මකන්න + ඉඟිය + eCO2 + TVOC + ප්ලොට් - ආලෝක ලක්ෂ + ප්ලොට් - සමීපත්වය + සමීපත්වය + lx + ලක්ස් උෂ්ණත්වය ආලෝක තීව්‍රතාවය ආර්ද්‍රතාවය diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1de834d4f..e9e35f1a7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -302,7 +302,7 @@ Plot - Light Lux Plot - Proximity Prox - (lx) + lx Lux Temp Luminosity