Compare commits
2 Commits
web
...
9ff38aa875
| Author | SHA1 | Date | |
|---|---|---|---|
| 9ff38aa875 | |||
| 3b869851b8 |
4
Pipfile
4
Pipfile
@@ -12,7 +12,6 @@ python-rtmidi = "*"
|
|||||||
pyaudio = "*"
|
pyaudio = "*"
|
||||||
aubio = "*"
|
aubio = "*"
|
||||||
websocket-client = "*"
|
websocket-client = "*"
|
||||||
microdot = "*"
|
|
||||||
|
|
||||||
[dev-packages]
|
[dev-packages]
|
||||||
|
|
||||||
@@ -20,6 +19,5 @@ microdot = "*"
|
|||||||
python_version = "3.12"
|
python_version = "3.12"
|
||||||
|
|
||||||
[scripts]
|
[scripts]
|
||||||
main = "python src/main.py"
|
main = "python main.py"
|
||||||
dev = 'watchfiles "python src/main.py" src'
|
dev = 'watchfiles "python src/main.py" src'
|
||||||
web = "python run_web.py"
|
|
||||||
|
|||||||
41
presets.json
41
presets.json
@@ -1,41 +0,0 @@
|
|||||||
{
|
|
||||||
"blinker": {
|
|
||||||
"pattern": "blink",
|
|
||||||
"colors": [
|
|
||||||
"#12b533"
|
|
||||||
],
|
|
||||||
"brightness": 127,
|
|
||||||
"delay": 100,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"circler": {
|
|
||||||
"pattern": "circle",
|
|
||||||
"colors": [
|
|
||||||
"#9d3434",
|
|
||||||
"#cb5d5d"
|
|
||||||
],
|
|
||||||
"brightness": 127,
|
|
||||||
"delay": 100,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"pulser": {
|
|
||||||
"pattern": "pulse",
|
|
||||||
"colors": [
|
|
||||||
"#9f1d1d",
|
|
||||||
"#176d2d",
|
|
||||||
"#50309c"
|
|
||||||
],
|
|
||||||
"brightness": 127,
|
|
||||||
"delay": 300,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,157 +0,0 @@
|
|||||||
{
|
|
||||||
"tab_password": "",
|
|
||||||
"color_palette": [
|
|
||||||
"#c12525",
|
|
||||||
"#246dcc"
|
|
||||||
],
|
|
||||||
"lights": {
|
|
||||||
"test": {
|
|
||||||
"names": [
|
|
||||||
"test"
|
|
||||||
],
|
|
||||||
"settings": {
|
|
||||||
"pattern": "pulse",
|
|
||||||
"brightness": 127,
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 100,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"patterns": {
|
|
||||||
"on": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 100,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"off": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 100,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"rainbow": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 100,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"transition": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 100,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"blink": {
|
|
||||||
"colors": [
|
|
||||||
"#12b533"
|
|
||||||
],
|
|
||||||
"delay": 100,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"circle": {
|
|
||||||
"colors": [
|
|
||||||
"#9d3434",
|
|
||||||
"#cb5d5d"
|
|
||||||
],
|
|
||||||
"delay": 100,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"pulse": {
|
|
||||||
"colors": [
|
|
||||||
"#9f1d1d",
|
|
||||||
"#176d2d",
|
|
||||||
"#50309c"
|
|
||||||
],
|
|
||||||
"delay": 300,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"test2": {
|
|
||||||
"names": [
|
|
||||||
"test"
|
|
||||||
],
|
|
||||||
"settings": {
|
|
||||||
"pattern": "pulse",
|
|
||||||
"brightness": 127,
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 100,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"patterns": {
|
|
||||||
"blink": {
|
|
||||||
"colors": [
|
|
||||||
"#12b533"
|
|
||||||
],
|
|
||||||
"delay": 100,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"circle": {
|
|
||||||
"colors": [
|
|
||||||
"#9d3434",
|
|
||||||
"#cb5d5d"
|
|
||||||
],
|
|
||||||
"delay": 100,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"pulse": {
|
|
||||||
"colors": [
|
|
||||||
"#9f1d1d",
|
|
||||||
"#176d2d",
|
|
||||||
"#50309c"
|
|
||||||
],
|
|
||||||
"delay": 300,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tab_order": [
|
|
||||||
"test",
|
|
||||||
"test2"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
{
|
|
||||||
"tab_password": "",
|
|
||||||
"lights": {
|
|
||||||
"dsfdfd": {
|
|
||||||
"names": [
|
|
||||||
"1"
|
|
||||||
],
|
|
||||||
"settings": {
|
|
||||||
"pattern": "on",
|
|
||||||
"brightness": 127,
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 100,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"patterns": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tab_order": [
|
|
||||||
"dsfdfd"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"lights": {},
|
|
||||||
"tab_password": "",
|
|
||||||
"tab_order": [],
|
|
||||||
"color_palette": []
|
|
||||||
}
|
|
||||||
868
profiles/tt.json
868
profiles/tt.json
@@ -1,868 +0,0 @@
|
|||||||
{
|
|
||||||
"tab_password": "qwerty1234",
|
|
||||||
"lights": {
|
|
||||||
"sign": {
|
|
||||||
"names": [
|
|
||||||
"tt-sign",
|
|
||||||
"1"
|
|
||||||
],
|
|
||||||
"settings": {
|
|
||||||
"colors": [
|
|
||||||
"#968a00"
|
|
||||||
],
|
|
||||||
"brightness": 39,
|
|
||||||
"pattern": "circle",
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10,
|
|
||||||
"patterns": {
|
|
||||||
"pulse": {
|
|
||||||
"colors": [
|
|
||||||
"#ff00ff"
|
|
||||||
],
|
|
||||||
"delay": 657,
|
|
||||||
"n1": 100,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 100,
|
|
||||||
"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": [
|
|
||||||
"#ff00ff"
|
|
||||||
],
|
|
||||||
"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": [
|
|
||||||
"#0000ff",
|
|
||||||
"#ff0000"
|
|
||||||
],
|
|
||||||
"delay": 10000,
|
|
||||||
"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
|
|
||||||
},
|
|
||||||
"transition": {
|
|
||||||
"colors": [
|
|
||||||
"#ff00ff",
|
|
||||||
"#ffff00"
|
|
||||||
],
|
|
||||||
"delay": 10000,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"circle": {
|
|
||||||
"colors": [
|
|
||||||
"#0000ff",
|
|
||||||
"#ff0000"
|
|
||||||
],
|
|
||||||
"delay": 10000,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"chase": {
|
|
||||||
"colors": [
|
|
||||||
"#000091",
|
|
||||||
"#00d800"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"dj": {
|
|
||||||
"names": [
|
|
||||||
"dj"
|
|
||||||
],
|
|
||||||
"settings": {
|
|
||||||
"colors": [
|
|
||||||
"#0000ff",
|
|
||||||
"#ff0000"
|
|
||||||
],
|
|
||||||
"brightness": 39,
|
|
||||||
"pattern": "transition",
|
|
||||||
"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": [
|
|
||||||
"#ff0062",
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"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": 13,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10,
|
|
||||||
"delay": 639,
|
|
||||||
"colors": [
|
|
||||||
"#0000ff"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"off": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"circle": {
|
|
||||||
"colors": [
|
|
||||||
"#0001bd",
|
|
||||||
"#00ff00"
|
|
||||||
],
|
|
||||||
"delay": 1778,
|
|
||||||
"n1": 20,
|
|
||||||
"n2": 40,
|
|
||||||
"n3": 40,
|
|
||||||
"n4": 0
|
|
||||||
},
|
|
||||||
"chase": {
|
|
||||||
"colors": [
|
|
||||||
"#8d00ff",
|
|
||||||
"#ff0077"
|
|
||||||
],
|
|
||||||
"delay": 69,
|
|
||||||
"n1": 30,
|
|
||||||
"n2": 30,
|
|
||||||
"n3": 5,
|
|
||||||
"n4": 30
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"middle": {
|
|
||||||
"names": [
|
|
||||||
"middle1",
|
|
||||||
"middle2",
|
|
||||||
"middle3",
|
|
||||||
"middle4"
|
|
||||||
],
|
|
||||||
"settings": {
|
|
||||||
"colors": [
|
|
||||||
"#0000ff",
|
|
||||||
"#c30074",
|
|
||||||
"#00ff00",
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"brightness": 44,
|
|
||||||
"pattern": "on",
|
|
||||||
"delay": 520,
|
|
||||||
"patterns": {
|
|
||||||
"flicker": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"on": {
|
|
||||||
"colors": [
|
|
||||||
"#ff00ff"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"off": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"sides": {
|
|
||||||
"names": [
|
|
||||||
"left",
|
|
||||||
"right"
|
|
||||||
],
|
|
||||||
"settings": {
|
|
||||||
"colors": [
|
|
||||||
"#0000ff",
|
|
||||||
"#c30074",
|
|
||||||
"#00ff00",
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"brightness": 13,
|
|
||||||
"pattern": "on",
|
|
||||||
"delay": 520,
|
|
||||||
"patterns": {
|
|
||||||
"on": {
|
|
||||||
"colors": [
|
|
||||||
"#ff00ff"
|
|
||||||
],
|
|
||||||
"delay": 988,
|
|
||||||
"n1": 100,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"off": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"pulse": {
|
|
||||||
"n1": 100,
|
|
||||||
"n2": 100,
|
|
||||||
"n3": 100,
|
|
||||||
"n4": 10,
|
|
||||||
"delay": 411,
|
|
||||||
"colors": [
|
|
||||||
"#ff00ff"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"outside": {
|
|
||||||
"names": [
|
|
||||||
"outside"
|
|
||||||
],
|
|
||||||
"settings": {
|
|
||||||
"colors": [
|
|
||||||
"#0000ff",
|
|
||||||
"#c30074",
|
|
||||||
"#00ff00",
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"brightness": 76,
|
|
||||||
"pattern": "on",
|
|
||||||
"delay": 520,
|
|
||||||
"n1": -17,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10,
|
|
||||||
"patterns": {
|
|
||||||
"on": {
|
|
||||||
"colors": [
|
|
||||||
"#ff00ff"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"transition": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"off": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"middle1": {
|
|
||||||
"names": [
|
|
||||||
"middle1"
|
|
||||||
],
|
|
||||||
"settings": {
|
|
||||||
"colors": [
|
|
||||||
"#0000ff",
|
|
||||||
"#c30074",
|
|
||||||
"#00ff00",
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"brightness": 59,
|
|
||||||
"pattern": "on",
|
|
||||||
"delay": 520,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10,
|
|
||||||
"patterns": {
|
|
||||||
"flicker": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"on": {
|
|
||||||
"colors": [
|
|
||||||
"#ff00ff"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"pulse": {
|
|
||||||
"delay": 1096,
|
|
||||||
"colors": [
|
|
||||||
"#0000ff"
|
|
||||||
],
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"off": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"rainbow": {
|
|
||||||
"n1": 1,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"delay": 2884,
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"transition": {
|
|
||||||
"colors": [
|
|
||||||
"#0000ff",
|
|
||||||
"#ff0000"
|
|
||||||
],
|
|
||||||
"delay": 269,
|
|
||||||
"n1": 5,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"middle2": {
|
|
||||||
"names": [
|
|
||||||
"middle2"
|
|
||||||
],
|
|
||||||
"settings": {
|
|
||||||
"colors": [
|
|
||||||
"#0000ff",
|
|
||||||
"#c30074",
|
|
||||||
"#00ff00",
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"brightness": 141,
|
|
||||||
"pattern": "on",
|
|
||||||
"delay": 520,
|
|
||||||
"patterns": {
|
|
||||||
"flicker": {
|
|
||||||
"colors": [
|
|
||||||
"#000078"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"on": {
|
|
||||||
"colors": [
|
|
||||||
"#ff00ff"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"pulse": {
|
|
||||||
"colors": [
|
|
||||||
"#0000a0",
|
|
||||||
"#720000"
|
|
||||||
],
|
|
||||||
"delay": 4102,
|
|
||||||
"n1": 100,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 100,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"off": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"middle3": {
|
|
||||||
"names": [
|
|
||||||
"middle3"
|
|
||||||
],
|
|
||||||
"settings": {
|
|
||||||
"colors": [
|
|
||||||
"#0000ff",
|
|
||||||
"#c30074",
|
|
||||||
"#00ff00",
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"brightness": 6,
|
|
||||||
"pattern": "on",
|
|
||||||
"delay": 520,
|
|
||||||
"patterns": {
|
|
||||||
"flicker": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"on": {
|
|
||||||
"colors": [
|
|
||||||
"#00c4a5"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"off": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"middle4": {
|
|
||||||
"names": [
|
|
||||||
"middle4"
|
|
||||||
],
|
|
||||||
"settings": {
|
|
||||||
"colors": [
|
|
||||||
"#0000ff",
|
|
||||||
"#c30074",
|
|
||||||
"#00ff00",
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"brightness": 6,
|
|
||||||
"pattern": "on",
|
|
||||||
"delay": 520,
|
|
||||||
"patterns": {
|
|
||||||
"flicker": {
|
|
||||||
"colors": [
|
|
||||||
"#ff00d6"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"on": {
|
|
||||||
"colors": [
|
|
||||||
"#ff00ff"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"off": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"front1": {
|
|
||||||
"names": [
|
|
||||||
"front1"
|
|
||||||
],
|
|
||||||
"settings": {
|
|
||||||
"colors": [
|
|
||||||
"#0000ff",
|
|
||||||
"#c30074",
|
|
||||||
"#00ff00",
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"brightness": 255,
|
|
||||||
"pattern": "on",
|
|
||||||
"delay": 520,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10,
|
|
||||||
"patterns": {
|
|
||||||
"on": {
|
|
||||||
"colors": [
|
|
||||||
"#ff00ff",
|
|
||||||
"#0000ff"
|
|
||||||
],
|
|
||||||
"delay": 2409,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"off": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"pulse": {
|
|
||||||
"colors": [
|
|
||||||
"#000090"
|
|
||||||
],
|
|
||||||
"delay": 1051,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"transition": {
|
|
||||||
"colors": [
|
|
||||||
"#ff0000",
|
|
||||||
"#0000ff"
|
|
||||||
],
|
|
||||||
"delay": 2564,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"front2": {
|
|
||||||
"names": [
|
|
||||||
"front2"
|
|
||||||
],
|
|
||||||
"settings": {
|
|
||||||
"colors": [
|
|
||||||
"#0000ff",
|
|
||||||
"#c30074",
|
|
||||||
"#00ff00",
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"brightness": 255,
|
|
||||||
"pattern": "off",
|
|
||||||
"delay": 520,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10,
|
|
||||||
"patterns": {
|
|
||||||
"on": {
|
|
||||||
"colors": [
|
|
||||||
"#ff00ff"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"off": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"rainbow": {
|
|
||||||
"colors": [
|
|
||||||
"#00006b"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"transition": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"front3": {
|
|
||||||
"names": [
|
|
||||||
"front3"
|
|
||||||
],
|
|
||||||
"settings": {
|
|
||||||
"colors": [
|
|
||||||
"#0000ff",
|
|
||||||
"#c30074",
|
|
||||||
"#00ff00",
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"brightness": 29,
|
|
||||||
"pattern": "on",
|
|
||||||
"delay": 520,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"n5": 10,
|
|
||||||
"n6": 10,
|
|
||||||
"patterns": {
|
|
||||||
"on": {
|
|
||||||
"colors": [
|
|
||||||
"#d200d1"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"off": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"rainbow": {
|
|
||||||
"colors": [
|
|
||||||
"#00006b"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
},
|
|
||||||
"transition": {
|
|
||||||
"colors": [
|
|
||||||
"#000000"
|
|
||||||
],
|
|
||||||
"delay": 99,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tab_order": [
|
|
||||||
"sign",
|
|
||||||
"dj",
|
|
||||||
"middle",
|
|
||||||
"sides",
|
|
||||||
"outside",
|
|
||||||
"middle1",
|
|
||||||
"middle2",
|
|
||||||
"middle3",
|
|
||||||
"middle4",
|
|
||||||
"front1",
|
|
||||||
"front2",
|
|
||||||
"front3"
|
|
||||||
],
|
|
||||||
"color_palette": [
|
|
||||||
"#c33232",
|
|
||||||
"#3237c3"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
17
run_web.py
17
run_web.py
@@ -1,17 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
Startup script for the Flask web application.
|
|
||||||
"""
|
|
||||||
import sys
|
|
||||||
import os
|
|
||||||
|
|
||||||
# Add src directory to path
|
|
||||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'src'))
|
|
||||||
|
|
||||||
from flask_app import app
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
print("Starting Lighting Controller Web App with Flask...")
|
|
||||||
print("Open http://localhost:5000 in your browser")
|
|
||||||
app.run(host='0.0.0.0', port=5000, debug=True)
|
|
||||||
|
|
||||||
192
settings.json
192
settings.json
@@ -1,54 +1,162 @@
|
|||||||
{
|
{
|
||||||
"tab_password": "",
|
"lights": {
|
||||||
"current_profile": "default",
|
"sign": {
|
||||||
"patterns": {
|
"names": [
|
||||||
"on": {
|
"tt-sign",
|
||||||
"min_delay": 10,
|
"1"
|
||||||
"max_delay": 10000
|
],
|
||||||
|
"settings": {
|
||||||
|
"colors": [
|
||||||
|
"#0000ff",
|
||||||
|
"#c30074",
|
||||||
|
"#00ff00"
|
||||||
|
],
|
||||||
|
"brightness": 9,
|
||||||
|
"pattern": "off",
|
||||||
|
"delay": 50
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"off": {
|
"dj": {
|
||||||
"min_delay": 10,
|
"names": [
|
||||||
"max_delay": 10000
|
"dj"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"colors": [
|
||||||
|
"#0000ff",
|
||||||
|
"#c30074",
|
||||||
|
"#00ff00",
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"brightness": 6,
|
||||||
|
"pattern": "flicker",
|
||||||
|
"delay": 520
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"rainbow": {
|
"middle": {
|
||||||
"Step Rate": "n1",
|
"names": [
|
||||||
"min_delay": 10,
|
"middle1",
|
||||||
"max_delay": 10000
|
"middle2",
|
||||||
|
"middle3",
|
||||||
|
"middle4"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"colors": [
|
||||||
|
"#0000ff",
|
||||||
|
"#c30074",
|
||||||
|
"#00ff00",
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"brightness": 6,
|
||||||
|
"pattern": "flicker",
|
||||||
|
"delay": 520
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"transition": {
|
"sides": {
|
||||||
"min_delay": 10,
|
"names": [
|
||||||
"max_delay": 10000
|
"left",
|
||||||
|
"right"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"colors": [
|
||||||
|
"#0000ff",
|
||||||
|
"#c30074",
|
||||||
|
"#00ff00",
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"brightness": 6,
|
||||||
|
"pattern": "on",
|
||||||
|
"delay": 520
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"chase": {
|
"outside": {
|
||||||
"Colour 1 Length": "n1",
|
"names": [
|
||||||
"Colour 2 Length": "n2",
|
"outside"
|
||||||
"Step 1": "n3",
|
],
|
||||||
"Step 2": "n4",
|
"settings": {
|
||||||
"min_delay": 10,
|
"colors": [
|
||||||
"max_delay": 10000
|
"#0000ff",
|
||||||
|
"#c30074",
|
||||||
|
"#00ff00",
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"brightness": 6,
|
||||||
|
"pattern": "on",
|
||||||
|
"delay": 520
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"pulse": {
|
"middle1": {
|
||||||
"Attack": "n1",
|
"names": [
|
||||||
"Hold": "n2",
|
"middle1"
|
||||||
"Decay": "n3",
|
],
|
||||||
"min_delay": 10,
|
"settings": {
|
||||||
"max_delay": 10000
|
"colors": [
|
||||||
|
"#0000ff",
|
||||||
|
"#c30074",
|
||||||
|
"#00ff00",
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"brightness": 6,
|
||||||
|
"pattern": "flicker",
|
||||||
|
"delay": 520
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"circle": {
|
"middle2": {
|
||||||
"Head Rate": "n1",
|
"names": [
|
||||||
"Max Length": "n2",
|
"middle2"
|
||||||
"Tail Rate": "n3",
|
],
|
||||||
"Min Length": "n4",
|
"settings": {
|
||||||
"min_delay": 10,
|
"colors": [
|
||||||
"max_delay": 10000
|
"#0000ff",
|
||||||
|
"#c30074",
|
||||||
|
"#00ff00",
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"brightness": 6,
|
||||||
|
"pattern": "flicker",
|
||||||
|
"delay": 520
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"blink": {
|
"middle3": {
|
||||||
"min_delay": 10,
|
"names": [
|
||||||
"max_delay": 10000
|
"middle3"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"colors": [
|
||||||
|
"#0000ff",
|
||||||
|
"#c30074",
|
||||||
|
"#00ff00",
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"brightness": 6,
|
||||||
|
"pattern": "flicker",
|
||||||
|
"delay": 520
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"middle4": {
|
||||||
|
"names": [
|
||||||
|
"middle4"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"colors": [
|
||||||
|
"#0000ff",
|
||||||
|
"#c30074",
|
||||||
|
"#00ff00",
|
||||||
|
"#000000"
|
||||||
|
],
|
||||||
|
"brightness": 6,
|
||||||
|
"pattern": "flicker",
|
||||||
|
"delay": 520
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"color_palette": [
|
"patterns": [
|
||||||
"#c12525",
|
"on",
|
||||||
"#246dcc"
|
"off",
|
||||||
|
"blink",
|
||||||
|
"rainbow_cycle",
|
||||||
|
"color_transition",
|
||||||
|
"theater_chase",
|
||||||
|
"flicker",
|
||||||
|
"pulse"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
820
src/flask_app.py
820
src/flask_app.py
@@ -1,820 +0,0 @@
|
|||||||
"""
|
|
||||||
Flask web application for the lighting controller.
|
|
||||||
Provides REST API and serves the web UI.
|
|
||||||
"""
|
|
||||||
import asyncio
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
import math
|
|
||||||
from flask import Flask, render_template, request, jsonify
|
|
||||||
from flask_cors import CORS
|
|
||||||
from networking import WebSocketClient
|
|
||||||
import color_utils
|
|
||||||
from settings import Settings
|
|
||||||
|
|
||||||
app = Flask(__name__,
|
|
||||||
template_folder='../templates',
|
|
||||||
static_folder='../static')
|
|
||||||
CORS(app)
|
|
||||||
|
|
||||||
# Global settings and WebSocket client
|
|
||||||
settings = Settings()
|
|
||||||
websocket_client = None
|
|
||||||
websocket_uri = "ws://192.168.4.1:80/ws"
|
|
||||||
|
|
||||||
# Load current profile on startup
|
|
||||||
def load_current_profile():
|
|
||||||
"""Load the current profile if one is set."""
|
|
||||||
current_profile = settings.get("current_profile")
|
|
||||||
if current_profile:
|
|
||||||
profile_path = os.path.join("profiles", f"{current_profile}.json")
|
|
||||||
if os.path.exists(profile_path):
|
|
||||||
try:
|
|
||||||
with open(profile_path, 'r') as file:
|
|
||||||
profile_data = json.load(file)
|
|
||||||
|
|
||||||
# Update settings with profile data
|
|
||||||
profile_data.pop("current_profile", None)
|
|
||||||
patterns_backup = settings.get("patterns", {})
|
|
||||||
tab_password_backup = settings.get("tab_password", "")
|
|
||||||
|
|
||||||
settings.update(profile_data)
|
|
||||||
settings["patterns"] = patterns_backup
|
|
||||||
settings["current_profile"] = current_profile
|
|
||||||
# Ensure color_palette exists (default to empty array if not in profile)
|
|
||||||
if "color_palette" not in settings:
|
|
||||||
settings["color_palette"] = []
|
|
||||||
print(f"Loaded profile '{current_profile}' on startup.")
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading profile '{current_profile}': {e}")
|
|
||||||
|
|
||||||
# Load current profile when module is imported
|
|
||||||
load_current_profile()
|
|
||||||
|
|
||||||
# Presets file path
|
|
||||||
PRESETS_FILE = "presets.json"
|
|
||||||
|
|
||||||
def load_presets():
|
|
||||||
"""Load presets from presets.json file."""
|
|
||||||
try:
|
|
||||||
if os.path.exists(PRESETS_FILE):
|
|
||||||
with open(PRESETS_FILE, 'r') as file:
|
|
||||||
return json.load(file)
|
|
||||||
return {}
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading presets: {e}")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
def save_presets(presets):
|
|
||||||
"""Save presets to presets.json file."""
|
|
||||||
try:
|
|
||||||
with open(PRESETS_FILE, 'w') as file:
|
|
||||||
json.dump(presets, file, indent=4)
|
|
||||||
print(f"Presets saved successfully.")
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error saving presets: {e}")
|
|
||||||
|
|
||||||
|
|
||||||
def delay_to_slider(delay_ms, min_delay=10, max_delay=10000):
|
|
||||||
"""Convert delay in ms to slider position (0-1000) using logarithmic scale."""
|
|
||||||
if delay_ms <= min_delay:
|
|
||||||
return 0
|
|
||||||
if delay_ms >= max_delay:
|
|
||||||
return 1000
|
|
||||||
if min_delay == max_delay:
|
|
||||||
return 0
|
|
||||||
return 1000 * math.log(delay_ms / min_delay) / math.log(max_delay / min_delay)
|
|
||||||
|
|
||||||
|
|
||||||
def slider_to_delay(slider_value, min_delay=10, max_delay=10000):
|
|
||||||
"""Convert slider position (0-1000) to delay in ms using logarithmic scale."""
|
|
||||||
if slider_value <= 0:
|
|
||||||
return min_delay
|
|
||||||
if slider_value >= 1000:
|
|
||||||
return max_delay
|
|
||||||
if min_delay == max_delay:
|
|
||||||
return min_delay
|
|
||||||
return int(min_delay * ((max_delay / min_delay) ** (slider_value / 1000)))
|
|
||||||
|
|
||||||
|
|
||||||
def get_pattern_settings(tab_name, pattern_name):
|
|
||||||
"""Get pattern-specific settings."""
|
|
||||||
light_settings = 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]
|
|
||||||
# Fall back to global settings if pattern-specific settings don't exist
|
|
||||||
global_colors = light_settings.get("colors", ["#000000"])
|
|
||||||
return {
|
|
||||||
"colors": pattern_settings.get("colors", global_colors),
|
|
||||||
"delay": pattern_settings.get("delay", light_settings.get("delay", 100)),
|
|
||||||
"n1": pattern_settings.get("n1", light_settings.get("n1", 10)),
|
|
||||||
"n2": pattern_settings.get("n2", light_settings.get("n2", 10)),
|
|
||||||
"n3": pattern_settings.get("n3", light_settings.get("n3", 10)),
|
|
||||||
"n4": pattern_settings.get("n4", light_settings.get("n4", 10)),
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def save_pattern_settings(tab_name, pattern_name, colors=None, delay=None, n_params=None):
|
|
||||||
"""Save pattern-specific settings."""
|
|
||||||
light_settings = 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 save_current_profile():
|
|
||||||
"""Save current settings to the active profile file."""
|
|
||||||
current_profile = settings.get("current_profile")
|
|
||||||
|
|
||||||
# If no profile is set, create/use a default profile
|
|
||||||
if not current_profile:
|
|
||||||
current_profile = "default"
|
|
||||||
settings["current_profile"] = current_profile
|
|
||||||
# Save current_profile to settings.json
|
|
||||||
settings.save()
|
|
||||||
|
|
||||||
try:
|
|
||||||
profiles_dir = "profiles"
|
|
||||||
os.makedirs(profiles_dir, exist_ok=True)
|
|
||||||
profile_path = os.path.join(profiles_dir, f"{current_profile}.json")
|
|
||||||
|
|
||||||
# Get current tab order
|
|
||||||
tab_order = settings.get("tab_order", [])
|
|
||||||
if "lights" in settings:
|
|
||||||
# Ensure all current tabs are in the order
|
|
||||||
current_tabs = set(settings["lights"].keys())
|
|
||||||
order_tabs = set(tab_order)
|
|
||||||
for tab in current_tabs:
|
|
||||||
if tab not in order_tabs:
|
|
||||||
tab_order.append(tab)
|
|
||||||
settings["tab_order"] = tab_order
|
|
||||||
|
|
||||||
# Save to profile file (exclude current_profile from profile)
|
|
||||||
profile_data = dict(settings)
|
|
||||||
profile_data.pop("current_profile", None)
|
|
||||||
profile_data.pop("patterns", None) # Patterns stay in settings.json
|
|
||||||
# Ensure color_palette is included if it exists
|
|
||||||
if "color_palette" not in profile_data:
|
|
||||||
profile_data["color_palette"] = settings.get("color_palette", [])
|
|
||||||
|
|
||||||
with open(profile_path, 'w') as file:
|
|
||||||
json.dump(profile_data, file, indent=4)
|
|
||||||
print(f"Profile '{current_profile}' saved successfully.")
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error saving profile: {e}")
|
|
||||||
|
|
||||||
|
|
||||||
async def send_to_lighting_controller(payload):
|
|
||||||
"""Send data to the lighting controller via WebSocket."""
|
|
||||||
global websocket_client
|
|
||||||
if websocket_client is None:
|
|
||||||
websocket_client = WebSocketClient(websocket_uri)
|
|
||||||
await websocket_client.connect()
|
|
||||||
|
|
||||||
if not websocket_client.is_connected:
|
|
||||||
await websocket_client.connect()
|
|
||||||
|
|
||||||
if websocket_client.is_connected:
|
|
||||||
await websocket_client.send_data(payload)
|
|
||||||
|
|
||||||
|
|
||||||
def run_async(coro):
|
|
||||||
"""Run async function in sync context."""
|
|
||||||
loop = asyncio.new_event_loop()
|
|
||||||
asyncio.set_event_loop(loop)
|
|
||||||
try:
|
|
||||||
return loop.run_until_complete(coro)
|
|
||||||
finally:
|
|
||||||
loop.close()
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/')
|
|
||||||
def index():
|
|
||||||
"""Serve the main web UI."""
|
|
||||||
return render_template('index.html')
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/state', methods=['GET'])
|
|
||||||
def get_state():
|
|
||||||
"""Get the current state of all lights."""
|
|
||||||
# Ensure a profile is set if we have lights but no profile
|
|
||||||
if settings.get("lights") and not settings.get("current_profile"):
|
|
||||||
current_profile = "default"
|
|
||||||
settings["current_profile"] = current_profile
|
|
||||||
settings.save()
|
|
||||||
# Create default profile file if it doesn't exist
|
|
||||||
profiles_dir = "profiles"
|
|
||||||
os.makedirs(profiles_dir, exist_ok=True)
|
|
||||||
profile_path = os.path.join(profiles_dir, f"{current_profile}.json")
|
|
||||||
if not os.path.exists(profile_path):
|
|
||||||
profile_data = {
|
|
||||||
"lights": settings.get("lights", {}),
|
|
||||||
"tab_order": settings.get("tab_order", []),
|
|
||||||
"tab_password": settings.get("tab_password", "")
|
|
||||||
}
|
|
||||||
with open(profile_path, 'w') as file:
|
|
||||||
json.dump(profile_data, file, indent=4)
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"lights": settings.get("lights", {}),
|
|
||||||
"patterns": settings.get("patterns", {}),
|
|
||||||
"tab_order": settings.get("tab_order", []),
|
|
||||||
"current_profile": settings.get("current_profile", ""),
|
|
||||||
"color_palette": settings.get("color_palette", []),
|
|
||||||
"presets": load_presets()
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/pattern', methods=['POST'])
|
|
||||||
def set_pattern():
|
|
||||||
"""Set the pattern for a light group."""
|
|
||||||
data = request.json
|
|
||||||
tab_name = data.get("tab_name")
|
|
||||||
pattern_name = data.get("pattern")
|
|
||||||
|
|
||||||
if not tab_name or not pattern_name:
|
|
||||||
return jsonify({"error": "Missing tab_name or pattern"}), 400
|
|
||||||
|
|
||||||
if tab_name not in settings.get("lights", {}):
|
|
||||||
return jsonify({"error": f"Tab '{tab_name}' not found"}), 404
|
|
||||||
|
|
||||||
# Save current pattern's settings before switching
|
|
||||||
old_pattern = settings["lights"][tab_name]["settings"].get("pattern", "on")
|
|
||||||
# Get current delay (would need to be passed from frontend)
|
|
||||||
current_delay = data.get("delay", 100)
|
|
||||||
current_n_params = {
|
|
||||||
f"n{i}": data.get(f"n{i}", 10) for i in range(1, 5)
|
|
||||||
}
|
|
||||||
save_pattern_settings(
|
|
||||||
tab_name,
|
|
||||||
old_pattern,
|
|
||||||
colors=data.get("colors", ["#000000"]),
|
|
||||||
delay=current_delay,
|
|
||||||
n_params=current_n_params
|
|
||||||
)
|
|
||||||
|
|
||||||
# Load new pattern's settings
|
|
||||||
new_pattern_settings = get_pattern_settings(tab_name, pattern_name)
|
|
||||||
|
|
||||||
# Update settings
|
|
||||||
settings["lights"][tab_name]["settings"]["pattern"] = pattern_name
|
|
||||||
|
|
||||||
# Prepare payload for lighting controller
|
|
||||||
names = settings["lights"][tab_name]["names"]
|
|
||||||
payload = {
|
|
||||||
"save": True,
|
|
||||||
"names": names,
|
|
||||||
"settings": {
|
|
||||||
"pattern": pattern_name,
|
|
||||||
"brightness": settings["lights"][tab_name]["settings"].get("brightness", 127),
|
|
||||||
"delay": new_pattern_settings["delay"],
|
|
||||||
"colors": new_pattern_settings["colors"],
|
|
||||||
**{f"n{i}": new_pattern_settings[f"n{i}"] for i in range(1, 5)}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send to lighting controller
|
|
||||||
run_async(send_to_lighting_controller(payload))
|
|
||||||
|
|
||||||
settings.save()
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"success": True,
|
|
||||||
"pattern": pattern_name,
|
|
||||||
"settings": new_pattern_settings
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/parameters', methods=['POST'])
|
|
||||||
def set_parameters():
|
|
||||||
"""Update parameters (RGB, brightness, delay, n params) for a light group."""
|
|
||||||
data = request.json
|
|
||||||
tab_name = data.get("tab_name")
|
|
||||||
|
|
||||||
if not tab_name:
|
|
||||||
return jsonify({"error": "Missing tab_name"}), 400
|
|
||||||
|
|
||||||
if tab_name not in settings.get("lights", {}):
|
|
||||||
return jsonify({"error": f"Tab '{tab_name}' not found"}), 404
|
|
||||||
|
|
||||||
current_pattern = settings["lights"][tab_name]["settings"].get("pattern", "on")
|
|
||||||
pattern_config = settings.get("patterns", {}).get(current_pattern, {})
|
|
||||||
min_delay = pattern_config.get("min_delay", 10)
|
|
||||||
max_delay = pattern_config.get("max_delay", 10000)
|
|
||||||
|
|
||||||
# Build settings payload
|
|
||||||
payload_settings = {}
|
|
||||||
|
|
||||||
# Handle RGB colors
|
|
||||||
if "red" in data or "green" in data or "blue" in data:
|
|
||||||
r = data.get("red", 0)
|
|
||||||
g = data.get("green", 0)
|
|
||||||
b = data.get("blue", 0)
|
|
||||||
hex_color = f"#{r:02x}{g:02x}{b:02x}"
|
|
||||||
|
|
||||||
# Update color in palette
|
|
||||||
pattern_settings = get_pattern_settings(tab_name, current_pattern)
|
|
||||||
colors = pattern_settings["colors"].copy()
|
|
||||||
selected_index = data.get("color_index", 0)
|
|
||||||
if 0 <= selected_index < len(colors):
|
|
||||||
colors[selected_index] = hex_color
|
|
||||||
else:
|
|
||||||
# If index is out of range, append the color
|
|
||||||
colors.append(hex_color)
|
|
||||||
|
|
||||||
# Save pattern settings to persist the color change
|
|
||||||
save_pattern_settings(tab_name, current_pattern, colors=colors)
|
|
||||||
payload_settings["colors"] = colors
|
|
||||||
|
|
||||||
# Handle brightness
|
|
||||||
if "brightness" in data:
|
|
||||||
brightness = int(data["brightness"])
|
|
||||||
settings["lights"][tab_name]["settings"]["brightness"] = brightness
|
|
||||||
payload_settings["brightness"] = brightness
|
|
||||||
|
|
||||||
# Handle delay
|
|
||||||
if "delay_slider" in data:
|
|
||||||
slider_value = int(data["delay_slider"])
|
|
||||||
delay = slider_to_delay(slider_value, min_delay, max_delay)
|
|
||||||
save_pattern_settings(tab_name, current_pattern, delay=delay)
|
|
||||||
payload_settings["delay"] = delay
|
|
||||||
|
|
||||||
# Handle n parameters
|
|
||||||
n_params = {}
|
|
||||||
for i in range(1, 5):
|
|
||||||
if f"n{i}" in data:
|
|
||||||
n_params[f"n{i}"] = int(data[f"n{i}"])
|
|
||||||
|
|
||||||
if n_params:
|
|
||||||
save_pattern_settings(tab_name, current_pattern, n_params=n_params)
|
|
||||||
payload_settings.update(n_params)
|
|
||||||
|
|
||||||
# Send to lighting controller
|
|
||||||
if payload_settings:
|
|
||||||
names = settings["lights"][tab_name]["names"]
|
|
||||||
payload = {
|
|
||||||
"save": True,
|
|
||||||
"names": names,
|
|
||||||
"settings": payload_settings
|
|
||||||
}
|
|
||||||
run_async(send_to_lighting_controller(payload))
|
|
||||||
|
|
||||||
# Save to settings.json (for patterns) and to profile file (for lights data)
|
|
||||||
settings.save()
|
|
||||||
save_current_profile()
|
|
||||||
|
|
||||||
return jsonify({"success": True})
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/tabs', methods=['GET'])
|
|
||||||
def get_tabs():
|
|
||||||
"""Get list of tabs."""
|
|
||||||
return jsonify({
|
|
||||||
"tabs": settings.get("tab_order", []),
|
|
||||||
"lights": settings.get("lights", {})
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/tabs', methods=['POST'])
|
|
||||||
def create_tab():
|
|
||||||
"""Create a new tab."""
|
|
||||||
data = request.json
|
|
||||||
tab_name = data.get("name")
|
|
||||||
ids = data.get("ids", ["1"])
|
|
||||||
|
|
||||||
if not tab_name:
|
|
||||||
return jsonify({"error": "Missing name"}), 400
|
|
||||||
|
|
||||||
if tab_name in settings.get("lights", {}):
|
|
||||||
return jsonify({"error": f"Tab '{tab_name}' already exists"}), 400
|
|
||||||
|
|
||||||
settings.setdefault("lights", {})[tab_name] = {
|
|
||||||
"names": ids if isinstance(ids, list) else [ids],
|
|
||||||
"settings": {
|
|
||||||
"pattern": "on",
|
|
||||||
"brightness": 127,
|
|
||||||
"colors": ["#000000"],
|
|
||||||
"delay": 100,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"patterns": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if "tab_order" not in settings:
|
|
||||||
settings["tab_order"] = []
|
|
||||||
settings["tab_order"].append(tab_name)
|
|
||||||
settings.save()
|
|
||||||
save_current_profile()
|
|
||||||
|
|
||||||
return jsonify({"success": True, "tab_name": tab_name})
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/tabs/<tab_name>', methods=['PUT'])
|
|
||||||
def update_tab(tab_name):
|
|
||||||
"""Update a tab."""
|
|
||||||
data = request.json
|
|
||||||
new_name = data.get("name", tab_name)
|
|
||||||
ids = data.get("ids")
|
|
||||||
|
|
||||||
if tab_name not in settings.get("lights", {}):
|
|
||||||
return jsonify({"error": f"Tab '{tab_name}' not found"}), 404
|
|
||||||
|
|
||||||
if new_name != tab_name:
|
|
||||||
if new_name in settings.get("lights", {}):
|
|
||||||
return jsonify({"error": f"Tab '{new_name}' already exists"}), 400
|
|
||||||
|
|
||||||
# Rename tab
|
|
||||||
settings["lights"][new_name] = settings["lights"][tab_name]
|
|
||||||
del settings["lights"][tab_name]
|
|
||||||
|
|
||||||
# Update tab order
|
|
||||||
if "tab_order" in settings and tab_name in settings["tab_order"]:
|
|
||||||
index = settings["tab_order"].index(tab_name)
|
|
||||||
settings["tab_order"][index] = new_name
|
|
||||||
|
|
||||||
tab_name = new_name
|
|
||||||
|
|
||||||
if ids is not None:
|
|
||||||
settings["lights"][tab_name]["names"] = ids if isinstance(ids, list) else [ids]
|
|
||||||
|
|
||||||
settings.save()
|
|
||||||
save_current_profile()
|
|
||||||
|
|
||||||
return jsonify({"success": True, "tab_name": tab_name})
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/tabs/<tab_name>', methods=['DELETE'])
|
|
||||||
def delete_tab(tab_name):
|
|
||||||
"""Delete a tab."""
|
|
||||||
if tab_name not in settings.get("lights", {}):
|
|
||||||
return jsonify({"error": f"Tab '{tab_name}' not found"}), 404
|
|
||||||
|
|
||||||
del settings["lights"][tab_name]
|
|
||||||
|
|
||||||
if "tab_order" in settings and tab_name in settings["tab_order"]:
|
|
||||||
settings["tab_order"].remove(tab_name)
|
|
||||||
|
|
||||||
settings.save()
|
|
||||||
save_current_profile()
|
|
||||||
|
|
||||||
return jsonify({"success": True})
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/profiles', methods=['GET'])
|
|
||||||
def get_profiles():
|
|
||||||
"""Get list of profiles."""
|
|
||||||
profiles_dir = "profiles"
|
|
||||||
profiles = []
|
|
||||||
if os.path.exists(profiles_dir):
|
|
||||||
for filename in os.listdir(profiles_dir):
|
|
||||||
if filename.endswith('.json'):
|
|
||||||
profiles.append(filename[:-5])
|
|
||||||
profiles.sort()
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"profiles": profiles,
|
|
||||||
"current_profile": settings.get("current_profile", ""),
|
|
||||||
"color_palette": settings.get("color_palette", [])
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/profiles', methods=['POST'])
|
|
||||||
def create_profile():
|
|
||||||
"""Create a new profile."""
|
|
||||||
data = request.json
|
|
||||||
profile_name = data.get("name")
|
|
||||||
|
|
||||||
if not profile_name:
|
|
||||||
return jsonify({"error": "Missing name"}), 400
|
|
||||||
|
|
||||||
profiles_dir = "profiles"
|
|
||||||
os.makedirs(profiles_dir, exist_ok=True)
|
|
||||||
profile_path = os.path.join(profiles_dir, f"{profile_name}.json")
|
|
||||||
|
|
||||||
if os.path.exists(profile_path):
|
|
||||||
return jsonify({"error": f"Profile '{profile_name}' already exists"}), 400
|
|
||||||
|
|
||||||
empty_profile = {
|
|
||||||
"lights": {},
|
|
||||||
"tab_password": "",
|
|
||||||
"tab_order": [],
|
|
||||||
"color_palette": []
|
|
||||||
}
|
|
||||||
|
|
||||||
with open(profile_path, 'w') as file:
|
|
||||||
json.dump(empty_profile, file, indent=4)
|
|
||||||
|
|
||||||
return jsonify({"success": True, "profile_name": profile_name})
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/profiles/<profile_name>', methods=['DELETE'])
|
|
||||||
def delete_profile(profile_name):
|
|
||||||
"""Delete a profile."""
|
|
||||||
profiles_dir = "profiles"
|
|
||||||
profile_path = os.path.join(profiles_dir, f"{profile_name}.json")
|
|
||||||
|
|
||||||
if not os.path.exists(profile_path):
|
|
||||||
return jsonify({"error": f"Profile '{profile_name}' not found"}), 404
|
|
||||||
|
|
||||||
# Prevent deleting the only existing profile to avoid leaving the app with no profiles
|
|
||||||
existing_profiles = [
|
|
||||||
f[:-5] for f in os.listdir(profiles_dir) if f.endswith('.json')
|
|
||||||
] if os.path.exists(profiles_dir) else []
|
|
||||||
if len(existing_profiles) <= 1:
|
|
||||||
return jsonify({"error": "Cannot delete the only existing profile"}), 400
|
|
||||||
|
|
||||||
# If deleting the current profile, clear current_profile and related state
|
|
||||||
if settings.get("current_profile") == profile_name:
|
|
||||||
settings["current_profile"] = ""
|
|
||||||
settings["lights"] = {}
|
|
||||||
settings["tab_order"] = []
|
|
||||||
settings["color_palette"] = []
|
|
||||||
# Persist to settings.json
|
|
||||||
settings_to_save = {
|
|
||||||
"tab_password": settings.get("tab_password", ""),
|
|
||||||
"current_profile": "",
|
|
||||||
"patterns": settings.get("patterns", {})
|
|
||||||
}
|
|
||||||
with open("settings.json", 'w') as f:
|
|
||||||
json.dump(settings_to_save, f, indent=4)
|
|
||||||
|
|
||||||
# Remove the profile file
|
|
||||||
os.remove(profile_path)
|
|
||||||
|
|
||||||
return jsonify({"success": True})
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/profiles/<profile_name>', methods=['POST'])
|
|
||||||
def load_profile(profile_name):
|
|
||||||
"""Load a profile."""
|
|
||||||
profile_path = os.path.join("profiles", f"{profile_name}.json")
|
|
||||||
|
|
||||||
if not os.path.exists(profile_path):
|
|
||||||
return jsonify({"error": f"Profile '{profile_name}' not found"}), 404
|
|
||||||
|
|
||||||
with open(profile_path, 'r') as file:
|
|
||||||
profile_data = json.load(file)
|
|
||||||
|
|
||||||
# Update settings with profile data
|
|
||||||
profile_data.pop("current_profile", None)
|
|
||||||
patterns_backup = settings.get("patterns", {})
|
|
||||||
tab_password_backup = settings.get("tab_password", "")
|
|
||||||
|
|
||||||
settings.update(profile_data)
|
|
||||||
settings["patterns"] = patterns_backup
|
|
||||||
settings["current_profile"] = profile_name
|
|
||||||
# Ensure color_palette exists (default to empty array if not in profile)
|
|
||||||
if "color_palette" not in settings:
|
|
||||||
settings["color_palette"] = []
|
|
||||||
|
|
||||||
settings_to_save = {
|
|
||||||
"tab_password": tab_password_backup,
|
|
||||||
"current_profile": profile_name,
|
|
||||||
"patterns": patterns_backup
|
|
||||||
}
|
|
||||||
with open("settings.json", 'w') as f:
|
|
||||||
json.dump(settings_to_save, f, indent=4)
|
|
||||||
|
|
||||||
return jsonify({"success": True})
|
|
||||||
|
|
||||||
@app.route('/api/profiles/<profile_name>/palette', methods=['GET'])
|
|
||||||
def get_profile_palette(profile_name):
|
|
||||||
"""Get the color palette for a profile."""
|
|
||||||
profile_path = os.path.join("profiles", f"{profile_name}.json")
|
|
||||||
|
|
||||||
if not os.path.exists(profile_path):
|
|
||||||
return jsonify({"error": f"Profile '{profile_name}' not found"}), 404
|
|
||||||
|
|
||||||
with open(profile_path, 'r') as file:
|
|
||||||
profile_data = json.load(file)
|
|
||||||
|
|
||||||
palette = profile_data.get("color_palette", [])
|
|
||||||
return jsonify({"color_palette": palette})
|
|
||||||
|
|
||||||
@app.route('/api/profiles/<profile_name>/palette', methods=['POST'])
|
|
||||||
def update_profile_palette(profile_name):
|
|
||||||
"""Update the color palette for a profile."""
|
|
||||||
data = request.json
|
|
||||||
color_palette = data.get("color_palette", [])
|
|
||||||
|
|
||||||
profile_path = os.path.join("profiles", f"{profile_name}.json")
|
|
||||||
|
|
||||||
if not os.path.exists(profile_path):
|
|
||||||
return jsonify({"error": f"Profile '{profile_name}' not found"}), 404
|
|
||||||
|
|
||||||
with open(profile_path, 'r') as file:
|
|
||||||
profile_data = json.load(file)
|
|
||||||
|
|
||||||
profile_data["color_palette"] = color_palette
|
|
||||||
|
|
||||||
with open(profile_path, 'w') as file:
|
|
||||||
json.dump(profile_data, file, indent=4)
|
|
||||||
|
|
||||||
# Update current settings if this is the active profile
|
|
||||||
if settings.get("current_profile") == profile_name:
|
|
||||||
settings["color_palette"] = color_palette
|
|
||||||
|
|
||||||
return jsonify({"success": True, "color_palette": color_palette})
|
|
||||||
|
|
||||||
@app.route('/api/profiles/<profile_name>/save', methods=['POST'])
|
|
||||||
def save_profile(profile_name):
|
|
||||||
"""Save current state to a profile."""
|
|
||||||
# Save current state to the specified profile
|
|
||||||
save_current_profile()
|
|
||||||
|
|
||||||
# If saving to a different profile, switch to it
|
|
||||||
if profile_name != settings.get("current_profile"):
|
|
||||||
settings["current_profile"] = profile_name
|
|
||||||
settings.save()
|
|
||||||
save_current_profile()
|
|
||||||
|
|
||||||
return jsonify({"success": True})
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/presets', methods=['GET'])
|
|
||||||
def get_presets():
|
|
||||||
"""Get list of all presets."""
|
|
||||||
presets = load_presets()
|
|
||||||
return jsonify({
|
|
||||||
"presets": presets
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/presets', methods=['POST'])
|
|
||||||
def create_preset():
|
|
||||||
"""Create a new preset."""
|
|
||||||
data = request.json
|
|
||||||
preset_name = data.get("name")
|
|
||||||
|
|
||||||
if not preset_name:
|
|
||||||
return jsonify({"error": "Missing name"}), 400
|
|
||||||
|
|
||||||
presets = load_presets()
|
|
||||||
|
|
||||||
if preset_name in presets:
|
|
||||||
return jsonify({"error": f"Preset '{preset_name}' already exists"}), 400
|
|
||||||
|
|
||||||
# Validate required fields
|
|
||||||
required_fields = ["pattern", "colors", "brightness", "delay", "n1", "n2", "n3", "n4"]
|
|
||||||
for field in required_fields:
|
|
||||||
if field not in data:
|
|
||||||
return jsonify({"error": f"Missing required field: {field}"}), 400
|
|
||||||
|
|
||||||
preset = {
|
|
||||||
"pattern": data["pattern"],
|
|
||||||
"colors": data["colors"],
|
|
||||||
"brightness": int(data["brightness"]),
|
|
||||||
"delay": int(data["delay"]),
|
|
||||||
"n1": int(data["n1"]),
|
|
||||||
"n2": int(data["n2"]),
|
|
||||||
"n3": int(data["n3"]),
|
|
||||||
"n4": int(data["n4"])
|
|
||||||
}
|
|
||||||
|
|
||||||
presets[preset_name] = preset
|
|
||||||
save_presets(presets)
|
|
||||||
|
|
||||||
return jsonify({"success": True, "preset": preset})
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/presets/<preset_name>', methods=['PUT'])
|
|
||||||
def update_preset(preset_name):
|
|
||||||
"""Update an existing preset."""
|
|
||||||
data = request.json
|
|
||||||
new_name = data.get("name", preset_name)
|
|
||||||
|
|
||||||
presets = load_presets()
|
|
||||||
|
|
||||||
if preset_name not in presets:
|
|
||||||
return jsonify({"error": f"Preset '{preset_name}' not found"}), 404
|
|
||||||
|
|
||||||
# If renaming, check if new name exists
|
|
||||||
if new_name != preset_name:
|
|
||||||
if new_name in presets:
|
|
||||||
return jsonify({"error": f"Preset '{new_name}' already exists"}), 400
|
|
||||||
# Rename preset
|
|
||||||
presets[new_name] = presets[preset_name]
|
|
||||||
del presets[preset_name]
|
|
||||||
preset_name = new_name
|
|
||||||
|
|
||||||
# Update preset fields
|
|
||||||
preset = presets[preset_name]
|
|
||||||
if "pattern" in data:
|
|
||||||
preset["pattern"] = data["pattern"]
|
|
||||||
if "colors" in data:
|
|
||||||
preset["colors"] = data["colors"]
|
|
||||||
if "brightness" in data:
|
|
||||||
preset["brightness"] = int(data["brightness"])
|
|
||||||
if "delay" in data:
|
|
||||||
preset["delay"] = int(data["delay"])
|
|
||||||
for i in range(1, 5):
|
|
||||||
if f"n{i}" in data:
|
|
||||||
preset[f"n{i}"] = int(data[f"n{i}"])
|
|
||||||
|
|
||||||
save_presets(presets)
|
|
||||||
|
|
||||||
return jsonify({"success": True, "preset": preset})
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/presets/<preset_name>', methods=['DELETE'])
|
|
||||||
def delete_preset(preset_name):
|
|
||||||
"""Delete a preset."""
|
|
||||||
presets = load_presets()
|
|
||||||
|
|
||||||
if preset_name not in presets:
|
|
||||||
return jsonify({"error": f"Preset '{preset_name}' not found"}), 404
|
|
||||||
|
|
||||||
del presets[preset_name]
|
|
||||||
save_presets(presets)
|
|
||||||
|
|
||||||
return jsonify({"success": True})
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/presets/<preset_name>/apply', methods=['POST'])
|
|
||||||
def apply_preset(preset_name):
|
|
||||||
"""Apply a preset to a tab."""
|
|
||||||
data = request.json
|
|
||||||
tab_name = data.get("tab_name")
|
|
||||||
|
|
||||||
if not tab_name:
|
|
||||||
return jsonify({"error": "Missing tab_name"}), 400
|
|
||||||
|
|
||||||
if tab_name not in settings.get("lights", {}):
|
|
||||||
return jsonify({"error": f"Tab '{tab_name}' not found"}), 404
|
|
||||||
|
|
||||||
presets = load_presets()
|
|
||||||
|
|
||||||
if preset_name not in presets:
|
|
||||||
return jsonify({"error": f"Preset '{preset_name}' not found"}), 404
|
|
||||||
|
|
||||||
preset = presets[preset_name]
|
|
||||||
|
|
||||||
# Apply preset to tab
|
|
||||||
light_settings = settings["lights"][tab_name]["settings"]
|
|
||||||
light_settings["pattern"] = preset["pattern"]
|
|
||||||
light_settings["brightness"] = preset["brightness"]
|
|
||||||
|
|
||||||
# Save pattern-specific settings
|
|
||||||
save_pattern_settings(
|
|
||||||
tab_name,
|
|
||||||
preset["pattern"],
|
|
||||||
colors=preset["colors"],
|
|
||||||
delay=preset["delay"],
|
|
||||||
n_params={f"n{i}": preset[f"n{i}"] for i in range(1, 5)}
|
|
||||||
)
|
|
||||||
|
|
||||||
# Prepare payload for lighting controller
|
|
||||||
names = settings["lights"][tab_name]["names"]
|
|
||||||
payload = {
|
|
||||||
"save": True,
|
|
||||||
"names": names,
|
|
||||||
"settings": {
|
|
||||||
"pattern": preset["pattern"],
|
|
||||||
"brightness": preset["brightness"],
|
|
||||||
"delay": preset["delay"],
|
|
||||||
"colors": preset["colors"],
|
|
||||||
**{f"n{i}": preset[f"n{i}"] for i in range(1, 5)}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send to lighting controller
|
|
||||||
run_async(send_to_lighting_controller(payload))
|
|
||||||
|
|
||||||
settings.save()
|
|
||||||
save_current_profile()
|
|
||||||
|
|
||||||
return jsonify({"success": True})
|
|
||||||
|
|
||||||
|
|
||||||
def init_websocket():
|
|
||||||
"""Initialize WebSocket connection in background."""
|
|
||||||
global websocket_client
|
|
||||||
if websocket_client is None:
|
|
||||||
websocket_client = WebSocketClient(websocket_uri)
|
|
||||||
run_async(websocket_client.connect())
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
# Initialize WebSocket connection
|
|
||||||
init_websocket()
|
|
||||||
|
|
||||||
app.run(host='0.0.0.0', port=5000, debug=True)
|
|
||||||
|
|
||||||
1600
src/main.py
1600
src/main.py
File diff suppressed because it is too large
Load Diff
1054
src/main_textual.py
1054
src/main_textual.py
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,665 +0,0 @@
|
|||||||
"""
|
|
||||||
Microdot web application for the lighting controller.
|
|
||||||
Provides REST API and serves the web UI.
|
|
||||||
"""
|
|
||||||
import asyncio
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
import math
|
|
||||||
from microdot import Microdot, Request, Response
|
|
||||||
from networking import WebSocketClient
|
|
||||||
import color_utils
|
|
||||||
from settings import Settings
|
|
||||||
|
|
||||||
app = Microdot()
|
|
||||||
|
|
||||||
# CORS middleware
|
|
||||||
@app.after_request()
|
|
||||||
def cors_handler(req, res):
|
|
||||||
"""Add CORS headers to all responses."""
|
|
||||||
res.headers['Access-Control-Allow-Origin'] = '*'
|
|
||||||
res.headers['Access-Control-Allow-Methods'] = 'GET, POST, PUT, DELETE, OPTIONS'
|
|
||||||
res.headers['Access-Control-Allow-Headers'] = 'Content-Type'
|
|
||||||
return res
|
|
||||||
|
|
||||||
@app.route('/<path:path>', methods=['OPTIONS'])
|
|
||||||
def options_handler(req, path):
|
|
||||||
"""Handle OPTIONS requests for CORS."""
|
|
||||||
return Response('', status_code=204, headers={
|
|
||||||
'Access-Control-Allow-Origin': '*',
|
|
||||||
'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS',
|
|
||||||
'Access-Control-Allow-Headers': 'Content-Type'
|
|
||||||
})
|
|
||||||
|
|
||||||
# Global settings and WebSocket client
|
|
||||||
settings = Settings()
|
|
||||||
websocket_client = None
|
|
||||||
websocket_uri = "ws://192.168.4.1:80/ws"
|
|
||||||
|
|
||||||
# Load current profile on startup
|
|
||||||
def load_current_profile():
|
|
||||||
"""Load the current profile if one is set."""
|
|
||||||
current_profile = settings.get("current_profile")
|
|
||||||
if current_profile:
|
|
||||||
profile_path = os.path.join("profiles", f"{current_profile}.json")
|
|
||||||
if os.path.exists(profile_path):
|
|
||||||
try:
|
|
||||||
with open(profile_path, 'r') as file:
|
|
||||||
profile_data = json.load(file)
|
|
||||||
|
|
||||||
# Update settings with profile data
|
|
||||||
profile_data.pop("current_profile", None)
|
|
||||||
patterns_backup = settings.get("patterns", {})
|
|
||||||
tab_password_backup = settings.get("tab_password", "")
|
|
||||||
|
|
||||||
settings.update(profile_data)
|
|
||||||
settings["patterns"] = patterns_backup
|
|
||||||
settings["current_profile"] = current_profile
|
|
||||||
# Ensure color_palette exists (default to empty array if not in profile)
|
|
||||||
if "color_palette" not in settings:
|
|
||||||
settings["color_palette"] = []
|
|
||||||
print(f"Loaded profile '{current_profile}' on startup.")
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading profile '{current_profile}': {e}")
|
|
||||||
|
|
||||||
# Load current profile when module is imported
|
|
||||||
load_current_profile()
|
|
||||||
|
|
||||||
|
|
||||||
def delay_to_slider(delay_ms, min_delay=10, max_delay=10000):
|
|
||||||
"""Convert delay in ms to slider position (0-1000) using logarithmic scale."""
|
|
||||||
if delay_ms <= min_delay:
|
|
||||||
return 0
|
|
||||||
if delay_ms >= max_delay:
|
|
||||||
return 1000
|
|
||||||
if min_delay == max_delay:
|
|
||||||
return 0
|
|
||||||
return 1000 * math.log(delay_ms / min_delay) / math.log(max_delay / min_delay)
|
|
||||||
|
|
||||||
|
|
||||||
def slider_to_delay(slider_value, min_delay=10, max_delay=10000):
|
|
||||||
"""Convert slider position (0-1000) to delay in ms using logarithmic scale."""
|
|
||||||
if slider_value <= 0:
|
|
||||||
return min_delay
|
|
||||||
if slider_value >= 1000:
|
|
||||||
return max_delay
|
|
||||||
if min_delay == max_delay:
|
|
||||||
return min_delay
|
|
||||||
return int(min_delay * ((max_delay / min_delay) ** (slider_value / 1000)))
|
|
||||||
|
|
||||||
|
|
||||||
def get_pattern_settings(tab_name, pattern_name):
|
|
||||||
"""Get pattern-specific settings."""
|
|
||||||
light_settings = 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]
|
|
||||||
# Fall back to global settings if pattern-specific settings don't exist
|
|
||||||
global_colors = light_settings.get("colors", ["#000000"])
|
|
||||||
return {
|
|
||||||
"colors": pattern_settings.get("colors", global_colors),
|
|
||||||
"delay": pattern_settings.get("delay", light_settings.get("delay", 100)),
|
|
||||||
"n1": pattern_settings.get("n1", light_settings.get("n1", 10)),
|
|
||||||
"n2": pattern_settings.get("n2", light_settings.get("n2", 10)),
|
|
||||||
"n3": pattern_settings.get("n3", light_settings.get("n3", 10)),
|
|
||||||
"n4": pattern_settings.get("n4", light_settings.get("n4", 10)),
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def save_pattern_settings(tab_name, pattern_name, colors=None, delay=None, n_params=None):
|
|
||||||
"""Save pattern-specific settings."""
|
|
||||||
light_settings = 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 save_current_profile():
|
|
||||||
"""Save current settings to the active profile file."""
|
|
||||||
current_profile = settings.get("current_profile")
|
|
||||||
|
|
||||||
# If no profile is set, create/use a default profile
|
|
||||||
if not current_profile:
|
|
||||||
current_profile = "default"
|
|
||||||
settings["current_profile"] = current_profile
|
|
||||||
# Save current_profile to settings.json
|
|
||||||
settings.save()
|
|
||||||
|
|
||||||
try:
|
|
||||||
profiles_dir = "profiles"
|
|
||||||
os.makedirs(profiles_dir, exist_ok=True)
|
|
||||||
profile_path = os.path.join(profiles_dir, f"{current_profile}.json")
|
|
||||||
|
|
||||||
# Get current tab order
|
|
||||||
tab_order = settings.get("tab_order", [])
|
|
||||||
if "lights" in settings:
|
|
||||||
# Ensure all current tabs are in the order
|
|
||||||
current_tabs = set(settings["lights"].keys())
|
|
||||||
order_tabs = set(tab_order)
|
|
||||||
for tab in current_tabs:
|
|
||||||
if tab not in order_tabs:
|
|
||||||
tab_order.append(tab)
|
|
||||||
settings["tab_order"] = tab_order
|
|
||||||
|
|
||||||
# Save to profile file (exclude current_profile from profile)
|
|
||||||
profile_data = dict(settings)
|
|
||||||
profile_data.pop("current_profile", None)
|
|
||||||
profile_data.pop("patterns", None) # Patterns stay in settings.json
|
|
||||||
# Ensure color_palette is included if it exists
|
|
||||||
if "color_palette" not in profile_data:
|
|
||||||
profile_data["color_palette"] = settings.get("color_palette", [])
|
|
||||||
|
|
||||||
with open(profile_path, 'w') as file:
|
|
||||||
json.dump(profile_data, file, indent=4)
|
|
||||||
print(f"Profile '{current_profile}' saved successfully.")
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error saving profile: {e}")
|
|
||||||
|
|
||||||
|
|
||||||
async def send_to_lighting_controller(payload):
|
|
||||||
"""Send data to the lighting controller via WebSocket."""
|
|
||||||
global websocket_client
|
|
||||||
if websocket_client is None:
|
|
||||||
websocket_client = WebSocketClient(websocket_uri)
|
|
||||||
await websocket_client.connect()
|
|
||||||
|
|
||||||
if not websocket_client.is_connected:
|
|
||||||
await websocket_client.connect()
|
|
||||||
|
|
||||||
if websocket_client.is_connected:
|
|
||||||
await websocket_client.send_data(payload)
|
|
||||||
|
|
||||||
|
|
||||||
def run_async(coro):
|
|
||||||
"""Run async function in sync context."""
|
|
||||||
loop = asyncio.new_event_loop()
|
|
||||||
asyncio.set_event_loop(loop)
|
|
||||||
try:
|
|
||||||
return loop.run_until_complete(coro)
|
|
||||||
finally:
|
|
||||||
loop.close()
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/')
|
|
||||||
def index(req):
|
|
||||||
"""Serve the main web UI."""
|
|
||||||
return Response.send_file('templates/index.html', base_path='.')
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/state', methods=['GET'])
|
|
||||||
def get_state(req):
|
|
||||||
"""Get the current state of all lights."""
|
|
||||||
# Ensure a profile is set if we have lights but no profile
|
|
||||||
if settings.get("lights") and not settings.get("current_profile"):
|
|
||||||
current_profile = "default"
|
|
||||||
settings["current_profile"] = current_profile
|
|
||||||
settings.save()
|
|
||||||
# Create default profile file if it doesn't exist
|
|
||||||
profiles_dir = "profiles"
|
|
||||||
os.makedirs(profiles_dir, exist_ok=True)
|
|
||||||
profile_path = os.path.join(profiles_dir, f"{current_profile}.json")
|
|
||||||
if not os.path.exists(profile_path):
|
|
||||||
profile_data = {
|
|
||||||
"lights": settings.get("lights", {}),
|
|
||||||
"tab_order": settings.get("tab_order", []),
|
|
||||||
"tab_password": settings.get("tab_password", "")
|
|
||||||
}
|
|
||||||
with open(profile_path, 'w') as file:
|
|
||||||
json.dump(profile_data, file, indent=4)
|
|
||||||
|
|
||||||
return {
|
|
||||||
"lights": settings.get("lights", {}),
|
|
||||||
"patterns": settings.get("patterns", {}),
|
|
||||||
"tab_order": settings.get("tab_order", []),
|
|
||||||
"current_profile": settings.get("current_profile", ""),
|
|
||||||
"color_palette": settings.get("color_palette", [])
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/pattern', methods=['POST'])
|
|
||||||
def set_pattern(req):
|
|
||||||
"""Set the pattern for a light group."""
|
|
||||||
data = req.json
|
|
||||||
tab_name = data.get("tab_name")
|
|
||||||
pattern_name = data.get("pattern")
|
|
||||||
|
|
||||||
if not tab_name or not pattern_name:
|
|
||||||
return {"error": "Missing tab_name or pattern"}, 400
|
|
||||||
|
|
||||||
if tab_name not in settings.get("lights", {}):
|
|
||||||
return {"error": f"Tab '{tab_name}' not found"}, 404
|
|
||||||
|
|
||||||
# Save current pattern's settings before switching
|
|
||||||
old_pattern = settings["lights"][tab_name]["settings"].get("pattern", "on")
|
|
||||||
# Get current delay (would need to be passed from frontend)
|
|
||||||
current_delay = data.get("delay", 100)
|
|
||||||
current_n_params = {
|
|
||||||
f"n{i}": data.get(f"n{i}", 10) for i in range(1, 5)
|
|
||||||
}
|
|
||||||
save_pattern_settings(
|
|
||||||
tab_name,
|
|
||||||
old_pattern,
|
|
||||||
colors=data.get("colors", ["#000000"]),
|
|
||||||
delay=current_delay,
|
|
||||||
n_params=current_n_params
|
|
||||||
)
|
|
||||||
|
|
||||||
# Load new pattern's settings
|
|
||||||
new_pattern_settings = get_pattern_settings(tab_name, pattern_name)
|
|
||||||
|
|
||||||
# Update settings
|
|
||||||
settings["lights"][tab_name]["settings"]["pattern"] = pattern_name
|
|
||||||
|
|
||||||
# Prepare payload for lighting controller
|
|
||||||
names = settings["lights"][tab_name]["names"]
|
|
||||||
payload = {
|
|
||||||
"save": True,
|
|
||||||
"names": names,
|
|
||||||
"settings": {
|
|
||||||
"pattern": pattern_name,
|
|
||||||
"brightness": settings["lights"][tab_name]["settings"].get("brightness", 127),
|
|
||||||
"delay": new_pattern_settings["delay"],
|
|
||||||
"colors": new_pattern_settings["colors"],
|
|
||||||
**{f"n{i}": new_pattern_settings[f"n{i}"] for i in range(1, 5)}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send to lighting controller
|
|
||||||
run_async(send_to_lighting_controller(payload))
|
|
||||||
|
|
||||||
settings.save()
|
|
||||||
save_current_profile()
|
|
||||||
|
|
||||||
return {
|
|
||||||
"success": True,
|
|
||||||
"pattern": pattern_name,
|
|
||||||
"settings": new_pattern_settings
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/parameters', methods=['POST'])
|
|
||||||
def set_parameters(req):
|
|
||||||
"""Update parameters (RGB, brightness, delay, n params) for a light group."""
|
|
||||||
data = req.json
|
|
||||||
tab_name = data.get("tab_name")
|
|
||||||
|
|
||||||
if not tab_name:
|
|
||||||
return {"error": "Missing tab_name"}, 400
|
|
||||||
|
|
||||||
if tab_name not in settings.get("lights", {}):
|
|
||||||
return {"error": f"Tab '{tab_name}' not found"}, 404
|
|
||||||
|
|
||||||
current_pattern = settings["lights"][tab_name]["settings"].get("pattern", "on")
|
|
||||||
pattern_config = settings.get("patterns", {}).get(current_pattern, {})
|
|
||||||
min_delay = pattern_config.get("min_delay", 10)
|
|
||||||
max_delay = pattern_config.get("max_delay", 10000)
|
|
||||||
|
|
||||||
# Build settings payload
|
|
||||||
payload_settings = {}
|
|
||||||
|
|
||||||
# Handle RGB colors
|
|
||||||
if "red" in data or "green" in data or "blue" in data:
|
|
||||||
r = data.get("red", 0)
|
|
||||||
g = data.get("green", 0)
|
|
||||||
b = data.get("blue", 0)
|
|
||||||
hex_color = f"#{r:02x}{g:02x}{b:02x}"
|
|
||||||
|
|
||||||
# Update color in palette
|
|
||||||
pattern_settings = get_pattern_settings(tab_name, current_pattern)
|
|
||||||
colors = pattern_settings["colors"].copy()
|
|
||||||
selected_index = data.get("color_index", 0)
|
|
||||||
if 0 <= selected_index < len(colors):
|
|
||||||
colors[selected_index] = hex_color
|
|
||||||
else:
|
|
||||||
# If index is out of range, append the color
|
|
||||||
colors.append(hex_color)
|
|
||||||
|
|
||||||
# Save pattern settings to persist the color change
|
|
||||||
save_pattern_settings(tab_name, current_pattern, colors=colors)
|
|
||||||
payload_settings["colors"] = colors
|
|
||||||
|
|
||||||
# Handle brightness
|
|
||||||
if "brightness" in data:
|
|
||||||
brightness = int(data["brightness"])
|
|
||||||
settings["lights"][tab_name]["settings"]["brightness"] = brightness
|
|
||||||
payload_settings["brightness"] = brightness
|
|
||||||
|
|
||||||
# Handle delay
|
|
||||||
if "delay_slider" in data:
|
|
||||||
slider_value = int(data["delay_slider"])
|
|
||||||
delay = slider_to_delay(slider_value, min_delay, max_delay)
|
|
||||||
save_pattern_settings(tab_name, current_pattern, delay=delay)
|
|
||||||
payload_settings["delay"] = delay
|
|
||||||
|
|
||||||
# Handle n parameters
|
|
||||||
n_params = {}
|
|
||||||
for i in range(1, 5):
|
|
||||||
if f"n{i}" in data:
|
|
||||||
n_params[f"n{i}"] = int(data[f"n{i}"])
|
|
||||||
|
|
||||||
if n_params:
|
|
||||||
save_pattern_settings(tab_name, current_pattern, n_params=n_params)
|
|
||||||
payload_settings.update(n_params)
|
|
||||||
|
|
||||||
# Send to lighting controller
|
|
||||||
if payload_settings:
|
|
||||||
names = settings["lights"][tab_name]["names"]
|
|
||||||
payload = {
|
|
||||||
"save": True,
|
|
||||||
"names": names,
|
|
||||||
"settings": payload_settings
|
|
||||||
}
|
|
||||||
run_async(send_to_lighting_controller(payload))
|
|
||||||
|
|
||||||
# Save to settings.json (for patterns) and to profile file (for lights data)
|
|
||||||
settings.save()
|
|
||||||
save_current_profile()
|
|
||||||
|
|
||||||
return {"success": True}
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/tabs', methods=['GET'])
|
|
||||||
def get_tabs(req):
|
|
||||||
"""Get list of tabs."""
|
|
||||||
return {
|
|
||||||
"tabs": settings.get("tab_order", []),
|
|
||||||
"lights": settings.get("lights", {})
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/tabs', methods=['POST'])
|
|
||||||
def create_tab(req):
|
|
||||||
"""Create a new tab."""
|
|
||||||
data = req.json
|
|
||||||
tab_name = data.get("name")
|
|
||||||
ids = data.get("ids", ["1"])
|
|
||||||
|
|
||||||
if not tab_name:
|
|
||||||
return {"error": "Missing name"}, 400
|
|
||||||
|
|
||||||
if tab_name in settings.get("lights", {}):
|
|
||||||
return {"error": f"Tab '{tab_name}' already exists"}, 400
|
|
||||||
|
|
||||||
settings.setdefault("lights", {})[tab_name] = {
|
|
||||||
"names": ids if isinstance(ids, list) else [ids],
|
|
||||||
"settings": {
|
|
||||||
"pattern": "on",
|
|
||||||
"brightness": 127,
|
|
||||||
"colors": ["#000000"],
|
|
||||||
"delay": 100,
|
|
||||||
"n1": 10,
|
|
||||||
"n2": 10,
|
|
||||||
"n3": 10,
|
|
||||||
"n4": 10,
|
|
||||||
"patterns": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if "tab_order" not in settings:
|
|
||||||
settings["tab_order"] = []
|
|
||||||
settings["tab_order"].append(tab_name)
|
|
||||||
settings.save()
|
|
||||||
save_current_profile()
|
|
||||||
|
|
||||||
return {"success": True, "tab_name": tab_name}
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/tabs/<tab_name>', methods=['PUT'])
|
|
||||||
def update_tab(req, tab_name):
|
|
||||||
"""Update a tab."""
|
|
||||||
data = req.json
|
|
||||||
new_name = data.get("name", tab_name)
|
|
||||||
ids = data.get("ids")
|
|
||||||
|
|
||||||
if tab_name not in settings.get("lights", {}):
|
|
||||||
return {"error": f"Tab '{tab_name}' not found"}, 404
|
|
||||||
|
|
||||||
if new_name != tab_name:
|
|
||||||
if new_name in settings.get("lights", {}):
|
|
||||||
return {"error": f"Tab '{new_name}' already exists"}, 400
|
|
||||||
|
|
||||||
# Rename tab
|
|
||||||
settings["lights"][new_name] = settings["lights"][tab_name]
|
|
||||||
del settings["lights"][tab_name]
|
|
||||||
|
|
||||||
# Update tab order
|
|
||||||
if "tab_order" in settings and tab_name in settings["tab_order"]:
|
|
||||||
index = settings["tab_order"].index(tab_name)
|
|
||||||
settings["tab_order"][index] = new_name
|
|
||||||
|
|
||||||
tab_name = new_name
|
|
||||||
|
|
||||||
if ids is not None:
|
|
||||||
settings["lights"][tab_name]["names"] = ids if isinstance(ids, list) else [ids]
|
|
||||||
|
|
||||||
settings.save()
|
|
||||||
save_current_profile()
|
|
||||||
|
|
||||||
return {"success": True, "tab_name": tab_name}
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/tabs/<tab_name>', methods=['DELETE'])
|
|
||||||
def delete_tab(req, tab_name):
|
|
||||||
"""Delete a tab."""
|
|
||||||
if tab_name not in settings.get("lights", {}):
|
|
||||||
return {"error": f"Tab '{tab_name}' not found"}, 404
|
|
||||||
|
|
||||||
del settings["lights"][tab_name]
|
|
||||||
|
|
||||||
if "tab_order" in settings and tab_name in settings["tab_order"]:
|
|
||||||
settings["tab_order"].remove(tab_name)
|
|
||||||
|
|
||||||
settings.save()
|
|
||||||
save_current_profile()
|
|
||||||
|
|
||||||
return {"success": True}
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/profiles', methods=['GET'])
|
|
||||||
def get_profiles(req):
|
|
||||||
"""Get list of profiles."""
|
|
||||||
profiles_dir = "profiles"
|
|
||||||
profiles = []
|
|
||||||
if os.path.exists(profiles_dir):
|
|
||||||
for filename in os.listdir(profiles_dir):
|
|
||||||
if filename.endswith('.json'):
|
|
||||||
profiles.append(filename[:-5])
|
|
||||||
profiles.sort()
|
|
||||||
|
|
||||||
return {
|
|
||||||
"profiles": profiles,
|
|
||||||
"current_profile": settings.get("current_profile", ""),
|
|
||||||
"color_palette": settings.get("color_palette", [])
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/profiles', methods=['POST'])
|
|
||||||
def create_profile(req):
|
|
||||||
"""Create a new profile."""
|
|
||||||
data = req.json
|
|
||||||
profile_name = data.get("name")
|
|
||||||
|
|
||||||
if not profile_name:
|
|
||||||
return {"error": "Missing name"}, 400
|
|
||||||
|
|
||||||
profiles_dir = "profiles"
|
|
||||||
os.makedirs(profiles_dir, exist_ok=True)
|
|
||||||
profile_path = os.path.join(profiles_dir, f"{profile_name}.json")
|
|
||||||
|
|
||||||
if os.path.exists(profile_path):
|
|
||||||
return {"error": f"Profile '{profile_name}' already exists"}, 400
|
|
||||||
|
|
||||||
empty_profile = {
|
|
||||||
"lights": {},
|
|
||||||
"tab_password": "",
|
|
||||||
"tab_order": [],
|
|
||||||
"color_palette": []
|
|
||||||
}
|
|
||||||
|
|
||||||
with open(profile_path, 'w') as file:
|
|
||||||
json.dump(empty_profile, file, indent=4)
|
|
||||||
|
|
||||||
return {"success": True, "profile_name": profile_name}
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/profiles/<profile_name>', methods=['DELETE'])
|
|
||||||
def delete_profile(req, profile_name):
|
|
||||||
"""Delete a profile."""
|
|
||||||
profiles_dir = "profiles"
|
|
||||||
profile_path = os.path.join(profiles_dir, f"{profile_name}.json")
|
|
||||||
|
|
||||||
if not os.path.exists(profile_path):
|
|
||||||
return {"error": f"Profile '{profile_name}' not found"}, 404
|
|
||||||
|
|
||||||
# Prevent deleting the only existing profile to avoid leaving the app with no profiles
|
|
||||||
existing_profiles = [
|
|
||||||
f[:-5] for f in os.listdir(profiles_dir) if f.endswith('.json')
|
|
||||||
] if os.path.exists(profiles_dir) else []
|
|
||||||
if len(existing_profiles) <= 1:
|
|
||||||
return {"error": "Cannot delete the only existing profile"}, 400
|
|
||||||
|
|
||||||
# If deleting the current profile, clear current_profile and related state
|
|
||||||
if settings.get("current_profile") == profile_name:
|
|
||||||
settings["current_profile"] = ""
|
|
||||||
settings["lights"] = {}
|
|
||||||
settings["tab_order"] = []
|
|
||||||
settings["color_palette"] = []
|
|
||||||
# Persist to settings.json
|
|
||||||
settings_to_save = {
|
|
||||||
"tab_password": settings.get("tab_password", ""),
|
|
||||||
"current_profile": "",
|
|
||||||
"patterns": settings.get("patterns", {})
|
|
||||||
}
|
|
||||||
with open("settings.json", 'w') as f:
|
|
||||||
json.dump(settings_to_save, f, indent=4)
|
|
||||||
|
|
||||||
# Remove the profile file
|
|
||||||
os.remove(profile_path)
|
|
||||||
|
|
||||||
return {"success": True}
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/profiles/<profile_name>', methods=['POST'])
|
|
||||||
def load_profile(req, profile_name):
|
|
||||||
"""Load a profile."""
|
|
||||||
profile_path = os.path.join("profiles", f"{profile_name}.json")
|
|
||||||
|
|
||||||
if not os.path.exists(profile_path):
|
|
||||||
return {"error": f"Profile '{profile_name}' not found"}, 404
|
|
||||||
|
|
||||||
with open(profile_path, 'r') as file:
|
|
||||||
profile_data = json.load(file)
|
|
||||||
|
|
||||||
# Update settings with profile data
|
|
||||||
profile_data.pop("current_profile", None)
|
|
||||||
patterns_backup = settings.get("patterns", {})
|
|
||||||
tab_password_backup = settings.get("tab_password", "")
|
|
||||||
|
|
||||||
settings.update(profile_data)
|
|
||||||
settings["patterns"] = patterns_backup
|
|
||||||
settings["current_profile"] = profile_name
|
|
||||||
# Ensure color_palette exists (default to empty array if not in profile)
|
|
||||||
if "color_palette" not in settings:
|
|
||||||
settings["color_palette"] = []
|
|
||||||
|
|
||||||
settings_to_save = {
|
|
||||||
"tab_password": tab_password_backup,
|
|
||||||
"current_profile": profile_name,
|
|
||||||
"patterns": patterns_backup
|
|
||||||
}
|
|
||||||
with open("settings.json", 'w') as f:
|
|
||||||
json.dump(settings_to_save, f, indent=4)
|
|
||||||
|
|
||||||
return {"success": True}
|
|
||||||
|
|
||||||
@app.route('/api/profiles/<profile_name>/palette', methods=['GET'])
|
|
||||||
def get_profile_palette(req, profile_name):
|
|
||||||
"""Get the color palette for a profile."""
|
|
||||||
profile_path = os.path.join("profiles", f"{profile_name}.json")
|
|
||||||
|
|
||||||
if not os.path.exists(profile_path):
|
|
||||||
return {"error": f"Profile '{profile_name}' not found"}, 404
|
|
||||||
|
|
||||||
with open(profile_path, 'r') as file:
|
|
||||||
profile_data = json.load(file)
|
|
||||||
|
|
||||||
palette = profile_data.get("color_palette", [])
|
|
||||||
return {"color_palette": palette}
|
|
||||||
|
|
||||||
@app.route('/api/profiles/<profile_name>/palette', methods=['POST'])
|
|
||||||
def update_profile_palette(req, profile_name):
|
|
||||||
"""Update the color palette for a profile."""
|
|
||||||
data = req.json
|
|
||||||
color_palette = data.get("color_palette", [])
|
|
||||||
|
|
||||||
profile_path = os.path.join("profiles", f"{profile_name}.json")
|
|
||||||
|
|
||||||
if not os.path.exists(profile_path):
|
|
||||||
return {"error": f"Profile '{profile_name}' not found"}, 404
|
|
||||||
|
|
||||||
with open(profile_path, 'r') as file:
|
|
||||||
profile_data = json.load(file)
|
|
||||||
|
|
||||||
profile_data["color_palette"] = color_palette
|
|
||||||
|
|
||||||
with open(profile_path, 'w') as file:
|
|
||||||
json.dump(profile_data, file, indent=4)
|
|
||||||
|
|
||||||
# Update current settings if this is the active profile
|
|
||||||
if settings.get("current_profile") == profile_name:
|
|
||||||
settings["color_palette"] = color_palette
|
|
||||||
|
|
||||||
return {"success": True, "color_palette": color_palette}
|
|
||||||
|
|
||||||
@app.route('/api/profiles/<profile_name>/save', methods=['POST'])
|
|
||||||
def save_profile(req, profile_name):
|
|
||||||
"""Save current state to a profile."""
|
|
||||||
# Save current state to the specified profile
|
|
||||||
save_current_profile()
|
|
||||||
|
|
||||||
# If saving to a different profile, switch to it
|
|
||||||
if profile_name != settings.get("current_profile"):
|
|
||||||
settings["current_profile"] = profile_name
|
|
||||||
settings.save()
|
|
||||||
save_current_profile()
|
|
||||||
|
|
||||||
return {"success": True}
|
|
||||||
|
|
||||||
|
|
||||||
# Serve static files
|
|
||||||
@app.route('/static/<path:path>')
|
|
||||||
def serve_static(req, path):
|
|
||||||
"""Serve static files."""
|
|
||||||
return Response.send_file(f'static/{path}', base_path='.')
|
|
||||||
|
|
||||||
|
|
||||||
def init_websocket():
|
|
||||||
"""Initialize WebSocket connection in background."""
|
|
||||||
global websocket_client
|
|
||||||
if websocket_client is None:
|
|
||||||
websocket_client = WebSocketClient(websocket_uri)
|
|
||||||
run_async(websocket_client.connect())
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
# Initialize WebSocket connection
|
|
||||||
init_websocket()
|
|
||||||
|
|
||||||
print("Starting Lighting Controller Web App with Microdot...")
|
|
||||||
print("Open http://localhost:5000 in your browser")
|
|
||||||
app.run(host='0.0.0.0', port=5000, debug=True)
|
|
||||||
|
|
||||||
322
src/midi.py
322
src/midi.py
@@ -1,105 +1,253 @@
|
|||||||
import mido
|
import mido
|
||||||
import asyncio
|
import asyncio
|
||||||
import time
|
import networking
|
||||||
import networking # <--- This will now correctly import your module
|
import socket
|
||||||
|
import json
|
||||||
|
import logging # Added logging import
|
||||||
|
|
||||||
|
# Configure logging
|
||||||
|
DEBUG_MODE = True # Set to False for INFO level logging
|
||||||
|
logging.basicConfig(level=logging.DEBUG if DEBUG_MODE else logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
||||||
|
|
||||||
async def midi_to_websocket_listener(midi_port_index: int, websocket_uri: str):
|
# TCP Server Configuration
|
||||||
"""
|
TCP_HOST = "127.0.0.1"
|
||||||
Listens to a specific MIDI port and sends data to a WebSocket server
|
TCP_PORT = 65432
|
||||||
when Note 32 (and 33) is pressed.
|
|
||||||
"""
|
|
||||||
delay = 100 # Default delay value
|
|
||||||
|
|
||||||
# 1. Get MIDI port name
|
# Sound Control Server Configuration (for sending reset)
|
||||||
|
SOUND_CONTROL_HOST = "127.0.0.1"
|
||||||
|
SOUND_CONTROL_PORT = 65433
|
||||||
|
|
||||||
|
class MidiHandler:
|
||||||
|
def __init__(self, midi_port_index: int, websocket_uri: str):
|
||||||
|
self.midi_port_index = midi_port_index
|
||||||
|
self.websocket_uri = websocket_uri
|
||||||
|
self.ws_client = networking.WebSocketClient(websocket_uri)
|
||||||
|
self.delay = 100 # Default delay value, controlled by MIDI controller
|
||||||
|
self.brightness = 100 # Default brightness value, controlled by MIDI controller
|
||||||
|
self.tcp_host = TCP_HOST
|
||||||
|
self.tcp_port = TCP_PORT
|
||||||
|
self.beat_sending_enabled = True # New: Local flag for beat sending
|
||||||
|
self.sound_control_host = SOUND_CONTROL_HOST
|
||||||
|
self.sound_control_port = SOUND_CONTROL_PORT
|
||||||
|
|
||||||
|
async def _send_reset_to_sound(self):
|
||||||
|
try:
|
||||||
|
reader, writer = await asyncio.open_connection(self.sound_control_host, self.sound_control_port)
|
||||||
|
cmd = "RESET_TEMPO\n".encode('utf-8')
|
||||||
|
writer.write(cmd)
|
||||||
|
await writer.drain()
|
||||||
|
resp = await reader.read(100)
|
||||||
|
logging.info(f"[MidiHandler - Control] Sent RESET_TEMPO, response: {resp.decode().strip()}")
|
||||||
|
writer.close()
|
||||||
|
await writer.wait_closed()
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"[MidiHandler - Control] Failed to send RESET_TEMPO: {e}")
|
||||||
|
|
||||||
|
async def _handle_tcp_client(self, reader, writer):
|
||||||
|
addr = writer.get_extra_info('peername')
|
||||||
|
logging.info(f"[MidiHandler - TCP Server] Connected by {addr}") # Changed to info
|
||||||
|
|
||||||
|
try:
|
||||||
|
while True:
|
||||||
|
data = await reader.read(4096) # Read up to 4KB of data
|
||||||
|
if not data:
|
||||||
|
logging.info(f"[MidiHandler - TCP Server] Client {addr} disconnected.") # Changed to info
|
||||||
|
break
|
||||||
|
|
||||||
|
message = data.decode().strip()
|
||||||
|
logging.debug(f"[MidiHandler - TCP Server] Received from {addr}: {message}") # Changed to debug
|
||||||
|
|
||||||
|
if self.beat_sending_enabled:
|
||||||
|
try:
|
||||||
|
# Attempt to parse as float (BPM) from sound.py
|
||||||
|
bpm_value = float(message)
|
||||||
|
# Construct JSON message using the current MIDI-controlled delay and brightness
|
||||||
|
json_message = {
|
||||||
|
"names": ["0"],
|
||||||
|
"settings": {
|
||||||
|
"pattern": "pulse",
|
||||||
|
"delay": self.delay, # Use MIDI-controlled delay
|
||||||
|
"colors": ["#00ff00"],
|
||||||
|
"brightness": self.brightness,
|
||||||
|
"num_leds": 200,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
logging.debug(f"[MidiHandler - TCP Server] Forwarding BPM-derived JSON message to WebSocket with delay {self.delay}, brightness {self.brightness}: {json_message}") # Changed to debug
|
||||||
|
await self.ws_client.send_data(json_message)
|
||||||
|
except ValueError:
|
||||||
|
logging.warning(f"[MidiHandler - TCP Server] Received non-BPM message from {addr}, not forwarding: {message}") # Changed to warning
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"[MidiHandler - TCP Server] Error processing received message from {addr}: {e}") # Changed to error
|
||||||
|
else:
|
||||||
|
logging.debug(f"[MidiHandler - TCP Server] Beat received from {addr} but sending to WebSocket is disabled: {message}") # Changed to debug
|
||||||
|
|
||||||
|
except asyncio.CancelledError:
|
||||||
|
logging.info(f"[MidiHandler - TCP Server] Client handler for {addr} cancelled.") # Changed to info
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"[MidiHandler - TCP Server] Error handling client {addr}: {e}") # Changed to error
|
||||||
|
finally:
|
||||||
|
logging.info(f"[MidiHandler - TCP Server] Closing connection for {addr}") # Changed to info
|
||||||
|
writer.close()
|
||||||
|
await writer.wait_closed()
|
||||||
|
|
||||||
|
async def _midi_tcp_server(self):
|
||||||
|
server = await asyncio.start_server(
|
||||||
|
lambda r, w: self._handle_tcp_client(r, w), self.tcp_host, self.tcp_port)
|
||||||
|
|
||||||
|
addrs = ', '.join(str(sock.getsockname()) for sock in server.sockets)
|
||||||
|
logging.info(f"[MidiHandler - TCP Server] Serving on {addrs}") # Changed to info
|
||||||
|
|
||||||
|
async with server:
|
||||||
|
await server.serve_forever()
|
||||||
|
|
||||||
|
async def _midi_listener(self):
|
||||||
|
logging.info("Midi function") # Changed to info
|
||||||
|
"""
|
||||||
|
Listens to a specific MIDI port and sends data to a WebSocket server
|
||||||
|
when Note 32 (and 33) is pressed.
|
||||||
|
"""
|
||||||
|
|
||||||
|
# 1. Get MIDI port name
|
||||||
|
port_names = mido.get_input_names()
|
||||||
|
if not port_names:
|
||||||
|
logging.warning("No MIDI input ports found. Please connect your device.") # Changed to warning
|
||||||
|
return
|
||||||
|
if not (0 <= self.midi_port_index < len(port_names)):
|
||||||
|
logging.error(f"Error: MIDI port index {self.midi_port_index} out of range. Available ports: {port_names}") # Changed to error
|
||||||
|
logging.info("Available ports:") # Changed to info
|
||||||
|
for i, name in enumerate(port_names):
|
||||||
|
logging.info(f" {i}: {name}") # Changed to info
|
||||||
|
return
|
||||||
|
|
||||||
|
midi_port_name = port_names[self.midi_port_index]
|
||||||
|
logging.info(f"Selected MIDI input port: {midi_port_name}") # Changed to info
|
||||||
|
|
||||||
|
try:
|
||||||
|
with mido.open_input(midi_port_name) as port:
|
||||||
|
logging.info(f"MIDI port '{midi_port_name}' opened. Press Ctrl+C to stop.") # Changed to info
|
||||||
|
while True:
|
||||||
|
msg = port.receive(block=False) # Non-blocking read
|
||||||
|
if msg:
|
||||||
|
logging.debug(msg) # Changed to debug
|
||||||
|
match msg.type:
|
||||||
|
case 'note_on':
|
||||||
|
logging.debug(f" Note ON: Note={msg.note}, Velocity={msg.velocity}, Channel={msg.channel}") # Changed to debug
|
||||||
|
pattern_name = "Unknown"
|
||||||
|
|
||||||
|
match msg.note:
|
||||||
|
case 48: # Original Note 48 for 'pulse'
|
||||||
|
pattern_name = "pulse"
|
||||||
|
await self.ws_client.send_data({
|
||||||
|
"names": ["0"],
|
||||||
|
"settings": {
|
||||||
|
"pattern": pattern_name,
|
||||||
|
"delay": self.delay, # Use MIDI-controlled delay
|
||||||
|
"colors": ["#00ff00"],
|
||||||
|
"brightness": self.brightness,
|
||||||
|
"num_leds": 120,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
case 49: # Original Note 49 for 'theater_chase'
|
||||||
|
pattern_name = "theater_chase"
|
||||||
|
await self.ws_client.send_data({
|
||||||
|
"names": ["0"],
|
||||||
|
"settings": {
|
||||||
|
"pattern": pattern_name,
|
||||||
|
"delay": self.delay, # Use MIDI-controlled delay
|
||||||
|
"colors": ["#00ff00"],
|
||||||
|
"brightness": self.brightness,
|
||||||
|
"num_leds": 120,
|
||||||
|
"on_width": 10,
|
||||||
|
"off_width": 10,
|
||||||
|
"n1": 0,
|
||||||
|
"n2": 100
|
||||||
|
}
|
||||||
|
})
|
||||||
|
case 50: # Original Note 50 for 'alternating'
|
||||||
|
pattern_name = "alternating"
|
||||||
|
logging.debug("Triggering Alternating Pattern") # Changed to debug
|
||||||
|
await self.ws_client.send_data({
|
||||||
|
"names": ["0"],
|
||||||
|
"settings": {
|
||||||
|
"pattern": pattern_name,
|
||||||
|
"delay": self.delay, # Use MIDI-controlled delay
|
||||||
|
"colors": ["#00ff00", "#0000ff"],
|
||||||
|
"brightness": self.brightness,
|
||||||
|
"num_leds": 120,
|
||||||
|
"n1": 10,
|
||||||
|
"n2": 10
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
case 'control_change':
|
||||||
|
match msg.control:
|
||||||
|
case 36:
|
||||||
|
self.delay = msg.value * 4 # Update instance delay
|
||||||
|
logging.info(f"Delay set to {self.delay} ms by MIDI controller") # Changed to info
|
||||||
|
case 27:
|
||||||
|
if msg.value == 127:
|
||||||
|
self.beat_sending_enabled = True
|
||||||
|
logging.info("[MidiHandler - Listener] Beat sending ENABLED by MIDI control.") # Changed to info
|
||||||
|
elif msg.value == 0:
|
||||||
|
self.beat_sending_enabled = False
|
||||||
|
logging.info("[MidiHandler - Listener] Beat sending DISABLED by MIDI control.") # Changed to info
|
||||||
|
case 29:
|
||||||
|
if msg.value == 127:
|
||||||
|
logging.info("[MidiHandler - Listener] RESET_TEMPO requested by control 29.")
|
||||||
|
await self._send_reset_to_sound()
|
||||||
|
case 37:
|
||||||
|
# Map 0-127 to 0-100 brightness scale
|
||||||
|
self.brightness = round((msg.value / 127) * 100)
|
||||||
|
logging.info(f"Brightness set to {self.brightness} by MIDI controller")
|
||||||
|
|
||||||
|
await asyncio.sleep(0.001) # Important: Yield control to asyncio event loop
|
||||||
|
|
||||||
|
except mido.PortsError as e:
|
||||||
|
logging.error(f"Error opening MIDI port '{midi_port_name}': {e}") # Changed to error
|
||||||
|
except asyncio.CancelledError:
|
||||||
|
logging.info(f"MIDI listener cancelled.") # Changed to info
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"An unexpected error occurred in MIDI listener: {e}") # Changed to error
|
||||||
|
|
||||||
|
async def run(self):
|
||||||
|
try:
|
||||||
|
await self.ws_client.connect()
|
||||||
|
logging.info(f"[MidiHandler] WebSocket client connected to {self.ws_client.uri}") # Changed to info
|
||||||
|
|
||||||
|
await asyncio.gather(
|
||||||
|
self._midi_listener(),
|
||||||
|
self._midi_tcp_server()
|
||||||
|
)
|
||||||
|
except mido.PortsError as e:
|
||||||
|
logging.error(f"[MidiHandler] Error opening MIDI port: {e}") # Changed to error
|
||||||
|
except asyncio.CancelledError:
|
||||||
|
logging.info("[MidiHandler] Tasks cancelled due to program shutdown.") # Changed to info
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
logging.info("\n[MidiHandler] Program interrupted by user.") # Changed to info
|
||||||
|
finally:
|
||||||
|
logging.info("[MidiHandler] Main program finished. Closing WebSocket client...") # Changed to info
|
||||||
|
await self.ws_client.close()
|
||||||
|
logging.info("[MidiHandler] WebSocket client closed.") # Changed to info
|
||||||
|
|
||||||
|
def print_midi_ports():
|
||||||
|
logging.info("\n--- Available MIDI Input Ports ---") # Changed to info
|
||||||
port_names = mido.get_input_names()
|
port_names = mido.get_input_names()
|
||||||
if not port_names:
|
if not port_names:
|
||||||
print("No MIDI input ports found. Please connect your device.")
|
logging.warning("No MIDI input ports found.") # Changed to warning
|
||||||
return
|
else:
|
||||||
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):
|
for i, name in enumerate(port_names):
|
||||||
print(f" {i}: {name}")
|
logging.info(f" {i}: {name}") # Changed to info
|
||||||
return
|
logging.info("----------------------------------") # Changed to info
|
||||||
|
|
||||||
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():
|
async def main():
|
||||||
|
print_midi_ports()
|
||||||
# --- Configuration ---
|
# --- Configuration ---
|
||||||
MIDI_PORT_INDEX = 1 # <--- IMPORTANT: Change this to the correct index for your device
|
MIDI_PORT_INDEX = 1 # <--- IMPORTANT: Change this to the correct index for your device
|
||||||
WEBSOCKET_SERVER_URI = "ws://192.168.4.1:80/ws"
|
WEBSOCKET_SERVER_URI = "ws://192.168.4.1:80/ws"
|
||||||
# --- End Configuration ---
|
# --- End Configuration ---
|
||||||
|
|
||||||
try:
|
midi_handler = MidiHandler(MIDI_PORT_INDEX, WEBSOCKET_SERVER_URI)
|
||||||
await midi_to_websocket_listener(MIDI_PORT_INDEX, WEBSOCKET_SERVER_URI)
|
await midi_handler.run()
|
||||||
except KeyboardInterrupt:
|
|
||||||
print("\nProgram interrupted by user.")
|
|
||||||
finally:
|
|
||||||
print("Main program finished.")
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
asyncio.run(main())
|
asyncio.run(main())
|
||||||
@@ -9,13 +9,7 @@ class Settings(dict):
|
|||||||
|
|
||||||
def save(self):
|
def save(self):
|
||||||
try:
|
try:
|
||||||
# Create a copy without lights and tab_order (these belong in profiles, not settings.json)
|
j = json.dumps(self, indent=4)
|
||||||
# But keep patterns, tab_password, and current_profile
|
|
||||||
settings_to_save = {k: v for k, v in self.items() if k not in ["lights", "tab_order"]}
|
|
||||||
# Ensure patterns are always included if they exist
|
|
||||||
if "patterns" in self:
|
|
||||||
settings_to_save["patterns"] = self["patterns"]
|
|
||||||
j = json.dumps(settings_to_save, indent=4)
|
|
||||||
with open(self.SETTINGS_FILE, 'w') as file:
|
with open(self.SETTINGS_FILE, 'w') as file:
|
||||||
file.write(j)
|
file.write(j)
|
||||||
print("Settings saved successfully.")
|
print("Settings saved successfully.")
|
||||||
@@ -27,40 +21,6 @@ class Settings(dict):
|
|||||||
with open(self.SETTINGS_FILE, 'r') as file:
|
with open(self.SETTINGS_FILE, 'r') as file:
|
||||||
loaded_settings = json.load(file)
|
loaded_settings = json.load(file)
|
||||||
self.update(loaded_settings)
|
self.update(loaded_settings)
|
||||||
# Ensure patterns exist (they should always be in settings.json)
|
|
||||||
if "patterns" not in self:
|
|
||||||
# Initialize with default patterns if missing
|
|
||||||
self["patterns"] = {
|
|
||||||
"on": {"min_delay": 10, "max_delay": 10000},
|
|
||||||
"off": {"min_delay": 10, "max_delay": 10000},
|
|
||||||
"rainbow": {"Step Rate": "n1", "min_delay": 10, "max_delay": 10000},
|
|
||||||
"transition": {"min_delay": 10, "max_delay": 10000},
|
|
||||||
"chase": {
|
|
||||||
"Colour 1 Length": "n1",
|
|
||||||
"Colour 2 Length": "n2",
|
|
||||||
"Step 1": "n3",
|
|
||||||
"Step 2": "n4",
|
|
||||||
"min_delay": 10,
|
|
||||||
"max_delay": 10000
|
|
||||||
},
|
|
||||||
"pulse": {
|
|
||||||
"Attack": "n1",
|
|
||||||
"Hold": "n2",
|
|
||||||
"Decay": "n3",
|
|
||||||
"min_delay": 10,
|
|
||||||
"max_delay": 10000
|
|
||||||
},
|
|
||||||
"circle": {
|
|
||||||
"Head Rate": "n1",
|
|
||||||
"Max Length": "n2",
|
|
||||||
"Tail Rate": "n3",
|
|
||||||
"Min Length": "n4",
|
|
||||||
"min_delay": 10,
|
|
||||||
"max_delay": 10000
|
|
||||||
},
|
|
||||||
"blink": {"min_delay": 10, "max_delay": 10000}
|
|
||||||
}
|
|
||||||
self.save() # Save to persist the default patterns
|
|
||||||
print("Settings loaded successfully.")
|
print("Settings loaded successfully.")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"Error loading settings {e}")
|
print(f"Error loading settings {e}")
|
||||||
|
|||||||
278
src/sound.py
278
src/sound.py
@@ -4,121 +4,207 @@ import pyaudio
|
|||||||
import aubio
|
import aubio
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from time import sleep
|
from time import sleep
|
||||||
import websocket # pip install websocket-client
|
|
||||||
import json
|
import json
|
||||||
|
import socket
|
||||||
|
import time
|
||||||
|
import logging # Added logging import
|
||||||
|
import asyncio # Re-added asyncio import
|
||||||
|
import threading # Added threading for control server
|
||||||
|
|
||||||
seconds = 10 # how long this script should run (if not using infinite loop)
|
# Configure logging
|
||||||
|
DEBUG_MODE = True # Set to False for INFO level logging
|
||||||
|
logging.basicConfig(level=logging.DEBUG if DEBUG_MODE else logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
||||||
|
|
||||||
bufferSize = 512
|
# TCP Server Configuration (assuming midi.py runs this)
|
||||||
windowSizeMultiple = 2 # or 4 for higher accuracy, but more computational cost
|
MIDI_TCP_HOST = "127.0.0.1"
|
||||||
|
MIDI_TCP_PORT = 65432
|
||||||
|
|
||||||
audioInputDeviceIndex = 7 # use 'arecord -l' to check available audio devices
|
# Sound Control Server Configuration (for midi.py to control sound.py)
|
||||||
audioInputChannels = 1
|
SOUND_CONTROL_HOST = "127.0.0.1"
|
||||||
|
SOUND_CONTROL_PORT = 65433
|
||||||
|
|
||||||
pa = pyaudio.PyAudio()
|
class SoundBeatDetector:
|
||||||
|
def __init__(self, tcp_host: str, tcp_port: int):
|
||||||
|
self.tcp_host = tcp_host
|
||||||
|
self.tcp_port = tcp_port
|
||||||
|
self.tcp_socket = None
|
||||||
|
self.connected_to_midi = False
|
||||||
|
self.reconnect_delay = 1 # seconds
|
||||||
|
# Note: beat_sending_enabled is not used in this simplified flow
|
||||||
|
|
||||||
print("Available audio input devices:")
|
self.bufferSize = 512
|
||||||
info = pa.get_host_api_info_by_index(0)
|
self.windowSizeMultiple = 2
|
||||||
num_devices = info.get('deviceCount')
|
self.audioInputDeviceIndex = 7
|
||||||
found_device = False
|
self.audioInputChannels = 1
|
||||||
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:
|
self.pa = pyaudio.PyAudio()
|
||||||
print(f"Warning: Audio input device index {audioInputDeviceIndex} not found or has no input channels.")
|
|
||||||
# Consider exiting or picking a default if necessary
|
|
||||||
|
|
||||||
try:
|
logging.info("Available audio input devices:")
|
||||||
audioInputDevice = pa.get_device_info_by_index(audioInputDeviceIndex)
|
info = self.pa.get_host_api_info_by_index(0)
|
||||||
audioInputSampleRate = int(audioInputDevice['defaultSampleRate'])
|
num_devices = info.get('deviceCount')
|
||||||
except Exception as e:
|
found_device = False
|
||||||
print(f"Error getting audio device info for index {audioInputDeviceIndex}: {e}")
|
for i in range(0, num_devices):
|
||||||
pa.terminate()
|
device_info = self.pa.get_device_info_by_host_api_device_index(0, i)
|
||||||
exit()
|
if (device_info.get('maxInputChannels')) > 0:
|
||||||
|
logging.info(f" Input Device id {i} - {device_info.get('name')}")
|
||||||
|
if i == self.audioInputDeviceIndex:
|
||||||
|
found_device = True
|
||||||
|
|
||||||
# create the aubio tempo detection:
|
if not found_device:
|
||||||
hopSize = bufferSize
|
logging.warning(f"Audio input device index {self.audioInputDeviceIndex} not found or has no input channels.")
|
||||||
winSize = hopSize * windowSizeMultiple
|
|
||||||
tempoDetection = aubio.tempo(method='default', buf_size=winSize, hop_size=hopSize, samplerate=audioInputSampleRate)
|
|
||||||
|
|
||||||
# --- WebSocket Setup ---
|
try:
|
||||||
websocket_url = "ws://192.168.4.1:80/ws"
|
audioInputDevice = self.pa.get_device_info_by_index(self.audioInputDeviceIndex)
|
||||||
ws = None
|
self.audioInputSampleRate = int(audioInputDevice['defaultSampleRate'])
|
||||||
try:
|
except Exception as e:
|
||||||
ws = websocket.create_connection(websocket_url)
|
logging.error(f"Error getting audio device info for index {self.audioInputDeviceIndex}: {e}")
|
||||||
print(f"Successfully connected to WebSocket at {websocket_url}")
|
self.pa.terminate()
|
||||||
except Exception as e:
|
exit()
|
||||||
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:
|
self.hopSize = self.bufferSize
|
||||||
def readAudioFrames(in_data, frame_count, time_info, status):
|
self.winSize = self.hopSize * self.windowSizeMultiple
|
||||||
global ws # Allow modification of the global ws variable
|
self.tempoDetection = aubio.tempo(method='default', buf_size=self.winSize, hop_size=self.hopSize, samplerate=self.audioInputSampleRate)
|
||||||
|
|
||||||
signal = np.frombuffer(in_data, dtype=np.float32)
|
self.inputStream = None
|
||||||
|
self._control_thread = None
|
||||||
|
|
||||||
beat = tempoDetection(signal)
|
self._connect_to_midi_server()
|
||||||
if beat:
|
self._start_control_server() # Start control server in background
|
||||||
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
|
def reset_tempo_detection(self):
|
||||||
|
"""Re-initializes the aubio tempo detection object."""
|
||||||
|
logging.info("[SoundBeatDetector] Resetting tempo detection.")
|
||||||
|
self.tempoDetection = aubio.tempo(method='default', buf_size=self.winSize, hop_size=self.hopSize, samplerate=self.audioInputSampleRate)
|
||||||
|
|
||||||
|
def _control_server_loop(self):
|
||||||
|
srv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||||
|
try:
|
||||||
|
srv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||||
|
srv.bind((SOUND_CONTROL_HOST, SOUND_CONTROL_PORT))
|
||||||
|
srv.listen(5)
|
||||||
|
logging.info(f"[SoundBeatDetector - Control] Listening on {SOUND_CONTROL_HOST}:{SOUND_CONTROL_PORT}")
|
||||||
|
while True:
|
||||||
|
conn, addr = srv.accept()
|
||||||
|
with conn:
|
||||||
|
logging.info(f"[SoundBeatDetector - Control] Connection from {addr}")
|
||||||
|
try:
|
||||||
|
data = conn.recv(1024)
|
||||||
|
if not data:
|
||||||
|
continue
|
||||||
|
command = data.decode().strip()
|
||||||
|
logging.debug(f"[SoundBeatDetector - Control] Received command: {command}")
|
||||||
|
if command == "RESET_TEMPO":
|
||||||
|
self.reset_tempo_detection()
|
||||||
|
response = "OK: Tempo reset\n"
|
||||||
|
else:
|
||||||
|
response = "ERROR: Unknown command\n"
|
||||||
|
conn.sendall(response.encode('utf-8'))
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"[SoundBeatDetector - Control] Error handling control message: {e}")
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"[SoundBeatDetector - Control] Server error: {e}")
|
||||||
|
finally:
|
||||||
try:
|
try:
|
||||||
ws.send(json.dumps(data_to_send))
|
srv.close()
|
||||||
# print("Sent data over WebSocket") # Optional: for debugging
|
except Exception:
|
||||||
except websocket.WebSocketConnectionClosedException:
|
pass
|
||||||
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)
|
def _start_control_server(self):
|
||||||
|
if self._control_thread and self._control_thread.is_alive():
|
||||||
|
return
|
||||||
|
self._control_thread = threading.Thread(target=self._control_server_loop, daemon=True)
|
||||||
|
self._control_thread.start()
|
||||||
|
|
||||||
|
def _connect_to_midi_server(self):
|
||||||
|
if self.tcp_socket:
|
||||||
|
self.tcp_socket.close()
|
||||||
|
self.tcp_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||||
|
self.tcp_socket.settimeout(self.reconnect_delay)
|
||||||
|
try:
|
||||||
|
logging.info(f"[SoundBeatDetector] Attempting to connect to MIDI TCP server at {self.tcp_host}:{self.tcp_port}...")
|
||||||
|
self.tcp_socket.connect((self.tcp_host, self.tcp_port))
|
||||||
|
self.tcp_socket.setblocking(0)
|
||||||
|
self.connected_to_midi = True
|
||||||
|
logging.info(f"[SoundBeatDetector] Successfully connected to MIDI TCP server.")
|
||||||
|
except (socket.error, socket.timeout) as e:
|
||||||
|
logging.error(f"[SoundBeatDetector] Failed to connect to MIDI TCP server: {e}")
|
||||||
|
self.connected_to_midi = False
|
||||||
|
|
||||||
# create and start the input stream
|
# Removed _handle_control_client and _control_server (replaced by simple threaded server)
|
||||||
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()
|
def readAudioFrames(self, in_data, frame_count, time_info, status):
|
||||||
print("\nAudio stream started. Detecting beats. Press Ctrl+C to stop.")
|
signal = np.frombuffer(in_data, dtype=np.float32)
|
||||||
|
|
||||||
# Loop to keep the script running, allowing graceful shutdown
|
beat = self.tempoDetection(signal)
|
||||||
while inputStream.is_active():
|
if beat:
|
||||||
sleep(0.1) # Small delay to prevent busy-waiting
|
bpm = self.tempoDetection.get_bpm()
|
||||||
|
logging.debug(f"beat! (running with {bpm:.2f} bpm)") # Changed to debug
|
||||||
|
bpm_message = str(bpm)
|
||||||
|
|
||||||
except KeyboardInterrupt:
|
if self.connected_to_midi and self.tcp_socket:
|
||||||
print("\nKeyboardInterrupt: Stopping script gracefully.")
|
try:
|
||||||
except Exception as e:
|
message_bytes = (bpm_message + "\n").encode('utf-8')
|
||||||
print(f"An error occurred with the audio stream: {e}")
|
self.tcp_socket.sendall(message_bytes)
|
||||||
finally:
|
logging.debug(f"[SoundBeatDetector] Sent BPM to MIDI TCP server: {bpm_message}") # Changed to debug
|
||||||
# Ensure streams and resources are closed
|
except socket.error as e:
|
||||||
if 'inputStream' in locals() and inputStream.is_active():
|
logging.error(f"[SoundBeatDetector] Error sending BPM to MIDI TCP server: {e}. Attempting to reconnect...")
|
||||||
inputStream.stop_stream()
|
self.connected_to_midi = False
|
||||||
if 'inputStream' in locals() and not inputStream.is_stopped():
|
self._connect_to_midi_server()
|
||||||
inputStream.close()
|
elif not self.connected_to_midi:
|
||||||
pa.terminate()
|
logging.warning("[SoundBeatDetector] Not connected to MIDI TCP server, attempting to reconnect...") # Changed to warning
|
||||||
if ws:
|
self._connect_to_midi_server()
|
||||||
print("Closing WebSocket connection.")
|
else:
|
||||||
ws.close()
|
logging.warning("[SoundBeatDetector] TCP socket not initialized, cannot send BPM.") # Changed to warning
|
||||||
|
|
||||||
print("Script finished.")
|
return (in_data, pyaudio.paContinue)
|
||||||
|
|
||||||
|
def start_stream(self):
|
||||||
|
try:
|
||||||
|
self.inputStream = self.pa.open(format=pyaudio.paFloat32,
|
||||||
|
input=True,
|
||||||
|
channels=self.audioInputChannels,
|
||||||
|
input_device_index=self.audioInputDeviceIndex,
|
||||||
|
frames_per_buffer=self.bufferSize,
|
||||||
|
rate=self.audioInputSampleRate,
|
||||||
|
stream_callback=self.readAudioFrames)
|
||||||
|
|
||||||
|
self.inputStream.start_stream()
|
||||||
|
logging.info("\nAudio stream started. Detecting beats. Press Ctrl+C to stop.")
|
||||||
|
|
||||||
|
while self.inputStream.is_active():
|
||||||
|
sleep(0.1)
|
||||||
|
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
logging.info("\nKeyboardInterrupt: Stopping script gracefully.")
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"An error occurred with the audio stream: {e}")
|
||||||
|
finally:
|
||||||
|
self.stop_stream()
|
||||||
|
|
||||||
|
def stop_stream(self):
|
||||||
|
if self.inputStream and self.inputStream.is_active():
|
||||||
|
self.inputStream.stop_stream()
|
||||||
|
if self.inputStream and not self.inputStream.is_stopped():
|
||||||
|
self.inputStream.close()
|
||||||
|
self.pa.terminate()
|
||||||
|
if self.tcp_socket and self.connected_to_midi:
|
||||||
|
logging.info("[SoundBeatDetector] Closing TCP socket.")
|
||||||
|
self.tcp_socket.close()
|
||||||
|
self.connected_to_midi = False
|
||||||
|
logging.info("SoundBeatDetector stopped.")
|
||||||
|
|
||||||
|
# Removed async def run(self)
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
# TCP Server Configuration (should match midi.py)
|
||||||
|
MIDI_TCP_HOST = "127.0.0.1"
|
||||||
|
MIDI_TCP_PORT = 65432
|
||||||
|
|
||||||
|
sound_detector = SoundBeatDetector(MIDI_TCP_HOST, MIDI_TCP_PORT)
|
||||||
|
logging.info("Starting SoundBeatDetector...")
|
||||||
|
try:
|
||||||
|
sound_detector.start_stream()
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
logging.info("\nProgram interrupted by user.")
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"An error occurred during main execution: {e}")
|
||||||
1650
static/app.js
1650
static/app.js
File diff suppressed because it is too large
Load Diff
548
static/style.css
548
static/style.css
@@ -1,548 +0,0 @@
|
|||||||
* {
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
|
|
||||||
background-color: #2e2e2e;
|
|
||||||
color: white;
|
|
||||||
height: 100vh;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.app-container {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
height: 100vh;
|
|
||||||
}
|
|
||||||
|
|
||||||
header {
|
|
||||||
background-color: #1a1a1a;
|
|
||||||
padding: 1rem 2rem;
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
align-items: center;
|
|
||||||
border-bottom: 2px solid #4a4a4a;
|
|
||||||
}
|
|
||||||
|
|
||||||
header h1 {
|
|
||||||
font-size: 1.5rem;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
|
|
||||||
.header-actions {
|
|
||||||
display: flex;
|
|
||||||
gap: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn {
|
|
||||||
padding: 0.5rem 1rem;
|
|
||||||
border: none;
|
|
||||||
border-radius: 4px;
|
|
||||||
cursor: pointer;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
font-weight: 500;
|
|
||||||
transition: background-color 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-primary {
|
|
||||||
background-color: #4a4a4a;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-primary:hover {
|
|
||||||
background-color: #5a5a5a;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-secondary {
|
|
||||||
background-color: #3a3a3a;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-secondary:hover {
|
|
||||||
background-color: #4a4a4a;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-danger {
|
|
||||||
background-color: #d32f2f;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-danger:hover {
|
|
||||||
background-color: #c62828;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-small {
|
|
||||||
padding: 0.25rem 0.5rem;
|
|
||||||
font-size: 0.8rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.main-content {
|
|
||||||
flex: 1;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tabs-container {
|
|
||||||
background-color: #1a1a1a;
|
|
||||||
border-bottom: 2px solid #4a4a4a;
|
|
||||||
padding: 0.5rem 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tabs-list {
|
|
||||||
display: flex;
|
|
||||||
gap: 0.5rem;
|
|
||||||
overflow-x: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tab-button {
|
|
||||||
padding: 0.5rem 1rem;
|
|
||||||
background-color: #3a3a3a;
|
|
||||||
color: white;
|
|
||||||
border: none;
|
|
||||||
border-radius: 4px 4px 0 0;
|
|
||||||
cursor: pointer;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
white-space: nowrap;
|
|
||||||
transition: background-color 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tab-button:hover {
|
|
||||||
background-color: #4a4a4a;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tab-button.active {
|
|
||||||
background-color: #6a5acd;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tab-content {
|
|
||||||
flex: 1;
|
|
||||||
display: flex;
|
|
||||||
overflow: hidden;
|
|
||||||
padding: 1rem;
|
|
||||||
gap: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.left-panel {
|
|
||||||
flex: 0 0 50%;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 1rem;
|
|
||||||
overflow-y: auto;
|
|
||||||
border-right: 2px solid #4a4a4a;
|
|
||||||
padding-right: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.right-panel {
|
|
||||||
flex: 1;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 1rem;
|
|
||||||
overflow-y: auto;
|
|
||||||
padding-left: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ids-display {
|
|
||||||
padding: 0.5rem;
|
|
||||||
background-color: #3a3a3a;
|
|
||||||
border-radius: 4px;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.left-panel-header {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: space-between;
|
|
||||||
gap: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.left-panel-toggle {
|
|
||||||
padding: 0.25rem 0.5rem;
|
|
||||||
min-width: 32px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.left-panel-body {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.left-panel.collapsed {
|
|
||||||
flex: 0 0 48px;
|
|
||||||
padding-right: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.left-panel.collapsed .left-panel-body {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.left-panel.collapsed .left-panel-toggle {
|
|
||||||
transform: rotate(180deg);
|
|
||||||
}
|
|
||||||
|
|
||||||
.controls-section {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.control-group {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.control-group label {
|
|
||||||
min-width: 100px;
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
.slider {
|
|
||||||
flex: 1;
|
|
||||||
height: 8px;
|
|
||||||
background-color: #3a3a3a;
|
|
||||||
border-radius: 4px;
|
|
||||||
outline: none;
|
|
||||||
-webkit-appearance: none;
|
|
||||||
margin: 0 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.slider::-webkit-slider-thumb {
|
|
||||||
-webkit-appearance: none;
|
|
||||||
appearance: none;
|
|
||||||
width: 20px;
|
|
||||||
height: 20px;
|
|
||||||
background-color: #6a5acd;
|
|
||||||
border-radius: 50%;
|
|
||||||
cursor: pointer;
|
|
||||||
transition: background-color 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
.slider::-webkit-slider-thumb:hover {
|
|
||||||
background-color: #7a6add;
|
|
||||||
}
|
|
||||||
|
|
||||||
.slider::-moz-range-thumb {
|
|
||||||
width: 20px;
|
|
||||||
height: 20px;
|
|
||||||
background-color: #6a5acd;
|
|
||||||
border-radius: 50%;
|
|
||||||
cursor: pointer;
|
|
||||||
border: none;
|
|
||||||
transition: background-color 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
.slider::-moz-range-thumb:hover {
|
|
||||||
background-color: #7a6add;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Red slider */
|
|
||||||
#red-slider {
|
|
||||||
accent-color: #ff0000;
|
|
||||||
}
|
|
||||||
|
|
||||||
#red-slider::-webkit-slider-thumb {
|
|
||||||
background-color: #ff0000;
|
|
||||||
}
|
|
||||||
|
|
||||||
#red-slider::-moz-range-thumb {
|
|
||||||
background-color: #ff0000;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Green slider */
|
|
||||||
#green-slider {
|
|
||||||
accent-color: #00ff00;
|
|
||||||
}
|
|
||||||
|
|
||||||
#green-slider::-webkit-slider-thumb {
|
|
||||||
background-color: #00ff00;
|
|
||||||
}
|
|
||||||
|
|
||||||
#green-slider::-moz-range-thumb {
|
|
||||||
background-color: #00ff00;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Blue slider */
|
|
||||||
#blue-slider {
|
|
||||||
accent-color: #0000ff;
|
|
||||||
}
|
|
||||||
|
|
||||||
#blue-slider::-webkit-slider-thumb {
|
|
||||||
background-color: #0000ff;
|
|
||||||
}
|
|
||||||
|
|
||||||
#blue-slider::-moz-range-thumb {
|
|
||||||
background-color: #0000ff;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Brightness slider */
|
|
||||||
#brightness-slider {
|
|
||||||
accent-color: #ffff00;
|
|
||||||
}
|
|
||||||
|
|
||||||
#brightness-slider::-webkit-slider-thumb {
|
|
||||||
background-color: #ffff00;
|
|
||||||
}
|
|
||||||
|
|
||||||
#brightness-slider::-moz-range-thumb {
|
|
||||||
background-color: #ffff00;
|
|
||||||
}
|
|
||||||
|
|
||||||
.slider-value {
|
|
||||||
min-width: 50px;
|
|
||||||
text-align: right;
|
|
||||||
font-weight: 500;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.n-params-section {
|
|
||||||
margin-top: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.n-params-section h3 {
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
font-size: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.n-params-grid {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: 1fr 1fr;
|
|
||||||
gap: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.n-param-group {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.n-param-group label {
|
|
||||||
min-width: 40px;
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
.n-input {
|
|
||||||
flex: 1;
|
|
||||||
padding: 0.5rem;
|
|
||||||
background-color: #3a3a3a;
|
|
||||||
color: white;
|
|
||||||
border: 1px solid #4a4a4a;
|
|
||||||
border-radius: 4px;
|
|
||||||
font-size: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.n-input:focus {
|
|
||||||
outline: none;
|
|
||||||
border-color: #6a5acd;
|
|
||||||
}
|
|
||||||
|
|
||||||
.patterns-section,
|
|
||||||
.presets-section,
|
|
||||||
.color-palette-section {
|
|
||||||
background-color: #1a1a1a;
|
|
||||||
border: 2px solid #4a4a4a;
|
|
||||||
border-radius: 4px;
|
|
||||||
padding: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.patterns-section h3,
|
|
||||||
.presets-section h3,
|
|
||||||
.color-palette-section h3 {
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
font-size: 1.1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.patterns-list {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.presets-list {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
|
|
||||||
gap: 0.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pattern-button {
|
|
||||||
padding: 0.75rem;
|
|
||||||
background-color: #3a3a3a;
|
|
||||||
color: white;
|
|
||||||
border: none;
|
|
||||||
border-radius: 4px;
|
|
||||||
cursor: pointer;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
text-align: left;
|
|
||||||
transition: background-color 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pattern-button:hover {
|
|
||||||
background-color: #4a4a4a;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pattern-button.active {
|
|
||||||
background-color: #6a5acd;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pattern-button.default-preset {
|
|
||||||
border: 2px solid #6a5acd;
|
|
||||||
}
|
|
||||||
|
|
||||||
.color-palette {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 0.5rem;
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
max-height: 300px;
|
|
||||||
overflow-y: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.color-swatch {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
padding: 0.5rem;
|
|
||||||
background-color: #3a3a3a;
|
|
||||||
border: 2px solid transparent;
|
|
||||||
border-radius: 4px;
|
|
||||||
cursor: pointer;
|
|
||||||
transition: border-color 0.2s;
|
|
||||||
gap: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.color-swatch:hover {
|
|
||||||
border-color: #6a5acd;
|
|
||||||
}
|
|
||||||
|
|
||||||
.color-swatch.selected {
|
|
||||||
border-color: #FFD700;
|
|
||||||
border-width: 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.color-swatch-preview {
|
|
||||||
width: 40px;
|
|
||||||
height: 40px;
|
|
||||||
border-radius: 4px;
|
|
||||||
border: 1px solid #4a4a4a;
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.color-swatch-label {
|
|
||||||
flex: 1;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
min-width: 80px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.color-picker-input {
|
|
||||||
width: 60px;
|
|
||||||
height: 40px;
|
|
||||||
border: 1px solid #4a4a4a;
|
|
||||||
border-radius: 4px;
|
|
||||||
cursor: pointer;
|
|
||||||
background: none;
|
|
||||||
padding: 0;
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.color-picker-input::-webkit-color-swatch-wrapper {
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.color-picker-input::-webkit-color-swatch {
|
|
||||||
border: none;
|
|
||||||
border-radius: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.color-picker-input::-moz-color-swatch {
|
|
||||||
border: none;
|
|
||||||
border-radius: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.palette-actions {
|
|
||||||
display: flex;
|
|
||||||
gap: 0.5rem;
|
|
||||||
margin-top: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal {
|
|
||||||
display: none;
|
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
background-color: rgba(0, 0, 0, 0.7);
|
|
||||||
z-index: 1000;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal.active {
|
|
||||||
display: flex;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-content {
|
|
||||||
background-color: #2e2e2e;
|
|
||||||
padding: 2rem;
|
|
||||||
border-radius: 8px;
|
|
||||||
min-width: 400px;
|
|
||||||
max-width: 500px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-content h2 {
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
font-size: 1.3rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-content label {
|
|
||||||
display: block;
|
|
||||||
margin-top: 1rem;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-content input {
|
|
||||||
width: 100%;
|
|
||||||
padding: 0.5rem;
|
|
||||||
background-color: #3a3a3a;
|
|
||||||
color: white;
|
|
||||||
border: 1px solid #4a4a4a;
|
|
||||||
border-radius: 4px;
|
|
||||||
font-size: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-content input:focus {
|
|
||||||
outline: none;
|
|
||||||
border-color: #6a5acd;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-actions {
|
|
||||||
display: flex;
|
|
||||||
gap: 0.5rem;
|
|
||||||
margin-top: 1.5rem;
|
|
||||||
justify-content: flex-end;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Scrollbar styling */
|
|
||||||
::-webkit-scrollbar {
|
|
||||||
width: 8px;
|
|
||||||
height: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
::-webkit-scrollbar-track {
|
|
||||||
background: #1a1a1a;
|
|
||||||
}
|
|
||||||
|
|
||||||
::-webkit-scrollbar-thumb {
|
|
||||||
background: #4a4a4a;
|
|
||||||
border-radius: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
::-webkit-scrollbar-thumb:hover {
|
|
||||||
background: #5a5a5a;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,279 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>Lighting Controller</title>
|
|
||||||
<link rel="stylesheet" href="/static/style.css">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div class="app-container">
|
|
||||||
<header>
|
|
||||||
<h1>Lighting Controller</h1>
|
|
||||||
<div class="header-actions">
|
|
||||||
<button id="add-tab-btn" class="btn btn-primary">+ Add Tab</button>
|
|
||||||
<button id="edit-tab-btn" class="btn btn-secondary">Edit Tab</button>
|
|
||||||
<button id="delete-tab-btn" class="btn btn-danger">Delete Tab</button>
|
|
||||||
<button id="color-palette-btn" class="btn btn-secondary">Color Palette</button>
|
|
||||||
<button id="presets-btn" class="btn btn-secondary">Presets</button>
|
|
||||||
<button id="profiles-btn" class="btn btn-secondary">Profiles</button>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<div class="main-content">
|
|
||||||
<div class="tabs-container">
|
|
||||||
<div id="tabs-list" class="tabs-list"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="tab-content" class="tab-content">
|
|
||||||
<div class="left-panel">
|
|
||||||
<div class="left-panel-header">
|
|
||||||
<div class="ids-display">
|
|
||||||
<label>IDs: </label>
|
|
||||||
<span id="current-ids"></span>
|
|
||||||
</div>
|
|
||||||
<button id="toggle-left-panel" class="btn btn-small left-panel-toggle" title="Collapse/expand controls">◀</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="left-panel-body">
|
|
||||||
<div class="color-palette-section">
|
|
||||||
<h3>Color Palette</h3>
|
|
||||||
<div id="color-palette" class="color-palette"></div>
|
|
||||||
<div class="palette-actions">
|
|
||||||
<button id="add-color-btn" class="btn btn-small">Add Color</button>
|
|
||||||
<button id="remove-color-btn" class="btn btn-small">Remove Selected</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="controls-section">
|
|
||||||
<div class="control-group">
|
|
||||||
<label for="brightness-slider">Brightness:</label>
|
|
||||||
<input type="range" id="brightness-slider" min="0" max="255" value="127" class="slider">
|
|
||||||
<span id="brightness-value" class="slider-value">127</span>
|
|
||||||
</div>
|
|
||||||
<div class="control-group">
|
|
||||||
<label for="delay-slider">Delay:</label>
|
|
||||||
<input type="range" id="delay-slider" min="0" max="1000" value="0" class="slider">
|
|
||||||
<span id="delay-value" class="slider-value">100 ms</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="n-params-section">
|
|
||||||
<h3>N Parameters</h3>
|
|
||||||
<div class="n-params-grid">
|
|
||||||
<div class="n-param-group">
|
|
||||||
<label for="n1-input">n1:</label>
|
|
||||||
<input type="number" id="n1-input" min="0" max="255" value="10" class="n-input">
|
|
||||||
</div>
|
|
||||||
<div class="n-param-group">
|
|
||||||
<label for="n2-input">n2:</label>
|
|
||||||
<input type="number" id="n2-input" min="0" max="255" value="10" class="n-input">
|
|
||||||
</div>
|
|
||||||
<div class="n-param-group">
|
|
||||||
<label for="n3-input">n3:</label>
|
|
||||||
<input type="number" id="n3-input" min="0" max="255" value="10" class="n-input">
|
|
||||||
</div>
|
|
||||||
<div class="n-param-group">
|
|
||||||
<label for="n4-input">n4:</label>
|
|
||||||
<input type="number" id="n4-input" min="0" max="255" value="10" class="n-input">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="right-panel">
|
|
||||||
<div class="presets-section">
|
|
||||||
<h3>Presets</h3>
|
|
||||||
<div id="presets-list-tab" class="presets-list"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Modals -->
|
|
||||||
<div id="add-tab-modal" class="modal">
|
|
||||||
<div class="modal-content">
|
|
||||||
<h2>Add New Tab</h2>
|
|
||||||
<label>Tab Name:</label>
|
|
||||||
<input type="text" id="new-tab-name" placeholder="Enter tab name">
|
|
||||||
<label>Device IDs (comma-separated):</label>
|
|
||||||
<input type="text" id="new-tab-ids" placeholder="1,2,3" value="1">
|
|
||||||
<div class="modal-actions">
|
|
||||||
<button id="add-tab-confirm" class="btn btn-primary">Add</button>
|
|
||||||
<button id="add-tab-cancel" class="btn btn-secondary">Cancel</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="edit-tab-modal" class="modal">
|
|
||||||
<div class="modal-content">
|
|
||||||
<h2>Edit Tab</h2>
|
|
||||||
<label>Tab Name:</label>
|
|
||||||
<input type="text" id="edit-tab-name" placeholder="Enter tab name">
|
|
||||||
<label>Device IDs (comma-separated):</label>
|
|
||||||
<input type="text" id="edit-tab-ids" placeholder="1,2,3">
|
|
||||||
<div class="modal-actions">
|
|
||||||
<button id="edit-tab-confirm" class="btn btn-primary">Update</button>
|
|
||||||
<button id="edit-tab-cancel" class="btn btn-secondary">Cancel</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="profiles-modal" class="modal">
|
|
||||||
<div class="modal-content" style="min-width: 500px;">
|
|
||||||
<h2>Profiles</h2>
|
|
||||||
<div id="profiles-list-container" style="margin: 1rem 0; max-height: 400px; overflow-y: auto;">
|
|
||||||
<div id="profiles-list"></div>
|
|
||||||
</div>
|
|
||||||
<div style="margin-top: 1rem;">
|
|
||||||
<label>New Profile Name:</label>
|
|
||||||
<div style="display: flex; gap: 0.5rem; margin-top: 0.5rem;">
|
|
||||||
<input type="text" id="new-profile-name" placeholder="Enter profile name" style="flex: 1;">
|
|
||||||
<button id="create-profile-btn" class="btn btn-primary">Create</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div style="margin-top: 1rem;">
|
|
||||||
<label>Current Profile:</label>
|
|
||||||
<div id="current-profile-display" style="padding: 0.5rem; background-color: #3a3a3a; border-radius: 4px; margin-top: 0.5rem;">
|
|
||||||
<span id="current-profile-name">None</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div style="margin-top: 1.5rem;">
|
|
||||||
<label>Profile Color Palette:</label>
|
|
||||||
<div id="profile-palette-container" style="margin-top: 0.5rem; display: flex; flex-wrap: wrap; gap: 0.5rem; padding: 0.5rem; background-color: #3a3a3a; border-radius: 4px; min-height: 60px;">
|
|
||||||
<!-- Palette colors will be rendered here -->
|
|
||||||
</div>
|
|
||||||
<div style="display: flex; gap: 0.5rem; margin-top: 0.5rem;">
|
|
||||||
<input type="color" id="new-palette-color" value="#000000" style="width: 60px; height: 40px; border: 1px solid #4a4a4a; border-radius: 4px; cursor: pointer;">
|
|
||||||
<button id="add-palette-color-btn" class="btn btn-small">Add to Palette</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="modal-actions">
|
|
||||||
<button id="profiles-close-btn" class="btn btn-secondary">Close</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="color-palette-modal" class="modal">
|
|
||||||
<div class="modal-content" style="min-width: 500px;">
|
|
||||||
<h2>Color Palette</h2>
|
|
||||||
<div style="margin-top: 1rem;">
|
|
||||||
<label>Current Profile:</label>
|
|
||||||
<div id="palette-current-profile-display" style="padding: 0.5rem; background-color: #3a3a3a; border-radius: 4px; margin-top: 0.5rem;">
|
|
||||||
<span id="palette-current-profile-name">None</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div style="margin-top: 1.5rem;">
|
|
||||||
<label>Profile Color Palette:</label>
|
|
||||||
<div id="palette-container" style="margin-top: 0.5rem; display: flex; flex-wrap: wrap; gap: 0.5rem; padding: 0.5rem; background-color: #3a3a3a; border-radius: 4px; min-height: 60px;">
|
|
||||||
<!-- Palette colors will be rendered here -->
|
|
||||||
</div>
|
|
||||||
<div style="display: flex; gap: 0.5rem; margin-top: 0.5rem;">
|
|
||||||
<input type="color" id="palette-new-color" value="#000000" style="width: 60px; height: 40px; border: 1px solid #4a4a4a; border-radius: 4px; cursor: pointer;">
|
|
||||||
<button id="palette-add-color-btn" class="btn btn-small">Add to Palette</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="modal-actions">
|
|
||||||
<button id="color-palette-close-btn" class="btn btn-secondary">Close</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="quick-palette-modal" class="modal">
|
|
||||||
<div class="modal-content" style="min-width: 500px; max-width: 600px;">
|
|
||||||
<h2>Select Color from Palette</h2>
|
|
||||||
<div id="quick-palette-container" style="margin-top: 1rem; display: flex; flex-wrap: wrap; gap: 0.75rem; padding: 1rem; background-color: #3a3a3a; border-radius: 4px; min-height: 200px; max-height: 500px; overflow-y: auto;">
|
|
||||||
<!-- Palette colors will be rendered here -->
|
|
||||||
</div>
|
|
||||||
<div class="modal-actions" style="margin-top: 1rem;">
|
|
||||||
<button id="quick-palette-use-picker-btn" class="btn btn-secondary">Use Color Picker</button>
|
|
||||||
<button id="quick-palette-close-btn" class="btn btn-secondary">Cancel</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="presets-modal" class="modal">
|
|
||||||
<div class="modal-content" style="min-width: 600px; max-width: 800px;">
|
|
||||||
<h2>Presets</h2>
|
|
||||||
<div id="presets-list-container" style="margin: 1rem 0; max-height: 400px; overflow-y: auto;">
|
|
||||||
<div id="presets-list"></div>
|
|
||||||
</div>
|
|
||||||
<div class="modal-actions">
|
|
||||||
<button id="create-preset-btn" class="btn btn-primary">Create Preset</button>
|
|
||||||
<button id="presets-close-btn" class="btn btn-secondary">Close</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="preset-editor-modal" class="modal">
|
|
||||||
<div class="modal-content" style="min-width: 600px; max-width: 800px; max-height: 90vh; overflow-y: auto;">
|
|
||||||
<h2 id="preset-editor-title">Create Preset</h2>
|
|
||||||
<div style="display: flex; flex-direction: column; gap: 1rem;">
|
|
||||||
<div>
|
|
||||||
<label>Preset Name:</label>
|
|
||||||
<input type="text" id="preset-name-input" placeholder="Enter preset name" style="width: 100%; padding: 0.5rem; margin-top: 0.5rem;">
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label>Pattern:</label>
|
|
||||||
<select id="preset-pattern-select" style="width: 100%; padding: 0.5rem; margin-top: 0.5rem;">
|
|
||||||
<!-- Patterns will be populated dynamically -->
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label>Brightness:</label>
|
|
||||||
<div style="display: flex; align-items: center; gap: 1rem; margin-top: 0.5rem;">
|
|
||||||
<input type="range" id="preset-brightness-slider" min="0" max="255" value="127" class="slider" style="flex: 1;">
|
|
||||||
<span id="preset-brightness-value" class="slider-value">127</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label>Delay (ms):</label>
|
|
||||||
<input type="number" id="preset-delay-input" min="10" max="10000" value="100" style="width: 100%; padding: 0.5rem; margin-top: 0.5rem;">
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label>N Parameters:</label>
|
|
||||||
<div style="display: grid; grid-template-columns: repeat(2, 1fr); gap: 0.5rem; margin-top: 0.5rem;">
|
|
||||||
<div>
|
|
||||||
<label for="preset-n1-input">n1:</label>
|
|
||||||
<input type="number" id="preset-n1-input" min="0" max="255" value="10" style="width: 100%; padding: 0.5rem;">
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label for="preset-n2-input">n2:</label>
|
|
||||||
<input type="number" id="preset-n2-input" min="0" max="255" value="10" style="width: 100%; padding: 0.5rem;">
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label for="preset-n3-input">n3:</label>
|
|
||||||
<input type="number" id="preset-n3-input" min="0" max="255" value="10" style="width: 100%; padding: 0.5rem;">
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label for="preset-n4-input">n4:</label>
|
|
||||||
<input type="number" id="preset-n4-input" min="0" max="255" value="10" style="width: 100%; padding: 0.5rem;">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label>Colors:</label>
|
|
||||||
<div id="preset-colors-container" style="margin-top: 0.5rem; display: flex; flex-wrap: wrap; gap: 0.5rem; padding: 0.5rem; background-color: #3a3a3a; border-radius: 4px; min-height: 60px;">
|
|
||||||
<!-- Colors will be rendered here -->
|
|
||||||
</div>
|
|
||||||
<div style="display: flex; gap: 0.5rem; margin-top: 0.5rem;">
|
|
||||||
<input type="color" id="preset-new-color" value="#000000" style="width: 60px; height: 40px; border: 1px solid #4a4a4a; border-radius: 4px; cursor: pointer;">
|
|
||||||
<button id="preset-add-color-btn" class="btn btn-small">Add Color</button>
|
|
||||||
<button id="preset-remove-color-btn" class="btn btn-small">Remove Selected</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div style="display: flex; gap: 0.5rem; margin-top: 1rem;">
|
|
||||||
<button id="preset-editor-from-current-btn" class="btn btn-secondary" style="flex: 1;">Create from Current</button>
|
|
||||||
<button id="preset-editor-save-btn" class="btn btn-primary" style="flex: 1;">Save Preset</button>
|
|
||||||
<button id="preset-editor-cancel-btn" class="btn btn-secondary" style="flex: 1;">Cancel</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script src="/static/app.js"></script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
This is just a placeholder to satisfy the tool requirement; actual code changes are in other files.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user