Merge pull request #384 from LedgerHQ/ocr_speculos

Add support for Speculos OCR
LedgerHQ · Jul 28, 2023 · 372bf7d · 372bf7d
2 parents 77e7ad2 + 840ec51
commit 372bf7d
Show file tree

Hide file tree

Showing 16 changed files with 14,366 additions and 39 deletions.
diff --git a/lib_bagl/include/bagl_font_open_sans_extrabold_11px.json b/lib_bagl/include/bagl_font_open_sans_extrabold_11px.json
diff --git a/lib_bagl/include/bagl_font_open_sans_extrabold_11px_unicode.json b/lib_bagl/include/bagl_font_open_sans_extrabold_11px_unicode.json
diff --git a/lib_bagl/include/bagl_font_open_sans_light_16px.json b/lib_bagl/include/bagl_font_open_sans_light_16px.json
diff --git a/lib_bagl/include/bagl_font_open_sans_light_16px_unicode.json b/lib_bagl/include/bagl_font_open_sans_light_16px_unicode.json
diff --git a/lib_bagl/include/bagl_font_open_sans_regular_11px.json b/lib_bagl/include/bagl_font_open_sans_regular_11px.json
diff --git a/lib_bagl/include/bagl_font_open_sans_regular_11px_unicode.json b/lib_bagl/include/bagl_font_open_sans_regular_11px_unicode.json
diff --git a/lib_bagl/src/bagl.c b/lib_bagl/src/bagl.c
@@ -523,7 +523,7 @@ int bagl_draw_string(unsigned short font_id, unsigned int fgcolor, unsigned int
       */
 
       // chars are storred LSB to MSB in each char, packed chars. horizontal scan
-      if (ch_bitmap && ch_bits) {
+      if (ch_bitmap) {
         bagl_hal_draw_bitmap_within_rect(xx + ch_offset_x, ch_y + ch_offset_y, ch_width, ch_height, (1<<bpp), colors, bpp, ch_bitmap, ch_bits);
       }
       else {

diff --git a/lib_nbgl/include/nbgl_font_hmalpha_mono_medium_32.json b/lib_nbgl/include/nbgl_font_hmalpha_mono_medium_32.json
diff --git a/lib_nbgl/include/nbgl_font_inter_medium_32.json b/lib_nbgl/include/nbgl_font_inter_medium_32.json