coldcard/firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bbqr animation display

Browse Source
This commit is contained in:
Peter D. Gray 2024-02-15 11:52:41 -05:00
parent 909e32c084
commit 6aff15bb45
No known key found for this signature in database
GPG Key ID: A2DCD558C2BE5D7C
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shared/lcd_display.py
View File

@ -629,10 +629,6 @@ class Display:
# - we need one more (white) pixel on all sides
from utils import word_wrap
self.real_clear()
if partial_bar is not None:
self.progress_part_bar(partial_bar)
# maybe show something other than QR contents under it
msg = sidebar or msg
@ -657,6 +653,10 @@ class Display:
num_lines = 0
del parts
self.clear()
if partial_bar is not None:
self.progress_part_bar(partial_bar)
# send packed pixel data to C level to decode and expand onto LCD
# - 8-bit aligned rows of data
scan_w, w, data = qr_data.packed() if hasattr(qr_data, 'packed') else qr_data

2
shared/ux_q1.py
View File

@ -1121,7 +1121,7 @@ async def show_bbqr_codes(type_code, data, msg, already_hex=False):
del qr_data
dis.progress_bar_show(pkt / num_parts)
dis.progress_bar_show((pkt+1) / num_parts)
# display rate (plus time to send to display, etc)
ms_per_each = 200

19
stm32/COLDCARD_Q1/modlcd.c
View File

@ -34,8 +34,9 @@
#define SWAB16(n) (( ((n)>>8) | ((n) << 8) )&0xffff)
/* have not needed
static inline void wait_vsync(void) {
/* works, but not needed.
static void wait_vsync(void)
{
// PB11 is TEAR input: a positive pulse every 60Hz that
// corresponds to vertical blanking time
uint32_t timeout = 1000000;
@ -162,7 +163,11 @@ STATIC mp_obj_t send_qr(size_t n_args, const mp_obj_t *args)
// - expands it by "expand"
// - adds one-unit border to all sides
// - scan_w: scanline width (packed to mod 8)
//lcd.send_qr(self.spi, x, y, w, expand, scan_w, packed_data)
// - called: lcd.send_qr(self.spi, x, y, w, expand, scan_w, packed_data)
// - tearing should happen, but because we draw line-wise, seems invisible.
// - test with:
// from h import *; from ux_q1 import *; arun(show_bbqr_codes('B', bytes(ngu.random.bytes(4096)), 'foo'))
//
const uint16_t COL_WHITE = 0xffff;
const uint16_t COL_BLACK = 0x0000;
@ -188,13 +193,16 @@ STATIC mp_obj_t send_qr(size_t n_args, const mp_obj_t *args)
line[i] = COL_WHITE;
}
// top, bot blank lines
// top, bot white lines, around the QR body
set_window(spi, x, y, W, expand);
write_data_repeated(spi, expand, sizeof(line), (const uint8_t *)line);
set_window(spi, x, y+W-expand, W, expand);
write_data_repeated(spi, expand, sizeof(line), (const uint8_t *)line);
const uint8_t *ptr=boxes.buf;
// body of QR
set_window(spi, x, y+expand, W, expand*w);
const uint8_t *ptr = boxes.buf;
for(int Y=0; Y < w; Y++, ptr += (scan_w/8)) {
const uint8_t *p = ptr;
for(int X=0; X<w; ) {
@ -208,7 +216,6 @@ STATIC mp_obj_t send_qr(size_t n_args, const mp_obj_t *args)
p++;
}
set_window(spi, x, y+((Y+1)*expand), W, expand);
write_data_repeated(spi, expand, sizeof(line), (const uint8_t *)line);
}