From 7d7dd8aae50816e86d32b5c5c3b34391131b3607 Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Sun, 7 Jun 2015 22:34:06 +0200 Subject: Updated HardwareRevision for Pebble Time - https://github.com/pebble/libpebble/blob/master/pebblecomm/ - http://pebbledev.org/wiki/Firmware_Updates --- app/pebblefirmware.cpp | 2 +- daemon/watchconnector.cpp | 20 ++++++++++++-------- daemon/watchconnector.h | 21 +++++++++++++-------- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/app/pebblefirmware.cpp b/app/pebblefirmware.cpp index f42c29b..4e0fc08 100644 --- a/app/pebblefirmware.cpp +++ b/app/pebblefirmware.cpp @@ -16,7 +16,7 @@ PebbleFirmware::PebbleFirmware(QObject *parent) : void PebbleFirmware::updateLatest(QString hw) { QNetworkRequest req; - req.setUrl(firmwareURL.arg(hw).arg("release-v2")); + req.setUrl(firmwareURL.arg(hw).arg(hw.startsWith("snowy_") ? "release-v3" : "release-v2")); req.setRawHeader("Cache-Control", "no-cache"); nm->get(req); } diff --git a/daemon/watchconnector.cpp b/daemon/watchconnector.cpp index 2c17a0b..d9cdd67 100644 --- a/daemon/watchconnector.cpp +++ b/daemon/watchconnector.cpp @@ -73,14 +73,18 @@ WatchConnector::WatchConnector(QObject *parent) : timeSyncTimer.setInterval(4 * 60 * 60 * 1000); // sync time every 4 hours firmwareMapping.insert(UNKNOWN, "unknown"); - firmwareMapping.insert(PEBBLE_ONE_EV1, "ev1"); - firmwareMapping.insert(PEBBLE_ONE_EV2, "ev2"); - firmwareMapping.insert(PEBBLE_ONE_EV2_3, "ev2_3"); - firmwareMapping.insert(PEBBLE_ONE_EV2_4, "ev2_4"); - firmwareMapping.insert(PEBBLE_ONE_POINT_FIVE, "v1_5"); - firmwareMapping.insert(PEBBLE_TWO_POINT_ZERO, "v2_0"); - firmwareMapping.insert(PEBBLE_ONE_BIGBOARD_2, "bb2"); - firmwareMapping.insert(PEBBLE_ONE_BIGBOARD, "bigboard"); + firmwareMapping.insert(TINTIN_EV1, "ev1"); + firmwareMapping.insert(TINTIN_EV2, "ev2"); + firmwareMapping.insert(TINTIN_EV2_3, "ev2_3"); + firmwareMapping.insert(TINTIN_EV2_4, "ev2_4"); + firmwareMapping.insert(TINTIN_V1_5, "v1_5"); + firmwareMapping.insert(BIANCA, "v2_0"); + firmwareMapping.insert(SNOWY_EVT2, "snowy_evt2"); + firmwareMapping.insert(SNOWY_DVT, "snowy_dvt"); + firmwareMapping.insert(TINTIN_BB, "bigboard"); + firmwareMapping.insert(TINTIN_BB2, "bb2"); + firmwareMapping.insert(SNOWY_BB, "snowy_bb"); + firmwareMapping.insert(SNOWY_BB2, "snowy_bb2"); setEndpointHandler(watchVERSION, [this](const QByteArray &data) { Unpacker u(data); diff --git a/daemon/watchconnector.h b/daemon/watchconnector.h index f9576a3..518493b 100644 --- a/daemon/watchconnector.h +++ b/daemon/watchconnector.h @@ -150,14 +150,19 @@ public: enum HardwareRevision { UNKNOWN = 0, - PEBBLE_ONE_EV1 = 1, - PEBBLE_ONE_EV2 = 2, - PEBBLE_ONE_EV2_3 = 3, - PEBBLE_ONE_EV2_4 = 4, - PEBBLE_ONE_POINT_FIVE = 5, - PEBBLE_TWO_POINT_ZERO = 6, - PEBBLE_ONE_BIGBOARD_2 = 254, - PEBBLE_ONE_BIGBOARD = 255 + TINTIN_EV1 = 1, + TINTIN_EV2 = 2, + TINTIN_EV2_3 = 3, + TINTIN_EV2_4 = 4, + TINTIN_V1_5 = 5, + BIANCA = 6, + SNOWY_EVT2 = 7, + SNOWY_DVT = 8, + + TINTIN_BB = 0xFF, + TINTIN_BB2 = 0xFE, + SNOWY_BB = 0xFD, + SNOWY_BB2 = 0xFC }; QMap firmwareMapping; -- cgit v1.2.3