diff --git a/devices/tuya-generic-yy-w9099-water-quality-meter-v2.0.2.json b/devices/tuya-generic-yy-w9099-water-quality-meter-v2.0.2.json
new file mode 100644
index 00000000..ba351f96
--- /dev/null
+++ b/devices/tuya-generic-yy-w9099-water-quality-meter-v2.0.2.json
@@ -0,0 +1,355 @@
+{
+	"manufacturer": "Tuya Generic",
+	"name": "YY-W9099 Water Quality Meter v2.0.2",
+	"key": "5ok0wq7drlqyo2hb",
+	"ap_ssid": "SmartLife",
+	"github_issues": [
+		652
+	],
+	"image_urls": [
+		"tuya-generic-yy-w9099-water-quality-meter-v2.0.2.jpg"
+	],
+	"profiles": [
+		"bk7231n-common-user-config-ty-2.0.2-sdk-2.3.1-40.00"
+	],
+	"schemas": {
+		"00000471rq": [
+			{
+				"trigger": "direct",
+				"type": "obj",
+				"mode": "ro",
+				"property": {
+					"min": -100,
+					"max": 1100,
+					"scale": 1,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 8
+			},
+			{
+				"mode": "ro",
+				"id": 101,
+				"type": "raw"
+			},
+			{
+				"trigger": "direct",
+				"type": "obj",
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 1500,
+					"scale": 2,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 102
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 1500,
+					"scale": 2,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 103,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 1500,
+					"scale": 2,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 104,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": -100,
+					"max": 1100,
+					"scale": 1,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 105,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": -100,
+					"max": 1100,
+					"scale": 1,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 106,
+				"type": "obj"
+			},
+			{
+				"trigger": "direct",
+				"type": "obj",
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 199999,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 107
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 199999,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 108,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 199999,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 109,
+				"type": "obj"
+			},
+			{
+				"trigger": "direct",
+				"type": "obj",
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 199999,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 110
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 199999,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 111,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 199999,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 112,
+				"type": "obj"
+			},
+			{
+				"trigger": "direct",
+				"type": "obj",
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 199999,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 113
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 199999,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 114,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 199999,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 115,
+				"type": "obj"
+			},
+			{
+				"trigger": "direct",
+				"type": "obj",
+				"mode": "ro",
+				"property": {
+					"min": 500,
+					"max": 2000,
+					"scale": 3,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 116
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 500,
+					"max": 2000,
+					"scale": 3,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 117,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 500,
+					"max": 2000,
+					"scale": 3,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 118,
+				"type": "obj"
+			},
+			{
+				"trigger": "direct",
+				"type": "obj",
+				"mode": "ro",
+				"property": {
+					"min": -2000,
+					"max": 2000,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 119
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": -2000,
+					"max": 2000,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 120,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": -2000,
+					"max": 2000,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 121,
+				"type": "obj"
+			},
+			{
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 199999,
+					"scale": 2,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 136,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 199999,
+					"scale": 2,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 137,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 1,
+					"max": 199999,
+					"scale": 2,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 138,
+				"type": "obj"
+			},
+			{
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 100,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 139,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 100,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 140,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 100,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 141,
+				"type": "obj"
+			}
+		]
+	}
+}
diff --git a/images/tuya-generic-yy-w9099-water-quality-meter-v2.0.2.jpg b/images/tuya-generic-yy-w9099-water-quality-meter-v2.0.2.jpg
new file mode 100644
index 00000000..477417bf
Binary files /dev/null and b/images/tuya-generic-yy-w9099-water-quality-meter-v2.0.2.jpg differ