Skip to content

Feature/high res #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anselanza merged 9 commits into from
Dec 24, 2024
Merged

Feature/high res #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
91919cf
WIP, LoRes working again, not through GUI
anselanza Dec 23, 2024
cf0058d
POC high res brightness control (remote, not UI)
anselanza Dec 23, 2024
7a6da9f
working HiRes controls, all fixture definitions updated
anselanza Dec 24, 2024
e37cc3c
HiRes is the definitive example now
anselanza Dec 24, 2024
adfd2fd
MIDI values need to be converted for u16 macros, too
anselanza Dec 24, 2024
2f8db64
more readable conversion
anselanza Dec 24, 2024
08eb908
Animations only need to be f32
anselanza Dec 24, 2024
8b829ab
remove unused hover label
anselanza Dec 24, 2024
6def472
v0.8 supports 16-bit macro controls
anselanza Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tether-artnet-controller"
version = "0.7.4"
version = "0.8.0"
edition = "2021"
repository = "https://github.com/RandomStudio/tether-artnet-controller"
homepage = "https://github.com/RandomStudio/tether-artnet-controller"
Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ If you have Tether Egui installed (`cargo install tether-egui`) then the easiest
- [x] Allow the app to launch just fine without Tether
- [x] If no ArtNet provided in Project (and no settings provided from CLI), then do NOT connect, but allow editing / manual connect
- [x] Allow Tether settings to be saved with project as well
- [ ] Add amber Macros for some fixtures (and include these in scenes)
- [ ] Keep project files sorted, e.g. by fixtures
- [x] Allow the app to launch without any project file at all
- [ ] Add 16-bit control, at least for macros (single slider adjusts the two channels as split between first and second 8-bit digits)
- [x] Add 16-bit control, at least for macros (single slider adjusts the two channels as split between first and second 8-bit digits)
- [ ] ArtNet on separate thread, with more precise timing; this might require some messaging back and forth and/or mutex
- [ ] It should be possible to add Macros from "Advanced Mode" into the available macros for the fixtures (and therefore the scenes). This would be part of a fixture-editing UI?
24 changes: 13 additions & 11 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,20 @@ fn main() {

for (index, fixture_path) in entries.iter().enumerate() {
println!("Fixture file: {:?}", fixture_path);
match fs::read_to_string(fixture_path) {
Ok(d) => {
entire_string.push_str(&d);
if index < (entries.len() - 1) {
entire_string.push(',');
if fixture_path.is_file() {
match fs::read_to_string(fixture_path) {
Ok(d) => {
entire_string.push_str(&d);
if index < (entries.len() - 1) {
entire_string.push(',');
}
}
Err(e) => {
panic!(
"Something went wrong reading the contents of the fixture file: {}",
e
);
}
}
Err(e) => {
panic!(
"Something went wrong reading the contents of the fixture file: {}",
e
);
}
}
}
Expand Down
91 changes: 14 additions & 77 deletions example.project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,7 @@
"ControlValue": 195
},
"colour": {
"ColourValue": [
255,
0,
245,
255
]
"ColourValue": [255, 0, 245, 255]
},
"pan": {
"ControlValue": 50
Expand All @@ -56,12 +51,7 @@
"ControlValue": 255
},
"colour": {
"ColourValue": [
49,
81,
255,
255
]
"ColourValue": [49, 81, 255, 255]
},
"pan": {
"ControlValue": 155
Expand All @@ -78,12 +68,7 @@
"ControlValue": 255
},
"colour": {
"ColourValue": [
0,
104,
255,
255
]
"ColourValue": [0, 104, 255, 255]
},
"pan": {
"ControlValue": 105
Expand All @@ -100,12 +85,7 @@
"ControlValue": 255
},
"colour": {
"ColourValue": [
243,
0,
255,
255
]
"ColourValue": [243, 0, 255, 255]
},
"pan": {
"ControlValue": 60
Expand All @@ -127,12 +107,7 @@
"ControlValue": 255
},
"colour": {
"ColourValue": [
37,
0,
243,
255
]
"ColourValue": [37, 0, 243, 255]
},
"pan": {
"ControlValue": 67
Expand All @@ -149,12 +124,7 @@
"ControlValue": 255
},
"colour": {
"ColourValue": [
237,
255,
0,
255
]
"ColourValue": [237, 255, 0, 255]
},
"pan": {
"ControlValue": 15
Expand All @@ -171,12 +141,7 @@
"ControlValue": 15
},
"colour": {
"ColourValue": [
244,
222,
159,
255
]
"ColourValue": [244, 222, 159, 255]
},
"pan": {
"ControlValue": 60
Expand All @@ -193,12 +158,7 @@
"ControlValue": 15
},
"colour": {
"ColourValue": [
255,
237,
220,
255
]
"ColourValue": [255, 237, 220, 255]
},
"pan": {
"ControlValue": 30
Expand All @@ -220,12 +180,7 @@
"ControlValue": 255
},
"colour": {
"ColourValue": [
0,
0,
0,
0
]
"ColourValue": [0, 0, 0, 0]
},
"pan": {
"ControlValue": 193
Expand All @@ -242,12 +197,7 @@
"ControlValue": 255
},
"colour": {
"ColourValue": [
0,
0,
0,
0
]
"ColourValue": [0, 0, 0, 0]
},
"pan": {
"ControlValue": 205
Expand All @@ -264,12 +214,7 @@
"ControlValue": 255
},
"colour": {
"ColourValue": [
0,
0,
0,
0
]
"ColourValue": [0, 0, 0, 0]
},
"pan": {
"ControlValue": 82
Expand All @@ -286,12 +231,7 @@
"ControlValue": 255
},
"colour": {
"ColourValue": [
0,
0,
0,
0
]
"ColourValue": [0, 0, 0, 0]
},
"pan": {
"ControlValue": 165
Expand All @@ -311,9 +251,6 @@
"noteStart": 49
},
"artnetConfig": {
"Unicast": [
"127.0.0.1",
"127.0.0.1"
]
"Unicast": ["127.0.0.1", "127.0.0.1"]
}
}
}
Loading