Merge branch 'staging/4.3' into release/4.3

Author: ashvayka

_data/guides.yml

@@ -40,7 +40,5 @@ toc:
     section:
     - title: Add & remove devices from groups dynamically
       path: /docs/user-guide/rule-engine-2-0/tutorials/add-devices-to-group/
-- title: Live Demo Server
-  path: /docs/user-guide/live-demo/
 - title: Local Demo Account
   path: /docs/samples/demo-account/

_data/host-constant.yml

@@ -1,11 +1,11 @@
 - tag: ce
-  hostLabel: ThingsBoard Demo
-  hostName: demo.thingsboard.io
-  mqttHostName: demo.thingsboard.io
-  coapHostName: demo.thingsboard.io
-  httpsUrl: https://demo.thingsboard.io
-  lwm2mHostName: demo.thingsboard.io
-  apiHostName: demo.thingsboard.io
+  hostLabel: localhost
+  hostName: localhost
+  mqttHostName: localhost
+  coapHostName: localhost
+  httpsUrl: https://localhost
+  lwm2mHostName: localhost
+  apiHostName: localhost
 - tag: pe
   hostLabel: ThingsBoard Cloud
   hostName: thingsboard.cloud

_data/installation-options/installation-options-ce.yml

@@ -1,12 +1,21 @@
 liveDemo:
   0:
-    title: ThingsBoard
-    description: Create your personal account on the live demo server. It is totally free!
-    link: https://demo.thingsboard.io/signup
-    icon: https://img.thingsboard.io/thingsboard_small_icon.svg
-    alt: Thingsboard logo
-    imageTitleAttribute: Try ThingsBoard live demo for free
-    imageWidth: 72
+    title: North America
+    description: ThingsBoard Cloud is a fully managed, scalable and fault-tolerant platform for your IoT applications.
+    link: https://thingsboard.cloud/signup
+    icon: https://img.thingsboard.io/thingsboard_pe_small_icon.svg
+    alt: Thingsboard PE logo
+    imageTitleAttribute: ThingsBoard Professional Edition
+    imageWidth: 39
+    imageHeight: 36
+  1:
+    title: Europe
+    description: ThingsBoard Cloud is a fully managed, scalable and fault-tolerant platform for your IoT applications.
+    link: https://eu.thingsboard.cloud/signup
+    icon: https://img.thingsboard.io/thingsboard_pe_small_icon.svg
+    alt: Thingsboard PE logo
+    imageTitleAttribute: ThingsBoard Professional Edition
+    imageWidth: 39
     imageHeight: 36
 onPremise:
   0:

_data/paas-eu/guides.yml

@@ -40,7 +40,5 @@ toc:
     section:
     - title: Add & remove devices from groups dynamically
       path: /docs/user-guide/rule-engine-2-0/tutorials/add-devices-to-group/
-- title: Live Demo Server
-  path: /docs/user-guide/live-demo/
 - title: Local Demo Account
   path: /docs/samples/demo-account/

_data/paas/guides.yml

@@ -40,7 +40,5 @@ toc:
     section:
     - title: Add & remove devices from groups dynamically
       path: /docs/user-guide/rule-engine-2-0/tutorials/add-devices-to-group/
-- title: Live Demo Server
-  path: /docs/user-guide/live-demo/
 - title: Local Demo Account
   path: /docs/samples/demo-account/

_data/pages_info.yml

@@ -4814,9 +4814,6 @@
 "/docs/samples/roltek/roltek/":
   url: "/docs/samples/roltek/roltek/"
   redirect_from: []
-"/docs/samples/sample/sample/":
-  url: "/docs/samples/sample/sample/"
-  redirect_from: []
 "/docs/samples/senquip/":
   url: "/docs/samples/senquip/"
   redirect_from: []

_data/pe/guides.yml

@@ -40,7 +40,5 @@ toc:
     section:
     - title: Add & remove devices from groups dynamically
       path: /docs/user-guide/rule-engine-2-0/tutorials/add-devices-to-group/
-- title: Live Demo Server
-  path: /docs/user-guide/live-demo/
 - title: Local Demo Account
   path: /docs/samples/demo-account/

_includes/contact-us-modal.html

@@ -87,6 +87,7 @@ <h2>{{ modalDescription }}</h2>
                     <input type="hidden" name="utm_term" id="utm_term">
                     <input type="hidden" name="utm_content" id="utm_content">
                     <input type="hidden" name="client_id" id="client_id">
+                    <input type="hidden" name="fpr" id="fpr">
                     <input type="hidden" name="tags" id="tags" value="product">
                     <input type="hidden" name="form_id" id="form_id" value="contact_us_modal">
                     <input type="hidden" name="path" id="path" value="">
@@ -163,6 +164,14 @@ <h2>{{ modalDescription }}</h2>
                     $form.find('input[name="client_id"]').val(clientId);
                 }
             }
+
+            // get fpr from localStorage
+            const fprValue = localStorage.getItem('fpr');
+            if (fprValue) {
+                utmData['fpr'] = fprValue;
+                $form.find('input[name="fpr"]').val(fprValue);
+            }
+
             window.dataLayer = window.dataLayer || [];
             window.dataLayer.push({
                 event: 'contact-us',

_includes/docs/device-library/blocks/basic/introduction-block.md

@@ -10,9 +10,9 @@ Additionally, you’ll learn how to control the device using platform features s
 
 Before proceeding, ensure you have the following requirements in place:  
 {{ prerequisites }} {% if page.docsPrefix == "pe/edge/" %}
-- A ThingsBoard Cloud account ([Europe](https://eu.thingsboard.cloud/signup){: target="_blank"} or [America](https://thingsboard.cloud/signup){: target="_blank"}), or a [local server](/docs/user-guide/install/pe/installation-options/){: target="_blank"} installed on-premises
+- ThingsBoard Cloud account in ([Europe](https://eu.thingsboard.cloud/signup){: target="_blank"} or [North America](https://thingsboard.cloud/signup){: target="_blank"}), or a [local server](/docs/user-guide/install/pe/installation-options/){: target="_blank"} installed on-premises
 {% else %}
-- A [ThingsBoard account](https://demo.thingsboard.io/signup){: target="_blank"} or a [local server](/docs/user-guide/install/installation-options/){: target="_blank"} installed on-premises
+- [ThingsBoard Cloud](https://thingsboard.io/installations/){: target="_blank"} account or a [local server](/docs/user-guide/install/installation-options/){: target="_blank"} installed on-premises
 {% endif %}
 
 {% else %}
@@ -30,7 +30,7 @@ To continue with this guide, we will need the following:
 {{ prerequisites }} {% if page.docsPrefix == "pe/" %}
 - [ThingsBoard Cloud (Europe)](https://eu.thingsboard.cloud/signup){: target="_blank"} or [ThingsBoard Cloud (America)](https://thingsboard.cloud/signup){: target="_blank"}
 {% else %}
-- [ThingsBoard account](https://demo.thingsboard.io/signup){: target="_blank"}
+- [ThingsBoard Cloud](https://thingsboard.io/installations/){: target="_blank"} account or a [local server](/docs/user-guide/install/installation-options/){: target="_blank"} installed on-premises
 {% endif %}
 
 {% endif %}

_includes/docs/device-library/blocks/microcontrollers/camera-code-to-program-block.md

@@ -1,21 +1,6 @@
 
 Now it’s time to program the board to connect to ThingsBoard.  
-To do this, you can use the code below. It contains all required functionality for this guide.  
-
-{% capture demoExample %}
-If you want to use [**demo.thingsboard.io**](https://demo.thingsboard.io), please notice that it has a size limit for the MQTT messages - **1024 bytes per message**.  
-  
-In this case you can reduce the resolution, quality and cut the encoded photo.  
-To do this you can change the value of variable **DEMO_MODE** to **1**:  
-<code>
-#define DEMO_MODE 1  
-</code>
-
-{% endcapture %}
-
-{% unless page.docsPrefix == "pe/" or page.docsPrefix contains "paas/" %}
-{% include templates/warn-banner.md content=demoExample %}
-{% endunless %}
+To do this, you can use the code below. It contains all required functionality for this guide.
 
 ```cpp
 #include <Arduino_MQTT_Client.h>
@@ -24,8 +9,6 @@ To do this you can change the value of variable **DEMO_MODE** to **1**:
 #include "soc/soc.h"
 #include "soc/rtc_cntl_reg.h"
 
-#define DEMO_MODE {% if page.docsPrefix == "pe/" or page.docsPrefix contains "paas/" %}0{% else %}1{% endif %}
-
 #include <Server_Side_RPC.h>
 #include <Attribute_Request.h>
 #include <Shared_Attribute_Update.h>
@@ -194,14 +177,9 @@ bool initCamera() {
   config.pin_reset = RESET_GPIO_NUM;
   config.xclk_freq_hz = 20000000;
   config.pixel_format = PIXFORMAT_JPEG;
-  config.fb_count = 1;{% unless page.docsPrefix == "pe/" or page.docsPrefix contains "paas/" %}
-  if (DEMO_MODE == 1) {
-    config.frame_size = FRAMESIZE_96X96;
-    config.jpeg_quality = 63;
-  } else { {% endunless %}
+  config.fb_count = 1;
   config.frame_size = FRAMESIZE_240X240;
-  config.jpeg_quality = 10;{% unless page.docsPrefix == "pe/" or page.docsPrefix contains "paas/" %}
-  }{% endunless %}
+  config.jpeg_quality = 10;
 
   esp_err_t err = esp_camera_init(&config);
   if (err != ESP_OK) {
@@ -229,10 +207,7 @@ bool captureImage() {
   return true;
 }
 
-void encode(const uint8_t *data, size_t length) { {% unless page.docsPrefix == "pe/" or page.docsPrefix contains "paas/" %}
-  if (DEMO_MODE == 1) {
-    length = 756;
-  }{% endunless %} 
+void encode(const uint8_t *data, size_t length) { 
   size_t size = base64_encode_expected_len(length) + 1;
   base64_encodestate _state;
   base64_init_encodestate(&_state);
@@ -519,7 +494,6 @@ Necessary variables for connection:
 | THINGSBOARD_PORT | **1883U**                    | ThingsBoard server MQTT port. Can be default for this guide.                                                                                 |
 | MAX_MESSAGE_SIZE | **100U*1024**                | Maximal size of MQTT messages. Should be more than picture size + ~1024 or more.                                                             |
 | SERIAL_DEBUG_BAUD | **1883U**                    | Baud rate for serial port. Can be default for this guide.                                                                                    |
-| DEMO_MODE | **1**                        | If you want to use **demo.thingsboard.io** set this value to **1**. This reduces the resolution, quality and cut the encoded photo to avoid size limit. |
 
 ```cpp
 ...