diff --git a/data/sidebar_docs.yaml b/data/sidebar_docs.yaml
index 6c9bbb42582..b2d97ebac3b 100644
--- a/data/sidebar_docs.yaml
+++ b/data/sidebar_docs.yaml
@@ -82,8 +82,8 @@
items:
- title_en: IR Remote
link: /docs/ir-controller
-# - title_en: Energy Meter
-# link: /docs/energy-meter
+ - title_en: Energy Meter
+ link: /docs/energy-meter
- title_en: Learn
items:
# - title_en: Introduction
diff --git a/docs/docsCovers/energy-meter-en.png b/docs/docsCovers/energy-meter-en.png
new file mode 100644
index 00000000000..5e3b1676efe
Binary files /dev/null and b/docs/docsCovers/energy-meter-en.png differ
diff --git a/docs/energy-meter.md b/docs/energy-meter.md
new file mode 100644
index 00000000000..1e64a1f1519
--- /dev/null
+++ b/docs/energy-meter.md
@@ -0,0 +1,72 @@
+---
+title: Energy Monitoring
+contributors: [nakata5321]
+---
+
+Congratulations on acquiring the innovative energy monitoring! We are pleased that you have chosen our device to
+enhance the comfort in your home. This device boasts a range of unique features, such as:
+
+Features:
+1. Monitor energy consumption, whether that's an individual estate or an entire building
+2. The included software provides vital insight that can help to control and save energy in the future
+3. Monitoring works on the local network and does not require access to the cloud
+4. Support of Home Assistant via the MQTT protocol
+
+## Hardware specification
+
+- Input Voltage: AC 100-240V 50/60Hz
+- Measuring Range: 0.1-80A
+- Wireless Protocol: IEEE 802.11b/g/n (2.4 GHz Wi-Fi)
+- CPU: ESP32-S3 MCU-based system on a chip (SoC) dual-core microprocessor (Xtensa 32-bit LX7), up to 240 MHz
+- Memory: 448 KB ROM, 520 KB SRAM, 8 MB FLASH
+- USB-C for development and updates
+
+## How to setup
+
+1) Take the device from the box and connect it to the computer. Then go the website [webflasher.robonomics.network](https://webflasher.robonomics.network/). You will see next:
+
+
+
+ Note! web flasher is working only with Google Chrome or Microsoft Edge browser.
+
+In "Firmware" drop-box choose "ENERGY MONITOR" option and next in "SELECT CHIP" choose "ESP32-S3". Press "CONNECT" button.
+A popup window will appear where you should select the serial port to which the device is connected. Then choose "INSTALL ENERGY-MONITOR_EN".
+On next window you can make "clear installation" by check "erase device". Next and install. Wait until firmware will be uploaded to the Energy Monitor.
+
+## Configuration
+
+After finishing the installation process Wi-Fi configuration popup will appear. Provide your wi-fi credentials, for connect the device to your wi-fi network.
+
+After setting up wi-fi you can visit device via "visit device" button. Later you can visit device via it's IP address in network. To find it you can use [Fing mobile app](https://www.fing.com/products) or
+[nmap CLI tool](https://vitux.com/find-devices-connected-to-your-network-with-nmap/).
+
+
+
+Go to "Configuration"->"Configure other". In "Template" string insert next:
+
+
+
+```shell
+{"NAME":"Robonomics-Energy-Monitor","GPIO":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3200,5440,1,1,576,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1],"FLAG":0,"BASE":1, "CMND":"SetOption21 1|WattRes 2|VoltRes 2"}
+```
+
+
+
+Verify that checkbox "Activate" and "MQTT Enable" is enabled. If not, enable it and press Save button.
+
+Return to "main menu" and go to "Configuration" -> "Configure MQTT".
+Provide your MQTT credentials here:
+
+
+
+That's all with ESP for now. Next step is install Home Assistant integration.
+
+## Integration setup
+
+This article assumes that you have Home Assistant. To connect Energy Monitoring to Home Assistant, you need to install "Tasmota" integration.
+
+Basically, Home Assistant will discover "Tasmota" integration automatically. But if not, add it manually.
+
+
+
+That's all. Now you can add energy entities to dashboard.
\ No newline at end of file
diff --git a/docs/images/energymeter/HA.jpg b/docs/images/energymeter/HA.jpg
new file mode 100644
index 00000000000..86d6a531d6e
Binary files /dev/null and b/docs/images/energymeter/HA.jpg differ
diff --git a/docs/images/energymeter/energymeter.jpg b/docs/images/energymeter/energymeter.jpg
new file mode 100644
index 00000000000..b34b6091eb5
Binary files /dev/null and b/docs/images/energymeter/energymeter.jpg differ
diff --git a/docs/ir-controller.md b/docs/ir-controller.md
index b124a1c1ae9..27e290c61b8 100644
--- a/docs/ir-controller.md
+++ b/docs/ir-controller.md
@@ -15,7 +15,7 @@ but also boasts a range of unique features, such as:
Get ready for a new level of air conditioner management with our remote, and may your home always be set to maximum comfort!
-## Hardware specification:
+## Hardware specification
- Viewing angle 360°
- CPU: ESP32 series of SoCs, Xtensa 32-bit LX6 microprocessor, up to 240 MHz
@@ -48,10 +48,15 @@ After setting up wi-fi you can visit device via "visit device" button. Later you
Go to "Configuration"->"Configure other". In "Template" string insert next:
+
+
+
```shell
{"NAME":"Robonomics IR remote","GPIO":[1,1,1,1,1056,1088,1,1,1,1,1,1,1,1,1,1,0,1,1,1,0,1,1,1,0,0,0,0,1,1,1,1,1,0,0,1],"FLAG":0,"BASE":1}
```
-If box "Activate" is disabled, enable it and press Save button.
+
+
+Verify that checkbox "Activate" and "MQTT Enable" is enabled. If not, enable it and press Save button.
Return to "main menu" and go to "Configuration" -> "Configure MQTT".
Provide your MQTT credentials here:
@@ -75,6 +80,9 @@ Point your IR remote control to the Robonomics IR remote and press buttons on yo
You need information from "IRHVAC" topic.
Open `configuration.yaml` file of our Home Assistant instance and insert next:
+
+
+
```shell
tasmota_irhvac:
@@ -159,6 +167,8 @@ climate:
#- SwingV
#- Turbo
```
+
+
Change all necessary statements in inserted part with values from console message.