Skip to content

Commit a1f1499

Browse files
ashvaykaashvayka
committed
Merge branch 'staging/3.9' into release/3.9
2 parents 5ae61ff + d5003c1 commit a1f1499

File tree

103 files changed

+782
-603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+782
-603
lines changed

‎_includes/templates/device-library/ready-to-go-devices/temco-controls-t3e-6ct-configuring-gateway-advanced.md‎

Lines changed: 59 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
title: Select "**BACnet**" connector type, fill in the "**Name**" field, disable filling configuration with default values and click "**Add**" button;
1717
===
1818
image: https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-t3e-6ct/advanced-temco-t3e-6ct-gateway-configuring-2-ce.png,
19-
title: In the created connector go to "**Advanced**" section and paste the below json configuration. Replace **host** and **port** configuration parameter values with the device host and port. Click on "Save" button.
19+
title: In the created connector go to "**Advanced**" section and paste the below json configuration. Replace **host** and **port** configuration parameter values with the device host and port. Also, replace "**DEVICE_HOST**" in "**altResponsesAddresses**" with device host. Click on "Save" button.
2020
'
2121
%}
2222

@@ -38,7 +38,7 @@
3838
title: Select "**BACnet**" connector type, fill in the "**Name**" field, disable filling configuration with default values and click "**Add**" button;
3939
===
4040
image: https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-t3e-6ct/advanced-temco-t3e-6ct-gateway-configuring-2-pe.png,
41-
title: In the created connector go to "**Advanced**" section and paste the below json configuration. Replace **host** and **port** configuration parameter values with the device host and port. Click on "Save" button.
41+
title: In the created connector go to "**Advanced**" section and paste the below json configuration. Replace **host** and **port** configuration parameter values with the device host and port. Also, replace "**DEVICE_HOST**" in "**altResponsesAddresses**" with device host. Click on "Save" button.
4242
'
4343
%}
4444

@@ -50,46 +50,63 @@
5050

5151
```json
5252
{
53-
"application": {
54-
"objectName": "TB_gateway",
55-
"host": "0.0.0.0",
56-
"port": "47808",
57-
"objectIdentifier": 599,
58-
"maxApduLengthAccepted": 1476,
59-
"segmentationSupported": "segmentedBoth",
60-
"vendorIdentifier": 15
61-
},
62-
"devices": [
63-
{
64-
"altResponsesAddresses": [],
65-
"host": "DEVICE_HOST",
66-
"port": 47808,
67-
"deviceInfo": {
68-
"deviceNameExpression": "T3E-6CT",
69-
"deviceNameExpressionSource": "constant",
70-
"deviceProfileExpressionSource": "constant",
71-
"deviceProfileExpression": "default"
72-
},
73-
"pollPeriod": 3000,
74-
"timeseries": [
75-
{
76-
"key": "humidity",
77-
"objectType": "analogInput",
78-
"objectId": 0,
79-
"propertyId": "presentValue"
80-
},
81-
{
82-
"key": "temperature",
83-
"objectType": "analogInput",
84-
"objectId": 1,
85-
"propertyId": "presentValue"
86-
}
87-
],
88-
"attributes": [],
89-
"attributeUpdates": [],
90-
"serverSideRpc": []
91-
}
92-
]
53+
"application": {
54+
"objectName": "TB_gateway",
55+
"host": "0.0.0.0",
56+
"port": "47808",
57+
"objectIdentifier": 599,
58+
"maxApduLengthAccepted": 1476,
59+
"segmentationSupported": "segmentedBoth",
60+
"vendorIdentifier": 15
61+
},
62+
"devices": [
63+
{
64+
"altResponsesAddresses": ["DEVICE_HOST"],
65+
"host": "DEVICE_HOST",
66+
"port": 47808,
67+
"deviceInfo": {
68+
"deviceNameExpression": "T3E-6CT",
69+
"deviceNameExpressionSource": "constant",
70+
"deviceProfileExpressionSource": "constant",
71+
"deviceProfileExpression": "default"
72+
},
73+
"pollPeriod": 10000,
74+
"timeseries": [
75+
{
76+
"key": "humidity",
77+
"objectType": "analogInput",
78+
"objectId": 0,
79+
"propertyId": "presentValue"
80+
},
81+
{
82+
"key": "temperature",
83+
"objectType": "analogInput",
84+
"objectId": 1,
85+
"propertyId": "presentValue"
86+
}
87+
],
88+
"attributes": [],
89+
"attributeUpdates": [],
90+
"serverSideRpc": [
91+
{
92+
"method": "setRelay1",
93+
"objectType": "binaryOutput",
94+
"objectId": 0,
95+
"propertyId": "presentValue",
96+
"requestTimeout": 5000,
97+
"requestType": "writeProperty"
98+
},
99+
{
100+
"method": "setRelay2",
101+
"objectType": "binaryOutput",
102+
"objectId": 1,
103+
"propertyId": "presentValue",
104+
"requestTimeout": 5000,
105+
"requestType": "writeProperty"
106+
}
107+
]
108+
}
109+
]
93110
}
94111
```
95112
{:.copy-code.expandable-10}

‎_includes/templates/device-library/ready-to-go-devices/temco-controls-t3e-6ct-configuring-gateway-basic.md‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,67 @@
9696
'
9797
%}
9898

99+
{% capture difference %}
100+
Don't forget to expose **47808** port in the docker compose file.
101+
Also, add device host to the **Alternative responses address** array in the **device advanced configuration section**.
102+
{% endcapture %}
103+
{% include templates/info-banner.md content=difference %}
104+
99105
{% if page.docsPrefix == "pe/" or page.docsPrefix contains "pe/" or page.docsPrefix contains "paas/" or docsPrefix == "pe/" or docsPrefix contains "paas/" %}
100106
{% include images-gallery.liquid showListImageTitles="true" imageCollection=creatingGatewayPE %}
101107
{% else %}
102108
{% include images-gallery.liquid showListImageTitles="true" imageCollection=creatingGatewayCE %}
103109
{% endif %}
110+
111+
Also, Temco T3E-6CT provide two output relays that can be controlled using the gateway. Let's create a new RPC commands
112+
to control the relay. For this purpose, use the following steps:
113+
114+
{% assign creatingGatewayRPCCE = '
115+
===
116+
image: https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-t3e-6ct/temco-t3e-6ct-gateway-configuring-19-ce.png,
117+
title: Select created device in the device list of BACnet connector. Click on "pencil" icon;
118+
===
119+
image: https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-t3e-6ct/temco-t3e-6ct-gateway-configuring-20-ce.png,
120+
title: In the opened window scroll down to the "RPC methods" section and click on "pencil" icon;
121+
===
122+
image: https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-t3e-6ct/temco-t3e-6ct-gateway-configuring-21-ce.png,
123+
title: Click on "Add method" button;
124+
===
125+
image: https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-t3e-6ct/temco-t3e-6ct-gateway-configuring-16-ce.png,
126+
title: fill in the "Method" field with "setRelay1", "Object ID" with "Binary Output" and "0". Click "Add method" button;
127+
===
128+
image: https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-t3e-6ct/temco-t3e-6ct-gateway-configuring-17-ce.png,
129+
title: Click on "Add method" button and fill in the "Method" field with "setRelay2", "Object ID" with "Binary Output" and "1". Click "Apply" button;;
130+
===
131+
image: https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-t3e-6ct/temco-t3e-6ct-gateway-configuring-18-ce.png,
132+
title: Click "Save" button.
133+
'
134+
%}
135+
136+
{% assign creatingGatewayRPCPE = '
137+
===
138+
image: https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-t3e-6ct/temco-t3e-6ct-gateway-configuring-19-pe.png,
139+
title: Select created device in the device list of BACnet connector. Click on "pencil" icon;
140+
===
141+
image: https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-t3e-6ct/temco-t3e-6ct-gateway-configuring-20-pe.png,
142+
title: In the opened window scroll down to the "RPC methods" section and click on "pencil" icon;
143+
===
144+
image: https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-t3e-6ct/temco-t3e-6ct-gateway-configuring-21-pe.png,
145+
title: Click on "Add method" button;
146+
===
147+
image: https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-t3e-6ct/temco-t3e-6ct-gateway-configuring-16-pe.png,
148+
title: fill in the "Method" field with "setRelay1", "Object ID" with "Binary Output" and "0". Click "Add method" button;
149+
===
150+
image: https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-t3e-6ct/temco-t3e-6ct-gateway-configuring-17-pe.png,
151+
title: Click on "Add method" button and fill in the "Method" field with "setRelay2", "Object ID" with "Binary Output" and "1". Click "Apply" button;;
152+
===
153+
image: https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-t3e-6ct/temco-t3e-6ct-gateway-configuring-18-pe.png,
154+
title: Click "Save" button.
155+
'
156+
%}
157+
158+
{% if page.docsPrefix == "pe/" or page.docsPrefix contains "pe/" or page.docsPrefix contains "paas/" or docsPrefix == "pe/" or docsPrefix contains "paas/" %}
159+
{% include images-gallery.liquid showListImageTitles="true" imageCollection=creatingGatewayRPCPE %}
160+
{% else %}
161+
{% include images-gallery.liquid showListImageTitles="true" imageCollection=creatingGatewayRPCCE %}
162+
{% endif %}

‎_includes/templates/device-library/ready-to-go-devices/temco-controls-t3e-6ct-imported-dashboard.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### Import dashboard
22

3-
Download [Check Device Data Dashboard](/docs/devices-library/resources/dashboards/ready-to-go-devices/temco-t3e-6ct-dashboard.json){:target="_blank" download="teltonika-rut955-dashboard.json"} and import.
3+
Download [Check Device Data Dashboard](/docs/devices-library/resources/dashboards/ready-to-go-devices/temco-t3e-6ct-dashboard.json){:target="_blank" download="temco-t3e-6ct-dashboard.json"} and import.
44

55
You are able to import a dashboard in JSON format. To import a dashboard, you should go to the Dashboard group and click
66
on the **“+”** button in the upper right corner of the page and choose **“Import dashboard”**. The dashboard import window
@@ -41,5 +41,5 @@ If you did everything right, you have to see the following dashboard:
4141
{% if page.docsPrefix == "pe/" or page.docsPrefix contains "paas/" or docsPrefix == "pe/" or docsPrefix contains "paas/" %}
4242
![imagePe](https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-t3e-6ct/temco-t3e-6ct-dashboard-pe.png)
4343
{% else %}
44-
![imageCe](https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-t3e-6ct/temco-t3e-6ct-dashboard-pe.png)
44+
![imageCe](https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-t3e-6ct/temco-t3e-6ct-dashboard-ce.png)
4545
{% endif %}

‎_includes/templates/device-library/ready-to-go-devices/temco-controls-tstat10-configuring-gateway-advanced.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
title: Select "**BACnet**" connector type, fill in the "**Name**" field, disable filling configuration with default values and click "**Add**" button;
1717
===
1818
image: https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-tstat10/advanced-temco-tstat10-gateway-configuring-2-ce.png,
19-
title: In the created connector go to "**Advanced**" section and paste the below json configuration. Replace **host** and **port** configuration parameter values with the device host and port. Click on "Save" button.
19+
title: In the created connector go to "**Advanced**" section and paste the below json configuration. Replace **host** and **port** configuration parameter values with the device host and port. Also, replace "**DEVICE_HOST**" in "**altResponsesAddresses**" with device host. Click on "Save" button.
2020
'
2121
%}
2222

@@ -38,7 +38,7 @@
3838
title: Select "**BACnet**" connector type, fill in the "**Name**" field, disable filling configuration with default values and click "**Add**" button;
3939
===
4040
image: https://img.thingsboard.io/devices-library/ready-to-go-devices/temco-tstat10/advanced-temco-tstat10-gateway-configuring-2-pe.png,
41-
title: In the created connector go to "**Advanced**" section and paste the below json configuration. Replace **host** and **port** configuration parameter values with the device host and port. Click on "Save" button.
41+
title: In the created connector go to "**Advanced**" section and paste the below json configuration. Replace **host** and **port** configuration parameter values with the device host and port. Also, replace "**DEVICE_HOST**" in "**altResponsesAddresses**" with device host. Click on "Save" button.
4242
'
4343
%}
4444

@@ -61,7 +61,7 @@
6161
},
6262
"devices": [
6363
{
64-
"altResponsesAddresses": [],
64+
"altResponsesAddresses": ["DEVICE_HOST"],
6565
"host": "DEVICE_HOST",
6666
"port": 47808,
6767
"deviceInfo": {

‎_includes/templates/device-library/ready-to-go-devices/temco-controls-tstat10-configuring-gateway-basic.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,12 @@
102102
'
103103
%}
104104

105+
{% capture difference %}
106+
Don't forget to expose **47808** port in the docker compose file.
107+
Also, add device host to the **Alternative responses address** array in the device **advanced configuration section**.
108+
{% endcapture %}
109+
{% include templates/info-banner.md content=difference %}
110+
105111
{% if page.docsPrefix == "pe/" or page.docsPrefix contains "pe/" or page.docsPrefix contains "paas/" or docsPrefix == "pe/" or docsPrefix contains "paas/" %}
106112
{% include images-gallery.liquid showListImageTitles="true" imageCollection=creatingGatewayPE %}
107113
{% else %}

‎_includes/templates/edge/user-guide/start-upgrade.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Execute the following command to start upgrade process. Once upgrade process successfully completed, the TB Edge upgrade container will be automatically stopped:
2+
3+
```
4+
docker compose -f docker-compose-upgrade.yml up --abort-on-container-exit
5+
```
6+
{: .copy-code}
7+

0 commit comments

Comments
 (0)