From 0cf36253049e186467c06331245b59cf125bbaea Mon Sep 17 00:00:00 2001 From: Daniele Gobbetti Date: Mon, 17 Apr 2017 15:12:25 +0200 Subject: [PATCH 1/3] Remove the Pebble Time 2 Pebble Time 2 is unreleased / untested, better leave it out from the supported devices list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 080f44a9..113a2eec 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ need to create an account and transmit any of your data to the vendor's servers. ## Supported Devices * Pebble, Pebble Steel, Pebble Time, Pebble Time Steel, Pebble Time Round [Wiki section about this device](https://github.com/Freeyourgadget/Gadgetbridge/wiki/Pebble) -* Pebble 2, Pebble Time 2 (experimental, PAIR WITHIN GADGETBRIDGE) [Wiki section about pebble](https://github.com/Freeyourgadget/Gadgetbridge/wiki/Pebble), most parts apply to Pebble 2 as well +* Pebble 2 (add the device from within Gadgetbridge!) [Wiki section about pebble](https://github.com/Freeyourgadget/Gadgetbridge/wiki/Pebble), most parts apply to Pebble 2 as well * Mi Band, Mi Band 1A, Mi Band 1S [Wiki section about this device](https://github.com/Freeyourgadget/Gadgetbridge/wiki/Mi-Band) * Mi Band 2 [Wiki section about mi band](https://github.com/Freeyourgadget/Gadgetbridge/wiki/Mi-Band), some parts apply to mi band 2 as well * Vibratissimo (experimental) From a936ff06168ec792da7c61c5bb830bb27a055ea5 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Mon, 17 Apr 2017 19:19:23 +0200 Subject: [PATCH 2/3] Tests: set device state to inizialized before assuming fw version gets written to attributes --- .../freeyourgadget/gadgetbridge/database/EntitiesTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/database/EntitiesTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/database/EntitiesTest.java index fcd5fc09..44f99f4a 100644 --- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/database/EntitiesTest.java +++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/database/EntitiesTest.java @@ -178,6 +178,8 @@ public class EntitiesTest extends TestBase { public void testDeviceAttributes() throws Exception { GBDevice dummyGBDevice = createDummyGDevice("00:00:00:00:02"); dummyGBDevice.setFirmwareVersion("1.0"); + dummyGBDevice.setState(GBDevice.State.INITIALIZED); + Device deviceOld = DBHelper.getDevice(dummyGBDevice, daoSession); assertNotNull(deviceOld); From 60b7a73558141cc30fde6c356008da53400b6ad9 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Mon, 17 Apr 2017 19:36:50 +0200 Subject: [PATCH 3/3] Test: fix other test --- .../freeyourgadget/gadgetbridge/database/EntitiesTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/database/EntitiesTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/database/EntitiesTest.java index 44f99f4a..7c4f4746 100644 --- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/database/EntitiesTest.java +++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/database/EntitiesTest.java @@ -82,6 +82,7 @@ public class EntitiesTest extends TestBase { @Test public void testDBHelper() { GBDevice dummyGBDevice = createDummyGDevice("00:00:00:00:01"); + dummyGBDevice.setState(GBDevice.State.INITIALIZED); Device device = DBHelper.getDevice(dummyGBDevice, daoSession); assertNotNull(device); assertEquals("00:00:00:00:01", device.getIdentifier());