embed (a subset of) inter into the installer

pull/33756/head
Cameron Clough 3 weeks ago
parent c2d9382761
commit 96eac9d68d
  1. 6
      selfdrive/ui/SConscript
  2. 6
      selfdrive/ui/installer/installer.cc
  3. 3
      selfdrive/ui/installer/inter-ascii.ttf

@ -95,15 +95,17 @@ if GetOption('extras'):
cont = raylib_env.Command("installer/continue_openpilot.o", "installer/continue_openpilot.sh",
"ld -r -b binary -o $TARGET $SOURCE")
inter = raylib_env.Command("installer/inter_ttf.o", "installer/inter-ascii.ttf",
"ld -r -b binary -o $TARGET $SOURCE")
for name, branch in installers:
d = {'BRANCH': f"'\"{branch}\"'"}
if "internal" in name:
d['INTERNAL'] = "1"
obj = raylib_env.Object(f"installer/installers/installer_{name}.o", ["installer/installer.cc"], CPPDEFINES=d)
f = raylib_env.Program(f"installer/installers/installer_{name}", [obj, cont], LIBS=raylib_libs)
f = raylib_env.Program(f"installer/installers/installer_{name}", [obj, cont, inter], LIBS=raylib_libs)
# keep installers small
assert f[0].get_size() < 1200*1e3, f[0].get_size()
assert f[0].get_size() < 1220*1e3, f[0].get_size()
# build watch3
if arch in ['x86_64', 'aarch64', 'Darwin'] or GetOption('extras'):

@ -31,8 +31,9 @@ const std::string CACHE_PATH = "/data/openpilot.cache";
extern const uint8_t str_continue[] asm("_binary_selfdrive_ui_installer_continue_openpilot_sh_start");
extern const uint8_t str_continue_end[] asm("_binary_selfdrive_ui_installer_continue_openpilot_sh_end");
extern const uint8_t inter_ttf[] asm("_binary_selfdrive_ui_installer_inter_ascii_ttf_start");
extern const uint8_t inter_ttf_end[] asm("_binary_selfdrive_ui_installer_inter_ascii_ttf_end");
const char* FONT_PATH = "/usr/share/fonts/Inter-Regular.woff2";
Font font;
void run(const char* cmd) {
@ -175,7 +176,8 @@ void cloneFinished(int exitCode) {
int main(int argc, char *argv[]) {
InitWindow(2160, 1080, "Installer");
font = LoadFontEx(FONT_PATH, 120, NULL, 0);
font = LoadFontFromMemory(".ttf", inter_ttf, inter_ttf_end - inter_ttf, 120, NULL, 0);
SetTextureFilter(font.texture, TEXTURE_FILTER_BILINEAR);
renderProgress(0);
int result = doInstall();
cloneFinished(result);

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1ef26a4099ef867f3493389379d882381a2491cdbfa41a086be8899a2154dcb3
size 26160
Loading…
Cancel
Save