summaryrefslogtreecommitdiffstats
path: root/tradeshow
Commit message (Collapse)AuthorAgeFilesLines
* SensorTag: Fix qml warningMaurice Kalinowski2018-11-051-3/+3
| | | | | | | Prefer Layout properties instead of anchors. Change-Id: Ic5d958c1e9cb1060b81eb85003db1d198ee6fd4a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* SensorTag: Update QML filesMaurice Kalinowski2018-10-312-2/+1
| | | | | Change-Id: Ibde6e12d29d422fa27f7fc98c2c54eb170c28638 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* SensorTag: Fix warnings and cleanupMaurice Kalinowski2018-10-255-38/+44
| | | | | Change-Id: I2caf3353eebed6dfa3153b94ae88d1653ad7805a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* SensorTag: Prefer loading MQTT configuration from fileMaurice Kalinowski2018-10-254-15/+79
| | | | | | | | | To avoid accidently pushing credentials, they should not be patched into the header, but rather be placed in to a file co-located to the executable. Change-Id: I03950107f39a88b0f1c7deb49ff16d25ddf9df4d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* add 3d alexa knx demoAndrew O'Doherty2018-05-31136-0/+5494
| | | | | | | | | | The knx-demo directory needs to be divided into two sub-directories containing the alexa 3D demo and the 2d demo. Very large files used by the 3d demo are stored in https://git-lfs.qt.io/Gerrit/boot2qt-demos.git Change-Id: I55e4210e93fc9e017d85e163f13c0b04de96cff0 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Add Qt KNX tradeshow demo applicationKarsten Heimrich2018-04-2648-0/+2838
| | | | | | | | Move from: http://code.qt.io/cgit/qt/qtknx.git/ Change-Id: I92de81ebb1505fe8c8349300321606ec7b2ea120 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devMikko Gronoff2018-02-125-1/+64
|\ | | | | | | | | | | | | | | | | | | * origin/5.10: Doc: Bump version to 5.10.1 iot-sensortag: Add an About tab iot-sensortag: Fix build against 5.10.0 iot-sensortag: Create a quit button SmartWatch demo Change-Id: I247db054b05cb481c67b08cd42fb762f5539460c
| * iot-sensortag: Add an About tabMaurice Kalinowski2017-12-183-0/+49
| | | | | | | | | | | | | | | | | | | | For the watch UI it is helpful to provide an About to visualize it is a Qt application. Change-Id: I83779c038dcaac12ca873b53f4d82d0e801233f2 Reviewed-by: Andrew O'Doherty <andrew.odoherty@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * iot-sensortag: Fix build against 5.10.0Maurice Kalinowski2017-12-181-1/+1
| | | | | | | | | | | | | | | | | | Before the final release the Qt Mqtt API has been updated. Change-Id: I6f9e3e9cc5db16fe87d3493f12703194e9f14654 Reviewed-by: Lorenz Haas <lorenz.haas@histomatics.de> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * iot-sensortag: Create a quit button SmartWatch demoAndrew O'Doherty2017-11-232-0/+14
| | | | | | | | | | | | | | SmartWatch demo requires a button to exit the application Change-Id: I64f366d70960e868bcf9f4c644f81a145edd44b6 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2110-12/+379
|\ \ | |/ | | | | Change-Id: I08eb1b887d7b8cfaae3e105d176136886682c865
| * iot-sensortag: Adapt demo to the screen size of a smartwatchAndrew O'Doherty2017-11-1510-7/+372
| | | | | | | | | | | | | | | | | | mainSmall.qml requires a SwipeView since the smartwatch screen is too small too display all the charts. The charts have been scaled to smaller size and some alignment adjustments have been made Change-Id: I229b6150135c8a1a65bc8114f430904a15397b1e Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * iot-sensortag: Make any cloud backend optionalMaurice Kalinowski2017-10-181-5/+5
| | | | | | | | | | | | | | | | | | Previously, either the MQTT or Azure backend was enabled. But there are users who prefer to have a pure local build. Hence UPDATE_TO_AZURE is an optional setting now. Change-Id: Ie1ff8b6eaa1c357f83a971bd2ded59d40f2c2eb0 Reviewed-by: Shrikant Dhumal <shrikant.dhumal@qt.io>
| * iot-sensortag: Specify package source locationMaurice Kalinowski2017-10-121-0/+2
| | | | | | | | | | | | | | | | | | | | This enables the build system to use the manual manifest file and is a regression of the UI clean up changes. Change-Id: Ib3ece60c01f1055b7104defbd9752af534bf52ac Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Tino Pyssysalo <tino.pyssysalo@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devMikko Gronoff2017-10-1170-1104/+1527
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/5.10: iot-sensortag: Add Uuid fallback for device id iot-sensortag: Use double-click to select connection iot-sensortag: Add logging window iot-sensortag: Do not enable MQTT by default Merge remote-tracking branch 'origin/5.9' into 5.10 iot-sensortag: Disable dateview in portrait mode iot-sensortag: Show fullscreen on Android iot-sensortag: Align font sizes iot-sensortag: Add support for MQTT iot-sensortag: Redesign of example Fix typo Doc: Bump version to 5.10.0 Doc: Bump version to 5.9.2 Change-Id: Id006d6911a42db2a493f7b3f0eb891c791a5879c
| * iot-sensortag: Add Uuid fallback for device idMaurice Kalinowski2017-10-041-1/+6
| | | | | | | | | | | | | | | | | | All Android test devices report localhost as hostname. That causes the remote display to not show any other android device, but also have multiple localhost devices report data. Change-Id: I144800d876faf35bc9ff8e526be31d9c322032dc Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * iot-sensortag: Use double-click to select connectionMaurice Kalinowski2017-10-041-23/+29
| | | | | | | | | | Change-Id: I46c3860799018e51f74df8d24dd54eccab02db7a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * iot-sensortag: Add logging windowMaurice Kalinowski2017-10-043-0/+42
| | | | | | | | | | | | | | | | | | This is most useful in the embedded use-case. Usually there is no debug connection and initialization of a bluetooth connection can take very long. Change-Id: If5b6e8a6e684d2340d6a52b8b21bec25630d6874 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * iot-sensortag: Do not enable MQTT by defaultMaurice Kalinowski2017-09-281-1/+1
| | | | | | | | | | | | | | | | | | This was agreed in a previous patch set for bb226a8dc9b6508c8d72c67b5260b9a733f7fca1. However, it slipped in due to wrong rebasing. Change-Id: I2725ae54da6573a9bc2dc5f965b8e9c0c65997a0 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * iot-sensortag: Disable dateview in portrait modeMaurice Kalinowski2017-09-271-0/+1
| | | | | | | | | | Change-Id: Ic57220e63398f2e7a8745aaa4bcbd341a2b02010 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * iot-sensortag: Show fullscreen on AndroidMaurice Kalinowski2017-09-271-9/+9
| | | | | | | | | | Change-Id: I14a2e55adea3072c23cd25b27d5f65c08a176857 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * iot-sensortag: Align font sizesMaurice Kalinowski2017-09-277-0/+13
| | | | | | | | | | | | | | | | | | 26 is used on some, but not all locations. That had the side effect, that text had different sizes on different platforms causing layouting issues. Change-Id: I057010fdf2aa562c188bd2376829d065a5eeff93 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * iot-sensortag: Add support for MQTTMaurice Kalinowski2017-09-277-49/+891
| | | | | | | | | | | | | | | | Using MQTT a sensor can send its data to a broker as well as display data from a remote MQTT broker. Change-Id: I01f961e89b2c6d028498ce61e4087a47742b8b82 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * iot-sensortag: Redesign of exampleMaurice Kalinowski2017-09-2761-1055/+569
| | | | | | | | | | | | | | | | | | | | | | The updated version switches the focus from having multiple sensors locally towards showing one sensor from a list. This list can display local or remote sensors and switch on runtime. Also incorporated many style fixes and cleanups. Change-Id: If7b8acbb2a784ebba95d467176e76728721c82f7 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Add Altitude to mock data providerMaurice Kalinowski2017-09-071-1/+1
|/ | | | | Change-Id: Ib0377874db5767034109b3446614c4bf56b40a62 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Add IP displayMaurice Kalinowski2017-03-083-1/+16
| | | | | | | | | | | When the app automatically runs on startup, we need to have a way to identify the device's IP address to deploy updates, for instance new MAC filter addresses. When clicking on the date string, it switches to show the IP addresses available. Change-Id: Ie3b10f2b701674ee07f1a8c7a3b064e67d8f6373 Reviewed-by: Risto Avila <risto.avila@qt.io>
* Remove superfluous functionMaurice Kalinowski2017-03-032-7/+0
| | | | | | | | Uses base class variable in any case. In addition setTageType is not virtual. Change-Id: Iaa7b5bb65f07966b193f7ce2c142284325cd9bb9 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Fix Sensor Settings font sizeTitta Heikkala2017-03-031-0/+2
| | | | | | | | The size of the font for provided data in Sensor Settings fixed so that it's readable also with Nexus 7. Change-Id: I0dd0935be36442e39c83c83c8879ba932aa6a1cb Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Initialize member variablesMaurice Kalinowski2017-03-031-0/+5
| | | | | | | | Otherwise isDeviceReady() returns random results, causing the initialization of the whole connection to stop. Change-Id: I777c5eeaf342a30821f45afb076a826cda9896b9 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Reduce waiting time for service scanTitta Heikkala2017-03-024-10/+22
| | | | | | | | | | Unnecessary 1s delay to start service scan removed. If all service details have been discovered there's no need to start the 5s service details timer. Change-Id: I6c8c89455fb3cfdbc1a28198234e95a4ed0b7e8b Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* iot-sensortag: Assign sensor types arbitrarily to available sensor tagsKari Hautamäki2017-02-282-32/+29
| | | | | | | | In the demo setup, assign all sensor types to the set of available sensor types. Change-Id: If07674ccc40f7668e96e41df62d3b2745e6c9cb4 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* iot-sensortag: Allow reconnect after a failed connection attemptKari Hautamäki2017-02-2822-178/+561
| | | | | | | | | | | | | | | | | | A disconnected sensor tag can be tried to be reconnected by clicking on the chart area or starting rescan from the Sensor settings menu. During a (re)connection process a progress indicator is shown to the user. The user has a possibility to disconnect (and reconnect) a currently connect SensorDataProvider A new state, 'NotFound' is added in SensorTagDataProvider to distinguish between states when a Sensor Tag has not been discovered at all, and when it has already been discovered but is has been disconnected. Change-Id: I54eea72d8c92a67a5ccbb3bc192ac8f33ada1c39 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* iot-sensortag: NumberAnimation in LightChartKari Hautamäki2017-02-281-7/+1
| | | | | | | In LightChart, replace NumberAnimation with OpacityAnimator Change-Id: I52c15a5fee3cc7d4fedde51b7011ba7c3a269a32 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* iot-sensortag: Update Gyro imagesTitta Heikkala2017-02-285-0/+0
| | | | | | | Images for RotationPage gyro updated. Change-Id: I4678bd51d0334e4d57980309fe0d9e3e67e718ad Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* iot-sensortag: RotationAnimator in RotationPageKari Hautamäki2017-02-271-7/+7
| | | | | | | In RotationPage, replace RotationAnimation with RotationAnimator Change-Id: I7344a836319213a3a62f766ec4731af3c800fb5b Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Remove transparent image from object temperatureTitta Heikkala2017-02-241-36/+5
| | | | | | | The transparent image is not needed for object temperature cauge. Change-Id: I8880f0ef3c84a382a7bfc9cdaf867e901fbf6219 Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* iot-sensortag: Remove Glow effectTitta Heikkala2017-02-243-25/+7
| | | | | | | Glow effect removed from ChartView elements. Change-Id: I4a020c783c715c45c8d10663c8f2828d7f10bdd5 Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* iot-sensortag: Remove unused SensorTag.qmlKari Hautamäki2017-02-242-253/+0
| | | | | | | Remove the unused file Change-Id: I1822fb06885cbe26a2506860ad27dbfffb18c3b7 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Update Humidity imageTitta Heikkala2017-02-231-0/+0
| | | | | | | Image for Humidity Chart updated. Change-Id: I3343354bdc7c5f5d76e6869b874dd33f58846c54 Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* iot-sensortag: Clean up onSensorChanged signal handlersTitta Heikkala2017-02-226-77/+34
| | | | | | | | Removed onSensorChanged signal handlers from charts as they are not needed. Instead, react to changes of sensor properties. Change-Id: Ib848d3ddfeed550538d35793b24eeb137a57a171 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* iot-sensortag: Upate GyroChart graph when reading from the Azure cloudKari Hautamäki2017-02-211-0/+6
| | | | | | | | | Send the aggregate signal rotationValuesChanged when a changed rotation value is read from the Azure cloud. SeriesStorage uses this signal to update the series data. Change-Id: I879f1e7c3b625541156fe909473397d7d40148bf Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* iot-sensortag: Add missing files for MockDataProviderPoolKari Hautamäki2017-02-212-0/+169
| | | | | | | | The commit 22ca8687ef2c4ebbbc8d40fd41b45335b0058418 had missing files for MockDataProviderPool. Add the missing files here Change-Id: Ib49d120d107428079686e474fd9f06bdddbdcf8f Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Fix build for AndroidKari Hautamäki2017-02-211-0/+2
| | | | | | | | Add namespace directive QT_CHARTS_USE_NAMESPACE to seriesstorage.h Change-Id: I4b96cfced5aa70700d97af97ff1a739415102f18 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* iot-sensortag: Add MockDataProviderPoolKari Hautamäki2017-02-212-9/+9
| | | | | | | | | | | Add MockDataProviderPool that derives directly from SensorTagDataProviderPool. This allows building for Android without a dependency to SensorTagDataProviderPool that can be used only when a device runs in host mode Change-Id: I3ff6fe36b80a4ee5dfe9815c811cc6bf016e3e6d Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Fix warningMaurice Kalinowski2017-02-201-2/+3
| | | | | | | Also add initializer for yAxisG. Change-Id: If2518de5463ab509b8d58b20ead288374558cd5e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Remove platform name from variableMaurice Kalinowski2017-02-201-2/+2
| | | | | | | | The demo can also run on other platforms than linux. Hence the old name is misleading. Change-Id: I8345c93be552c6e8fc614a517528a8e45b5d1381 Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* Remove hardcoded pathsMaurice Kalinowski2017-02-201-10/+15
| | | | | | | | User has to specify location for cpprest and wastorage when invoking qmake Change-Id: Ib0b3b7b0e648022c73ca1f942ebbc423b6f3caf6 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Change to more details cloud namingMaurice Kalinowski2017-02-202-5/+5
| | | | | | | | | In case additional protocols get added, cloud can be a confusing and to generic name. Change-Id: I3ff4ac0178e017c42684514a1923e718bb1fe5b7 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
* iot-sensortag: Remove unnecessary importTitta Heikkala2017-02-171-1/+0
| | | | | | | Remove Particles import as it's no longer needed. Change-Id: If55f643b31f43db6df9be166d24bad72a4304c2b Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* iot-sensortag: Change Magnetometer chart typeTitta Heikkala2017-02-176-58/+37
| | | | | | | | Magnetometer chart changed from polar chart view to chart view. Also changed the series to LineSeries. Change-Id: Ibdf2dc1c86e63fd20caa8d3c1a09377ea6de8f4b Reviewed-by: Otto Ryynänen <otto.ryynanen@qt.io>