Skip to content

Commit

Permalink
Merge pull request #39 from cianmawhinney/testing
Browse files Browse the repository at this point in the history
Few tweaks
  • Loading branch information
cianmawhinney authored Jun 13, 2024
2 parents baa8516 + 66eaed1 commit f9bcdf9
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 2 deletions.
42 changes: 42 additions & 0 deletions config/config.json.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"webserver_port": 3000,
"joystick_id": 0,
"cameras": [
{
"id": 1,
"friendly_name": "Gallery Left",
"visca_address": 1,
"connection": {
"type": "",
"parameters": {
"host": "10.10.10.22",
"port": 5678
}
}
},
{
"id": 2,
"friendly_name": "Gallery Center",
"visca_address": 1,
"connection": {
"type": "",
"parameters": {
"host": "10.10.10.20",
"port": 5678
}
}
},
{
"id": 3,
"friendly_name": "Front Right",
"visca_address": 1,
"connection": {
"type": "",
"parameters": {
"host": "10.10.10.21",
"port": 5678
}
}
}
]
}
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ services:
# I'm pretty certain this is insecure, so you can try just passing
# individual devices, though I'm not sure if hotplugging works this way
- /dev:/dev

privileged: true

volumes:
config:
4 changes: 2 additions & 2 deletions src/inputs/web/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ var cameraSelectors = document.getElementsByClassName('camera-selector');

for (var i = 0; i < cameraSelectors.length; i++) {
cameraSelectors[i].addEventListener('click', function(eventData) {
currentCamera = eventData.toElement.value;
currentCamera = eventData.target.value;
});
}
// TODO: when a camera is selected, update the currently shown presets
Expand Down Expand Up @@ -169,7 +169,7 @@ preset, edit the position, or delete it (the data and the name)
var presetButtons = document.getElementsByClassName('presets-button');
for (let i = 0; i < presetButtons.length; i++) {
presetButtons[i].addEventListener('click', function(eventData) {
var presetID = eventData.toElement.dataset.presetId;
var presetID = eventData.target.dataset.presetId;

// TODO: find a better name for variable x
var x = {
Expand Down

0 comments on commit f9bcdf9

Please sign in to comment.