From fd33abcc689837a63f36b0376df32d9f2319f582 Mon Sep 17 00:00:00 2001 From: ZeliardM Date: Tue, 7 Jan 2025 10:02:44 -0500 Subject: [PATCH 1/3] Add KS230(US) 2.0 1.0.11 IOT Fixture --- SUPPORTED.md | 1 + tests/fixtures/iot/KS230(US)_2.0_1.0.11.json | 112 +++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 tests/fixtures/iot/KS230(US)_2.0_1.0.11.json diff --git a/SUPPORTED.md b/SUPPORTED.md index 81469347c..841bbe01a 100644 --- a/SUPPORTED.md +++ b/SUPPORTED.md @@ -120,6 +120,7 @@ Some newer Kasa devices require authentication. These are marked with [^1] in th - Hardware: 1.0 (US) / Firmware: 1.1.0[^1] - **KS230** - Hardware: 1.0 (US) / Firmware: 1.0.14 + - Hardware: 2.0 (US) / Firmware: 1.0.11 - **KS240** - Hardware: 1.0 (US) / Firmware: 1.0.4[^1] - Hardware: 1.0 (US) / Firmware: 1.0.5[^1] diff --git a/tests/fixtures/iot/KS230(US)_2.0_1.0.11.json b/tests/fixtures/iot/KS230(US)_2.0_1.0.11.json new file mode 100644 index 000000000..718f17dc3 --- /dev/null +++ b/tests/fixtures/iot/KS230(US)_2.0_1.0.11.json @@ -0,0 +1,112 @@ +{ + "cnCloud": { + "get_info": { + "binded": 1, + "cld_connection": 1, + "err_code": 0, + "fwDlPage": "", + "fwNotifyType": -1, + "illegalType": 0, + "server": "n-devs.tplinkcloud.com", + "stopConnect": 0, + "tcspInfo": "", + "tcspStatus": 1, + "username": "user@example.com" + }, + "get_intl_fw_list": { + "err_code": 0, + "fw_list": [] + } + }, + "schedule": { + "get_next_action": { + "err_code": 0, + "type": -1 + }, + "get_rules": { + "enable": 1, + "err_code": 0, + "rule_list": [], + "version": 2 + } + }, + "smartlife.iot.dimmer": { + "get_default_behavior": { + "double_click": { + "mode": "none" + }, + "err_code": 0, + "hard_on": { + "mode": "last_status" + }, + "long_press": { + "mode": "instant_on_off" + }, + "soft_on": { + "mode": "last_status" + } + }, + "get_dimmer_parameters": { + "bulb_type": 1, + "calibration_type": 0, + "err_code": 0, + "fadeOffTime": 1000, + "fadeOnTime": 1000, + "gentleOffTime": 10000, + "gentleOnTime": 3000, + "minThreshold": 11, + "rampRate": 30 + } + }, + "system": { + "get_sysinfo": { + "active_mode": "none", + "alias": "#MASKED_NAME#", + "brightness": 100, + "dc_state": 0, + "dev_name": "Wi-Fi Smart 3-Way Dimmer", + "deviceId": "0000000000000000000000000000000000000000", + "err_code": 0, + "feature": "TIM", + "hwId": "00000000000000000000000000000000", + "hw_ver": "2.0", + "icon_hash": "", + "latitude_i": 0, + "led_off": 0, + "longitude_i": 0, + "mac": "5C:E9:31:00:00:00", + "mic_type": "IOT.SMARTPLUGSWITCH", + "model": "KS230(US)", + "next_action": { + "type": -1 + }, + "ntc_state": 0, + "obd_src": "tplink", + "oemId": "00000000000000000000000000000000", + "on_time": 0, + "preferred_state": [ + { + "brightness": 100, + "index": 0 + }, + { + "brightness": 75, + "index": 1 + }, + { + "brightness": 50, + "index": 2 + }, + { + "brightness": 25, + "index": 3 + } + ], + "relay_state": 0, + "rssi": -41, + "status": "new", + "sw_ver": "1.0.11 Build 240516 Rel.104458", + "updating": 0 + } + } +} \ No newline at end of file From d3b6d280c8300777b56b9da3342fe0687a0359a4 Mon Sep 17 00:00:00 2001 From: ZeliardM Date: Tue, 7 Jan 2025 10:04:56 -0500 Subject: [PATCH 2/3] Fix KS230(US)_2.0_1.0.11.json File Ending --- tests/fixtures/iot/KS230(US)_2.0_1.0.11.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fixtures/iot/KS230(US)_2.0_1.0.11.json b/tests/fixtures/iot/KS230(US)_2.0_1.0.11.json index 718f17dc3..5a7829aa9 100644 --- a/tests/fixtures/iot/KS230(US)_2.0_1.0.11.json +++ b/tests/fixtures/iot/KS230(US)_2.0_1.0.11.json @@ -109,4 +109,4 @@ "updating": 0 } } -} \ No newline at end of file +} From a54678443c2423354a4cd9a6d4dbce04b68b3645 Mon Sep 17 00:00:00 2001 From: ZeliardM Date: Tue, 7 Jan 2025 10:36:41 -0500 Subject: [PATCH 3/3] Fix KS230(US)_2.0_1.0.11.json White Spaces --- tests/fixtures/iot/KS230(US)_2.0_1.0.11.json | 216 +++++++++---------- 1 file changed, 108 insertions(+), 108 deletions(-) diff --git a/tests/fixtures/iot/KS230(US)_2.0_1.0.11.json b/tests/fixtures/iot/KS230(US)_2.0_1.0.11.json index 5a7829aa9..213f24602 100644 --- a/tests/fixtures/iot/KS230(US)_2.0_1.0.11.json +++ b/tests/fixtures/iot/KS230(US)_2.0_1.0.11.json @@ -1,112 +1,112 @@ { - "cnCloud": { - "get_info": { - "binded": 1, + "cnCloud": { + "get_info": { + "binded": 1, "cld_connection": 1, - "err_code": 0, - "fwDlPage": "", - "fwNotifyType": -1, - "illegalType": 0, - "server": "n-devs.tplinkcloud.com", - "stopConnect": 0, - "tcspInfo": "", - "tcspStatus": 1, - "username": "user@example.com" - }, - "get_intl_fw_list": { - "err_code": 0, - "fw_list": [] - } - }, - "schedule": { - "get_next_action": { - "err_code": 0, - "type": -1 - }, + "err_code": 0, + "fwDlPage": "", + "fwNotifyType": -1, + "illegalType": 0, + "server": "n-devs.tplinkcloud.com", + "stopConnect": 0, + "tcspInfo": "", + "tcspStatus": 1, + "username": "user@example.com" + }, + "get_intl_fw_list": { + "err_code": 0, + "fw_list": [] + } + }, + "schedule": { + "get_next_action": { + "err_code": 0, + "type": -1 + }, "get_rules": { - "enable": 1, - "err_code": 0, - "rule_list": [], - "version": 2 - } - }, - "smartlife.iot.dimmer": { - "get_default_behavior": { - "double_click": { - "mode": "none" - }, - "err_code": 0, - "hard_on": { - "mode": "last_status" - }, - "long_press": { - "mode": "instant_on_off" - }, - "soft_on": { - "mode": "last_status" - } - }, - "get_dimmer_parameters": { - "bulb_type": 1, - "calibration_type": 0, - "err_code": 0, - "fadeOffTime": 1000, - "fadeOnTime": 1000, - "gentleOffTime": 10000, - "gentleOnTime": 3000, - "minThreshold": 11, - "rampRate": 30 - } - }, - "system": { - "get_sysinfo": { - "active_mode": "none", - "alias": "#MASKED_NAME#", - "brightness": 100, - "dc_state": 0, - "dev_name": "Wi-Fi Smart 3-Way Dimmer", - "deviceId": "0000000000000000000000000000000000000000", - "err_code": 0, - "feature": "TIM", - "hwId": "00000000000000000000000000000000", - "hw_ver": "2.0", - "icon_hash": "", - "latitude_i": 0, - "led_off": 0, - "longitude_i": 0, - "mac": "5C:E9:31:00:00:00", - "mic_type": "IOT.SMARTPLUGSWITCH", - "model": "KS230(US)", - "next_action": { - "type": -1 - }, - "ntc_state": 0, - "obd_src": "tplink", - "oemId": "00000000000000000000000000000000", - "on_time": 0, - "preferred_state": [ - { - "brightness": 100, - "index": 0 - }, - { - "brightness": 75, - "index": 1 - }, - { - "brightness": 50, - "index": 2 - }, - { - "brightness": 25, - "index": 3 - } - ], - "relay_state": 0, - "rssi": -41, - "status": "new", - "sw_ver": "1.0.11 Build 240516 Rel.104458", - "updating": 0 - } - } + "enable": 1, + "err_code": 0, + "rule_list": [], + "version": 2 + } + }, + "smartlife.iot.dimmer": { + "get_default_behavior": { + "double_click": { + "mode": "none" + }, + "err_code": 0, + "hard_on": { + "mode": "last_status" + }, + "long_press": { + "mode": "instant_on_off" + }, + "soft_on": { + "mode": "last_status" + } + }, + "get_dimmer_parameters": { + "bulb_type": 1, + "calibration_type": 0, + "err_code": 0, + "fadeOffTime": 1000, + "fadeOnTime": 1000, + "gentleOffTime": 10000, + "gentleOnTime": 3000, + "minThreshold": 11, + "rampRate": 30 + } + }, + "system": { + "get_sysinfo": { + "active_mode": "none", + "alias": "#MASKED_NAME#", + "brightness": 100, + "dc_state": 0, + "dev_name": "Wi-Fi Smart 3-Way Dimmer", + "deviceId": "0000000000000000000000000000000000000000", + "err_code": 0, + "feature": "TIM", + "hwId": "00000000000000000000000000000000", + "hw_ver": "2.0", + "icon_hash": "", + "latitude_i": 0, + "led_off": 0, + "longitude_i": 0, + "mac": "5C:E9:31:00:00:00", + "mic_type": "IOT.SMARTPLUGSWITCH", + "model": "KS230(US)", + "next_action": { + "type": -1 + }, + "ntc_state": 0, + "obd_src": "tplink", + "oemId": "00000000000000000000000000000000", + "on_time": 0, + "preferred_state": [ + { + "brightness": 100, + "index": 0 + }, + { + "brightness": 75, + "index": 1 + }, + { + "brightness": 50, + "index": 2 + }, + { + "brightness": 25, + "index": 3 + } + ], + "relay_state": 0, + "rssi": -41, + "status": "new", + "sw_ver": "1.0.11 Build 240516 Rel.104458", + "updating": 0 + } + } }