Skip to content

Commit 45008cc

Browse files
Same position for channels regardless of mode.
1 parent 44d997b commit 45008cc

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/disp/disp_n5.mjs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,7 @@ let Ns5rDisplay = class extends RootDisplay {
264264
continue;
265265
};
266266
for (let c = Math.floor(e / showReduction); c >= 0; c --) {
267-
let pixX = (i % 32) * 4 + 12 + ((i >> 5) & 1), pixY = 39 - (((i >> 5) & 1) << 1) - c - ((i >> 6) << 3);
268-
if (trueMode) {
269-
pixX ++;
270-
};
267+
let pixX = (i % 32) * 4 + 12 + ((i >> 5) & 1) + 1, pixY = 39 - (((i >> 5) & 1) << 1) - c - ((i >> 6) << 3);
271268
this.#nmdb[pixY * 144 + pixX] = this.#pixelLit;
272269
this.#nmdb[pixY * 144 + pixX + 1] = this.#pixelLit;
273270
this.#nmdb[pixY * 144 + pixX + 2] = this.#pixelLit;
@@ -342,7 +339,7 @@ let Ns5rDisplay = class extends RootDisplay {
342339
// White bounding box
343340
for (let i = 0; i < 777; i ++) {
344341
let x = i % 37, y = Math.floor(i / 37);
345-
let realX = x + 77 + (+trueMode), realY = y + 19;
342+
let realX = x + 78, realY = y + 19;
346343
// Top and bottom borders
347344
if (
348345
(y == 0 && x < 36) ||
@@ -359,7 +356,7 @@ let Ns5rDisplay = class extends RootDisplay {
359356
let colUnit = (sum.bitmap.bitmap.length == 512) ? 1 : 2;
360357
for (let i = 0; i < 512; i += colUnit) {
361358
let x = i & 31, y = i >> 5;
362-
let realX = x + 79 + (+trueMode), realY = y + 21;
359+
let realX = x + 80, realY = y + 21;
363360
this.#nmdb[realY * 144 + realX] = sum.bitmap.bitmap[i / colUnit] ? this.#pixelLit : this.#pixelOff;
364361
if (colUnit == 2) {
365362
this.#nmdb[realY * 144 + realX + 1] = sum.bitmap.bitmap[i / colUnit] ? this.#pixelLit : this.#pixelOff;
@@ -390,11 +387,11 @@ let Ns5rDisplay = class extends RootDisplay {
390387
let circle = 2 * Math.PI;
391388
for (let c = 1; c < 33; c ++) {
392389
if (c == 1 || c == 32 || c % 5 == 0) {
393-
ctx.fillText(`${c}`, 24 * c + 58, 262);
390+
ctx.fillText(`${c}`, 24 * c + 64, 262);
394391
} else {
395392
ctx.beginPath();
396393
ctx.ellipse(
397-
24 * c + 58,
394+
24 * c + 64,
398395
258,
399396
2, 2,
400397
0, 0, circle

0 commit comments

Comments
 (0)