diff --git a/devices/atorch-s1tw-energy-meter-v2.1.6.json b/devices/atorch-s1tw-energy-meter-with-temperature-probe-v2.1.6.json
similarity index 97%
rename from devices/atorch-s1tw-energy-meter-v2.1.6.json
rename to devices/atorch-s1tw-energy-meter-with-temperature-probe-v2.1.6.json
index 658a4d18..e6976edc 100644
--- a/devices/atorch-s1tw-energy-meter-v2.1.6.json
+++ b/devices/atorch-s1tw-energy-meter-with-temperature-probe-v2.1.6.json
@@ -1,11 +1,11 @@
 {
 	"manufacturer": "Atorch",
-	"name": "S1TW Energy Meter v2.1.6",
+	"name": "S1TW Energy Meter with Temperature Probe v2.1.6",
 	"key": "rj84vmyhm0dh0jwy",
 	"ap_ssid": "SmartLife",
 	"github_issues": [],
 	"image_urls": [
-		"atorch-s1tw-energy-meter-v2.1.6.jpg"
+		"atorch-s1tw-energy-meter-with-temperature-probe-v2.1.6.jpg"
 	],
 	"profiles": [
 		"bk7231n-common-user-config-ty-2.1.6-sdk-2.3.3-40.00"
diff --git a/devices/atorch-s1w-energy-meter-v2.1.6.json b/devices/atorch-s1w-energy-meter-v2.1.6.json
new file mode 100644
index 00000000..be158f9d
--- /dev/null
+++ b/devices/atorch-s1w-energy-meter-v2.1.6.json
@@ -0,0 +1,553 @@
+{
+	"manufacturer": "Atorch",
+	"name": "S1W Energy Meter v2.1.6",
+	"key": "sqrf2g1amfutn4co",
+	"ap_ssid": "SmartLife",
+	"github_issues": [],
+	"image_urls": [
+		"atorch-s1w-energy-meter-v2.1.6.jpg"
+	],
+	"profiles": [
+		"bk7231n-common-user-config-ty-2.1.6-sdk-2.3.3-40.00"
+	],
+	"schemas": {
+		"000004nndw": [
+			{
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 1,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 360000,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 9,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 5000000,
+					"scale": 2,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 17,
+				"trigger": "direct",
+				"type": "obj"
+			},
+			{
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 30000,
+					"scale": 3,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 18,
+				"type": "obj"
+			},
+			{
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 600000,
+					"scale": 2,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 19,
+				"type": "obj"
+			},
+			{
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 30000,
+					"scale": 2,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 20,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 99999,
+					"scale": 2,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 101,
+				"type": "obj"
+			},
+			{
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 50000000,
+					"scale": 3,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 102,
+				"type": "obj"
+			},
+			{
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 5000000,
+					"scale": 2,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 103,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 1,
+					"max": 2750,
+					"scale": 1,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 104,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 1,
+					"max": 2000,
+					"scale": 2,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 105,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 1,
+					"max": 4500,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 106,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"range": [
+						"chinese",
+						"english"
+					],
+					"type": "enum"
+				},
+				"id": 107,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 1,
+					"max": 9,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 108,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 9,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 109,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 3,
+					"max": 99,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 110,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 111,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"range": [
+						"controlled",
+						"normally_open"
+					],
+					"type": "enum"
+				},
+				"id": 112,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 113,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 114,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 115,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 116,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"range": [
+						"original",
+						"measurement"
+					],
+					"type": "enum"
+				},
+				"id": 117,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"range": [
+						"wifi1",
+						"safety_protection",
+						"outage_a",
+						"outage_b",
+						"timing_close",
+						"timing_open",
+						"loop_timing",
+						"countdown"
+					],
+					"type": "enum"
+				},
+				"id": 118,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 1,
+					"max": 999,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 119,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 1,
+					"max": 99,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 120,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 1,
+					"max": 9999,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 121,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 1,
+					"max": 99,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 122,
+				"type": "obj"
+			},
+			{
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 999999999,
+					"scale": 3,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 123,
+				"type": "obj"
+			},
+			{
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 360000,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 124,
+				"trigger": "direct",
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 60,
+					"max": 359940,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 125,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 60,
+					"max": 359940,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 126,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 60,
+					"max": 359940,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 127,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 60,
+					"max": 359940,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 128,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 60,
+					"max": 359940,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 129,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 60,
+					"max": 359940,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 130,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"range": [
+						"open",
+						"close",
+						"auto"
+					],
+					"type": "enum"
+				},
+				"id": 131,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"range": [
+						"off",
+						"ovp",
+						"ocp",
+						"opp",
+						"outage_a",
+						"outage_b",
+						"timing_open",
+						"timing_close",
+						"loop_timing",
+						"countdown"
+					],
+					"type": "enum"
+				},
+				"id": 132,
+				"type": "obj"
+			},
+			{
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 100000,
+					"scale": 2,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 133,
+				"type": "obj"
+			},
+			{
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 100,
+					"scale": 2,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 134,
+				"type": "obj"
+			},
+			{
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 150,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 135,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"range": [
+						"single_rate",
+						"stair",
+						"peak_valley_stair"
+					],
+					"type": "enum"
+				},
+				"id": 136,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 99,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 137,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"range": [
+						"open",
+						"colse",
+						"memory"
+					],
+					"type": "enum"
+				},
+				"id": 138,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 1,
+					"max": 90,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 139,
+				"type": "obj"
+			}
+		]
+	},
+	"tuyamcu_baud": "115200"
+}
diff --git a/images/atorch-s1tw-energy-meter-with-temperature-probe-v2.1.6.jpg b/images/atorch-s1tw-energy-meter-with-temperature-probe-v2.1.6.jpg
new file mode 100644
index 00000000..f8dd203b
Binary files /dev/null and b/images/atorch-s1tw-energy-meter-with-temperature-probe-v2.1.6.jpg differ
diff --git a/images/atorch-s1tw-energy-meter-v2.1.6.jpg b/images/atorch-s1w-energy-meter-v2.1.6.jpg
similarity index 100%
rename from images/atorch-s1tw-energy-meter-v2.1.6.jpg
rename to images/atorch-s1w-energy-meter-v2.1.6.jpg