diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-04-14 15:30:51 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-04-14 15:30:51 -0400 |
| commit | d20c33f7cbdc4d0e4b51d2e318616a3b5f1f7150 (patch) | |
| tree | ee18cd8380cfe5520db3dcbd6c049c99169c04fe /www/js/MontageCtrl.js | |
| parent | e12f173eb5658772f5fc36249e73f2699c4a1f88 (diff) | |
#222 - moveRel code was missing from montageCtrl
Former-commit-id: 2e8ead3d23892b6276fc7615418554258ff071e3
Diffstat (limited to 'www/js/MontageCtrl.js')
| -rw-r--r-- | www/js/MontageCtrl.js | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 2cd606c0..eb4358e5 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -667,10 +667,30 @@ function initPackery() $http.get(myurl) .success(function (data) { + + $scope.ptzMoveCommand = "move"; // start with as move; + $scope.ptzStopCommand = ""; + + ZMDataModel.zmDebug("MontageCtrl: control data returned " + JSON.stringify(data)); - $scope.ptzMoveCommand = (data.control.Control.CanMoveCon == '1') ? 'moveCon' : 'move'; - $scope.ptzStopCommand = "moveStop"; - //console.log("***moveCommand: " + $scope.ptzMoveCommand); + + if (data.control.Control.CanMoveRel == '1') + { + + $scope.ptzMoveCommand = "moveRel"; + $scope.ptzStopCommand = "moveStop"; + } + + // Prefer con over rel if both enabled + // I've tested con + + if (data.control.Control.CanMoveCon == '1') + { + + $scope.ptzMoveCommand = "moveCon"; + $scope.ptzStopCommand = "moveStop"; + } + // presets |