Merge branch 'develop' into pin_and_anti_tamper

selfcustody · Oct 21, 2024 · 933825c · 933825c
2 parents 28e8871 + 7b9bb9e
commit 933825c
Show file tree

Hide file tree

Showing 8 changed files with 322,087 additions and 315,004 deletions.
diff --git a/firmware/MaixPy b/firmware/MaixPy
diff --git a/firmware/font/FusionPixel-14.bdf b/firmware/font/FusionPixel-14.bdf
diff --git a/firmware/font/bdftokff.py b/firmware/font/bdftokff.py
diff --git a/firmware/font/hextokff.py b/firmware/font/hextokff.py
diff --git a/i18n/translations/ja-JP.json b/i18n/translations/ja-JP.json
diff --git a/src/krux/display.py b/src/krux/display.py
diff --git a/src/krux/translations/__init__.py b/src/krux/translations/__init__.py
diff --git a/src/krux/translations/ja.py b/src/krux/translations/ja.py
+8 −2		components/micropython/port/src/omv/img/include/font.h
+871 −28		projects/maixpy_amigo/compile/overrides/components/micropython/port/src/omv/img/font.c
+655 −21		projects/maixpy_bit/compile/overrides/components/micropython/port/src/omv/img/font.c
+655 −21		projects/maixpy_cube/compile/overrides/components/micropython/port/src/omv/img/font.c
+655 −21		projects/maixpy_dock/compile/overrides/components/micropython/port/src/omv/img/font.c
+655 −21		projects/maixpy_m5stickv/compile/overrides/components/micropython/port/src/omv/img/font.c
+699 −95		projects/maixpy_wonder_mv/compile/overrides/components/micropython/port/src/omv/img/font.c
+655 −21		projects/maixpy_yahboom/compile/overrides/components/micropython/port/src/omv/img/font.c