Merge remote-tracking branch 'origin/master'
Conflicts: package.json
This commit is contained in:
commit
cb881670fa
@ -54,7 +54,7 @@ var varDiff = module.exports = function varDiff(ports){
|
||||
|
||||
var variance = varDiffOptions.targetTime * (varDiffOptions.variancePercent / 100);
|
||||
|
||||
portsCalcInfo[parseInt(ports)] = {
|
||||
portsCalcInfo[parseInt(port)] = {
|
||||
bufferSize: varDiffOptions.retargetTime / varDiffOptions.targetTime * 4,
|
||||
tMin: varDiffOptions.targetTime - variance,
|
||||
tMax: varDiffOptions.targetTime + variance
|
||||
@ -74,7 +74,7 @@ var varDiff = module.exports = function varDiff(ports){
|
||||
return;
|
||||
|
||||
var calcInfo = portsCalcInfo[stratumPort];
|
||||
var options = ports[stratumPort];
|
||||
var options = ports[stratumPort].varDiff;
|
||||
|
||||
var lastTs;
|
||||
var lastRtc;
|
||||
@ -127,4 +127,4 @@ var varDiff = module.exports = function varDiff(ports){
|
||||
});
|
||||
};
|
||||
};
|
||||
varDiff.prototype.__proto__ = events.EventEmitter.prototype;
|
||||
varDiff.prototype.__proto__ = events.EventEmitter.prototype;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user