summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* iot-sensortag: Remove unused CharacteristicInfoOliver Wolff2017-02-164-242/+2
| | | | | | Change-Id: I473c28d7c6d19e633623a30d6ca8d4edd07423b2 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Move series updates to C++Maurice Kalinowski2017-02-168-58/+321
| | | | | | | | | | | Instead of jumping to and from the QML engine for each sensor update, rather stay inside C++ and let QML only do the visual updates. This only updates the items which use Charts, as updates to a series is expensive. Change-Id: Idc7a98d2865e7095264f226c0ac5bbb5a977d18a Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Update the timeTitta Heikkala2017-02-161-0/+7
| | | | | | | Add a timer to update the time. Change-Id: I1ec817c15f4609c6c362481d2c5276b2dc167cca Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* iot-sensortag: Fix UI based on findings on Android deviceTitta Heikkala2017-02-164-19/+15
| | | | | | | | Minor changes done to UI based on findings on Nexus 7. Change-Id: I3e7496578a03ab059e0ba0b99f7f97ac2c91a8e5 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* Mark accessors as constMaurice Kalinowski2017-02-154-90/+91
| | | | | | Change-Id: I32afa9f74e428ee7c19369aad173c72f193f526f Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Remove dead codeMaurice Kalinowski2017-02-151-1/+0
| | | | | | Change-Id: If1af7fd6b88bccaccfe0a990e46e5ada96574736 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* cleanup enabling range-forMaurice Kalinowski2017-02-154-23/+24
| | | | | | | | | foreach is considered harmful since 5.7 and will be deprecated with 5.9. Add QT_NO_FOREACH to forbid accidental addition later on. Change-Id: I652975c3454fdb7987cf8ea609d490476e9e7624 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Fix mock backendMaurice Kalinowski2017-02-152-1/+4
| | | | | | | | | Signals were not emitted and wrong function call to mimick end of scanning. Change-Id: Ic418b3d636615e464b8e406f0e31f37a70354870 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: "Fix" isDeviceReadyOliver Wolff2017-02-152-12/+16
| | | | | | | | | The name suggests a const function so we either have to come up with a new name that describes the current functionality or move the state change out of the function. Decided for the latter. Change-Id: Ifab2689b8a3ec054222f40708e1eb2d1576a6a08 Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* iot-sensortag: Fix infrared temperature service uuidOliver Wolff2017-02-151-1/+1
| | | | | Change-Id: I9f5842272311e77dea066a6f73d09366c8ab529b Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* iot-sensortag: Fix compile errorTitta Heikkala2017-02-152-2/+2
| | | | | | | isDeviceReady() function can't be const because it changes the state. Change-Id: I05fe26aad80b7aaede42bf26c7aba6b9c9c299f3 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* iot-sensortag: Add sensor tag setup for Embedded WorldKari Hautamäki2017-02-1510-49/+344
| | | | | | | | - Added two sensor tags with unique capabilities by faking that each provide only a subset of available sensor data Change-Id: I9b7ad9f7b41ea7c5abaad0bc3fbe063219b19a9e Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Use dedicated slots for characteristic changesOliver Wolff2017-02-142-31/+37
| | | | | | | | By using a dedicated slot for each kind of sensor we can avoid one indirection and get rid of the characteristic handle members. Change-Id: I5da16fd4fab55c4085aa1ed141b69a3c442b8fb3 Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* iot-sensortag: Remove m_characteristicsOliver Wolff2017-02-142-45/+0
| | | | | | | | m_characteristics and related functions and signals are not used anywhere so they can be removed. Change-Id: I0e5e0808be4b308687a806ea43492c251d9122f8 Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* iot-sensortag: Rework service discoveryOliver Wolff2017-02-142-66/+60
| | | | | | | | | Instead of iterating over the list of the controller's services after discovery is finished, handle the found services one by one when the according serviceDiscovered signal is emitted. Change-Id: I84d879059222189fb106e085bd9f2e4d3cb44bb5 Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* iot-sensortag: Remove unused m_servicesOliver Wolff2017-02-142-134/+68
| | | | | | | | Neither m_services nor signals functions that use this member are used anywhere in the code so they can safely be removed. Change-Id: I3c5ff95499e5012b9c6e7d608a6feceb9d45fe7c Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* iot-sensortag: Avoid loops during sensor initializationOliver Wolff2017-02-141-77/+114
| | | | | | | | | Instead of iterating over service characteristics and their descriptors we should access the needed characteristics and descriptors directly. Change-Id: I5e14c5d24175ed73ed9396379a6f97360189cc8a Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* iot-sensortag: Do not hardcode characteristic handlesOliver Wolff2017-02-142-15/+17
| | | | | | | | | | Depending on the tag's firmware version the characteristics' handle values might be different. Following TI's advice we should do a proper lookup instead of hardcoding them. Change-Id: I95934e554563e99118fc8ffe87de44e87d409ecf Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* iot-sensortag: Add possibility to scan sensorsTitta Heikkala2017-02-143-0/+11
| | | | | | | Added possibility to start scanning of sensors to SensorSettings. Change-Id: I1ebb5da22a4e98d6c2220bb6d51f17641c7821ec Reviewed-by: Otto Ryynänen <otto.ryynanen@qt.io>
* iot-sensortag: Use OpenGL with all chartsTitta Heikkala2017-02-142-0/+6
| | | | | | | Gyro and MAgnetometer charts are updated to use OpenGL for series. Change-Id: Ib4f7e3c7e4bdf5015484f3849cc99ad9c1490f5f Reviewed-by: Otto Ryynänen <otto.ryynanen@qt.io>
* iot-sensortag: Fix RotationPage 'no rotation' bugKari Hautamäki2017-02-102-13/+13
| | | | | | | | | - Conditional binding to sensor values only when sensor is available - Set and recalibrate sensor for RotationPage when the sensor becomes available Change-Id: I3729faa482abdd17bf0d0a850a3eef528cd5a6b6 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Hide menus by clicking outsideKari Hautamäki2017-02-101-5/+34
| | | | | | | | Add a fullscreen MouseArea that is used to close a menu when clicked outside of the menu Change-Id: I1479519f6f14be56c12445b92b0c05d519dc7f01 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Add option to enable deploying resources to the file systemKari Hautamäki2017-02-092-9/+40
| | | | | | | | | | | Add a config flag to the project file that controls how resources are deployed with the binary. By default they are included in the binary but it is also possible to deploy them to the file system. This option is needed as Qt5.7.1 and and Qt5.8 fail to load QML files from resource files on some platforms (e.g. RPi3). Change-Id: I7e1e938ac829d01ac6117e04bbaef053daf15154 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Make central gyro visible always and calibratableTitta Heikkala2017-02-092-19/+11
| | | | | | | | Central gyro page is visible always. It is also possible to recalibrate the gyro sensor by clicking the GyroChart. Change-Id: I9805411e03d49571b9e392bcd77a9469aef153a0 Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* iot-sensortag: Update graphics for LightChart and RotationPageTitta Heikkala2017-02-0913-98/+18
| | | | | | | | Light gauge image updated. Gyro ring images updated for RotationPage. Particles removed for now. Change-Id: I3db8fc37685ba5d70c13685daa7b0ee61263046c Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* iot-sensortag: Zero level altitude in mock data providerKari Hautamäki2017-02-093-10/+26
| | | | | | | | - Zero level for altitude is set in mock data provider - Fix alignment problem in AltitudeChart Change-Id: I67f1ef9296201a0990cd17d79f33971441e15b32 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Add all states to sensor settingsTitta Heikkala2017-02-081-2/+6
| | | | | | | Added 'Scanning' and 'Error' states to sensor settings. Change-Id: Ib207170c00994873bbfcbf86cb6aaa541bf93101 Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* iot-sensortag: Fix alignment of graph in TemperatureChartKari Hautamäki2017-02-081-2/+1
| | | | | | | | - Chart data is correctly aligned vertically - remove unused (and bound in wrong way) avgValue Change-Id: I6adf7cfdbc3b13e54b982f6c50e2ae426ffadea6 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Visual style updated for most of the chartsKari Hautamäki2017-02-0833-220/+271
| | | | | | | | | | - Updated appearance and graphics of ambient and object temperature, air pressure, humidity and light charts. - Removed AirPressure chart - Added Altitude chart - Added altitude information to SensorTagData and derived classes Change-Id: Ief8eb9dd4f87f967b037eed3e9a4dd12c3c6efc9 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Added initial version of CloudSettings dialogTitta Heikkala2017-02-086-5/+135
| | | | | | | A new dialog added for cloud settings. Change-Id: I4064a9b1658237911e373aa32567d34f6bb2583d Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* emit providerForCloudChanged after being setMaurice Kalinowski2017-02-071-0/+1
| | | | | | Change-Id: I9f23ff2cce3e8f269d5ca14f647affcc03df3f68 Reviewed-by: Otto Ryynänen <otto.ryynanen@qt.io> Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* iot-sensortag: Update Gyro, Magnetometer and Ambient Temperature chartsTitta Heikkala2017-02-065-87/+91
| | | | | | | | Updated appearance and graphics of gyro, magnetometer and ambient temperature charts. Change-Id: I72c6c7b3d10692b838828a63551876dbe6918152 Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* iot-sensortag: Change TemperatureChartTitta Heikkala2017-02-066-107/+57
| | | | | | | Changed the appearance of TemperatureChart per ui spec. Change-Id: I17960c24d72f34a8bcf3b461ab19b7a57bfb3c6f Reviewed-by: Otto Ryynänen <otto.ryynanen@qt.io>
* RotationPage addedOtto Ryynänen2017-02-0320-56/+376
| | | | | | | | | Added a page that has three rotating disks. Current pictures are placeholders for final graphics. SensorTag can be recalibrated. Change-Id: I0666ab06e665d8c40861e170f36b09013b722973 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Add dialog for sensor settingsTitta Heikkala2017-02-034-24/+143
| | | | | | | Added new dialog for sensor settings. Change-Id: I1cb32984541dc20bb12e81fa645db4b24378554f Reviewed-by: Otto Ryynänen <otto.ryynanen@qt.io>
* Fixed bug in Accelometer data (was multiplied by 1000)Otto Ryynänen2017-02-021-1/+1
| | | | | Change-Id: I4ffd59c33ec35f2d65bc59822f4080887633fa43 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Add glow to gyro and magnetometer chartsTitta Heikkala2017-02-022-12/+25
| | | | | | | Glow effect added to gyro and magnetometer charts. Change-Id: Id219a687c9432c16326d578ba2816bc39ac09c2c Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* Background image added and humity chart tweakedKari Hautamäki2017-02-024-3/+8
| | | | | | | | - Blue background image added that is used in all UI variants - Readings in HumidityChart tweaked to show 0% when starting the app Change-Id: I8cca1cf4cafdd83063a6bcf9b98572839906dac3 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Accelometer changed to report values in G instead of mGOtto Ryynänen2017-02-018-61/+57
| | | | | | Change-Id: I4193b6566f7408f3e3e09161987d107941e2a6b2 Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Add Accelometer chartTitta Heikkala2017-02-0117-14/+150
| | | | | | | Added new accelometer chart. Updated the ui-layout and images. Change-Id: Id8474e533f39f5c8178b487fc9bc03d7ea956772 Reviewed-by: Otto Ryynänen <otto.ryynanen@qt.io>
* GyroChart and Magnetometerchart grid removalOtto Ryynänen2017-02-0110-121/+75
| | | | | | | | | | Removed grids from charts. changed magnetometer chart type. Removed old IR Temp from cloud IF. New signal(s) for Ambient and object temperatures. Change-Id: If9f215f33197ca1dc03b2a55187464fdb7a05cd9 Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* SensorTag changed to broadcasting mode form read-resp modeOtto Ryynänen2017-01-3112-263/+122
| | | | | | | | | | | | | Sensortag now sends data according to set intervals and app only listens to signals. Timers removed as they are no longer needed. Both ambient and object temperature read and converted properly. Cloud data updated with dedicated abient and object temperatures. Version is now 1.1 (backwards compatible). Mock data reflects to reality better. Change-Id: I6a0325a513c1a054322f18e68d2b15c474db3ee5 Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* Display rotation values in GyroChartKari Hautamäki2017-01-304-6/+10
| | | | | | | Displays rotation values in GyroChart instead of *_degPerSec values. Also, elapsed time between measurements given a meaningful initial value in BluetoothDataProvider. Change-Id: Id4aa8820d8e45ac72d85cc963e993941ccacd599 Reviewed-by: Otto Ryynänen <otto.ryynanen@qt.io>
* Added IoT SensorTag demo to tradeshowOtto Ryynänen2017-01-3093-0/+7367
| | | | | | | | | iot-sensortag folder added. This is project originally from consultacy repo, moved to here. It's a cross-platform app that shown multiple data values from TI CC2650 SensorTag. Change-Id: I648464ed9a8253e5069bc6fd59e8b92128b60adc Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Doc: Bump version to 5.8.05.8Topi Reinio2017-01-162-6/+6
| | | | | Change-Id: I88d96b2096f824bcb59985cbe65ed4aaea1d5ae5 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Mikko Gronoff2016-12-121-1/+1
|\ | | | | | | | | | | | | * origin/5.7: Remove wildcard in enterprise-gallery demo .pro file Change-Id: Idcaabd1b44e8c8e2e5095860532bbb7a5e8eb302
| * Merge remote-tracking branch 'origin/5.6' into 5.75.7Mikko Gronoff2016-12-121-1/+1
| |\ | | | | | | | | | | | | | | | | | | * origin/5.6: Remove wildcard in enterprise-gallery demo .pro file Change-Id: I64fe114bcb616f792bd02625cdf11ecdf6f9c093
| | * Remove wildcard in enterprise-gallery demo .pro fileMikko Gronoff2016-12-121-1/+1
| | | | | | | | | | | | | | | Change-Id: I5ff4496f0046bf6cb68545d20b108f7272fbf6f9 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Mikko Gronoff2016-12-0913-26/+101
|\ \ \ | |/ / | | | | | | | | | | | | | | | * origin/5.7: Fixed demo .pro files: removed exclude.txt and wildcards used with content files Change-Id: Icb391cbcf1796879417e42ebf206d07bd03d2fae
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Mikko Gronoff2016-12-0813-26/+101
| |\ \ | | |/ | | | | | | | | | | | | | | | * origin/5.6: Fixed demo .pro files: removed exclude.txt and wildcards used with content files Change-Id: I052c0f87dce2b5f8f7fc71647944e620fa6d0055