Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
@cs0x7f
cs0x7f committed Aug 25, 2024
1 parent ebf40a1 commit 4664623
Show file tree
Hide file tree
Showing 12 changed files with 139 additions and 125 deletions.
2 changes: 1 addition & 1 deletion src/js/export.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ var exportFunc = execMain(function() {
var baseObj = {};
var jobs = Promise.resolve(baseObj);
try {
var metaObj = JSON.parse(LZString.decompressFromEncodedURIComponent(val['data']));
metaObj = JSON.parse(LZString.decompressFromEncodedURIComponent(val['data']));
} catch (err) {
DEBUG && console.log('[export] error', err);
return Promise.reject('');
Expand Down
2 changes: 1 addition & 1 deletion src/js/kernel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ var kernel = execMain(function() {
break;
}
}
if (avail && !isHide || show || jQuery.fx.off) {
if (avail && !isHide || show || $.fx.off) {
leftbar.stop(true, true).fadeTo(200, 1);
} else {
leftbar.stop(true, true).fadeTo(200, 0.01);
Expand Down
4 changes: 1 addition & 3 deletions src/js/lib/utillib.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ execWorker(function() {
global['self'] = global;
}
self.$ = {
isArray: Array.isArray || function(obj) {
return jQuery.type(obj) === "array";
},
isArray: Array.isArray,
noop: function() {},
now: function() {
return +new Date;
Expand Down
4 changes: 2 additions & 2 deletions src/js/scramble/scramble_444.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ var scramble_444 = (function(Cnk, circle) {
if ((occ[i >>> 5] & 1 << (i & 31)) == 0) {
$set_0(c, i);
for (j = 0; j < 48; ++j) {
var idx = getCenter1RotThres(c, Center1RotPerm[j], mathlib.Cnk[21][8]);
idx = getCenter1RotThres(c, Center1RotPerm[j], mathlib.Cnk[21][8]);
if (idx == -1) {
continue;
}
Expand Down Expand Up @@ -1439,7 +1439,7 @@ var scramble_444 = (function(Cnk, circle) {
if (move3std[m] % 3 != 1) {
continue;
}
var idx = getMvSym(e.edge, m);
idx = getMvSym(e.edge, m);
Edge3SymMove[m][i] = ~~((idx >> 3) / 20160) << 3 | idx & 0x7;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/js/shortcut.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ var shortcuts = execMain(function(){
DEBUG && console.log('[shortcut] touch start', e);
clearLongTouch();
longTouchTid = setTimeout(longTouchCallback, 2000);
if (timer.getStatus() != -1 || !kernel.getProp('useGES')) {
if (timer.status() != -1 || !kernel.getProp('useGES')) {
return;
}
touchPoint = getOffXY(e);
Expand Down
37 changes: 27 additions & 10 deletions src/js/timer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ var timer = execMain(function(regListener, regProp, getProp, pretty, ui, pushSig
var status = -1;

function setStatus(_status) {
if (_status == status) {
return;
if (_status === undefined || _status == status) {
return status;
}
status = _status;
lcd.renderUtil();
Expand Down Expand Up @@ -807,24 +807,41 @@ var timer = execMain(function(regListener, regProp, getProp, pretty, ui, pushSig
onkeydown({which: 29});
}

function setCurTime(time) {
if (time !== undefined) {
curTime = time;
}
return curTime;
}

function setStartTime(time) {
if (time !== undefined) {
startTime = time;
}
return startTime;
}

function setHardTime(time) {
if (time !== undefined) {
hardTime = time;
}
return hardTime;
}

return {
onkeydown: onkeydown,
onkeyup: onkeyup,
showAvgDiv: avgDiv.showAvgDiv,
refocus: refocus,
softESC: softESC,
checkUseIns: checkUseIns,
getStatus: function() { return status; },
setStatus: setStatus,
status: setStatus,
getCurTime: function(now) { return status > 0 ? (now || $.now()) - startTime : 0; },
getStartTime: function() { return startTime || $.now(); },
setFobj: function(obj) { fobj = obj; },
getStart: function() { return startTime; },
setStart: function(time) { startTime = time; },
getCur: function() { return curTime; },
setCur: function(time) { curTime = time; },
getHard: function() { return hardTime; },
setHard: function(time) { hardTime = time; },
curTime: setCurTime,
startTime: setStartTime,
hardTime: setHardTime,
updateMulPhase: updateMulPhase,
getBTDiv: function() { return bluetoothInstructDiv; },
keyboard: keyboardTimer,
Expand Down
40 changes: 20 additions & 20 deletions src/js/timer/gan.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,41 +21,41 @@ execMain(function(timer) {
break;
case GanTimerState.IDLE: // timer reset button pressed
inspectionTime = 0;
if (timer.getHard() > 0 || timer.getStatus() != -1) { // reset timer / cancel inspection timer
timer.setHard(0);
timer.setStatus(-1);
if (timer.hardTime() > 0 || timer.status() != -1) { // reset timer / cancel inspection timer
timer.hardTime(0);
timer.status(-1);
timer.lcd.reset();
timer.lcd.fixDisplay(false, true);
} else if (timer.getStatus() == -1 && timer.checkUseIns()) { // start inspection timer if was idle and inspection enabled in settings
timer.setStatus(-3);
timer.setStart($.now());
} else if (timer.status() == -1 && timer.checkUseIns()) { // start inspection timer if was idle and inspection enabled in settings
timer.status(-3);
timer.startTime($.now());
timer.lcd.fixDisplay(false, true);
}
timer.lcd.renderUtil();
break;
case GanTimerState.RUNNING: // timer is started
if (timer.getStatus() == -3) { // if inspection timer was running, record elapsed inspection time
inspectionTime = $.now() - timer.getStart();
if (timer.status() == -3) { // if inspection timer was running, record elapsed inspection time
inspectionTime = $.now() - timer.startTime();
// 0 == Normal, 2000 == +2, -1 == DNF
inspectionTime = timer.checkUseIns() ? inspectionTime > 17000 ? -1 : (inspectionTime > 15000 ? 2000 : 0) : 0;
}
timer.setStart($.now());
timer.startTime($.now());
timer.lcd.reset();
timer.setCur([inspectionTime]);
timer.setStatus(1);
timer.curTime([inspectionTime]);
timer.status(1);
timer.lcd.fixDisplay(false, true);
break;
case GanTimerState.STOPPED: // timer is stopped, recorded time returned from timer
timer.setHard(timerEvent.recordedTime.asTimestamp);
timer.getCur()[1] = timer.getHard();
timer.setStatus(-1);
timer.hardTime(timerEvent.recordedTime.asTimestamp);
timer.curTime()[1] = timer.hardTime();
timer.status(-1);
timer.lcd.renderUtil();
timer.lcd.fixDisplay(false, true);
kernel.pushSignal('time', timer.getCur());
kernel.pushSignal('time', timer.curTime());
break;
case GanTimerState.DISCONNECT: // timer is switched off or something else
timer.setHard();
timer.setStatus(-1);
timer.hardTime(null);
timer.status(-1);
timer.lcd.renderUtil();
timer.lcd.fixDisplay(false, true);
reconnectTimer();
Expand All @@ -75,8 +75,8 @@ execMain(function(timer) {
GanTimerDriver.connect(reconnect).then(function () {
DEBUG && console.log('[gantimer] timer device successfully connected');
GanTimerDriver.setStateUpdateCallback(onGanTimerEvent);
timer.setHard(0);
timer.setStatus(-1);
timer.hardTime(0);
timer.status(-1);
timer.lcd.reset();
timer.lcd.renderUtil();
timer.lcd.fixDisplay(false, true);
Expand Down Expand Up @@ -111,7 +111,7 @@ execMain(function(timer) {
function setEnableImpl(input) {
enable = input == 'b';
if (enable) {
timer.setHard();
timer.hardTime(null);
showConnectionDialog();
} else {
disconnectTimer();
Expand Down
58 changes: 29 additions & 29 deletions src/js/timer/giiker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ execMain(function(timer) {
}
clearReadyTid();
var solvingMethod = kernel.getProp('vrcMP', 'n');
if (timer.getStatus() == -1) {
if (timer.status() == -1) {
if (canStart(currentFacelet)) {
var delayStart = kernel.getProp('giiSD');
if (delayStart == 's') {
Expand All @@ -163,28 +163,28 @@ execMain(function(timer) {
}
}
}
} else if (timer.getStatus() == -3 || timer.getStatus() == -2) {
} else if (timer.status() == -3 || timer.status() == -2) {
if (timer.checkUseIns()) {
insTime = locTime - timer.getStart();
insTime = locTime - timer.startTime();
} else {
insTime = 0;
}
timer.setStart(locTime);
timer.setCur([insTime > 17000 ? -1 : (insTime > 15000 ? 2000 : 0)]);
timer.setStatus(cubeutil.getStepCount(solvingMethod));
timer.startTime(locTime);
timer.curTime([insTime > 17000 ? -1 : (insTime > 15000 ? 2000 : 0)]);
timer.status(cubeutil.getStepCount(solvingMethod));
rawMoves = [];
for (var i = 0; i < timer.getStatus(); i++) {
for (var i = 0; i < timer.status(); i++) {
rawMoves[i] = [];
}
totPhases = timer.getStatus();
totPhases = timer.status();
var initialProgress = cubeutil.getProgress(prevFacelet, solvingMethod);
timer.updateMulPhase(totPhases, initialProgress, locTime);
timer.lcd.reset(enableVRC);
timer.lcd.fixDisplay(false, true);
}
if (timer.getStatus() >= 1) {
if (timer.status() >= 1) {
if (prevMoves.length > 0)
rawMoves[timer.getStatus() - 1].push([prevMoves[0], lastTs[0], lastTs[1]]);
rawMoves[timer.status() - 1].push([prevMoves[0], lastTs[0], lastTs[1]]);
var curProgress = cubeutil.getProgress(facelet, solvingMethod);
timer.updateMulPhase(totPhases, curProgress, locTime);

Expand All @@ -193,21 +193,21 @@ execMain(function(timer) {
var pretty = cubeutil.getPrettyReconstruction(rawMoves, solvingMethod);
var moveCnt = pretty.totalMoves;
giikerutil.setLastSolve(pretty.prettySolve);
timer.getCur()[1] = locTime - timer.getStart();
timer.setStatus(-1);
timer.curTime()[1] = locTime - timer.startTime();
timer.status(-1);
giikerutil.reSync();
timer.lcd.fixDisplay(false, true);
if (timer.getCur()[1] != 0) {
if (timer.curTime()[1] != 0) {
var sol = giikerutil.tsLinearFix(rawMoves.flat()); // fit deviceTime to locTime
var cnt = 0;
DEBUG && console.log('time fit, old=', timer.getCur());
DEBUG && console.log('time fit, old=', timer.curTime());
for (var i = 0; i < rawMoves.length; i++) {
cnt += rawMoves[i].length;
timer.getCur()[rawMoves.length - i] = cnt == 0 ? 0 : sol[cnt - 1][1];
timer.curTime()[rawMoves.length - i] = cnt == 0 ? 0 : sol[cnt - 1][1];
}
DEBUG && console.log('time fit, new=', timer.getCur());
DEBUG && console.log('time fit, new=', timer.curTime());
sol = cubeutil.getConjMoves(cubeutil.moveSeq2str(sol), true);
kernel.pushSignal('time', ["", 0, timer.getCur(), 0, [sol, '333']]);
kernel.pushSignal('time', ["", 0, timer.curTime(), 0, [sol, '333']]);
} else if (kernel.getProp('giiMode') != 'n') {
kernel.pushSignal('ctrl', ['scramble', 'next']);
}
Expand Down Expand Up @@ -239,7 +239,7 @@ execMain(function(timer) {

function markScrambled(now) {
clearReadyTid();
if (timer.getStatus() == -1) {
if (timer.status() == -1) {
if (kernel.getProp('giiMode') == 'n') {
if (!giikerutil.checkScramble()) {
var gen = scramble_333.genFacelet(currentFacelet);
Expand All @@ -249,8 +249,8 @@ execMain(function(timer) {
} else {
giikerutil.markScrambled(true);
}
timer.setStatus(-2);
timer.setStart(now);
timer.status(-2);
timer.startTime(now);
timer.lcd.reset(enableVRC);
timer.lcd.fixDisplay(true, true);
if (kernel.getProp('giiBS')) {
Expand All @@ -276,7 +276,7 @@ execMain(function(timer) {
}
}, /^(?:preScrT?|isTrainScr|giiOri)$/);
kernel.regListener('giikerVRC', 'scramble', function(signal, value) {
if (enableVRC && timer.getStatus() == -1 && kernel.getProp('giiMode') == 'at' && GiikerCube.isConnected()) {
if (enableVRC && timer.status() == -1 && kernel.getProp('giiMode') == 'at' && GiikerCube.isConnected()) {
clearReadyTid();
waitReadyTid = setTimeout(function() {
markScrambled($.now());
Expand All @@ -303,26 +303,26 @@ execMain(function(timer) {
onkeydown: function(keyCode) {
var now = $.now();
if (keyCode == 27 || keyCode == 28) {
var recordDNF = timer.getStatus() >= 1;
var recordDNF = timer.status() >= 1;
clearReadyTid();
timer.setStatus(-1);
timer.status(-1);
giikerutil.reSync();
timer.lcd.fixDisplay(false, true);
if (recordDNF) {
timer.getCur()[0] = -1;
timer.curTime()[0] = -1;
rawMoves.reverse();
var sol = giikerutil.tsLinearFix(rawMoves.flat()); // fit deviceTime to locTime
var cnt = 0;
DEBUG && console.log('time fit, old=', timer.getCur());
DEBUG && console.log('time fit, old=', timer.curTime());
for (var i = 0; i < rawMoves.length; i++) {
cnt += rawMoves[i].length;
timer.getCur()[rawMoves.length - i] = cnt == 0 ? 0 : sol[cnt - 1][1];
timer.curTime()[rawMoves.length - i] = cnt == 0 ? 0 : sol[cnt - 1][1];
}
DEBUG && console.log('time fit, new=', timer.getCur());
DEBUG && console.log('time fit, new=', timer.curTime());
sol = cubeutil.getConjMoves(cubeutil.moveSeq2str(sol), true);
kernel.pushSignal('time', ["", 0, timer.getCur(), 0, [sol, '333']]);
kernel.pushSignal('time', ["", 0, timer.curTime(), 0, [sol, '333']]);
}
} else if (keyCode == 32 && timer.getStatus() == -1 && kernel.getProp('giiSK') && canStart(currentFacelet)) {
} else if (keyCode == 32 && timer.status() == -1 && kernel.getProp('giiSK') && canStart(currentFacelet)) {
markScrambled($.now());
}
},
Expand Down
23 changes: 11 additions & 12 deletions src/js/timer/input.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,12 @@ execMain(function(timer) {
}
comment = m[7] || "";
scramble = m[8];
//TODO timestamp = m[9]
var curTime = [comment, scramble, [ins, time].concat(timeSplit)];
timer.setCur(curTime);
var timestamp = mathlib.str2time(m[9]);
if (timestamp) {
curTime.push(timestamp);
}
timer.curTime(curTime);
kernel.pushSignal('time', curTime);
kernel.clrKey();
}
Expand Down Expand Up @@ -99,16 +98,16 @@ execMain(function(timer) {
if (!timer.checkUseIns()) {
return;
} else if (isTrigger) {
if (timer.getStatus() == 0) {
timer.setStatus(-1);
} else if (timer.getStatus() == -1 || timer.getStatus() == -3) {
if (timer.status() == 0) {
timer.status(-1);
} else if (timer.status() == -1 || timer.status() == -3) {
if (now - lastStop < 500) {
timer.lcd.fixDisplay(false, isTrigger);
return;
}
} else if (timer.getStatus() == -4) {
timer.setStart(now);
timer.setStatus(-3);
} else if (timer.status() == -4) {
timer.startTime(now);
timer.status(-3);
}
}
timer.lcd.fixDisplay(false, isTrigger);
Expand All @@ -123,11 +122,11 @@ execMain(function(timer) {
return;
} else if (now - lastDown < 200) {
return;
} else if (timer.getStatus() == -3 || keyCode == 27) {
timer.setStatus(isTrigger ? 0 : -1);
} else if (timer.status() == -3 || keyCode == 27) {
timer.status(isTrigger ? 0 : -1);
timer.lcd.fixDisplay(false, false);
} else if (isTrigger && timer.getStatus() == -1) {
timer.setStatus(-4);
} else if (isTrigger && timer.status() == -1) {
timer.status(-4);
}
timer.lcd.fixDisplay(true, isTrigger);
if (isTrigger) {
Expand Down
Loading

0 comments on commit 4664623

Please sign in to comment.