From 646597cc00859311be91efac908d5346d2844109 Mon Sep 17 00:00:00 2001 From: Shuanglei Tao Date: Tue, 18 Mar 2025 18:15:40 +0800 Subject: [PATCH] fix SSD1619 red color --- html/index.html | 4 ++-- html/js/dithering.js | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/html/index.html b/html/index.html index 75b7fc9..931de53 100644 --- a/html/index.html +++ b/html/index.html @@ -132,8 +132,8 @@ - - + + \ No newline at end of file diff --git a/html/js/dithering.js b/html/js/dithering.js index 4504828..64b5d11 100644 --- a/html/js/dithering.js +++ b/html/js/dithering.js @@ -132,17 +132,15 @@ function canvas2bytes(canvas, type='bw', invert = false) { for (let y = 0; y < canvas.height; y++) { for (let x = 0; x < canvas.width; x++) { const i = (canvas.width * y + x) * 4; - let data; if (type !== 'red') { - data = imageData.data[i] === 0 && imageData.data[i+1] === 0 && imageData.data[i+2] === 0 ? 0 : 1; + buffer.push(imageData.data[i] === 0 && imageData.data[i+1] === 0 && imageData.data[i+2] === 0 ? 0 : 1); } else { - data = imageData.data[i] > 0 && imageData.data[i+1] === 0 && imageData.data[i+2] === 0 ? 0 : 1; + buffer.push(imageData.data[i] > 0 && imageData.data[i+1] === 0 && imageData.data[i+2] === 0 ? 0 : 1); } - if (invert) data = ~data; - buffer.push(data); if (buffer.length === 8) { - arr.push(parseInt(buffer.join(''), 2)); + const data = parseInt(buffer.join(''), 2); + arr.push(invert ? ~data : data); buffer = []; } }