velbus-aio 2024.7.5__py3-none-any.whl → 2024.10.0__py3-none-any.whl

{velbus_aio-2024.7.5.dist-info → velbus_aio-2024.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: velbus-aio
-Version: 2024.7.5
+Version: 2024.10.0
 Summary: Open-source home automation platform running on Python 3.
 Author-email: Maikel Punie <maikel.punie@gmail.com>
 License: MIT
@@ -14,7 +14,6 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -25,14 +24,18 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pyserial >=3.5.0
-Requires-Dist: pyserial-asyncio-fast >=0.11
-Requires-Dist: backoff >=1.10.0
+Requires-Dist: pyserial>=3.5.0
+Requires-Dist: pyserial-asyncio-fast>=0.11
+Requires-Dist: backoff>=1.10.0
 Requires-Dist: aiofile
 
 ![CI](https://github.com/Cereal2nd/velbus-aio/actions/workflows/main.yml/badge.svg)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/Cereal2nd/velbus-aio/master.svg)](https://results.pre-commit.ci/latest/github/Cereal2nd/velbus-aio/master)
 
+> This project requires financial support, but it is free for you to use. You can join those helping to keep the lights on at:
+>
+> [<img src="https://raw.githubusercontent.com/Cereal2nd/hassio-velbusd/refs/heads/main/images/bmc-button.svg" width=150 height=40 style="margin: 5px"/>](https://buymeacoffee.com/cereal2nd) [<img src="https://raw.githubusercontent.com/Cereal2nd/hassio-velbusd/refs/heads/main/images/github-sponsors-button.svg" width=150 height=40 style="margin: 5px"/>](https://github.com/sponsors/Cereal2nd/)
+
 # velbus-aio
 
 Velbus Asyncio, a library to support the [Velbus](https://www.velbus.eu/) home automation system.

{velbus_aio-2024.7.5.dist-info → velbus_aio-2024.10.0.dist-info}/RECORD

@@ -1,20 +1,19 @@
 velbusaio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-velbusaio/channels.py,sha256=YdIMneLYj_zTa8e2dHmhZvGKcD3iyv5jMeZpfuORcTU,22910
-velbusaio/command_registry.py,sha256=j9KuLmada41PMEdtfPvLmXVOAZOkBM9zi-3kluwYffk,5140
-velbusaio/const.py,sha256=HyBLMJkzZ0ApJRjCffcWlSGr2c3Qgt6kFpdhLQwl--c,1862
-velbusaio/controller.py,sha256=GkYYf_JRWA5iKDdvO5cUJhKO5GZTlTeApcyilrjwxCA,7437
+velbusaio/channels.py,sha256=DRA06Qn3mOPzLoXPkV0-mRONTBza0ooE8ERqK98fxGA,22911
+velbusaio/command_registry.py,sha256=arn5x2Don1xKKiLxRAhQlD9bpYbr8UbfO0bi-43DpEM,5163
+velbusaio/const.py,sha256=aHClMaMS6NINTCrjeRwLbVzdvS91VgFKM8j61ks5tn0,1862
+velbusaio/controller.py,sha256=vKoDfEDlQF_L0ZrXU0L4yD61Adxr_qDma-e-dgWYz1w,7607
 velbusaio/discovery.py,sha256=Px6qoZl4QhF17aMz6JxstCORBpLzZGWEK9h4Vyvg57o,1649
 velbusaio/exceptions.py,sha256=FHkXaM3dK5Gkk-QGAf9dLE3FPlCU2FRZWUyY-4KRNnA,515
-velbusaio/handler.py,sha256=XDdr6snW5__0Q7EDrwLHv2O0SvXRtH_eKiWaLQuDka0,10862
+velbusaio/handler.py,sha256=OqMagEnNhxnn7ttA4Ob9dkSDEcNMTkd4zQDc6mn_E-M,11445
 velbusaio/helpers.py,sha256=iqpoereRH4JY5WAkozIqWvXWyRmhko-J-UGXDylFyEM,2537
 velbusaio/message.py,sha256=_MRuI4XnMcqeduCDJ3AwhAPL1B8VMstFDnjjLo8QuxM,5018
-velbusaio/module.py,sha256=OMFIa8VhJR-G_rg2PcGUdpmubLD6gDwVruN4ZCmwpMY,35215
-velbusaio/protocol.json,sha256=cQ2RsXomOjB-sd4fIu53QthOlkcfJSa7M0oGkzi9fJQ,253142
-velbusaio/protocol.py,sha256=3XhSFYe2GS-3fis5uClJV4tJxI_XO0x-JKZW0cD5cKs,8004
+velbusaio/module.py,sha256=SrPU91eqkfxThRH-cds-lC_8ZMb975Inw7lkvBfEmNE,36021
+velbusaio/protocol.py,sha256=RIpdL0vPlL4qE4bC8sEZSD0SRS4tWtR9MdzjTPSd2zs,8002
 velbusaio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 velbusaio/raw_message.py,sha256=ODoTPVAvyXXQSMXxtQO1U5OxcoQ4W8JJN5fotEDGSTo,4690
 velbusaio/util.py,sha256=FW6YCiPYWOCgqHDs8-LbzME0h81mqftYVG0qqZ-oo7Y,1568
-velbusaio/messages/__init__.py,sha256=hLkLhsJ5hcgRnhaoyFWz1g2vphdnjrXURxgwezkDBwU,5893
+velbusaio/messages/__init__.py,sha256=ZiApo-9boa5fcxzuaTH3dQ2m8nfTVjrG84pL5V6rFbg,5893
 velbusaio/messages/blind_status.py,sha256=yzjoYLBxH85tBjihiGzLqebRg1urz0obBA-3q1pqSCE,3418
 velbusaio/messages/bus_active.py,sha256=AB1mEvbMXRuOaC2CQ7hzKSLmbaJnyFqqXrARi-aSdtg,749
 velbusaio/messages/bus_error_counter_status.py,sha256=x0RIzil6IcXWq6GHEFYDkSAergNF51JQYyetDXjvvzY,1178
@@ -36,7 +35,7 @@ velbusaio/messages/dali_device_settings_request.py,sha256=InTnrwLD7l9gCHXKlJ69FH
 velbusaio/messages/dali_dim_value_status.py,sha256=Kgtfb65HCku4OBm6uaxKFpK3VtlYaTemSjMhZqngqkY,1059
 velbusaio/messages/dimmer_channel_status.py,sha256=uk0SqV3EMJcDGZjoJDA_iHEpgk57qaa7xg1CQkSlIvc,2484
 velbusaio/messages/dimmer_status.py,sha256=pWsWXJGWmYGio4FyUktI9aYnIBQkGCQ5ZwaeqnenYsU,2938
-velbusaio/messages/edge_set_color.py,sha256=enwPshhNrleAQQwc3RobPt5foZ1ynE_74SlBEuzd86w,3305
+velbusaio/messages/edge_set_color.py,sha256=YhxTv-WtDrZ_O67Ro6V-bcHrxj3tyBI1GuzTI5LkIVw,3306
 velbusaio/messages/edge_set_custom_color.py,sha256=Lz-7prBveqPwuDWv2Mn13X9TAXGBEquw8xz2_y9NtTk,1338
 velbusaio/messages/fast_blinking_led.py,sha256=_AaG6NcjzG_cBNARogzu56l7DNpGU11XGrDHIkMuKss,909
 velbusaio/messages/forced_off.py,sha256=RhYRkd7bbq4Nvg2mOp8Vmg3zvhyGeXYeAYJC8iQ_Bzw,591
@@ -96,8 +95,89 @@ velbusaio/messages/very_fast_blinking_led.py,sha256=vlMEern8PoOvtO5JaAk9erMR4IKJ
 velbusaio/messages/write_data_to_memory.py,sha256=gr6bi4SzK8Mw8fnp8yV-STq5jts7NoeV7zZgdptH5Vs,1039
 velbusaio/messages/write_memory_block.py,sha256=zGnNxx_M66HpBQ8S7kagtNw8_qSRHsOLk1MuiS0uygM,1032
 velbusaio/messages/write_module_address_and_serial_number.py,sha256=6y57j-md3btNtQddX5CUREtSs1Dzgkd953sQPZ3Pioo,1597
-velbus_aio-2024.7.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-velbus_aio-2024.7.5.dist-info/METADATA,sha256=18h6EjobeKywNvcN1lFJlkecK06lokdJnzOrvnbM0uQ,3282
-velbus_aio-2024.7.5.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-velbus_aio-2024.7.5.dist-info/top_level.txt,sha256=W0-lSOwD23mm8FqaIe9vY20fKicBMIdUVjF-zmfxRnY,15
-velbus_aio-2024.7.5.dist-info/RECORD,,
+velbusaio/module_spec/01.json,sha256=HgE7mouKohbnMbT_bPl1yo59py36daqyhyG5ZVVluzA,953
+velbusaio/module_spec/02.json,sha256=f5xCxEGlqu1lVdMBRu8IDXV1RMXNRgi0cDk_e24UhFc,158
+velbusaio/module_spec/03.json,sha256=a-nJbRjNfXpJsOAwGPkbQjJpF4QDBjj5N1HZezCWgnU,255
+velbusaio/module_spec/05.json,sha256=vhMw5m-9dlUSR6tbBFW9g7vYZHZytElDakPXL_ASubY,667
+velbusaio/module_spec/06.json,sha256=CA2ytfVrICIeIP2AWsYBThylN4hW5x5ez8578Ddaqrk,3138
+velbusaio/module_spec/07.json,sha256=YLR1SAcSM4PBdghWxKAhGGLomtB5tMWls7JNH7vVNzQ,161
+velbusaio/module_spec/08.json,sha256=d4-yNJtjwxyDJHrKzvxgEQt7Y0VyBQqL18Dz6FcglCg,443
+velbusaio/module_spec/09.json,sha256=RDzASLWiILU7vNU5sBonI9DhHhiPGC-4NrWH6hp52qg,378
+velbusaio/module_spec/0A.json,sha256=N7eN0ovOGyWkmm1jkGli_0a1fVRN1cWmIFclHG_JzCU,880
+velbusaio/module_spec/0B.json,sha256=DDGF-3jGLRcsCgjBwbZdrHO9mUwTFJzLBdlA5bszsmY,868
+velbusaio/module_spec/0C.json,sha256=lohrBMeic48nV5sbLO8KuJpj2Yz1xUDDtIlYLA0PcEA,236
+velbusaio/module_spec/0E.json,sha256=Avb1lYqFZvCjWbrQpV9AmrOnrMquYiqIcE7y8SwDxMw,744
+velbusaio/module_spec/0F.json,sha256=589CrCMqI-8oJScbOX-PzXwQmpeZk9Ugv2RY6UQkM6M,176
+velbusaio/module_spec/10.json,sha256=7cjhUlMrJNugZViuG0GT06krB-m0jtlHVvAAn33ACjI,3116
+velbusaio/module_spec/11.json,sha256=cCTs3wHrSY4DzHcWTWJFGlf9Wpie37633T5YOScyvKE,3113
+velbusaio/module_spec/12.json,sha256=RvNW9OC50EETMznnqSJBFrEoGlU1dG18NhEGY2IVrKU,1763
+velbusaio/module_spec/13.json,sha256=reXGXbaTfVVmLekrXHlfzjsV424bb0ozG7q-PxDv27U,68
+velbusaio/module_spec/14.json,sha256=ym2T2jCds-lC7QBZr7mqb0L9PlSmQflwpFnlEDxByjk,161
+velbusaio/module_spec/15.json,sha256=VDkI3bJRZgpfAsCiEzRJls7Hj7spmaKZ6XR8TjyymAQ,2698
+velbusaio/module_spec/16.json,sha256=9sdbNwyQQRkGsd477Oyu279tRcSydQC0bGwSQrhnVTU,3459
+velbusaio/module_spec/17.json,sha256=WeWeIV6euBGkPq7jBv5rbSykZwhDP6nPzrfk7rrYz-w,3490
+velbusaio/module_spec/18.json,sha256=ylZ7_86DYCkHxk40ZqsGYEkLeUslZ_-b_ftUihfJ2bQ,3484
+velbusaio/module_spec/1A.json,sha256=dvIxgufmgIhZhsBuVEa27KmukJyvnFciorqpxwRNWFM,2581
+velbusaio/module_spec/1B.json,sha256=JbHvdmoRnsqyqhCItsTOP-UK_Yz_ha1Km9CXDe68YVc,3159
+velbusaio/module_spec/1D.json,sha256=flql_3BEJxN49hCuyY7rPpt1oSrbWsXurjnivOFd3vo,2717
+velbusaio/module_spec/1E.json,sha256=tLisdUarUyS8Fk9oDsQy7TjmlkGs-vHrA8QbU6F7Pz4,5298
+velbusaio/module_spec/1F.json,sha256=oFb-HIrLBhIr_sPX8ZsIzOtpi_nHyfLkfoP1P0Ewg88,4386
+velbusaio/module_spec/20.json,sha256=ysngPSzynugxFZGd5bZD76nN1ZbjyiHiA1-HReJYm-Y,4393
+velbusaio/module_spec/21.json,sha256=Sj-oc76Oi_KAEuwnaLHL8GsbR_ClZHW0yPiD0D7vIOA,6815
+velbusaio/module_spec/22.json,sha256=u09uXlE65VIx4iALJo5SUF1hK3fgaOhuw4J1ighFXDM,6150
+velbusaio/module_spec/23.json,sha256=3jCtHfqaqHNVZ6QyG499ZKaIQyTqmTxqqLujmgTW4RY,3593
+velbusaio/module_spec/25.json,sha256=H87YnDGlgnEJzokWZkrfDtGGE-3JRJEYDRnKTlL69eE,24
+velbusaio/module_spec/28.json,sha256=FHyi0Ax7ve6k-e6vE8oTXsfLT7OqIMTXBtkhU3C7304,7712
+velbusaio/module_spec/29.json,sha256=S_L0wHyhtqeyh4dxd_6tX179rhb5OoCzD2zl3GqcQOI,4008
+velbusaio/module_spec/2A.json,sha256=RJIqQh-aqvtB4DifBe8oiaaC47tf_r8mAMX1iJ_O3yc,4170
+velbusaio/module_spec/2B.json,sha256=lxzrmcWLz9KHMLVbiMSfzqH7rS8Ww3De11k5pJErUlo,4173
+velbusaio/module_spec/2C.json,sha256=84VjlZ9j5DREO72wAhdDAF9hXRBvntGCZWbwXxVWkQk,4486
+velbusaio/module_spec/2D.json,sha256=jmOmVnjHjozr6Cu345hPPQWpgCI7kuF_VVVGDEB4QV8,5276
+velbusaio/module_spec/2E.json,sha256=VA1J1Sevkgnv-OA1T-mFSeWEg4hTq1LMydryq9S7Dq0,3654
+velbusaio/module_spec/2F.json,sha256=95h-w7HA_xQpMCZRyFvPjVQP3mCa9AZM4zFNzTSi7vY,3595
+velbusaio/module_spec/30.json,sha256=WJsy2Uw4oANze8h4eMJilIy5JDoy8yzsm2MJtUMiH9k,871
+velbusaio/module_spec/31.json,sha256=o9AqfLTdjQkSd77t97A-ttQxWLEJVyKG22Ie50vsRIY,8291
+velbusaio/module_spec/32.json,sha256=kZXAfVBSwYf6w9fUfo17-68lpQkM6toYTx6P_aKD7-g,6102
+velbusaio/module_spec/33.json,sha256=7uEWgRW9_MOEtbJKxA6GPR-sWR-OMYp6snLoTgVzeyQ,4119
+velbusaio/module_spec/34.json,sha256=h7jjGfZboTC3awV-RhCNggsZn-pz9ZB-lE9Z0SBPsJE,2897
+velbusaio/module_spec/35.json,sha256=evnYDd_jX2CsvrLtCDrE1Dml5eO7zCaYauoYMAarED0,2894
+velbusaio/module_spec/36.json,sha256=aQhIjfu2rSINQXP5ijmrmLKPk00XaLxJThbofjtKP9c,2888
+velbusaio/module_spec/37.json,sha256=Ks3d_aq3aLdG4EnUrtz2o1JPtRp-DVLPYYO2zvxkmdo,6942
+velbusaio/module_spec/38.json,sha256=fW5hUjUNF_6oJ1oREHDVEzhvqBPHHz-WUSFNuMmbwUw,1947
+velbusaio/module_spec/39.json,sha256=o9p-zOhyyAgOrZT8JYok4qKsIDmYQS62v1HsqI_-SMU,70
+velbusaio/module_spec/3A.json,sha256=mifj-U7M-55rTAo9L1DBSMbpBUOMwrhBuuvDG90loDQ,5307
+velbusaio/module_spec/3B.json,sha256=npHo1SGnY9RT1jgKsBjcwLQRUCOByvzGvVMmR7bZabY,5304
+velbusaio/module_spec/3C.json,sha256=uvJjyxp7mmY3ohBfNvRGk1FtVt6rWtlIqwLl6zIawkw,5298
+velbusaio/module_spec/3D.json,sha256=PQN562OodAmwmhKfOqk2Grt4w-kFxj00ApYH3x_xqOs,7721
+velbusaio/module_spec/3E.json,sha256=eu0pecAOfc7G3I3YCeUpCVXbKcaIOw2f0wGnEw6AKJY,5285
+velbusaio/module_spec/3F.json,sha256=F_zC4QIDqkyT9kM0fGsusKYIqqMtOhmlYbQ0DFKqeas,73
+velbusaio/module_spec/40.json,sha256=JkSmbb9uQ43VB0Aacif-lnHYj9-P-oFsOeGblu3sHRQ,71
+velbusaio/module_spec/41.json,sha256=d5KBfGAUSht8Fl4WXiJg6QIQHu0mAP2e9oT4t25lldU,4103
+velbusaio/module_spec/42.json,sha256=0zSbvyG6I2O3XAhv28R_v0IQvd_h4xLQIJDXVInYR6g,59
+velbusaio/module_spec/43.json,sha256=y_e_hGjiUlnNj_Dnw_2pKvrutSlp-mU6OTym9KVPTLQ,178
+velbusaio/module_spec/44.json,sha256=tYq0Y_dju2VztBX63LdorK3TEmMv0HlfYO_s9cZYJQ8,474
+velbusaio/module_spec/45.json,sha256=aAlc4ANbdDXJs7YhXm06te-gN43uaL80DS9qoinS2cQ,71
+velbusaio/module_spec/48.json,sha256=ejmocqJuZgGg5KWAIKD5m8Msaz3hfdrN2Iy5_mHAXF4,3119
+velbusaio/module_spec/49.json,sha256=BBjSLnQ8sFeGgfuUVbigFAZX7wvh5dxRVdZnwvU2doQ,3116
+velbusaio/module_spec/4A.json,sha256=1E2BqC7aOC7sC22g9Ep3XPC8Lmc6__JD8yKPhESzRuk,63
+velbusaio/module_spec/4B.json,sha256=ZDpirjZS8teOrfV1mYIyG-_9PMeeHr_736hz-P_EO2U,3403
+velbusaio/module_spec/4C.json,sha256=l1oMv_JnUEpEIFY1GZMUeXDWPjbUz98tZZ-4VsGxhsM,3464
+velbusaio/module_spec/4D.json,sha256=9Lho_3m4H5SBhx363zCDN3HnA8zLlygIi0EgXyOolF8,3213
+velbusaio/module_spec/4E.json,sha256=5OfV91FVLz6FHwLN34FvkGtBbg5cGeUdXxTdddB2RF0,8675
+velbusaio/module_spec/4F.json,sha256=ePImVotWcTbCvJ5xYN3hBqwZkGoRFEgFJV4AwXg474A,1631
+velbusaio/module_spec/50.json,sha256=xmchRD1S_Z4j3aLEafYsAZtW7bOWpWCWvUk-8SU3Zww,1628
+velbusaio/module_spec/51.json,sha256=8xrdwniKVokfLK9k44JIBr_xJ4H0yh8pN1SuX1-fOc0,1622
+velbusaio/module_spec/52.json,sha256=NcDjyS_j86oobJmENaRsbmELxEp79iBFn05zlzSvw5Q,3452
+velbusaio/module_spec/54.json,sha256=kvSx4rKnpU10h4DZtPk_RZxej7zltx4hjWEstOPiNE8,60
+velbusaio/module_spec/55.json,sha256=CZArOlcjtP-Dd57KXIcOFcTVj4UEkQmJtiERWZ02V44,60
+velbusaio/module_spec/56.json,sha256=3EFab88JQrLrRwoiA_qlaL7t6tlfPo_gwCei2XIM5E0,60
+velbusaio/module_spec/57.json,sha256=E_Ftam1UP57p6uQtmFe1gOOA_11_AIQMb8_Khf6XNTM,4313
+velbusaio/module_spec/5A.json,sha256=V_yhMdGrNxFE7J_CXJmngN-yYBz2V_tqXkKCCwI7HCE,52
+velbusaio/module_spec/5C.json,sha256=yw_XlccuFp-buRL_NXThwQLwblVRa0diLpUDm9Exrg0,1586
+velbusaio/module_spec/5F.json,sha256=ebSwLMUW5A4LCRGOrF-vwxSVvrWZMNUWz10Xrmz7SwM,1259
+velbusaio/module_spec/broadcast.json,sha256=L2Sc9FhZ7NOuu7K5g5jAhvUQGDP6a2CKrg-uWh_v-sA,2250
+velbus_aio-2024.10.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+velbus_aio-2024.10.0.dist-info/METADATA,sha256=OXylu4UVsk3uUjo0d5zmOUnAOWlo_lkDy-OCVLuDRqw,3754
+velbus_aio-2024.10.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+velbus_aio-2024.10.0.dist-info/top_level.txt,sha256=W0-lSOwD23mm8FqaIe9vY20fKicBMIdUVjF-zmfxRnY,15
+velbus_aio-2024.10.0.dist-info/RECORD,,

{velbus_aio-2024.7.5.dist-info → velbus_aio-2024.10.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.2.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

velbusaio/channels.py

@@ -19,7 +19,7 @@ from velbusaio.const import (
     VOLUME_LITERS_HOUR,
 )
 from velbusaio.message import Message
-from velbusaio.messages.edge_set_color import SetEdgeColorMessage, CustomColorPriority
+from velbusaio.messages.edge_set_color import CustomColorPriority, SetEdgeColorMessage
 from velbusaio.messages.module_status import PROGRAM_SELECTION
 
 if TYPE_CHECKING:
@@ -508,7 +508,7 @@ class Temperature(Channel):
     _min = None
     _target = 0
     _cmode = None
-    _coolmode = None
+    _cool_mode = None
     _cstatus = None
     _thermostat = False
     _sleep_timer = 0

velbusaio/command_registry.py

@@ -9,8 +9,8 @@ MODULE_DIRECTORY = {
     0x01: "VMB8PB",
     0x02: "VMB1RY",
     0x03: "VMB1BL",
-    0x04: "VMB4LEDPWM-20",
     0x05: "VMB6IN",
+    0x06: "VMB4LEDPWM-20",
     0x07: "VMB1DM",
     0x08: "VMB4RY",
     0x09: "VMB2BL",
@@ -73,14 +73,15 @@ MODULE_DIRECTORY = {
     0x4A: "VMB2BLE-10",
     0x4B: "VMB8DC-20",
     0x4C: "VMB6PB-20",
+    0x4D: "VMBPIR-20",
     0x4F: "VMBEL1-20",
     0x50: "VMBEL2-20",
     0x51: "VMBEL4-20",
     0x52: "VMBELO-20",
-    0x53: "VMBGP1-20",
-    0x54: "VMBGP2-20",
-    0x55: "VMBGP4-20",
-    0x56: "VMBGPO-20",
+    0x54: "VMBGP1-20",
+    0x55: "VMBGP2-20",
+    0x56: "VMBGP4-20",
+    0x57: "VMBGPO-20",
     0x5A: "VMBDALI-20",
     0x5C: "VMBEL4PIR-20",
     0x5F: "VMBGP4PIR-20",

velbusaio/const.py

@@ -40,7 +40,7 @@ NO_RTR: Final = 0x00
 CACHEDIR: Final = ".velbuscache"
 
 # Module scan timeout values (in mSec)
-SCAN_MODULETYPE_TIMEOUT: Final = 2000  # time to wait for ModuleTypeRequest
+SCAN_MODULETYPE_TIMEOUT: Final = 3000  # time to wait for ModuleTypeRequest
 SCAN_MODULEINFO_TIMEOUT_INITIAL: Final = 1000  # time to wait for first info (status)
 SCAN_MODULEINFO_TIMEOUT_INTERVAL: Final = (
     150  # time to wait for info interval (between next message)

velbusaio/controller.py

@@ -34,6 +34,7 @@ class Velbus:
         self,
         dsn: str,
         cache_dir: str = get_cache_dir(),
+        one_address: int | None = None,
     ) -> None:
         """Init the Velbus controller."""
         self._log = logging.getLogger("velbus")
@@ -46,7 +47,7 @@ class Velbus:
         self._auto_reconnect = True
 
         self._dsn = dsn
-        self._handler = PacketHandler(self)
+        self._handler = PacketHandler(self, one_address)
         self._modules: dict[int, Module] = {}
         self._submodules: list[int] = []
         self._send_queue: asyncio.Queue = asyncio.Queue()
@@ -67,11 +68,10 @@ class Velbus:
             self._log.debug("Reconnecting to transport")
             asyncio.ensure_future(self.connect())
 
-    def add_module(
+    async def add_module(
         self,
         addr: int,
         typ: int,
-        data: dict,
         serial: int | None = None,
         memorymap: int | None = None,
         build_year: int | None = None,
@@ -81,14 +81,13 @@ class Velbus:
         module = Module.factory(
             addr,
             typ,
-            data,
             serial=serial,
             build_year=build_year,
             build_week=build_week,
             memorymap=memorymap,
             cache_dir=self._cache_dir,
         )
-        module.initialize(self.send)
+        await module.initialize(self.send)
         self._modules[addr] = module
         self._log.info(f"Found module {addr}: {module}")
 
@@ -102,6 +101,10 @@ class Velbus:
             self._modules[sub_addr] = module
         module.cleanupSubChannels()
 
+    def addr_is_submodule(self, addr: int) -> bool:
+        """Check if an address is a submodule."""
+        return addr in self._submodules
+
     def get_modules(self) -> dict:
         """Return the module cache."""
         return self._modules

velbusaio/handler.py

@@ -5,30 +5,29 @@ Velbus packet handler
 
 from __future__ import annotations
 
-from velbusaio.const import SCAN_MODULETYPE_TIMEOUT
-from velbusaio.const import SCAN_MODULEINFO_TIMEOUT_INITIAL
-from velbusaio.const import SCAN_MODULEINFO_TIMEOUT_INTERVAL
-
 import asyncio
 import json
 import logging
-import threading
 import os
 import pathlib
-
-from aiofile import async_open
-
+import pprint
 from typing import TYPE_CHECKING, Awaitable, Callable
+
 import pkg_resources
+from aiofile import async_open
 
 from velbusaio.command_registry import commandRegistry
+from velbusaio.const import (
+    SCAN_MODULEINFO_TIMEOUT_INITIAL,
+    SCAN_MODULEINFO_TIMEOUT_INTERVAL,
+    SCAN_MODULETYPE_TIMEOUT,
+)
 from velbusaio.helpers import h2, keys_exists
 from velbusaio.message import Message
 from velbusaio.messages.module_subtype import ModuleSubTypeMessage
-from velbusaio.messages.module_type import ModuleTypeMessage, ModuleType2Message
+from velbusaio.messages.module_type import ModuleType2Message, ModuleTypeMessage
 from velbusaio.raw_message import RawMessage
 
-
 if TYPE_CHECKING:
     from velbusaio.controller import Velbus
 
@@ -41,21 +40,23 @@ class PacketHandler:
     def __init__(
         self,
         velbus: Velbus,
+        one_address: int | None = None,
     ) -> None:
         self._log = logging.getLogger("velbus-handler")
         self._log.setLevel(logging.DEBUG)
         self._velbus = velbus
+        self._one_address = one_address
         self._typeResponseReceived = asyncio.Event()
-        self._scanLock = threading.Lock()
+        self._scanLock = asyncio.Lock()
         self._modulescan_address = 0
         self._scan_complete = False
         self._scan_delay_msec = 0
 
     async def read_protocol_data(self):
         async with async_open(
-            pkg_resources.resource_filename(__name__, "protocol.json")
+            pkg_resources.resource_filename(__name__, "module_spec/broadcast.json")
         ) as protocol_file:
-            self.pdata = json.loads(await protocol_file.read())
+            self.broadcast = json.loads(await protocol_file.read())
 
     def empty_cache(self) -> bool:
         if (
@@ -84,12 +85,22 @@ class PacketHandler:
         while self._modulescan_address < 254:
             address = 0
             module = None
-            with self._scanLock:
+            async with self._scanLock:
                 self._modulescan_address = self._modulescan_address + 1
                 address = self._modulescan_address
+                if self._velbus.addr_is_submodule(address):
+                    self._log.info(
+                        f"Skipping submodule address {address}, already handled"
+                    )
+                    continue
+                self._log.info(f"Starting handling scan {address}")
                 module = self._velbus.get_module(address)
 
-            self._log.info(f"Starting handling scan {address}")
+            if self._one_address is not None and address != int(self._one_address):
+                self._log.info(
+                    f"Skipping address {address} as we requested to only scan one address {self._one_address}"
+                )
+                continue
 
             cfile = pathlib.Path(f"{self._velbus.get_cache_dir()}/{address}.json")
             # cleanup the old module cache if needed
@@ -107,7 +118,7 @@ class PacketHandler:
                         self._typeResponseReceived.wait(),
                         SCAN_MODULETYPE_TIMEOUT / 1000.0,
                     )
-                    with self._scanLock:
+                    async with self._scanLock:
                         module = self._velbus.get_module(address)
                 except asyncio.TimeoutError:
                     self._log.info(
@@ -115,20 +126,24 @@ class PacketHandler:
                     )
                 if module is not None:
                     try:
-                        self._log.debug(f"Module {address} detected: start loading")
+                        self._log.debug(
+                            f"Module {module._address} detected: start loading"
+                        )
                         await asyncio.wait_for(
                             module.load(from_cache=True),
                             SCAN_MODULEINFO_TIMEOUT_INITIAL / 1000.0,
                         )
-                        self._scan_delay_msec = SCAN_MODULEINFO_TIMEOUT_INITIAL
-                        while self._scan_delay_msec > 50 and not module.is_loaded():
+                        self._scan_delay_msec = module.get_initial_timeout()
+                        while (
+                            self._scan_delay_msec > 50 and not await module.is_loaded()
+                        ):
                             # self._log.debug(
-                            #    f"\t... waiting {self._scan_delay_msec} is_loaded={module.is_loaded()}"
+                            #    f"\t... waiting {self._scan_delay_msec} is_loaded={await module.is_loaded()}"
                             # )
                             self._scan_delay_msec = self._scan_delay_msec - 50
                             await asyncio.sleep(0.05)
                         self._log.info(
-                            f"Scan module {address} completed, module loaded={module.is_loaded()}"
+                            f"Scan module {address} completed, module loaded={await module.is_loaded()}"
                         )
                     except asyncio.TimeoutError:
                         self._log.error(
@@ -153,49 +168,47 @@ class PacketHandler:
         data = rawmsg.data_only
 
         # handle module type response message
-        if command_value == 0xFF:
-            if not self._scan_complete:
-                tmsg: ModuleTypeMessage = ModuleTypeMessage()
-                tmsg.populate(priority, address, rtr, data)
-                with self._scanLock:
-                    self._handle_module_type(tmsg)
-                    if address == self._modulescan_address:
-                        self._typeResponseReceived.set()
-                    else:
-                        self._log.debug(
-                            f"Unexpected module type message module address {address}, Velbuslink scan?"
-                        )
-                        self._modulescan_address = address - 1
+        if command_value == 0xFF and not self._scan_complete:
+            tmsg: ModuleTypeMessage = ModuleTypeMessage()
+            tmsg.populate(priority, address, rtr, data)
+            async with self._scanLock:
+                await self._handle_module_type(tmsg)
+                if address == self._modulescan_address:
+                    self._typeResponseReceived.set()
+                else:
+                    self._log.debug(
+                        f"Unexpected module type message module address {address}, Velbuslink scan?"
+                    )
+                    self._modulescan_address = address - 1
 
-                self._typeResponseReceived.set()
+            self._typeResponseReceived.set()
 
         # handle module subtype response message
-        elif command_value in (0xB0, 0xA7, 0xA6):
-            if not self._scan_complete:
-                msg: ModuleSubTypeMessage = ModuleSubTypeMessage()
-                msg.populate(priority, address, rtr, data)
-                if command_value == 0xB0:
-                    msg.sub_address_offset = 0
-                elif command_value == 0xA7:
-                    msg.sub_address_offset = 4
-                elif command_value == 0xA6:
-                    msg.sub_address_offset = 8
-                with self._scanLock:
-                    self._scan_delay_msec = SCAN_MODULEINFO_TIMEOUT_INITIAL
-                    self._handle_module_subtype(msg)
+        elif command_value in (0xB0, 0xA7, 0xA6) and not self._scan_complete:
+            msg: ModuleSubTypeMessage = ModuleSubTypeMessage()
+            msg.populate(priority, address, rtr, data)
+            if command_value == 0xB0:
+                msg.sub_address_offset = 0
+            elif command_value == 0xA7:
+                msg.sub_address_offset = 4
+            elif command_value == 0xA6:
+                msg.sub_address_offset = 8
+            async with self._scanLock:
+                self._scan_delay_msec += SCAN_MODULEINFO_TIMEOUT_INTERVAL
+                self._handle_module_subtype(msg)
 
         # ignore broadcast
-        elif command_value in self.pdata["MessagesBroadCast"]:
+        elif command_value in self.broadcast:
             self._log.debug(
                 "Received broadcast message {} from {}, ignoring".format(
-                    self.pdata["MessageBroadCast"][str(command_value).upper()], address
+                    self.broadcast[str(command_value).upper()], address
                 )
             )
 
         # handle other messages for modules that are already scanned
         else:
             module = None
-            with self._scanLock:
+            async with self._scanLock:
                 module = self._velbus.get_module(address)
             if module is not None:
                 module_type = module.get_type()
@@ -214,28 +227,29 @@ class PacketHandler:
                         0xFE,
                         0xCC,
                     ):  # names, memory data, memory block
-                        self._scan_delay_msec = SCAN_MODULEINFO_TIMEOUT_INTERVAL
+                        self._scan_delay_msec += SCAN_MODULEINFO_TIMEOUT_INTERVAL
                         # self._log.debug(f"Restart timeout {msg}")
                     # send the message to the modules
                     await module.on_message(msg)
                 else:
                     self._log.warning(f"NOT FOUND IN command_registry: {rawmsg}")
 
-    def _handle_module_type(self, msg: ModuleTypeMessage | ModuleType2Message) -> None:
+    async def _handle_module_type(
+        self, msg: ModuleTypeMessage | ModuleType2Message
+    ) -> None:
         """
         load the module data
         """
         if msg is not None:
             module = self._velbus.get_module(msg.address)
             if module is None:
-                data = keys_exists(self.pdata, "ModuleTypes", h2(msg.module_type))
-                if not data:
-                    self._log.warning(f"Module not recognized: {msg.module_type}")
-                    return
-                self._velbus.add_module(
+                # data = keys_exists(self.pdata, "ModuleTypes", h2(msg.module_type))
+                # if not data:
+                #    self._log.warning(f"Module not recognized: {msg.module_type}")
+                #    return
+                await self._velbus.add_module(
                     msg.address,
                     msg.module_type,
-                    data,
                     memorymap=msg.memory_map_version,
                     build_year=msg.build_year,
                     build_week=msg.build_week,

velbusaio/messages/__init__.py

@@ -51,13 +51,13 @@ from velbusaio.messages.memo_text import MemoTextMessage
 from velbusaio.messages.memory_data import MemoryDataMessage
 from velbusaio.messages.memory_data_block import MemoryDataBlockMessage
 from velbusaio.messages.memory_dump_request import MemoryDumpRequestMessage
-from velbusaio.messages.raw import MeteoRawMessage, SensorRawMessage
 from velbusaio.messages.module_status import ModuleStatusMessage, ModuleStatusMessage2
 from velbusaio.messages.module_status_request import ModuleStatusRequestMessage
 from velbusaio.messages.module_subtype import ModuleSubTypeMessage
-from velbusaio.messages.module_type import ModuleTypeMessage, ModuleType2Message
+from velbusaio.messages.module_type import ModuleType2Message, ModuleTypeMessage
 from velbusaio.messages.module_type_request import ModuleTypeRequestMessage
 from velbusaio.messages.push_button_status import PushButtonStatusMessage
+from velbusaio.messages.raw import MeteoRawMessage, SensorRawMessage
 from velbusaio.messages.read_data_block_from_memory import (
     ReadDataBlockFromMemoryMessage,
 )

velbusaio/messages/edge_set_color.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from enum import IntEnum
+
 from velbusaio.command_registry import register
 from velbusaio.message import Message