8000 Merge branch 'master' into dev-adc · python-kasa/python-kasa@0ca0ed2 · GitHub
[go: up one dir, main page]
Skip to content
Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 0ca0ed2

Browse files
sdb9696sdb9696
authored
Merge branch 'master' into dev-adc
2 parents 5dd71dd + 3071734 commit 0ca0ed2

File tree

288 files changed

+25798
-3362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

288 files changed

+25798
-3362
lines changed

‎.pre-commit-config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ repos:
1616
- id: check-yaml
1717
- id: debug-statements
1818
- id: check-ast
19+
- id: pretty-format-json
20+
args:
21+
- "--autofix"
22+
- "--indent=4"
1923

2024
- repo: https://github.com/astral-sh/ruff-pre-commit
2125
rev: v0.7.4

‎.readthedocs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ version: 2
22

33
formats: all
44

5+
sphinx:
6+
configuration: docs/source/conf.py
7+
8+
59
build:
610
os: ubuntu-22.04
711
tools:

‎CHANGELOG.md

Lines changed: 133 additions & 14 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,17 @@ The following devices have been tested and confirmed as working. If your device
178178
> [!NOTE]
179179
> The hub attached Tapo buttons S200B and S200D do not currently support alerting when the button is pressed.
180180
181+
> [!NOTE]
182+
> Some firmware versions of Tapo Cameras will not authenticate unless you enable "Tapo Lab" > "Third-Party Compatibility" in the native Tapo app.
183+
> Alternatively, you can factory reset and then prevent the device from accessing the internet.
184+
181185
<!--Do not edit text inside the SUPPORTED section below -->
182186
<!--SUPPORTED_START-->
183187
### Supported Kasa devices
184188

185189
- **Plugs**: EP10, EP25[^1], HS100[^2], HS103, HS105, HS110, KP100, KP105, KP115, KP125, KP125M[^1], KP401
186190
- **Power Strips**: EP40, EP40M[^1], HS107, HS300, KP200, KP303, KP400
187-
- **Wall Switches**: ES20M, HS200[^2], HS210, HS220[^2], KP405, KS200M, KS205[^1], KS220, KS220M, KS225[^1], KS230, KS240[^1]
191+
- **Wall Switches**: ES20M, HS200[^2], HS210, HS220[^2], KP405, KS200, KS200M, KS205[^1], KS220, KS220M, KS225[^1], KS230, KS240[^1]
188192
- **Bulbs**: KL110, KL120, KL125, KL130, KL135, KL50, KL60, LB110
189193
- **Light Strips**: KL400L5, KL420L5, KL430
190194
- **Hubs**: KH100[^1]
@@ -193,13 +197,14 @@ The following devices have been tested and confirmed as working. If your device
193197
### Supported Tapo[^1] devices
194198

195199
- **Plugs**: P100, P110, P110M, P115, P125M, P135, TP15
196-
- **Power Strips**: P300, P304M, TP25
197-
- **Wall Switches**: S500D, S505, S505D
200+
- **Power Strips**: P210M, P300, P304M, P306, TP25
201+
- **Wall Switches**: S210, S220, S500D, S505, S505D
198202
- **Bulbs**: L510B, L510E, L530E, L630
199203
- **Light Strips**: L900-10, L900-5, L920-5, L930-5
200-
- **Cameras**: C210, TC65
204+
- **Cameras**: C100, C210, C220, C225, C325WB, C520WS, C720, D230, TC65, TC70
201205
- **Hubs**: H100, H200
202206
- **Hub-Connected Devices[^3]**: S200B, S200D, T100, T110, T300, T310, T315
207+
- **Vacuums**: RV20 Max Plus, RV30 Max
203208

204209
<!--SUPPORTED_END-->
205210
[^1]: Model requires authentication
@@ -223,6 +228,7 @@ See [supported devices in our documentation](SUPPORTED.md) for more detailed inf
223228

224229
* [Home Assistant](https://www.home-assistant.io/integrations/tplink/)
225230
* [MQTT access to TP-Link devices, using python-kasa](https://github.com/flavio-fernandes/mqtt2kasa)
231+
* [Homebridge Kasa Python Plug-In](https://github.com/ZeliardM/homebridge-kasa-python)
226232

227233
### Other related projects
228234

‎RELEASING.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,12 @@ git rebase upstream/master
283283
git checkout -b janitor/merge_patch
284284
git fetch upstream patch
285285
git merge upstream/patch --no-commit
286+
# If there are any merge conflicts run the following command which will simply make master win
287+
# Do not run it if there are no conflicts as it will end up checking out upstream/master
286288
git diff --name-only --diff-filter=U | xargs git checkout upstream/master
289+
# Check the diff is as expected
287290
git diff --staged
288-
# The only diff should be the version in pyproject.toml and CHANGELOG.md
291+
# The only diff should be the version in pyproject.toml and uv.lock, and CHANGELOG.md
289292
# unless a change made on patch that was not part of a cherry-pick commit
290293
# If there are any other unexpected diffs `git checkout upstream/master [thefilename]`
291294
git commit -m "Merge patch into local master" -S

‎SUPPORTED.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ The following devices have been tested and confirmed as working. If your device
55
> [!NOTE]
66
> The hub attached Tapo buttons S200B and S200D do not currently support alerting when the button is pressed.
77
8+
> [!NOTE]
9+
> Some firmware versions of Tapo Cameras will not authenticate unless you enable "Tapo Lab" > "Third-Party Compatibility" in the native Tapo app.
10+
> Alternatively, you can factory reset and then prevent the device from accessing the internet.
811
912
<!--Do not edit text inside the SUPPORTED section below -->
1013
<!--SUPPORTED_START-->
@@ -90,13 +93,16 @@ Some newer Kasa devices require authentication. These are marked with [^1] in th
9093
- **HS210**
9194
- Hardware: 1.0 (US) / Firmware: 1.5.8
9295
- Hardware: 2.0 (US) / Firmware: 1.1.5
96+
- Hardware: 3.0 (US) / Firmware: 1.0.10
9397
- **HS220**
9498
- Hardware: 1.0 (US) / Firmware: 1.5.7
9599
- Hardware: 2.0 (US) / Firmware: 1.0.3
96100
- Hardware: 3.26 (US) / Firmware: 1.0.1[^1]
97101
- **KP405**
98102
- Hardware: 1.0 (US) / Firmware: 1.0.5
99103
- Hardware: 1.0 (US) / Firmware: 1.0.6
104+
- **KS200**
105+
- Hardware: 1.0 (US) / Firmware: 1.0.8
100106
- **KS200M**
101107
- Hardware: 1.0 (US) / Firmware: 1.0.10
102108
- Hardware: 1.0 (US) / Firmware: 1.0.11
@@ -114,6 +120,7 @@ Some newer Kasa devices require authentication. These are marked with [^1] in th
114120
- Hardware: 1.0 (US) / Firmware: 1.1.0[^1]
115121
- **KS230**
116122
- Hardware: 1.0 (US) / Firmware: 1.0.14
123+
- Hardware: 2.0 (US) / Firmware: 1.0.11
117124
- **KS240**
118125
- Hardware: 1.0 (US) / Firmware: 1.0.4[^1]
119126
- Hardware: 1.0 (US) / Firmware: 1.0.5[^1]
@@ -192,26 +199,36 @@ All Tapo devices require authentication.<br>Hub-Connected Devices may work acros
192199
- Hardware: 1.0 (EU) / Firmware: 1.2.3
193200
- **P115**
194201
- Hardware: 1.0 (EU) / Firmware: 1.2.3
202+
- Hardware: 1.0 (US) / Firmware: 1.1.3
195203
- **P125M**
196204
- Hardware: 1.0 (US) / Firmware: 1.1.0
197205
- **P135**
198206
- Hardware: 1.0 (US) / Firmware: 1.0.5
207+
- Hardware: 1.0 (US) / Firmware: 1.2.0
199208
- **TP15**
200209
- Hardware: 1.0 (US) / Firmware: 1.0.3
201210

202211
### Power Strips
203212

213+
- **P210M**
214+
- Hardware: 1.0 (US) / Firmware: 1.0.3
204215
- **P300**
205216
- Hardware: 1.0 (EU) / Firmware: 1.0.13
206217
- Hardware: 1.0 (EU) / Firmware: 1.0.15
207218
- Hardware: 1.0 (EU) / Firmware: 1.0.7
208219
- **P304M**
209220
- Hardware: 1.0 (UK) / Firmware: 1.0.3
221+
- **P306**
222+
- Hardware: 1.0 (US) / Firmware: 1.1.2
210223
- **TP25**
211224
- Hardware: 1.0 (US) / Firmware: 1.0.2
212225

213226
### Wall Switches
214227

228+
- **S210**
229+
- Hardware: 1.0 (EU) / Firmware: 1.9.0
230+
- **S220**
231+
- Hardware: 1.0 (EU) / Firmware: 1.9.0
215232
- **S500D**
216233
- Hardware: 1.0 (US) / Firmware: 1.0.5
217234
- **S505**
@@ -252,11 +269,28 @@ All Tapo devices require authentication.<br>Hub-Connected Devices may work acros
252269

253270
### Cameras
254271

272+
- **C100**
273+
- Hardware: 4.0 / Firmware: 1.3.14
255274
- **C210**
275+
- Hardware: 2.0 / Firmware: 1.3.11
256276
- Hardware: 2.0 (EU) / Firmware: 1.4.2
257277
- Hardware: 2.0 (EU) / Firmware: 1.4.3
278+
- **C220**
279+
- Hardware: 1.0 (EU) / Firmware: 1.2.2
280+
- **C225**
281+
- Hardware: 2.0 (US) / Firmware: 1.0.11
282+
- **C325WB**
283+
- Hardware: 1.0 (EU) / Firmware: 1.1.17
284+
- **C520WS**
285+
- Hardware: 1.0 (US) / Firmware: 1.2.8
286+
- **C720**
287+
- Hardware: 1.0 (US) / Firmware: 1.2.3
288+
- **D230**
289+
- Hardware: 1.20 (EU) / Firmware: 1.1.19
258290
- **TC65**
259291
- Hardware: 1.0 / Firmware: 1.3.9
292+
- **TC70**
293+
- Hardware: 3.0 / Firmware: 1.3.11
260294

261295
### Hubs
262296

@@ -266,6 +300,7 @@ All Tapo devices require authentication.<br>Hub-Connected Devices may work acros
266300
- Hardware: 1.0 (EU) / Firmware: 1.5.5
267301
- **H200**
268302
- Hardware: 1.0 (EU) / Firmware: 1.3.2
303+
- Hardware: 1.0 (EU) / Firmware: 1.3.6
269304
- Hardware: 1.0 (US) / Firmware: 1.3.6
270305

271306
### Hub-Connected Devices
@@ -291,6 +326,13 @@ All Tapo devices require authentication.<br>Hub-Connected Devices may work acros
291326
- Hardware: 1.0 (EU) / Firmware: 1.7.0
292327
- Hardware: 1.0 (US) / Firmware: 1.8.0
293328

329+
### Vacuums
330+
331+
- **RV20 Max Plus**
332+
- Hardware: 1.0 (EU) / Firmware: 1.0.7
333+
- **RV30 Max**
334+
- Hardware: 1.0 (US) / Firmware: 1.2.0
335+
294336

295337
<!--SUPPORTED_END-->
296338
[^1]: Model requires authentication

0 commit comments

Comments
 (0)
0