16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Merge broke the UI, whoops

This commit is contained in:
mmcwilliams 2019-03-21 15:13:48 -04:00
parent 6faf78b92e
commit 9472527c70
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/js/app.js
View File

@ -2510,16 +2510,18 @@ mcopy.state = {
pos : 0, pos : 0,
direction: true direction: true
}, },
camera_second : {
pos : 0,
direction : true
},
projector_second : {
pos : 0,
direction : true
},
sequence : { sequence : {
size : 24, size : 24,
arr : ['CF', 'PF'], arr : ['CF', 'PF'],
light : ['255,255,255', ''], light : ['255,255,255', ''],
cmd : {
camera: mcopy.cfg.arduino.cmd.camera,
projector: mcopy.cfg.arduino.cmd.projector,
cam_direction: mcopy.cfg.arduino.cmd.cam_direction,
cam_direction: mcopy.cfg.arduino.cmd.proj_direction
},
pads: { pads: {
cam_forward: 'CF', cam_forward: 'CF',
proj_forward : 'PF', proj_forward : 'PF',

2
app/src/index.js
View File

@ -43,7 +43,7 @@ mcopy.state = {
projector_second : { projector_second : {
pos : 0, pos : 0,
direction : true direction : true
} },
sequence : { sequence : {
size : 24, size : 24,
arr : ['CF', 'PF'], arr : ['CF', 'PF'],