Commit 0f92fa83 authored by Tomi Korpipää's avatar Tomi Korpipää

Update HomeAutomation to 2.0 API

parent 9786f3aa
......@@ -14,6 +14,8 @@ KNX_BOARD {
QT += qml quick
CONFIG += resources_big
target.path = $$[QT_INSTALL_EXAMPLES]/studio3d/$$TARGET
INSTALLS += target
......
......@@ -132,10 +132,10 @@ void HouseModel::generateRooms()
{
removeRows(0, m_rooms.length());
// Position of labels is defined from the center point of window
addRoom(QStringLiteral("Living Room"), QStringLiteral("Livingroom"), 21, 0.8, 120, 200);
addRoom(QStringLiteral("Master Bedroom"), QStringLiteral("Masterbedroom"), 18, 0.8, -380, -290);
addRoom(QStringLiteral("Bedroom"), QStringLiteral("Bedroom"), 15, 0.0, -405, 170);
addRoom(QStringLiteral("Bath Room"), QStringLiteral("Bathroom"), 30, 1.0, -20, -320);
addRoom(QStringLiteral("Living Room"), QStringLiteral("LivingRoom"), 21, 0.8, 120, 200);
addRoom(QStringLiteral("Master Bedroom"), QStringLiteral("MasterBedRoom"), 18, 0.8, -380, -290);
addRoom(QStringLiteral("Bedroom"), QStringLiteral("BedRoom"), 15, 0.0, -405, 170);
addRoom(QStringLiteral("Bath Room"), QStringLiteral("BathRoom"), 30, 1.0, -20, -320);
#if !defined(KNX_BACKEND)
addRoom(QStringLiteral("Entrance"), QStringLiteral("Entrance"), 20, 0.6, -450, -70);
#endif
......
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<application xmlns="http://qt.io/qt3dstudio/uia">
<assets initial="houseStudio">
<presentation id="houseStudio" src="houseStudio.uip"/>
<dataInput name="slideInput" type="String"/>
</assets>
<statemachine ref="#logic">
<visual-states>
<state ref="Initial">
<enter>
<goto-slide element="main:Scene" rel="next"/>
</enter>
</state>
</visual-states>
</statemachine>
<?xml version="1.0" encoding="UTF-8" ?>
<application>
<assets initial="houseStudio">
<presentation id="houseStudio" src="houseStudio.uip"/>
<dataInput name="slideInput" type="String"/>
<dataInput name="lightEntrance" type="Ranged Number" min="0" max="100"/>
<dataInput name="lightBathRoom" type="Ranged Number" min="0" max="100"/>
<dataInput name="lightLivingRoom" type="Ranged Number" min="0" max="100"/>
<dataInput name="lightMasterBedRoom" type="Ranged Number" min="0" max="100"/>
<dataInput name="lightBedRoom" type="Ranged Number" min="0" max="100"/>
<dataInput name="heatEntrance" type="Vector3"/>
<dataInput name="heatBathRoom" type="Vector3"/>
<dataInput name="heatLivingRoom" type="Vector3"/>
<dataInput name="heatMasterBedRoom" type="Vector3"/>
<dataInput name="heatBedRoom" type="Vector3"/>
</assets>
<statemachine ref="#logic">
<visual-states>
<state ref="Initial">
<enter>
<goto-slide element="main:Scene" rel="next"/>
</enter>
</state>
</visual-states>
</statemachine>
</application>
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment