Compare commits
4 Commits
dev
...
e803dd4243
| Author | SHA1 | Date | |
|---|---|---|---|
| e803dd4243 | |||
| baf3d0b0ff | |||
| 7f43b93cb7 | |||
| 9fc58a827b |
11
Pipfile
11
Pipfile
@@ -5,6 +5,13 @@ name = "pypi"
|
|||||||
|
|
||||||
[packages]
|
[packages]
|
||||||
websockets = "*"
|
websockets = "*"
|
||||||
|
watchfiles = "*"
|
||||||
|
async-tkinter-loop = "*"
|
||||||
|
mido = "*"
|
||||||
|
python-rtmidi = "*"
|
||||||
|
pyaudio = "*"
|
||||||
|
aubio = "*"
|
||||||
|
websocket-client = "*"
|
||||||
|
|
||||||
[dev-packages]
|
[dev-packages]
|
||||||
|
|
||||||
@@ -12,5 +19,5 @@ websockets = "*"
|
|||||||
python_version = "3.12"
|
python_version = "3.12"
|
||||||
|
|
||||||
[scripts]
|
[scripts]
|
||||||
run = 'watchfiles "python main.py" main.py networking.py settings.py color_utils.py'
|
main = "python main.py"
|
||||||
|
dev = 'watchfiles "python src/main.py" src'
|
||||||
|
|||||||
321
Pipfile.lock
generated
321
Pipfile.lock
generated
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"_meta": {
|
"_meta": {
|
||||||
"hash": {
|
"hash": {
|
||||||
"sha256": "f7607d6d57851b07acb91db3698117d8af9ab03600cda23fd56c9ab927904d31"
|
"sha256": "4aaef0c08e86d190f036736e98ff0e932788c7b461e725840de5699a8758b9d5"
|
||||||
},
|
},
|
||||||
"pipfile-spec": 6,
|
"pipfile-spec": 6,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -16,6 +16,325 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"default": {
|
"default": {
|
||||||
|
"anyio": {
|
||||||
|
"hashes": [
|
||||||
|
"sha256:3f3fae35c96039744587aa5b8371e7e8e603c0702999535961dd336026973ba6",
|
||||||
|
"sha256:60e474ac86736bbfd6f210f7a61218939c318f43f9972497381f1c5e930ed3d1"
|
||||||
|
],
|
||||||
|
"markers": "python_version >= '3.9'",
|
||||||
|
"version": "==4.10.0"
|
||||||
|
},
|
||||||
|
"async-tkinter-loop": {
|
||||||
|
"hashes": [
|
||||||
|
"sha256:4c69f46ffdbac48dc44c296c3a7b00c4cc4f852c3d43aa2fa329991d1fadea02",
|
||||||
|
"sha256:509c418139847bcb2e47a5a6b6d24a2e2dca290bc468dad6b6b8029e8a865bfd"
|
||||||
|
],
|
||||||
|
"index": "pypi",
|
||||||
|
"markers": "python_version >= '3.8' and python_version < '4.0'",
|
||||||
|
"version": "==0.9.3"
|
||||||
|
},
|
||||||
|
"aubio": {
|
||||||
|
"hashes": [
|
||||||
|
"sha256:df1244f6c4cf5bea382c8c2d35aa43bc31f4cf631fe325ae3992c219546a4202"
|
||||||
|
],
|
||||||
|
"index": "pypi",
|
||||||
|
"version": "==0.4.9"
|
||||||
|
},
|
||||||
|
"idna": {
|
||||||
|
"hashes": [
|
||||||
|
"sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9",
|
||||||
|
"sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
|
||||||
|
],
|
||||||
|
"markers": "python_version >= '3.6'",
|
||||||
|
"version": "==3.10"
|
||||||
|
},
|
||||||
|
"mido": {
|
||||||
|
"hashes": [
|
||||||
|
"sha256:01033c9b10b049e4436fca2762194ca839b09a4334091dd3c34e7f4ae674fd8a",
|
||||||
|
"sha256:1aecb30b7f282404f17e43768cbf74a6a31bf22b3b783bdd117a1ce9d22cb74c"
|
||||||
|
],
|
||||||
|
"index": "pypi",
|
||||||
|
"markers": "python_version ~= '3.7'",
|
||||||
|
"version": "==1.3.3"
|
||||||
|
},
|
||||||
|
"numpy": {
|
||||||
|
"hashes": [
|
||||||
|
"sha256:07b62978075b67eee4065b166d000d457c82a1efe726cce608b9db9dd66a73a5",
|
||||||
|
"sha256:087ffc25890d89a43536f75c5fe8770922008758e8eeeef61733957041ed2f9b",
|
||||||
|
"sha256:092aeb3449833ea9c0bf0089d70c29ae480685dd2377ec9cdbbb620257f84631",
|
||||||
|
"sha256:095737ed986e00393ec18ec0b21b47c22889ae4b0cd2d5e88342e08b01141f58",
|
||||||
|
"sha256:0a4f2021a6da53a0d580d6ef5db29947025ae8b35b3250141805ea9a32bbe86b",
|
||||||
|
"sha256:103ea7063fa624af04a791c39f97070bf93b96d7af7eb23530cd087dc8dbe9dc",
|
||||||
|
"sha256:11e58218c0c46c80509186e460d79fbdc9ca1eb8d8aee39d8f2dc768eb781089",
|
||||||
|
"sha256:122bf5ed9a0221b3419672493878ba4967121514b1d7d4656a7580cd11dddcbf",
|
||||||
|
"sha256:14a91ebac98813a49bc6aa1a0dfc09513dcec1d97eaf31ca21a87221a1cdcb15",
|
||||||
|
"sha256:1f91e5c028504660d606340a084db4b216567ded1056ea2b4be4f9d10b67197f",
|
||||||
|
"sha256:20b8200721840f5621b7bd03f8dcd78de33ec522fc40dc2641aa09537df010c3",
|
||||||
|
"sha256:240259d6564f1c65424bcd10f435145a7644a65a6811cfc3201c4a429ba79170",
|
||||||
|
"sha256:2738534837c6a1d0c39340a190177d7d66fdf432894f469728da901f8f6dc910",
|
||||||
|
"sha256:27c9f90e7481275c7800dc9c24b7cc40ace3fdb970ae4d21eaff983a32f70c91",
|
||||||
|
"sha256:293b2192c6bcce487dbc6326de5853787f870aeb6c43f8f9c6496db5b1781e45",
|
||||||
|
"sha256:2c3271cc4097beb5a60f010bcc1cc204b300bb3eafb4399376418a83a1c6373c",
|
||||||
|
"sha256:2f4f0215edb189048a3c03bd5b19345bdfa7b45a7a6f72ae5945d2a28272727f",
|
||||||
|
"sha256:3dcf02866b977a38ba3ec10215220609ab9667378a9e2150615673f3ffd6c73b",
|
||||||
|
"sha256:4209f874d45f921bde2cff1ffcd8a3695f545ad2ffbef6d3d3c6768162efab89",
|
||||||
|
"sha256:448a66d052d0cf14ce9865d159bfc403282c9bc7bb2a31b03cc18b651eca8b1a",
|
||||||
|
"sha256:4ae6863868aaee2f57503c7a5052b3a2807cf7a3914475e637a0ecd366ced220",
|
||||||
|
"sha256:4d002ecf7c9b53240be3bb69d80f86ddbd34078bae04d87be81c1f58466f264e",
|
||||||
|
"sha256:4e6ecfeddfa83b02318f4d84acf15fbdbf9ded18e46989a15a8b6995dfbf85ab",
|
||||||
|
"sha256:508b0eada3eded10a3b55725b40806a4b855961040180028f52580c4729916a2",
|
||||||
|
"sha256:546aaf78e81b4081b2eba1d105c3b34064783027a06b3ab20b6eba21fb64132b",
|
||||||
|
"sha256:572d5512df5470f50ada8d1972c5f1082d9a0b7aa5944db8084077570cf98370",
|
||||||
|
"sha256:5ad4ebcb683a1f99f4f392cc522ee20a18b2bb12a2c1c42c3d48d5a1adc9d3d2",
|
||||||
|
"sha256:66459dccc65d8ec98cc7df61307b64bf9e08101f9598755d42d8ae65d9a7a6ee",
|
||||||
|
"sha256:6936aff90dda378c09bea075af0d9c675fe3a977a9d2402f95a87f440f59f619",
|
||||||
|
"sha256:69779198d9caee6e547adb933941ed7520f896fd9656834c300bdf4dd8642712",
|
||||||
|
"sha256:6f1ae3dcb840edccc45af496f312528c15b1f79ac318169d094e85e4bb35fdf1",
|
||||||
|
"sha256:71669b5daae692189540cffc4c439468d35a3f84f0c88b078ecd94337f6cb0ec",
|
||||||
|
"sha256:72c6df2267e926a6d5286b0a6d556ebe49eae261062059317837fda12ddf0c1a",
|
||||||
|
"sha256:72dbebb2dcc8305c431b2836bcc66af967df91be793d63a24e3d9b741374c450",
|
||||||
|
"sha256:754d6755d9a7588bdc6ac47dc4ee97867271b17cee39cb87aef079574366db0a",
|
||||||
|
"sha256:76c3e9501ceb50b2ff3824c3589d5d1ab4ac857b0ee3f8f49629d0de55ecf7c2",
|
||||||
|
"sha256:7a0e27186e781a69959d0230dd9909b5e26024f8da10683bd6344baea1885168",
|
||||||
|
"sha256:7d6e390423cc1f76e1b8108c9b6889d20a7a1f59d9a60cac4a050fa734d6c1e2",
|
||||||
|
"sha256:8145dd6d10df13c559d1e4314df29695613575183fa2e2d11fac4c208c8a1f73",
|
||||||
|
"sha256:8446acd11fe3dc1830568c941d44449fd5cb83068e5c70bd5a470d323d448296",
|
||||||
|
"sha256:852ae5bed3478b92f093e30f785c98e0cb62fa0a939ed057c31716e18a7a22b9",
|
||||||
|
"sha256:87c930d52f45df092f7578889711a0768094debf73cfcde105e2d66954358125",
|
||||||
|
"sha256:8b1224a734cd509f70816455c3cffe13a4f599b1bf7130f913ba0e2c0b2006c0",
|
||||||
|
"sha256:8dc082ea901a62edb8f59713c6a7e28a85daddcb67454c839de57656478f5b19",
|
||||||
|
"sha256:906a30249315f9c8e17b085cc5f87d3f369b35fedd0051d4a84686967bdbbd0b",
|
||||||
|
"sha256:938065908d1d869c7d75d8ec45f735a034771c6ea07088867f713d1cd3bbbe4f",
|
||||||
|
"sha256:9c144440db4bf3bb6372d2c3e49834cc0ff7bb4c24975ab33e01199e645416f2",
|
||||||
|
"sha256:9e196ade2400c0c737d93465327d1ae7c06c7cb8a1756121ebf54b06ca183c7f",
|
||||||
|
"sha256:a3ef07ec8cbc8fc9e369c8dcd52019510c12da4de81367d8b20bc692aa07573a",
|
||||||
|
"sha256:a7af9ed2aa9ec5950daf05bb11abc4076a108bd3c7db9aa7251d5f107079b6a6",
|
||||||
|
"sha256:a9f66e7d2b2d7712410d3bc5684149040ef5f19856f20277cd17ea83e5006286",
|
||||||
|
"sha256:aa098a5ab53fa407fded5870865c6275a5cd4101cfdef8d6fafc48286a96e981",
|
||||||
|
"sha256:af58de8745f7fa9ca1c0c7c943616c6fe28e75d0c81f5c295810e3c83b5be92f",
|
||||||
|
"sha256:b05a89f2fb84d21235f93de47129dd4f11c16f64c87c33f5e284e6a3a54e43f2",
|
||||||
|
"sha256:b5e40e80299607f597e1a8a247ff8d71d79c5b52baa11cc1cce30aa92d2da6e0",
|
||||||
|
"sha256:b9d0878b21e3918d76d2209c924ebb272340da1fb51abc00f986c258cd5e957b",
|
||||||
|
"sha256:bc3186bea41fae9d8e90c2b4fb5f0a1f5a690682da79b92574d63f56b529080b",
|
||||||
|
"sha256:c63d95dc9d67b676e9108fe0d2182987ccb0f11933c1e8959f42fa0da8d4fa56",
|
||||||
|
"sha256:c771cfac34a4f2c0de8e8c97312d07d64fd8f8ed45bc9f5726a7e947270152b5",
|
||||||
|
"sha256:c8d9727f5316a256425892b043736d63e89ed15bbfe6556c5ff4d9d4448ff3b3",
|
||||||
|
"sha256:cbc95b3813920145032412f7e33d12080f11dc776262df1712e1638207dde9e8",
|
||||||
|
"sha256:cefc2219baa48e468e3db7e706305fcd0c095534a192a08f31e98d83a7d45fb0",
|
||||||
|
"sha256:d95f59afe7f808c103be692175008bab926b59309ade3e6d25009e9a171f7036",
|
||||||
|
"sha256:dd937f088a2df683cbb79dda9a772b62a3e5a8a7e76690612c2737f38c6ef1b6",
|
||||||
|
"sha256:de6ea4e5a65d5a90c7d286ddff2b87f3f4ad61faa3db8dabe936b34c2275b6f8",
|
||||||
|
"sha256:e0486a11ec30cdecb53f184d496d1c6a20786c81e55e41640270130056f8ee48",
|
||||||
|
"sha256:ee807923782faaf60d0d7331f5e86da7d5e3079e28b291973c545476c2b00d07",
|
||||||
|
"sha256:efc81393f25f14d11c9d161e46e6ee348637c0a1e8a54bf9dedc472a3fae993b",
|
||||||
|
"sha256:f0a1a8476ad77a228e41619af2fa9505cf69df928e9aaa165746584ea17fed2b",
|
||||||
|
"sha256:f75018be4980a7324edc5930fe39aa391d5734531b1926968605416ff58c332d",
|
||||||
|
"sha256:f92d6c2a8535dc4fe4419562294ff957f83a16ebdec66df0805e473ffaad8bd0",
|
||||||
|
"sha256:fb1752a3bb9a3ad2d6b090b88a9a0ae1cd6f004ef95f75825e2f382c183b2097",
|
||||||
|
"sha256:fc927d7f289d14f5e037be917539620603294454130b6de200091e23d27dc9be",
|
||||||
|
"sha256:fed5527c4cf10f16c6d0b6bee1f89958bccb0ad2522c8cadc2efd318bcd545f5"
|
||||||
|
],
|
||||||
|
"markers": "python_version >= '3.11'",
|
||||||
|
"version": "==2.3.2"
|
||||||
|
},
|
||||||
|
"packaging": {
|
||||||
|
"hashes": [
|
||||||
|
"sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484",
|
||||||
|
"sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f"
|
||||||
|
],
|
||||||
|
"markers": "python_version >= '3.8'",
|
||||||
|
"version": "==25.0"
|
||||||
|
},
|
||||||
|
"pyaudio": {
|
||||||
|
"hashes": [
|
||||||
|
"sha256:009f357ee5aa6bc8eb19d69921cd30e98c42cddd34210615d592a71d09c4bd57",
|
||||||
|
"sha256:126065b5e82a1c03ba16e7c0404d8f54e17368836e7d2d92427358ad44fefe61",
|
||||||
|
"sha256:12f2f1ba04e06ff95d80700a78967897a489c05e093e3bffa05a84ed9c0a7fa3",
|
||||||
|
"sha256:2a166fc88d435a2779810dd2678354adc33499e9d4d7f937f28b20cc55893e83",
|
||||||
|
"sha256:2dac0d6d675fe7e181ba88f2de88d321059b69abd52e3f4934a8878e03a7a074",
|
||||||
|
"sha256:506b32a595f8693811682ab4b127602d404df7dfc453b499c91a80d0f7bad289",
|
||||||
|
"sha256:5fce4bcdd2e0e8c063d835dbe2860dac46437506af509353c7f8114d4bacbd5b",
|
||||||
|
"sha256:692d8c1446f52ed2662120bcd9ddcb5aa2b71f38bda31e58b19fb4672fffba69",
|
||||||
|
"sha256:78dfff3879b4994d1f4fc6485646a57755c6ee3c19647a491f790a0895bd2f87",
|
||||||
|
"sha256:858caf35b05c26d8fc62f1efa2e8f53d5fa1a01164842bd622f70ddc41f55000",
|
||||||
|
"sha256:95328285b4dab57ea8c52a4a996cb52be6d629353315be5bfda403d15932a497",
|
||||||
|
"sha256:bbeb01d36a2f472ae5ee5e1451cacc42112986abe622f735bb870a5db77cf903",
|
||||||
|
"sha256:f745109634a7c19fa4d6b8b7d6967c3123d988c9ade0cd35d4295ee1acdb53e9"
|
||||||
|
],
|
||||||
|
"index": "pypi",
|
||||||
|
"version": "==0.2.14"
|
||||||
|
},
|
||||||
|
"python-rtmidi": {
|
||||||
|
"hashes": [
|
||||||
|
"sha256:052c89933cae4fca354012d8ca7248f4f9e1e3f062471409d48415a7f7d7e59e",
|
||||||
|
"sha256:1d5da765184150fb946043d59be4039b36a8060ede025f109ef20492dbf99075",
|
||||||
|
"sha256:25f5a5db7be98911c41ca5bebb262fcf9a7c89600b88fd3c207ceafd3101e721",
|
||||||
|
"sha256:26149186367341bf5b0a3ac17b495f6a25950bd3da6b4f13d25ac0a9ce8208dd",
|
||||||
|
"sha256:271d625c489fffb39b3edc5aba67f7c8e29a04a0a0f056ce19e5a888a08b4c59",
|
||||||
|
"sha256:29661939f9b7bd1a4e29835f50f4790e741dacd21a5cb143297aefb51deefdec",
|
||||||
|
"sha256:29d9c9d9f82ce679fecad7bb4cb79f3a24574ea84600e377194b4cc1baacec0e",
|
||||||
|
"sha256:30d117193dcad8af67c600c405f53eb096e4ff84849760be14c97270af334922",
|
||||||
|
"sha256:46bbf32c8a4bf6c8f0df1c02a68689d0757f13cb7a69f27ccbbed3d7b2365918",
|
||||||
|
"sha256:4e234dca7f9d783dd3f1e9c9c5c2f295f02b7af3085301d6eed3b428cf49d327",
|
||||||
|
"sha256:5443634597eb340cdec0734f76267a827c2d366f00a6f9195141c78828016ac2",
|
||||||
|
"sha256:5966172ed28add6ff2b76d389702931bfc7ff3cc741c0e4b0d1aaae269ab7a8e",
|
||||||
|
"sha256:7bce7f17c71a71d8ef0bfeae3cb8a7652dd02f0d5067de882e1ee44eb38518db",
|
||||||
|
"sha256:7f9ade68b068ae09000ecb562ae9521da3a234361ad5449e83fc734544d004fa",
|
||||||
|
"sha256:82e61bc1b51aa91d9e615827056e80f78dbe364248eecd61698b233f7af903f6",
|
||||||
|
"sha256:844bd12840c9d4e03dfc89b2cd57c55dcbf5ed7246504d69c6c661732249b19c",
|
||||||
|
"sha256:878ce085dfb65c0974810a7e919f73708cbb4c0430c7924b78f25aea1dd4ebee",
|
||||||
|
"sha256:8bbaf7c7164471712a93ac60c8f9ed146b336a294a5103223bbaf8f10709a0bf",
|
||||||
|
"sha256:a5582983ad57ea7f0a7797ddc3e258efb00f8326113b6ddfa85b5165a4151806",
|
||||||
|
"sha256:a706e9850e22acc57fa840c60fdc4541baafe462a05ff7631a6d9eb91c65e171",
|
||||||
|
"sha256:c60dd180e5130fb87571e71aea30e2ef0512131aab45865a7d67063ed8e52ca4",
|
||||||
|
"sha256:cec30924e305f55284594ccf35a71dee7216fd308dfa2dec1b3ed03e6f243803",
|
||||||
|
"sha256:cfea32c91752fa7aecfe3d6827535c190ba0e646a9accd6604f4fc70cf4b780f",
|
||||||
|
"sha256:dd2bcbea822488fca6b8d9fc7e78a91da12914f3b88dc086f051cb65a643449f",
|
||||||
|
"sha256:efc07413b30b0039c0d35abe25a81d740c7405124eb58eed141a8f24388e6fe0",
|
||||||
|
"sha256:f2138005c6bd3d8b9af05df383679f6d0827d16056e68a941110732310dcb7dd"
|
||||||
|
],
|
||||||
|
"index": "pypi",
|
||||||
|
"markers": "python_version >= '3.8'",
|
||||||
|
"version": "==1.5.8"
|
||||||
|
},
|
||||||
|
"sniffio": {
|
||||||
|
"hashes": [
|
||||||
|
"sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2",
|
||||||
|
"sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc"
|
||||||
|
],
|
||||||
|
"markers": "python_version >= '3.7'",
|
||||||
|
"version": "==1.3.1"
|
||||||
|
},
|
||||||
|
"typing-extensions": {
|
||||||
|
"hashes": [
|
||||||
|
"sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466",
|
||||||
|
"sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548"
|
||||||
|
],
|
||||||
|
"markers": "python_version >= '3.9'",
|
||||||
|
"version": "==4.15.0"
|
||||||
|
},
|
||||||
|
"watchfiles": {
|
||||||
|
"hashes": [
|
||||||
|
"sha256:00645eb79a3faa70d9cb15c8d4187bb72970b2470e938670240c7998dad9f13a",
|
||||||
|
"sha256:04e4ed5d1cd3eae68c89bcc1a485a109f39f2fd8de05f705e98af6b5f1861f1f",
|
||||||
|
"sha256:0a7d40b77f07be87c6faa93d0951a0fcd8cbca1ddff60a1b65d741bac6f3a9f6",
|
||||||
|
"sha256:0ece16b563b17ab26eaa2d52230c9a7ae46cf01759621f4fbbca280e438267b3",
|
||||||
|
"sha256:11ee4444250fcbeb47459a877e5e80ed994ce8e8d20283857fc128be1715dac7",
|
||||||
|
"sha256:12b0a02a91762c08f7264e2e79542f76870c3040bbc847fb67410ab81474932a",
|
||||||
|
"sha256:12fe8eaffaf0faa7906895b4f8bb88264035b3f0243275e0bf24af0436b27259",
|
||||||
|
"sha256:130fc497b8ee68dce163e4254d9b0356411d1490e868bd8790028bc46c5cc297",
|
||||||
|
"sha256:17ab167cca6339c2b830b744eaf10803d2a5b6683be4d79d8475d88b4a8a4be1",
|
||||||
|
"sha256:199207b2d3eeaeb80ef4411875a6243d9ad8bc35b07fc42daa6b801cc39cc41c",
|
||||||
|
"sha256:20ecc8abbd957046f1fe9562757903f5eaf57c3bce70929fda6c7711bb58074a",
|
||||||
|
"sha256:239736577e848678e13b201bba14e89718f5c2133dfd6b1f7846fa1b58a8532b",
|
||||||
|
"sha256:249590eb75ccc117f488e2fabd1bfa33c580e24b96f00658ad88e38844a040bb",
|
||||||
|
"sha256:27f30e14aa1c1e91cb653f03a63445739919aef84c8d2517997a83155e7a2fcc",
|
||||||
|
"sha256:29e7bc2eee15cbb339c68445959108803dc14ee0c7b4eea556400131a8de462b",
|
||||||
|
"sha256:328dbc9bff7205c215a7807da7c18dce37da7da718e798356212d22696404339",
|
||||||
|
"sha256:32d6d4e583593cb8576e129879ea0991660b935177c0f93c6681359b3654bfa9",
|
||||||
|
"sha256:3366f56c272232860ab45c77c3ca7b74ee819c8e1f6f35a7125556b198bbc6df",
|
||||||
|
"sha256:3434e401f3ce0ed6b42569128b3d1e3af773d7ec18751b918b89cd49c14eaafb",
|
||||||
|
"sha256:37d3d3f7defb13f62ece99e9be912afe9dd8a0077b7c45ee5a57c74811d581a4",
|
||||||
|
"sha256:3a6fd40bbb50d24976eb275ccb55cd1951dfb63dbc27cae3066a6ca5f4beabd5",
|
||||||
|
"sha256:3aba215958d88182e8d2acba0fdaf687745180974946609119953c0e112397dc",
|
||||||
|
"sha256:406520216186b99374cdb58bc48e34bb74535adec160c8459894884c983a149c",
|
||||||
|
"sha256:4281cd9fce9fc0a9dbf0fc1217f39bf9cf2b4d315d9626ef1d4e87b84699e7e8",
|
||||||
|
"sha256:42f92befc848bb7a19658f21f3e7bae80d7d005d13891c62c2cd4d4d0abb3433",
|
||||||
|
"sha256:48aa25e5992b61debc908a61ab4d3f216b64f44fdaa71eb082d8b2de846b7d12",
|
||||||
|
"sha256:5007f860c7f1f8df471e4e04aaa8c43673429047d63205d1630880f7637bca30",
|
||||||
|
"sha256:50a51a90610d0845a5931a780d8e51d7bd7f309ebc25132ba975aca016b576a0",
|
||||||
|
"sha256:51556d5004887045dba3acdd1fdf61dddea2be0a7e18048b5e853dcd37149b86",
|
||||||
|
"sha256:51b81e55d40c4b4aa8658427a3ee7ea847c591ae9e8b81ef94a90b668999353c",
|
||||||
|
"sha256:5366164391873ed76bfdf618818c82084c9db7fac82b64a20c44d335eec9ced5",
|
||||||
|
"sha256:54062ef956807ba806559b3c3d52105ae1827a0d4ab47b621b31132b6b7e2866",
|
||||||
|
"sha256:60022527e71d1d1fda67a33150ee42869042bce3d0fcc9cc49be009a9cded3fb",
|
||||||
|
"sha256:622d6b2c06be19f6e89b1d951485a232e3b59618def88dbeda575ed8f0d8dbf2",
|
||||||
|
"sha256:62cc7a30eeb0e20ecc5f4bd113cd69dcdb745a07c68c0370cea919f373f65d9e",
|
||||||
|
"sha256:693ed7ec72cbfcee399e92c895362b6e66d63dac6b91e2c11ae03d10d503e575",
|
||||||
|
"sha256:6d2404af8db1329f9a3c9b79ff63e0ae7131986446901582067d9304ae8aaf7f",
|
||||||
|
"sha256:7049e52167fc75fc3cc418fc13d39a8e520cbb60ca08b47f6cedb85e181d2f2a",
|
||||||
|
"sha256:7080c4bb3efd70a07b1cc2df99a7aa51d98685be56be6038c3169199d0a1c69f",
|
||||||
|
"sha256:7738027989881e70e3723c75921f1efa45225084228788fc59ea8c6d732eb30d",
|
||||||
|
"sha256:7a7bd57a1bb02f9d5c398c0c1675384e7ab1dd39da0ca50b7f09af45fa435277",
|
||||||
|
"sha256:7b3443f4ec3ba5aa00b0e9fa90cf31d98321cbff8b925a7c7b84161619870bc9",
|
||||||
|
"sha256:7c55b0f9f68590115c25272b06e63f0824f03d4fc7d6deed43d8ad5660cabdbf",
|
||||||
|
"sha256:7fd1b3879a578a8ec2076c7961076df540b9af317123f84569f5a9ddee64ce92",
|
||||||
|
"sha256:8076a5769d6bdf5f673a19d51da05fc79e2bbf25e9fe755c47595785c06a8c72",
|
||||||
|
"sha256:80f811146831c8c86ab17b640801c25dc0a88c630e855e2bef3568f30434d52b",
|
||||||
|
"sha256:8412eacef34cae2836d891836a7fff7b754d6bcac61f6c12ba5ca9bc7e427b68",
|
||||||
|
"sha256:865c8e95713744cf5ae261f3067861e9da5f1370ba91fc536431e29b418676fa",
|
||||||
|
"sha256:86b1e28d4c37e89220e924305cd9f82866bb0ace666943a6e4196c5df4d58dcc",
|
||||||
|
"sha256:891c69e027748b4a73847335d208e374ce54ca3c335907d381fde4e41661b13b",
|
||||||
|
"sha256:8ac164e20d17cc285f2b94dc31c384bc3aa3dd5e7490473b3db043dd70fbccfd",
|
||||||
|
"sha256:8c5701dc474b041e2934a26d31d39f90fac8a3dee2322b39f7729867f932b1d4",
|
||||||
|
"sha256:90ebb429e933645f3da534c89b29b665e285048973b4d2b6946526888c3eb2c7",
|
||||||
|
"sha256:923fec6e5461c42bd7e3fd5ec37492c6f3468be0499bc0707b4bbbc16ac21792",
|
||||||
|
"sha256:935f9edd022ec13e447e5723a7d14456c8af254544cefbc533f6dd276c9aa0d9",
|
||||||
|
"sha256:95ab1594377effac17110e1352989bdd7bdfca9ff0e5eeccd8c69c5389b826d0",
|
||||||
|
"sha256:9974d2f7dc561cce3bb88dfa8eb309dab64c729de85fba32e98d75cf24b66297",
|
||||||
|
"sha256:9c733cda03b6d636b4219625a4acb5c6ffb10803338e437fb614fef9516825ef",
|
||||||
|
"sha256:9dc001c3e10de4725c749d4c2f2bdc6ae24de5a88a339c4bce32300a31ede179",
|
||||||
|
"sha256:9f811079d2f9795b5d48b55a37aa7773680a5659afe34b54cc1d86590a51507d",
|
||||||
|
"sha256:a2726d7bfd9f76158c84c10a409b77a320426540df8c35be172444394b17f7ea",
|
||||||
|
"sha256:a479466da6db5c1e8754caee6c262cd373e6e6c363172d74394f4bff3d84d7b5",
|
||||||
|
"sha256:a543492513a93b001975ae283a51f4b67973662a375a403ae82f420d2c7205ee",
|
||||||
|
"sha256:a89c75a5b9bc329131115a409d0acc16e8da8dfd5867ba59f1dd66ae7ea8fa82",
|
||||||
|
"sha256:a8f6f72974a19efead54195bc9bed4d850fc047bb7aa971268fd9a8387c89011",
|
||||||
|
"sha256:a9ccbf1f129480ed3044f540c0fdbc4ee556f7175e5ab40fe077ff6baf286d4e",
|
||||||
|
"sha256:aa0cc8365ab29487eb4f9979fd41b22549853389e22d5de3f134a6796e1b05a4",
|
||||||
|
"sha256:adb4167043d3a78280d5d05ce0ba22055c266cf8655ce942f2fb881262ff3cdf",
|
||||||
|
"sha256:af06c863f152005c7592df1d6a7009c836a247c9d8adb78fef8575a5a98699db",
|
||||||
|
"sha256:b067915e3c3936966a8607f6fe5487df0c9c4afb85226613b520890049deea20",
|
||||||
|
"sha256:b7c5f6fe273291f4d414d55b2c80d33c457b8a42677ad14b4b47ff025d0893e4",
|
||||||
|
"sha256:b915daeb2d8c1f5cee4b970f2e2c988ce6514aace3c9296e58dd64dc9aa5d575",
|
||||||
|
"sha256:ba0e3255b0396cac3cc7bbace76404dd72b5438bf0d8e7cefa2f79a7f3649caa",
|
||||||
|
"sha256:bda8136e6a80bdea23e5e74e09df0362744d24ffb8cd59c4a95a6ce3d142f79c",
|
||||||
|
"sha256:bfe3c517c283e484843cb2e357dd57ba009cff351edf45fb455b5fbd1f45b15f",
|
||||||
|
"sha256:c588c45da9b08ab3da81d08d7987dae6d2a3badd63acdb3e206a42dbfa7cb76f",
|
||||||
|
"sha256:c600e85f2ffd9f1035222b1a312aff85fd11ea39baff1d705b9b047aad2ce267",
|
||||||
|
"sha256:c68e9f1fcb4d43798ad8814c4c1b61547b014b667216cb754e606bfade587018",
|
||||||
|
"sha256:c9649dfc57cc1f9835551deb17689e8d44666315f2e82d337b9f07bd76ae3aa2",
|
||||||
|
"sha256:cb45350fd1dc75cd68d3d72c47f5b513cb0578da716df5fba02fff31c69d5f2d",
|
||||||
|
"sha256:cbcf8630ef4afb05dc30107bfa17f16c0896bb30ee48fc24bf64c1f970f3b1fd",
|
||||||
|
"sha256:cbd949bdd87567b0ad183d7676feb98136cde5bb9025403794a4c0db28ed3a47",
|
||||||
|
"sha256:cc08ef8b90d78bfac66f0def80240b0197008e4852c9f285907377b2947ffdcb",
|
||||||
|
"sha256:cd17a1e489f02ce9117b0de3c0b1fab1c3e2eedc82311b299ee6b6faf6c23a29",
|
||||||
|
"sha256:d05686b5487cfa2e2c28ff1aa370ea3e6c5accfe6435944ddea1e10d93872147",
|
||||||
|
"sha256:d0e10e6f8f6dc5762adee7dece33b722282e1f59aa6a55da5d493a97282fedd8",
|
||||||
|
"sha256:d181ef50923c29cf0450c3cd47e2f0557b62218c50b2ab8ce2ecaa02bd97e670",
|
||||||
|
"sha256:d1caf40c1c657b27858f9774d5c0e232089bca9cb8ee17ce7478c6e9264d2587",
|
||||||
|
"sha256:d7642b9bc4827b5518ebdb3b82698ada8c14c7661ddec5fe719f3e56ccd13c97",
|
||||||
|
"sha256:d9481174d3ed982e269c090f780122fb59cee6c3796f74efe74e70f7780ed94c",
|
||||||
|
"sha256:d9ba68ec283153dead62cbe81872d28e053745f12335d037de9cbd14bd1877f5",
|
||||||
|
"sha256:da71945c9ace018d8634822f16cbc2a78323ef6c876b1d34bbf5d5222fd6a72e",
|
||||||
|
"sha256:dc44678a72ac0910bac46fa6a0de6af9ba1355669b3dfaf1ce5f05ca7a74364e",
|
||||||
|
"sha256:df32d59cb9780f66d165a9a7a26f19df2c7d24e3bd58713108b41d0ff4f929c6",
|
||||||
|
"sha256:df670918eb7dd719642e05979fc84704af913d563fd17ed636f7c4783003fdcc",
|
||||||
|
"sha256:e78b6ed8165996013165eeabd875c5dfc19d41b54f94b40e9fff0eb3193e5e8e",
|
||||||
|
"sha256:ed8fc66786de8d0376f9f913c09e963c66e90ced9aa11997f93bdb30f7c872a8",
|
||||||
|
"sha256:eff4b8d89f444f7e49136dc695599a591ff769300734446c0a86cba2eb2f9895",
|
||||||
|
"sha256:f21af781a4a6fbad54f03c598ab620e3a77032c5878f3d780448421a6e1818c7",
|
||||||
|
"sha256:f2bcdc54ea267fe72bfc7d83c041e4eb58d7d8dc6f578dfddb52f037ce62f432",
|
||||||
|
"sha256:f2f0498b7d2a3c072766dba3274fe22a183dbea1f99d188f1c6c72209a1063dc",
|
||||||
|
"sha256:f7208ab6e009c627b7557ce55c465c98967e8caa8b11833531fdf95799372633",
|
||||||
|
"sha256:f7590d5a455321e53857892ab8879dce62d1f4b04748769f5adf2e707afb9d4f",
|
||||||
|
"sha256:fa257a4d0d21fcbca5b5fcba9dca5a78011cb93c0323fb8855c6d2dfbc76eb77",
|
||||||
|
"sha256:fba9b62da882c1be1280a7584ec4515d0a6006a94d6e5819730ec2eab60ffe12",
|
||||||
|
"sha256:fe4371595edf78c41ef8ac8df20df3943e13defd0efcb732b2e393b5a8a7a71f"
|
||||||
|
],
|
||||||
|
"index": "pypi",
|
||||||
|
"markers": "python_version >= '3.9'",
|
||||||
|
"version": "==1.1.0"
|
||||||
|
},
|
||||||
|
"websocket-client": {
|
||||||
|
"hashes": [
|
||||||
|
"sha256:17b44cc997f5c498e809b22cdf2d9c7a9e71c02c8cc2b6c56e7c2d1239bfa526",
|
||||||
|
"sha256:3239df9f44da632f96012472805d40a23281a991027ce11d2f45a6f24ac4c3da"
|
||||||
|
],
|
||||||
|
"index": "pypi",
|
||||||
|
"markers": "python_version >= '3.8'",
|
||||||
|
"version": "==1.8.0"
|
||||||
|
},
|
||||||
"websockets": {
|
"websockets": {
|
||||||
"hashes": [
|
"hashes": [
|
||||||
"sha256:0701bc3cfcb9164d04a14b149fd74be7347a530ad3bbf15ab2c678a2cd3dd9a2",
|
"sha256:0701bc3cfcb9164d04a14b149fd74be7347a530ad3bbf15ab2c678a2cd3dd9a2",
|
||||||
|
|||||||
291
settings.json
291
settings.json
@@ -2,17 +2,96 @@
|
|||||||
"lights": {
|
"lights": {
|
||||||
"sign": {
|
"sign": {
|
||||||
"names": [
|
"names": [
|
||||||
"tt-sign"
|
"tt-sign",
|
||||||
|
"1"
|
||||||
],
|
],
|
||||||
"settings": {
|
"settings": {
|
||||||
"colors": [
|
"colors": [
|
||||||
"#0000ff",
|
"#968a00"
|
||||||
"#c30074",
|
|
||||||
"#00ff00"
|
|
||||||
],
|
],
|
||||||
"brightness": 6,
|
"brightness": 21,
|
||||||
"pattern": "color_transition",
|
"pattern": "off",
|
||||||
"delay": 30
|
"delay": 99,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10,
|
||||||
|
"n5": 10,
|
||||||
|
"n6": 10,
|
||||||
|
"patterns": {
|
||||||
|
"pulse": {
|
||||||
|
"colors": [
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"delay": 99,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10,
|
||||||
|
"n5": 10,
|
||||||
|
"n6": 10
|
||||||
|
},
|
||||||
|
"n_chase": {
|
||||||
|
"colors": [
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"delay": 99,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10,
|
||||||
|
"n5": 10,
|
||||||
|
"n6": 10
|
||||||
|
},
|
||||||
|
"on": {
|
||||||
|
"colors": [
|
||||||
|
"#968a00"
|
||||||
|
],
|
||||||
|
"delay": 99,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10,
|
||||||
|
"n5": 10,
|
||||||
|
"n6": 10
|
||||||
|
},
|
||||||
|
"rainbow": {
|
||||||
|
"colors": [
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"delay": 99,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10,
|
||||||
|
"n5": 10,
|
||||||
|
"n6": 10
|
||||||
|
},
|
||||||
|
"off": {
|
||||||
|
"colors": [
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"delay": 99,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10,
|
||||||
|
"n5": 10,
|
||||||
|
"n6": 10
|
||||||
|
},
|
||||||
|
"blink": {
|
||||||
|
"colors": [
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"delay": 99,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10,
|
||||||
|
"n5": 10,
|
||||||
|
"n6": 10
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dj": {
|
"dj": {
|
||||||
@@ -22,13 +101,104 @@
|
|||||||
"settings": {
|
"settings": {
|
||||||
"colors": [
|
"colors": [
|
||||||
"#0000ff",
|
"#0000ff",
|
||||||
"#c30074",
|
"#ff0000"
|
||||||
"#00ff00",
|
|
||||||
"#000000"
|
|
||||||
],
|
],
|
||||||
"brightness": 6,
|
"brightness": 73,
|
||||||
"pattern": "flicker",
|
"pattern": "transition",
|
||||||
"delay": 520
|
"delay": 10000,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10,
|
||||||
|
"n5": 10,
|
||||||
|
"n6": 10,
|
||||||
|
"patterns": {
|
||||||
|
"rainbow": {
|
||||||
|
"colors": [
|
||||||
|
"#00006a"
|
||||||
|
],
|
||||||
|
"delay": 17,
|
||||||
|
"n1": 1,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10,
|
||||||
|
"n5": 10,
|
||||||
|
"n6": 10
|
||||||
|
},
|
||||||
|
"on": {
|
||||||
|
"colors": [
|
||||||
|
"#ffff00",
|
||||||
|
"#0000ff"
|
||||||
|
],
|
||||||
|
"delay": 99,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10,
|
||||||
|
"n5": 10,
|
||||||
|
"n6": 10
|
||||||
|
},
|
||||||
|
"blink": {
|
||||||
|
"colors": [
|
||||||
|
"#0000d0"
|
||||||
|
],
|
||||||
|
"delay": 99,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10,
|
||||||
|
"n5": 10,
|
||||||
|
"n6": 10
|
||||||
|
},
|
||||||
|
"pulse": {
|
||||||
|
"delay": 1002,
|
||||||
|
"colors": [
|
||||||
|
"#006600",
|
||||||
|
"#0000ff"
|
||||||
|
],
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10,
|
||||||
|
"n5": 10,
|
||||||
|
"n6": 10
|
||||||
|
},
|
||||||
|
"transition": {
|
||||||
|
"colors": [
|
||||||
|
"#0000ff",
|
||||||
|
"#ff0000"
|
||||||
|
],
|
||||||
|
"delay": 10000,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10,
|
||||||
|
"n5": 10,
|
||||||
|
"n6": 10
|
||||||
|
},
|
||||||
|
"n_chase": {
|
||||||
|
"n1": 11,
|
||||||
|
"n2": 11,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10,
|
||||||
|
"n5": 10,
|
||||||
|
"n6": 10,
|
||||||
|
"delay": 99,
|
||||||
|
"colors": [
|
||||||
|
"#0000ff"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"off": {
|
||||||
|
"colors": [
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"delay": 99,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"middle": {
|
"middle": {
|
||||||
@@ -47,7 +217,19 @@
|
|||||||
],
|
],
|
||||||
"brightness": 6,
|
"brightness": 6,
|
||||||
"pattern": "flicker",
|
"pattern": "flicker",
|
||||||
"delay": 520
|
"delay": 520,
|
||||||
|
"patterns": {
|
||||||
|
"flicker": {
|
||||||
|
"colors": [
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"delay": 99,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sides": {
|
"sides": {
|
||||||
@@ -64,7 +246,19 @@
|
|||||||
],
|
],
|
||||||
"brightness": 6,
|
"brightness": 6,
|
||||||
"pattern": "on",
|
"pattern": "on",
|
||||||
"delay": 520
|
"delay": 520,
|
||||||
|
"patterns": {
|
||||||
|
"on": {
|
||||||
|
"colors": [
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"delay": 99,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"outside": {
|
"outside": {
|
||||||
@@ -79,8 +273,36 @@
|
|||||||
"#000000"
|
"#000000"
|
||||||
],
|
],
|
||||||
"brightness": 6,
|
"brightness": 6,
|
||||||
"pattern": "flicker",
|
"pattern": "transition",
|
||||||
"delay": 520
|
"delay": 520,
|
||||||
|
"n1": -17,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10,
|
||||||
|
"n5": 10,
|
||||||
|
"n6": 10,
|
||||||
|
"patterns": {
|
||||||
|
"on": {
|
||||||
|
"colors": [
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"delay": 99,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10
|
||||||
|
},
|
||||||
|
"transition": {
|
||||||
|
"colors": [
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"delay": 99,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"middle1": {
|
"middle1": {
|
||||||
@@ -96,7 +318,16 @@
|
|||||||
],
|
],
|
||||||
"brightness": 6,
|
"brightness": 6,
|
||||||
"pattern": "flicker",
|
"pattern": "flicker",
|
||||||
"delay": 520
|
"delay": 520,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10,
|
||||||
|
"n3": 10,
|
||||||
|
"n4": 10,
|
||||||
|
"n5": 10,
|
||||||
|
"n6": 10,
|
||||||
|
"patterns": {
|
||||||
|
"flicker": {}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"middle2": {
|
"middle2": {
|
||||||
@@ -112,7 +343,10 @@
|
|||||||
],
|
],
|
||||||
"brightness": 6,
|
"brightness": 6,
|
||||||
"pattern": "flicker",
|
"pattern": "flicker",
|
||||||
"delay": 520
|
"delay": 520,
|
||||||
|
"patterns": {
|
||||||
|
"flicker": {}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"middle3": {
|
"middle3": {
|
||||||
@@ -128,7 +362,10 @@
|
|||||||
],
|
],
|
||||||
"brightness": 6,
|
"brightness": 6,
|
||||||
"pattern": "flicker",
|
"pattern": "flicker",
|
||||||
"delay": 520
|
"delay": 520,
|
||||||
|
"patterns": {
|
||||||
|
"flicker": {}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"middle4": {
|
"middle4": {
|
||||||
@@ -144,17 +381,19 @@
|
|||||||
],
|
],
|
||||||
"brightness": 6,
|
"brightness": 6,
|
||||||
"pattern": "flicker",
|
"pattern": "flicker",
|
||||||
"delay": 520
|
"delay": 520,
|
||||||
|
"patterns": {
|
||||||
|
"flicker": {}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"patterns": [
|
"patterns": [
|
||||||
"on",
|
"on",
|
||||||
"off",
|
"off",
|
||||||
"blink",
|
"rainbow",
|
||||||
"rainbow_cycle",
|
"transition",
|
||||||
"color_transition",
|
"n_chase",
|
||||||
"theater_chase",
|
"pulse"
|
||||||
"flicker"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -7,6 +7,7 @@ from networking import WebSocketClient
|
|||||||
import color_utils
|
import color_utils
|
||||||
from settings import Settings
|
from settings import Settings
|
||||||
import time
|
import time
|
||||||
|
import math
|
||||||
|
|
||||||
# Dark theme colors (unchanged)
|
# Dark theme colors (unchanged)
|
||||||
bg_color = "#2e2e2e"
|
bg_color = "#2e2e2e"
|
||||||
@@ -22,6 +23,26 @@ highlight_pattern_color = "#6a5acd"
|
|||||||
active_palette_color_border = "#FFD700" # Gold color
|
active_palette_color_border = "#FFD700" # Gold color
|
||||||
|
|
||||||
|
|
||||||
|
def delay_to_slider(delay_ms):
|
||||||
|
"""Convert delay in ms (10-10000) to slider position (0-1000) using logarithmic scale."""
|
||||||
|
if delay_ms <= 10:
|
||||||
|
return 0
|
||||||
|
if delay_ms >= 10000:
|
||||||
|
return 1000
|
||||||
|
# Logarithmic conversion: delay = 10 * (10000/10) ^ (position/1000)
|
||||||
|
# Solving for position: position = 1000 * log(delay/10) / log(1000)
|
||||||
|
return 1000 * math.log(delay_ms / 10) / math.log(1000)
|
||||||
|
|
||||||
|
def slider_to_delay(slider_value):
|
||||||
|
"""Convert slider position (0-1000) to delay in ms (10-10000) using logarithmic scale."""
|
||||||
|
if slider_value <= 0:
|
||||||
|
return 10
|
||||||
|
if slider_value >= 1000:
|
||||||
|
return 10000
|
||||||
|
# Logarithmic conversion: delay = 10 * 1000 ^ (position/1000)
|
||||||
|
return int(10 * (1000 ** (slider_value / 1000)))
|
||||||
|
|
||||||
|
|
||||||
class App:
|
class App:
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
self.settings = Settings()
|
self.settings = Settings()
|
||||||
@@ -42,6 +63,10 @@ class App:
|
|||||||
self.delay_update_interval_ms = 100
|
self.delay_update_interval_ms = 100
|
||||||
self.pending_delay_update_id = None
|
self.pending_delay_update_id = None
|
||||||
|
|
||||||
|
self.last_n_params_update_time = 0
|
||||||
|
self.n_params_update_interval_ms = 100
|
||||||
|
self.pending_n_params_update_id = None
|
||||||
|
|
||||||
# --- WebSocketClient ---
|
# --- WebSocketClient ---
|
||||||
self.websocket_client = WebSocketClient("ws://192.168.4.1:80/ws")
|
self.websocket_client = WebSocketClient("ws://192.168.4.1:80/ws")
|
||||||
self.root.after(100, async_handler(self.websocket_client.connect))
|
self.root.after(100, async_handler(self.websocket_client.connect))
|
||||||
@@ -66,24 +91,46 @@ class App:
|
|||||||
|
|
||||||
self.notebook.bind("<<NotebookTabChanged>>", self.on_tab_change)
|
self.notebook.bind("<<NotebookTabChanged>>", self.on_tab_change)
|
||||||
|
|
||||||
# Add Reload Config Button (unchanged)
|
|
||||||
reload_button = tk.Button(
|
|
||||||
self.root,
|
|
||||||
text="Reload Config",
|
|
||||||
command=self.reload_config,
|
|
||||||
bg=active_bg_color,
|
|
||||||
fg=fg_color,
|
|
||||||
font=("Arial", 20),
|
|
||||||
padx=20,
|
|
||||||
pady=10,
|
|
||||||
relief=tk.FLAT,
|
|
||||||
)
|
|
||||||
reload_button.pack(side=tk.BOTTOM, pady=20)
|
|
||||||
|
|
||||||
self.root.protocol("WM_DELETE_WINDOW", self.on_closing)
|
self.root.protocol("WM_DELETE_WINDOW", self.on_closing)
|
||||||
|
|
||||||
async_mainloop(self.root)
|
async_mainloop(self.root)
|
||||||
|
|
||||||
|
def get_pattern_settings(self, tab_name, pattern_name):
|
||||||
|
"""Get pattern-specific settings (colors, delay, n params). Returns defaults if not found."""
|
||||||
|
light_settings = self.settings["lights"][tab_name]["settings"]
|
||||||
|
if "patterns" not in light_settings:
|
||||||
|
light_settings["patterns"] = {}
|
||||||
|
if pattern_name not in light_settings["patterns"]:
|
||||||
|
light_settings["patterns"][pattern_name] = {}
|
||||||
|
|
||||||
|
pattern_settings = light_settings["patterns"][pattern_name]
|
||||||
|
return {
|
||||||
|
"colors": pattern_settings.get("colors", ["#000000"]),
|
||||||
|
"delay": pattern_settings.get("delay", 100),
|
||||||
|
"n1": pattern_settings.get("n1", 10),
|
||||||
|
"n2": pattern_settings.get("n2", 10),
|
||||||
|
"n3": pattern_settings.get("n3", 10),
|
||||||
|
"n4": pattern_settings.get("n4", 10),
|
||||||
|
}
|
||||||
|
|
||||||
|
def save_pattern_settings(self, tab_name, pattern_name, colors=None, delay=None, n_params=None):
|
||||||
|
"""Save pattern-specific settings."""
|
||||||
|
light_settings = self.settings["lights"][tab_name]["settings"]
|
||||||
|
if "patterns" not in light_settings:
|
||||||
|
light_settings["patterns"] = {}
|
||||||
|
if pattern_name not in light_settings["patterns"]:
|
||||||
|
light_settings["patterns"][pattern_name] = {}
|
||||||
|
|
||||||
|
pattern_settings = light_settings["patterns"][pattern_name]
|
||||||
|
if colors is not None:
|
||||||
|
pattern_settings["colors"] = colors
|
||||||
|
if delay is not None:
|
||||||
|
pattern_settings["delay"] = delay
|
||||||
|
if n_params is not None:
|
||||||
|
for i in range(1, 5):
|
||||||
|
if f"n{i}" in n_params:
|
||||||
|
pattern_settings[f"n{i}"] = n_params[f"n{i}"]
|
||||||
|
|
||||||
def on_closing(self):
|
def on_closing(self):
|
||||||
print("Closing application...")
|
print("Closing application...")
|
||||||
asyncio.create_task(self.websocket_client.close())
|
asyncio.create_task(self.websocket_client.close())
|
||||||
@@ -101,15 +148,22 @@ class App:
|
|||||||
self.tabs[key] = tab
|
self.tabs[key] = tab
|
||||||
|
|
||||||
def create_light_control_widgets(self, tab, tab_name, ids, initial_settings):
|
def create_light_control_widgets(self, tab, tab_name, ids, initial_settings):
|
||||||
slider_length = 800
|
slider_length = 600
|
||||||
slider_width = 50
|
slider_width = 50
|
||||||
|
|
||||||
# Extract initial color, brightness, and delay
|
# Get initial pattern and load pattern-specific settings
|
||||||
initial_colors = initial_settings.get("colors", ["#000000"])
|
|
||||||
initial_hex_color = initial_colors[0] if initial_colors else "#000000"
|
|
||||||
initial_brightness = initial_settings.get("brightness", 127)
|
|
||||||
initial_delay = initial_settings.get("delay", 0)
|
|
||||||
initial_pattern = initial_settings.get("pattern", "on")
|
initial_pattern = initial_settings.get("pattern", "on")
|
||||||
|
initial_brightness = initial_settings.get("brightness", 127) # Global brightness
|
||||||
|
pattern_settings = self.get_pattern_settings(tab_name, initial_pattern)
|
||||||
|
|
||||||
|
# Extract initial color, delay, and n params from pattern-specific settings
|
||||||
|
initial_colors = pattern_settings["colors"]
|
||||||
|
initial_hex_color = initial_colors[0] if initial_colors else "#000000"
|
||||||
|
initial_delay = pattern_settings["delay"]
|
||||||
|
initial_n1 = pattern_settings["n1"]
|
||||||
|
initial_n2 = pattern_settings["n2"]
|
||||||
|
initial_n3 = pattern_settings["n3"]
|
||||||
|
initial_n4 = pattern_settings["n4"]
|
||||||
|
|
||||||
initial_r, initial_g, initial_b = color_utils.hex_to_rgb(initial_hex_color)
|
initial_r, initial_g, initial_b = color_utils.hex_to_rgb(initial_hex_color)
|
||||||
|
|
||||||
@@ -117,9 +171,13 @@ class App:
|
|||||||
main_tab_frame = tk.Frame(tab, bg=bg_color)
|
main_tab_frame = tk.Frame(tab, bg=bg_color)
|
||||||
main_tab_frame.pack(expand=True, fill="both", padx=10, pady=10)
|
main_tab_frame.pack(expand=True, fill="both", padx=10, pady=10)
|
||||||
|
|
||||||
# Left panel for sliders
|
# Left panel container for sliders and n inputs
|
||||||
slider_panel_frame = tk.Frame(main_tab_frame, bg=bg_color)
|
left_panel_container = tk.Frame(main_tab_frame, bg=bg_color)
|
||||||
slider_panel_frame.pack(side=tk.LEFT, padx=10, pady=10)
|
left_panel_container.pack(side=tk.LEFT, padx=10, pady=10)
|
||||||
|
|
||||||
|
# Slider panel
|
||||||
|
slider_panel_frame = tk.Frame(left_panel_container, bg=bg_color)
|
||||||
|
slider_panel_frame.pack(side=tk.TOP, padx=10, pady=10)
|
||||||
|
|
||||||
# Common slider configuration
|
# Common slider configuration
|
||||||
slider_config = {
|
slider_config = {
|
||||||
@@ -166,22 +224,142 @@ class App:
|
|||||||
brightness_slider.bind("<B1-Motion>", lambda _: self.schedule_update_brightness(tab))
|
brightness_slider.bind("<B1-Motion>", lambda _: self.schedule_update_brightness(tab))
|
||||||
brightness_slider.bind("<ButtonRelease-1>", lambda _: self.schedule_update_brightness(tab, force_send=True))
|
brightness_slider.bind("<ButtonRelease-1>", lambda _: self.schedule_update_brightness(tab, force_send=True))
|
||||||
|
|
||||||
# Delay Slider
|
# Delay Slider with logarithmic scale (10ms to 10000ms)
|
||||||
delay_slider_config = slider_config.copy()
|
delay_slider_config = slider_config.copy()
|
||||||
delay_slider_config.update(
|
delay_slider_config.update(
|
||||||
{
|
{
|
||||||
"from_": 1000,
|
"from_": 1000, # Slider range 0-1000 (will be converted to 10-10000ms logarithmically)
|
||||||
"to": 0,
|
"to": 0,
|
||||||
"resolution": 10,
|
"resolution": 1,
|
||||||
"label": "Delay (ms)",
|
"label": "Delay (ms)",
|
||||||
|
"showvalue": False, # Hide default value, we'll show logarithmic value in custom label
|
||||||
"troughcolor": trough_color_delay,
|
"troughcolor": trough_color_delay,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
delay_slider = tk.Scale(slider_panel_frame, **delay_slider_config)
|
# Create a frame to contain the slider and its value label (to make them appear as one unit)
|
||||||
delay_slider.set(initial_delay)
|
delay_container = tk.Frame(slider_panel_frame, bg=bg_color)
|
||||||
delay_slider.pack(side=tk.LEFT, padx=10)
|
delay_container.pack(side=tk.LEFT, padx=10)
|
||||||
delay_slider.bind("<B1-Motion>", lambda _: self.schedule_update_delay(tab))
|
|
||||||
delay_slider.bind("<ButtonRelease-1>", lambda _: self.schedule_update_delay(tab, force_send=True))
|
delay_slider = tk.Scale(delay_container, **delay_slider_config)
|
||||||
|
# Convert initial delay to slider position using logarithmic scale
|
||||||
|
initial_slider_pos = delay_to_slider(initial_delay)
|
||||||
|
delay_slider.set(initial_slider_pos)
|
||||||
|
|
||||||
|
# Create a custom label to show the actual delay value, positioned like the default Scale value
|
||||||
|
delay_value_label = tk.Label(delay_container, text=f"{initial_delay}", font=("Arial", 12), bg=bg_color, fg=fg_color, width=5, anchor="e")
|
||||||
|
delay_value_label.pack(side=tk.LEFT, padx=(0, 5))
|
||||||
|
|
||||||
|
# Function to update the side label when slider moves
|
||||||
|
def update_delay_value_label(event=None):
|
||||||
|
slider_value = delay_slider.get()
|
||||||
|
actual_delay = slider_to_delay(slider_value)
|
||||||
|
delay_value_label.config(text=f"{actual_delay}")
|
||||||
|
|
||||||
|
delay_slider.pack(side=tk.LEFT)
|
||||||
|
delay_slider.bind("<B1-Motion>", lambda e: (update_delay_value_label(), self.schedule_update_delay(tab)))
|
||||||
|
delay_slider.bind("<ButtonRelease-1>", lambda e: (update_delay_value_label(), self.schedule_update_delay(tab, force_send=True)))
|
||||||
|
|
||||||
|
# N inputs panel below sliders (moved down to make sliders longer)
|
||||||
|
n_inputs_frame = tk.Frame(left_panel_container, bg=bg_color)
|
||||||
|
n_inputs_frame.pack(side=tk.TOP, padx=10, pady=10)
|
||||||
|
|
||||||
|
n_inputs_inner_frame = tk.Frame(n_inputs_frame, bg=bg_color)
|
||||||
|
n_inputs_inner_frame.pack()
|
||||||
|
|
||||||
|
# Common spinbox config for n inputs - larger for touch screen
|
||||||
|
n_spinbox_config = {
|
||||||
|
"from_": 0,
|
||||||
|
"to": 255,
|
||||||
|
"increment": 1,
|
||||||
|
"width": 12,
|
||||||
|
"bg": bg_color,
|
||||||
|
"fg": fg_color,
|
||||||
|
"font": ("Arial", 24),
|
||||||
|
"buttonbackground": active_bg_color,
|
||||||
|
}
|
||||||
|
|
||||||
|
# Create n1-n4 inputs in a grid with arrows on both sides
|
||||||
|
n_inputs = {}
|
||||||
|
for i in range(1, 5):
|
||||||
|
n_frame = tk.Frame(n_inputs_inner_frame, bg=bg_color)
|
||||||
|
n_frame.grid(row=(i-1)//2, column=(i-1)%2, padx=10, pady=10)
|
||||||
|
|
||||||
|
tk.Label(n_frame, text=f"n{i}", font=("Arial", 20), bg=bg_color, fg=fg_color).pack(pady=(0, 5))
|
||||||
|
|
||||||
|
# Create a frame for the input with arrows on both sides
|
||||||
|
input_container = tk.Frame(n_frame, bg=bg_color)
|
||||||
|
input_container.pack(pady=5)
|
||||||
|
|
||||||
|
# Use StringVar for the value
|
||||||
|
n_var = tk.StringVar(value=str(initial_settings.get(f"n{i}", 10)))
|
||||||
|
|
||||||
|
# Left arrow button (decrease)
|
||||||
|
def decrease_value(var=n_var):
|
||||||
|
try:
|
||||||
|
current_str = var.get()
|
||||||
|
if not current_str:
|
||||||
|
current = 0
|
||||||
|
else:
|
||||||
|
current = int(current_str)
|
||||||
|
new_value = current - 1
|
||||||
|
var.set(str(new_value))
|
||||||
|
self.schedule_update_n_params(tab, force_send=True)
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
# If value is invalid, set to -1
|
||||||
|
var.set("-1")
|
||||||
|
self.schedule_update_n_params(tab, force_send=True)
|
||||||
|
|
||||||
|
left_arrow = tk.Button(
|
||||||
|
input_container,
|
||||||
|
text="−",
|
||||||
|
font=("Arial", 32, "bold"),
|
||||||
|
bg=active_bg_color,
|
||||||
|
fg=fg_color,
|
||||||
|
relief=tk.FLAT,
|
||||||
|
command=decrease_value,
|
||||||
|
width=3,
|
||||||
|
height=1,
|
||||||
|
)
|
||||||
|
left_arrow.pack(side=tk.LEFT, padx=2)
|
||||||
|
|
||||||
|
# Entry in the middle
|
||||||
|
n_entry = tk.Entry(
|
||||||
|
input_container,
|
||||||
|
textvariable=n_var,
|
||||||
|
font=("Arial", 24),
|
||||||
|
bg=bg_color,
|
||||||
|
fg=fg_color,
|
||||||
|
width=8,
|
||||||
|
justify=tk.CENTER,
|
||||||
|
relief=tk.SUNKEN,
|
||||||
|
bd=2,
|
||||||
|
)
|
||||||
|
n_entry.pack(side=tk.LEFT, padx=2, ipady=8)
|
||||||
|
n_entry.bind("<KeyRelease>", lambda event: self.schedule_update_n_params(tab))
|
||||||
|
n_entry.bind("<FocusOut>", lambda event: self.schedule_update_n_params(tab, force_send=True))
|
||||||
|
|
||||||
|
# Right arrow button (increase)
|
||||||
|
def increase_value(var=n_var):
|
||||||
|
current = int(var.get())
|
||||||
|
new_value = current + 1
|
||||||
|
var.set(str(new_value))
|
||||||
|
self.schedule_update_n_params(tab, force_send=True)
|
||||||
|
|
||||||
|
right_arrow = tk.Button(
|
||||||
|
input_container,
|
||||||
|
text="+",
|
||||||
|
font=("Arial", 32, "bold"),
|
||||||
|
bg=active_bg_color,
|
||||||
|
fg=fg_color,
|
||||||
|
relief=tk.FLAT,
|
||||||
|
command=increase_value,
|
||||||
|
width=3,
|
||||||
|
height=1,
|
||||||
|
)
|
||||||
|
right_arrow.pack(side=tk.LEFT, padx=2)
|
||||||
|
|
||||||
|
n_inputs[f"n{i}"] = n_entry
|
||||||
|
n_inputs[f"n{i}_var"] = n_var # Store the variable for later updates
|
||||||
|
|
||||||
# Store references to widgets for this tab
|
# Store references to widgets for this tab
|
||||||
tab.widgets = {
|
tab.widgets = {
|
||||||
@@ -190,6 +368,15 @@ class App:
|
|||||||
"blue_slider": blue_slider,
|
"blue_slider": blue_slider,
|
||||||
"brightness_slider": brightness_slider,
|
"brightness_slider": brightness_slider,
|
||||||
"delay_slider": delay_slider,
|
"delay_slider": delay_slider,
|
||||||
|
"delay_value_label": delay_value_label, # Store the delay value label for updates
|
||||||
|
"n1": n_inputs["n1"],
|
||||||
|
"n1_var": n_inputs["n1_var"],
|
||||||
|
"n2": n_inputs["n2"],
|
||||||
|
"n2_var": n_inputs["n2_var"],
|
||||||
|
"n3": n_inputs["n3"],
|
||||||
|
"n3_var": n_inputs["n3_var"],
|
||||||
|
"n4": n_inputs["n4"],
|
||||||
|
"n4_var": n_inputs["n4_var"],
|
||||||
"selected_color_index": 0, # Default to the first color
|
"selected_color_index": 0, # Default to the first color
|
||||||
}
|
}
|
||||||
tab.colors_in_palette = initial_colors.copy() # Store the list of hex colors for this tab
|
tab.colors_in_palette = initial_colors.copy() # Store the list of hex colors for this tab
|
||||||
@@ -417,7 +604,7 @@ class App:
|
|||||||
# If not in 'transition' mode, but a color is selected, update sliders to that.
|
# If not in 'transition' mode, but a color is selected, update sliders to that.
|
||||||
# Or, if this is a fresh load/tab change, ensure it's the first color.
|
# Or, if this is a fresh load/tab change, ensure it's the first color.
|
||||||
# This ensures the sliders consistently show the color that will be sent
|
# This ensures the sliders consistently show the color that will be sent
|
||||||
# for 'on'/'blink' based on the palette's first entry.
|
# for 'on' based on the palette's first entry.
|
||||||
hex_color = tab.colors_in_palette[tab.widgets["selected_color_index"]]
|
hex_color = tab.colors_in_palette[tab.widgets["selected_color_index"]]
|
||||||
r, g, b = color_utils.hex_to_rgb(hex_color)
|
r, g, b = color_utils.hex_to_rgb(hex_color)
|
||||||
tab.widgets["red_slider"].set(r)
|
tab.widgets["red_slider"].set(r)
|
||||||
@@ -454,8 +641,12 @@ class App:
|
|||||||
# In a full reload, create_tabs ensures it is.
|
# In a full reload, create_tabs ensures it is.
|
||||||
return
|
return
|
||||||
|
|
||||||
|
# Get current pattern and load pattern-specific settings
|
||||||
|
current_pattern = initial_settings.get("pattern", "on")
|
||||||
|
pattern_settings = self.get_pattern_settings(selected_tab_name, current_pattern)
|
||||||
|
|
||||||
# Update the local colors_in_palette list for the tab
|
# Update the local colors_in_palette list for the tab
|
||||||
current_tab_widget.colors_in_palette = initial_settings.get("colors", ["#000000"]).copy()
|
current_tab_widget.colors_in_palette = pattern_settings["colors"].copy()
|
||||||
current_tab_widget.widgets["selected_color_index"] = 0 # Default to first color
|
current_tab_widget.widgets["selected_color_index"] = 0 # Default to first color
|
||||||
|
|
||||||
# Refresh the color palette display and select the first color
|
# Refresh the color palette display and select the first color
|
||||||
@@ -467,9 +658,19 @@ class App:
|
|||||||
current_tab_widget.widgets["green_slider"].set(0)
|
current_tab_widget.widgets["green_slider"].set(0)
|
||||||
current_tab_widget.widgets["blue_slider"].set(0)
|
current_tab_widget.widgets["blue_slider"].set(0)
|
||||||
|
|
||||||
# Update brightness and delay sliders
|
# Update brightness (global) and delay (pattern-specific) sliders
|
||||||
current_tab_widget.widgets["brightness_slider"].set(initial_settings.get("brightness", 127))
|
current_tab_widget.widgets["brightness_slider"].set(initial_settings.get("brightness", 127))
|
||||||
current_tab_widget.widgets["delay_slider"].set(initial_settings.get("delay", 0))
|
# Convert delay to slider position using logarithmic scale
|
||||||
|
initial_delay = pattern_settings["delay"]
|
||||||
|
initial_delay_slider_pos = delay_to_slider(initial_delay)
|
||||||
|
current_tab_widget.widgets["delay_slider"].set(initial_delay_slider_pos)
|
||||||
|
# Update the delay value label to show the actual delay value
|
||||||
|
if "delay_value_label" in current_tab_widget.widgets:
|
||||||
|
current_tab_widget.widgets["delay_value_label"].config(text=f"{initial_delay}")
|
||||||
|
|
||||||
|
# Update n parameter inputs (pattern-specific)
|
||||||
|
for i in range(1, 5):
|
||||||
|
current_tab_widget.widgets[f"n{i}_var"].set(str(pattern_settings[f"n{i}"]))
|
||||||
|
|
||||||
# Highlight the active pattern button
|
# Highlight the active pattern button
|
||||||
initial_pattern = initial_settings.get("pattern", "on")
|
initial_pattern = initial_settings.get("pattern", "on")
|
||||||
@@ -547,6 +748,26 @@ class App:
|
|||||||
time_to_wait = int(self.delay_update_interval_ms - (current_time - self.last_delay_update_time))
|
time_to_wait = int(self.delay_update_interval_ms - (current_time - self.last_delay_update_time))
|
||||||
self.pending_delay_update_id = self.root.after(time_to_wait, lambda: self.update_delay(tab))
|
self.pending_delay_update_id = self.root.after(time_to_wait, lambda: self.update_delay(tab))
|
||||||
|
|
||||||
|
def schedule_update_n_params(self, tab, force_send=False):
|
||||||
|
current_time = time.time() * 1000
|
||||||
|
if force_send:
|
||||||
|
if self.pending_n_params_update_id:
|
||||||
|
self.root.after_cancel(self.pending_n_params_update_id)
|
||||||
|
self.pending_n_params_update_id = None
|
||||||
|
self.update_n_params(tab)
|
||||||
|
self.last_n_params_update_time = current_time
|
||||||
|
elif current_time - self.last_n_params_update_time >= self.n_params_update_interval_ms:
|
||||||
|
if self.pending_n_params_update_id:
|
||||||
|
self.root.after_cancel(self.pending_n_params_update_id)
|
||||||
|
self.pending_n_params_update_id = None
|
||||||
|
self.update_n_params(tab)
|
||||||
|
self.last_n_params_update_time = current_time
|
||||||
|
else:
|
||||||
|
if self.pending_n_params_update_id:
|
||||||
|
self.root.after_cancel(self.pending_n_params_update_id)
|
||||||
|
time_to_wait = int(self.n_params_update_interval_ms - (current_time - self.last_n_params_update_time))
|
||||||
|
self.pending_n_params_update_id = self.root.after(time_to_wait, lambda: self.update_n_params(tab))
|
||||||
|
|
||||||
# --- Asynchronous Update Functions ---
|
# --- Asynchronous Update Functions ---
|
||||||
@async_handler
|
@async_handler
|
||||||
async def update_rgb(self, tab):
|
async def update_rgb(self, tab):
|
||||||
@@ -577,7 +798,7 @@ class App:
|
|||||||
|
|
||||||
if current_pattern == "transition":
|
if current_pattern == "transition":
|
||||||
colors_to_send = tab.colors_in_palette.copy()
|
colors_to_send = tab.colors_in_palette.copy()
|
||||||
elif current_pattern in ["on", "blink", "theater_chase", "flicker"]: # Add other patterns that use a single color
|
elif current_pattern in ["on", "theater_chase", "flicker"]: # Add other patterns that use a single color
|
||||||
if tab.colors_in_palette:
|
if tab.colors_in_palette:
|
||||||
# For non-transition patterns, the device typically uses only the first color.
|
# For non-transition patterns, the device typically uses only the first color.
|
||||||
# However, if a user picks a color from the palette, we want THAT color to be the one
|
# However, if a user picks a color from the palette, we want THAT color to be the one
|
||||||
@@ -598,15 +819,29 @@ class App:
|
|||||||
"settings": {
|
"settings": {
|
||||||
"colors": colors_to_send, # This now dynamically changes based on pattern
|
"colors": colors_to_send, # This now dynamically changes based on pattern
|
||||||
"brightness": tab.widgets["brightness_slider"].get(),
|
"brightness": tab.widgets["brightness_slider"].get(),
|
||||||
"delay": tab.widgets["delay_slider"].get(),
|
"delay": slider_to_delay(tab.widgets["delay_slider"].get()), # Convert from logarithmic slider
|
||||||
"pattern": current_pattern, # Always send the current pattern
|
"pattern": current_pattern, # Always send the current pattern
|
||||||
|
"n1": int(tab.widgets["n1_var"].get()),
|
||||||
|
"n2": int(tab.widgets["n2_var"].get()),
|
||||||
|
"n3": int(tab.widgets["n3_var"].get()),
|
||||||
|
"n4": int(tab.widgets["n4_var"].get()),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
# Update the settings object with the new color list (and potentially other synced values)
|
# Update the settings object - save pattern-specific settings
|
||||||
self.settings["lights"][selected_server]["settings"]["colors"] = tab.colors_in_palette.copy()
|
current_pattern = self.settings["lights"][selected_server]["settings"].get("pattern", "on")
|
||||||
|
slider_value = tab.widgets["delay_slider"].get()
|
||||||
|
delay = slider_to_delay(slider_value)
|
||||||
|
n_params = {f"n{i}": int(tab.widgets[f"n{i}_var"].get()) for i in range(1, 5)}
|
||||||
|
|
||||||
|
# Save pattern-specific settings
|
||||||
|
self.save_pattern_settings(selected_server, current_pattern,
|
||||||
|
colors=tab.colors_in_palette.copy(),
|
||||||
|
delay=delay,
|
||||||
|
n_params=n_params)
|
||||||
|
|
||||||
|
# Brightness is global
|
||||||
self.settings["lights"][selected_server]["settings"]["brightness"] = tab.widgets["brightness_slider"].get()
|
self.settings["lights"][selected_server]["settings"]["brightness"] = tab.widgets["brightness_slider"].get()
|
||||||
self.settings["lights"][selected_server]["settings"]["delay"] = tab.widgets["delay_slider"].get()
|
|
||||||
self.settings.save()
|
self.settings.save()
|
||||||
|
|
||||||
await self.websocket_client.send_data(payload)
|
await self.websocket_client.send_data(payload)
|
||||||
@@ -644,8 +879,9 @@ class App:
|
|||||||
async def update_delay(self, tab):
|
async def update_delay(self, tab):
|
||||||
try:
|
try:
|
||||||
delay_slider = tab.widgets["delay_slider"]
|
delay_slider = tab.widgets["delay_slider"]
|
||||||
delay = delay_slider.get()
|
slider_value = delay_slider.get()
|
||||||
print(f"Delay: {delay}")
|
delay = slider_to_delay(slider_value) # Convert from logarithmic slider to actual delay
|
||||||
|
print(f"Delay: {delay}ms (slider: {slider_value})")
|
||||||
|
|
||||||
selected_server = self.notebook.tab(self.notebook.select(), "text")
|
selected_server = self.notebook.tab(self.notebook.select(), "text")
|
||||||
names = self.settings["lights"][selected_server]["names"]
|
names = self.settings["lights"][selected_server]["names"]
|
||||||
@@ -656,14 +892,41 @@ class App:
|
|||||||
"delay": delay,
|
"delay": delay,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
# Update the settings object with the new delay
|
# Update pattern-specific delay setting
|
||||||
self.settings["lights"][selected_server]["settings"]["delay"] = delay
|
current_pattern = self.settings["lights"][selected_server]["settings"].get("pattern", "on")
|
||||||
|
self.save_pattern_settings(selected_server, current_pattern, delay=delay)
|
||||||
self.settings.save()
|
self.settings.save()
|
||||||
await self.websocket_client.send_data(payload)
|
await self.websocket_client.send_data(payload)
|
||||||
print(f"Sent delay payload: {payload}")
|
print(f"Sent delay payload: {payload}")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"Error updating delay: {e}")
|
print(f"Error updating delay: {e}")
|
||||||
|
|
||||||
|
@async_handler
|
||||||
|
async def update_n_params(self, tab):
|
||||||
|
try:
|
||||||
|
n_params = {}
|
||||||
|
for i in range(1, 5):
|
||||||
|
n_var = tab.widgets[f"n{i}_var"]
|
||||||
|
n_params[f"n{i}"] = int(n_var.get())
|
||||||
|
|
||||||
|
print(f"N Parameters: {n_params}")
|
||||||
|
|
||||||
|
selected_server = self.notebook.tab(self.notebook.select(), "text")
|
||||||
|
names = self.settings["lights"][selected_server]["names"]
|
||||||
|
payload = {
|
||||||
|
"save": True,
|
||||||
|
"names": names,
|
||||||
|
"settings": n_params,
|
||||||
|
}
|
||||||
|
# Update pattern-specific n params
|
||||||
|
current_pattern = self.settings["lights"][selected_server]["settings"].get("pattern", "on")
|
||||||
|
self.save_pattern_settings(selected_server, current_pattern, n_params=n_params)
|
||||||
|
self.settings.save()
|
||||||
|
await self.websocket_client.send_data(payload)
|
||||||
|
print(f"Sent n params payload: {payload}")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error updating n params: {e}")
|
||||||
|
|
||||||
@async_handler
|
@async_handler
|
||||||
async def send_pattern(self, tab_name: str, pattern_name: str):
|
async def send_pattern(self, tab_name: str, pattern_name: str):
|
||||||
try:
|
try:
|
||||||
@@ -681,26 +944,52 @@ class App:
|
|||||||
|
|
||||||
current_settings_for_tab = self.settings["lights"][tab_name]["settings"]
|
current_settings_for_tab = self.settings["lights"][tab_name]["settings"]
|
||||||
|
|
||||||
|
# Save current pattern's settings before switching
|
||||||
|
old_pattern = current_settings_for_tab.get("pattern", "on")
|
||||||
|
current_delay = slider_to_delay(current_tab_widget.widgets["delay_slider"].get())
|
||||||
|
current_n_params = {f"n{i}": int(current_tab_widget.widgets[f"n{i}_var"].get()) for i in range(1, 5)}
|
||||||
|
self.save_pattern_settings(tab_name, old_pattern,
|
||||||
|
colors=current_tab_widget.colors_in_palette.copy(),
|
||||||
|
delay=current_delay,
|
||||||
|
n_params=current_n_params)
|
||||||
|
|
||||||
|
# Load the new pattern's settings
|
||||||
|
new_pattern_settings = self.get_pattern_settings(tab_name, pattern_name)
|
||||||
|
|
||||||
|
# Update UI with new pattern's settings
|
||||||
|
current_tab_widget.colors_in_palette = new_pattern_settings["colors"].copy()
|
||||||
|
self.refresh_color_palette_display(current_tab_widget)
|
||||||
|
|
||||||
|
# Update delay slider
|
||||||
|
delay_slider_pos = delay_to_slider(new_pattern_settings["delay"])
|
||||||
|
current_tab_widget.widgets["delay_slider"].set(delay_slider_pos)
|
||||||
|
if "delay_value_label" in current_tab_widget.widgets:
|
||||||
|
current_tab_widget.widgets["delay_value_label"].config(text=f"{new_pattern_settings['delay']}")
|
||||||
|
|
||||||
|
# Update n params
|
||||||
|
for i in range(1, 5):
|
||||||
|
current_tab_widget.widgets[f"n{i}_var"].set(str(new_pattern_settings[f"n{i}"]))
|
||||||
|
|
||||||
|
# Update RGB sliders to first color
|
||||||
|
if current_tab_widget.colors_in_palette:
|
||||||
|
hex_color = current_tab_widget.colors_in_palette[0]
|
||||||
|
r, g, b = color_utils.hex_to_rgb(hex_color)
|
||||||
|
current_tab_widget.widgets["red_slider"].set(r)
|
||||||
|
current_tab_widget.widgets["green_slider"].set(g)
|
||||||
|
current_tab_widget.widgets["blue_slider"].set(b)
|
||||||
|
current_tab_widget.widgets["selected_color_index"] = 0
|
||||||
|
self._highlight_selected_color_swatch(current_tab_widget)
|
||||||
|
|
||||||
payload_settings = {
|
payload_settings = {
|
||||||
"pattern": pattern_name,
|
"pattern": pattern_name,
|
||||||
"brightness": current_settings_for_tab.get("brightness", 127),
|
"brightness": current_settings_for_tab.get("brightness", 127), # Global brightness
|
||||||
"delay": current_settings_for_tab.get("delay", 0),
|
"delay": new_pattern_settings["delay"],
|
||||||
|
"colors": new_pattern_settings["colors"],
|
||||||
}
|
}
|
||||||
|
|
||||||
# Determine colors to send based on the *newly selected* pattern
|
# Include n parameters
|
||||||
if pattern_name == "transition":
|
for i in range(1, 5):
|
||||||
payload_settings["colors"] = current_tab_widget.colors_in_palette.copy()
|
payload_settings[f"n{i}"] = new_pattern_settings[f"n{i}"]
|
||||||
elif pattern_name in ["on", "blink"]: # Add other patterns that use a single color here
|
|
||||||
# When switching TO 'on' or 'blink', ensure the color sent is the one
|
|
||||||
# currently displayed on the sliders (which reflects the selected palette color).
|
|
||||||
r = current_tab_widget.widgets["red_slider"].get()
|
|
||||||
g = current_tab_widget.widgets["green_slider"].get()
|
|
||||||
b = current_tab_widget.widgets["blue_slider"].get()
|
|
||||||
hex_color_from_sliders = f"#{r:02x}{g:02x}{b:02x}"
|
|
||||||
payload_settings["colors"] = [hex_color_from_sliders]
|
|
||||||
else:
|
|
||||||
# For other patterns, send the full palette, device might ignore or use default
|
|
||||||
payload_settings["colors"] = current_tab_widget.colors_in_palette.copy()
|
|
||||||
|
|
||||||
payload = {
|
payload = {
|
||||||
"save": True,
|
"save": True,
|
||||||
@@ -708,10 +997,8 @@ class App:
|
|||||||
"settings": payload_settings,
|
"settings": payload_settings,
|
||||||
}
|
}
|
||||||
|
|
||||||
# Update the settings object with the new pattern and current colors/brightness/delay
|
# Update the current pattern
|
||||||
self.settings["lights"][tab_name]["settings"]["pattern"] = pattern_name
|
self.settings["lights"][tab_name]["settings"]["pattern"] = pattern_name
|
||||||
# Always save the full current palette state in settings.
|
|
||||||
self.settings["lights"][tab_name]["settings"]["colors"] = current_tab_widget.colors_in_palette.copy()
|
|
||||||
self.settings.save()
|
self.settings.save()
|
||||||
|
|
||||||
self.highlight_pattern_button(current_tab_widget, pattern_name)
|
self.highlight_pattern_button(current_tab_widget, pattern_name)
|
||||||
@@ -730,10 +1017,20 @@ class App:
|
|||||||
if not hasattr(current_tab_widget, "colors_in_palette"):
|
if not hasattr(current_tab_widget, "colors_in_palette"):
|
||||||
return # Tab not fully initialized yet
|
return # Tab not fully initialized yet
|
||||||
|
|
||||||
# Update settings for the current tab in the self.settings object
|
# Update settings for the current tab - save pattern-specific settings
|
||||||
self.settings["lights"][selected_server]["settings"]["colors"] = current_tab_widget.colors_in_palette
|
current_pattern = self.settings["lights"][selected_server]["settings"].get("pattern", "on")
|
||||||
|
slider_value = current_tab_widget.widgets["delay_slider"].get()
|
||||||
|
delay = slider_to_delay(slider_value)
|
||||||
|
n_params = {f"n{i}": int(current_tab_widget.widgets[f"n{i}_var"].get()) for i in range(1, 5)}
|
||||||
|
|
||||||
|
# Save pattern-specific settings
|
||||||
|
self.save_pattern_settings(selected_server, current_pattern,
|
||||||
|
colors=current_tab_widget.colors_in_palette,
|
||||||
|
delay=delay,
|
||||||
|
n_params=n_params)
|
||||||
|
|
||||||
|
# Brightness is global
|
||||||
self.settings["lights"][selected_server]["settings"]["brightness"] = current_tab_widget.widgets["brightness_slider"].get()
|
self.settings["lights"][selected_server]["settings"]["brightness"] = current_tab_widget.widgets["brightness_slider"].get()
|
||||||
self.settings["lights"][selected_server]["settings"]["delay"] = current_tab_widget.widgets["delay_slider"].get()
|
|
||||||
# The pattern is updated in send_pattern already, but ensure consistency
|
# The pattern is updated in send_pattern already, but ensure consistency
|
||||||
# For simplicity, we assume send_pattern is the primary way to change pattern.
|
# For simplicity, we assume send_pattern is the primary way to change pattern.
|
||||||
|
|
||||||
105
src/midi.py
Normal file
105
src/midi.py
Normal file
@@ -0,0 +1,105 @@
|
|||||||
|
import mido
|
||||||
|
import asyncio
|
||||||
|
import time
|
||||||
|
import networking # <--- This will now correctly import your module
|
||||||
|
|
||||||
|
|
||||||
|
async def midi_to_websocket_listener(midi_port_index: int, websocket_uri: str):
|
||||||
|
"""
|
||||||
|
Listens to a specific MIDI port and sends data to a WebSocket server
|
||||||
|
when Note 32 (and 33) is pressed.
|
||||||
|
"""
|
||||||
|
delay = 100 # Default delay value
|
||||||
|
|
||||||
|
# 1. Get MIDI port name
|
||||||
|
port_names = mido.get_input_names()
|
||||||
|
if not port_names:
|
||||||
|
print("No MIDI input ports found. Please connect your device.")
|
||||||
|
return
|
||||||
|
if not (0 <= midi_port_index < len(port_names)):
|
||||||
|
print(f"Error: MIDI port index {midi_port_index} out of range. Available ports: {port_names}")
|
||||||
|
print("Available ports:")
|
||||||
|
for i, name in enumerate(port_names):
|
||||||
|
print(f" {i}: {name}")
|
||||||
|
return
|
||||||
|
|
||||||
|
midi_port_name = port_names[midi_port_index]
|
||||||
|
print(f"Selected MIDI input port: {midi_port_name}")
|
||||||
|
|
||||||
|
# 2. Initialize WebSocket client (using your actual networking.py)
|
||||||
|
ws_client = networking.WebSocketClient(websocket_uri)
|
||||||
|
|
||||||
|
try:
|
||||||
|
# 3. Connect WebSocket
|
||||||
|
await ws_client.connect()
|
||||||
|
print(f"WebSocket client connected to {ws_client.uri}")
|
||||||
|
|
||||||
|
# 4. Open MIDI port and start listening loop
|
||||||
|
with mido.open_input(midi_port_name) as port:
|
||||||
|
print(f"MIDI port '{midi_port_name}' opened. Press Ctrl+C to stop.")
|
||||||
|
while True:
|
||||||
|
msg = port.receive(block=False) # Non-blocking read
|
||||||
|
if msg:
|
||||||
|
match msg.type:
|
||||||
|
case 'note_on':
|
||||||
|
print(f" Note ON: Note={msg.note}, Velocity={msg.velocity}, Channel={msg.channel}")
|
||||||
|
match msg.note:
|
||||||
|
case 32:
|
||||||
|
await ws_client.send_data({
|
||||||
|
"names": ["1"],
|
||||||
|
"settings": {
|
||||||
|
"pattern": "pulse",
|
||||||
|
"delay": delay,
|
||||||
|
"colors": ["#00ff00"],
|
||||||
|
"brightness": 100,
|
||||||
|
"num_leds": 200,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
case 33:
|
||||||
|
await ws_client.send_data({
|
||||||
|
"names": ["2"],
|
||||||
|
"settings": {
|
||||||
|
"pattern": "chase",
|
||||||
|
"speed": 10,
|
||||||
|
"color": "#00FFFF",
|
||||||
|
}
|
||||||
|
})
|
||||||
|
case 'control_change':
|
||||||
|
match msg.control:
|
||||||
|
case 36:
|
||||||
|
|
||||||
|
delay = msg.value * 4
|
||||||
|
print(f"Delay set to {delay} ms")
|
||||||
|
|
||||||
|
await asyncio.sleep(0.001) # Important: Yield control to asyncio event loop
|
||||||
|
|
||||||
|
except mido.PortsError as e:
|
||||||
|
print(f"Error opening MIDI port '{midi_port_name}': {e}")
|
||||||
|
except asyncio.CancelledError:
|
||||||
|
print(f"MIDI listener cancelled.")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"An unexpected error occurred: {e}")
|
||||||
|
finally:
|
||||||
|
# 5. Disconnect WebSocket and clean up
|
||||||
|
# This assumes your WebSocketClient has a ._connected attribute or similar way to check state.
|
||||||
|
# If your client's disconnect method is safe to call even if not connected, you can simplify.
|
||||||
|
await ws_client.close()
|
||||||
|
print("MIDI listener stopped and cleaned up.")
|
||||||
|
|
||||||
|
|
||||||
|
async def main():
|
||||||
|
# --- Configuration ---
|
||||||
|
MIDI_PORT_INDEX = 1 # <--- IMPORTANT: Change this to the correct index for your device
|
||||||
|
WEBSOCKET_SERVER_URI = "ws://192.168.4.1:80/ws"
|
||||||
|
# --- End Configuration ---
|
||||||
|
|
||||||
|
try:
|
||||||
|
await midi_to_websocket_listener(MIDI_PORT_INDEX, WEBSOCKET_SERVER_URI)
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
print("\nProgram interrupted by user.")
|
||||||
|
finally:
|
||||||
|
print("Main program finished.")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
asyncio.run(main())
|
||||||
124
src/sound.py
Normal file
124
src/sound.py
Normal file
@@ -0,0 +1,124 @@
|
|||||||
|
#!/usr/bin/python
|
||||||
|
|
||||||
|
import pyaudio
|
||||||
|
import aubio
|
||||||
|
import numpy as np
|
||||||
|
from time import sleep
|
||||||
|
import websocket # pip install websocket-client
|
||||||
|
import json
|
||||||
|
|
||||||
|
seconds = 10 # how long this script should run (if not using infinite loop)
|
||||||
|
|
||||||
|
bufferSize = 512
|
||||||
|
windowSizeMultiple = 2 # or 4 for higher accuracy, but more computational cost
|
||||||
|
|
||||||
|
audioInputDeviceIndex = 7 # use 'arecord -l' to check available audio devices
|
||||||
|
audioInputChannels = 1
|
||||||
|
|
||||||
|
pa = pyaudio.PyAudio()
|
||||||
|
|
||||||
|
print("Available audio input devices:")
|
||||||
|
info = pa.get_host_api_info_by_index(0)
|
||||||
|
num_devices = info.get('deviceCount')
|
||||||
|
found_device = False
|
||||||
|
for i in range(0, num_devices):
|
||||||
|
device_info = pa.get_device_info_by_host_api_device_index(0, i)
|
||||||
|
if (device_info.get('maxInputChannels')) > 0:
|
||||||
|
print(f" Input Device id {i} - {device_info.get('name')}")
|
||||||
|
if i == audioInputDeviceIndex:
|
||||||
|
found_device = True
|
||||||
|
|
||||||
|
if not found_device:
|
||||||
|
print(f"Warning: Audio input device index {audioInputDeviceIndex} not found or has no input channels.")
|
||||||
|
# Consider exiting or picking a default if necessary
|
||||||
|
|
||||||
|
try:
|
||||||
|
audioInputDevice = pa.get_device_info_by_index(audioInputDeviceIndex)
|
||||||
|
audioInputSampleRate = int(audioInputDevice['defaultSampleRate'])
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error getting audio device info for index {audioInputDeviceIndex}: {e}")
|
||||||
|
pa.terminate()
|
||||||
|
exit()
|
||||||
|
|
||||||
|
# create the aubio tempo detection:
|
||||||
|
hopSize = bufferSize
|
||||||
|
winSize = hopSize * windowSizeMultiple
|
||||||
|
tempoDetection = aubio.tempo(method='default', buf_size=winSize, hop_size=hopSize, samplerate=audioInputSampleRate)
|
||||||
|
|
||||||
|
# --- WebSocket Setup ---
|
||||||
|
websocket_url = "ws://192.168.4.1:80/ws"
|
||||||
|
ws = None
|
||||||
|
try:
|
||||||
|
ws = websocket.create_connection(websocket_url)
|
||||||
|
print(f"Successfully connected to WebSocket at {websocket_url}")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Failed to connect to WebSocket: {e}. Data will not be sent over WebSocket.")
|
||||||
|
# --- End WebSocket Setup ---
|
||||||
|
|
||||||
|
# this function gets called by the input stream, as soon as enough samples are collected from the audio input:
|
||||||
|
def readAudioFrames(in_data, frame_count, time_info, status):
|
||||||
|
global ws # Allow modification of the global ws variable
|
||||||
|
|
||||||
|
signal = np.frombuffer(in_data, dtype=np.float32)
|
||||||
|
|
||||||
|
beat = tempoDetection(signal)
|
||||||
|
if beat:
|
||||||
|
bpm = tempoDetection.get_bpm()
|
||||||
|
print(f"beat! (running with {bpm:.2f} bpm)") # Use f-string for cleaner formatting, removed extra bells
|
||||||
|
data_to_send = {
|
||||||
|
"names": ["1"],
|
||||||
|
"settings": {
|
||||||
|
"pattern": "pulse",
|
||||||
|
"delay": 10,
|
||||||
|
"colors": ["#00ff00"],
|
||||||
|
"brightness": 10,
|
||||||
|
"num_leds": 200,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
if ws: # Only send if the websocket connection is established
|
||||||
|
try:
|
||||||
|
ws.send(json.dumps(data_to_send))
|
||||||
|
# print("Sent data over WebSocket") # Optional: for debugging
|
||||||
|
except websocket.WebSocketConnectionClosedException:
|
||||||
|
print("WebSocket connection closed, attempting to reconnect...")
|
||||||
|
ws = None # Mark as closed, connection will need to be re-established if desired
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error sending over WebSocket: {e}")
|
||||||
|
|
||||||
|
return (in_data, pyaudio.paContinue)
|
||||||
|
|
||||||
|
|
||||||
|
# create and start the input stream
|
||||||
|
try:
|
||||||
|
inputStream = pa.open(format=pyaudio.paFloat32,
|
||||||
|
input=True,
|
||||||
|
channels=audioInputChannels,
|
||||||
|
input_device_index=audioInputDeviceIndex,
|
||||||
|
frames_per_buffer=bufferSize,
|
||||||
|
rate=audioInputSampleRate,
|
||||||
|
stream_callback=readAudioFrames)
|
||||||
|
|
||||||
|
inputStream.start_stream()
|
||||||
|
print("\nAudio stream started. Detecting beats. Press Ctrl+C to stop.")
|
||||||
|
|
||||||
|
# Loop to keep the script running, allowing graceful shutdown
|
||||||
|
while inputStream.is_active():
|
||||||
|
sleep(0.1) # Small delay to prevent busy-waiting
|
||||||
|
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
print("\nKeyboardInterrupt: Stopping script gracefully.")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"An error occurred with the audio stream: {e}")
|
||||||
|
finally:
|
||||||
|
# Ensure streams and resources are closed
|
||||||
|
if 'inputStream' in locals() and inputStream.is_active():
|
||||||
|
inputStream.stop_stream()
|
||||||
|
if 'inputStream' in locals() and not inputStream.is_stopped():
|
||||||
|
inputStream.close()
|
||||||
|
pa.terminate()
|
||||||
|
if ws:
|
||||||
|
print("Closing WebSocket connection.")
|
||||||
|
ws.close()
|
||||||
|
|
||||||
|
print("Script finished.")
|
||||||
Reference in New Issue
Block a user