From 444649d4f684fb85f2c3ccdea6bfa22e9b0a6313 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Wed, 21 Jul 2021 23:30:02 -0700 Subject: [PATCH] show registration debug info after 60s (#21679) * show registration debug info after 60s * little nicer * larch * aarch Co-authored-by: Comma Device old-commit-hash: 987abb31ddd7affb18f9d93153eb00cf3bfb9c23 --- selfdrive/athena/registration.py | 12 ++++++++++-- selfdrive/ui/qt/spinner.cc | 2 ++ selfdrive/ui/qt/spinner_aarch64 | 4 ++-- selfdrive/ui/qt/spinner_larch64 | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) mode change 100644 => 100755 selfdrive/athena/registration.py diff --git a/selfdrive/athena/registration.py b/selfdrive/athena/registration.py old mode 100644 new mode 100755 index 6bcb29e4b0..39dfb3c239 --- a/selfdrive/athena/registration.py +++ b/selfdrive/athena/registration.py @@ -1,7 +1,7 @@ +#!/usr/bin/env python3 import os import time import json - import jwt from datetime import datetime, timedelta @@ -50,6 +50,8 @@ def register(show_spinner=False) -> str: private_key = f2.read() # Block until we get the imei + serial = HARDWARE.get_serial() + start_time = time.monotonic() imei1, imei2 = None, None while imei1 is None and imei2 is None: try: @@ -58,11 +60,14 @@ def register(show_spinner=False) -> str: cloudlog.exception("Error getting imei, trying again...") time.sleep(1) - serial = HARDWARE.get_serial() + if time.monotonic() - start_time > 60 and show_spinner: + spinner.update(f"registering device - serial: {serial}, IMEI: ({imei1}, {imei2})") + params.put("IMEI", imei1) params.put("HardwareSerial", serial) backoff = 0 + start_time = time.monotonic() while True: try: register_token = jwt.encode({'register': True, 'exp': datetime.utcnow() + timedelta(hours=1)}, private_key, algorithm='RS256') @@ -82,6 +87,9 @@ def register(show_spinner=False) -> str: backoff = min(backoff + 1, 15) time.sleep(backoff) + if time.monotonic() - start_time > 60 and show_spinner: + spinner.update(f"registering device - serial: {serial}, IMEI: ({imei1}, {imei2})") + if show_spinner: spinner.close() diff --git a/selfdrive/ui/qt/spinner.cc b/selfdrive/ui/qt/spinner.cc index 0dcae6d97b..5323d182ab 100644 --- a/selfdrive/ui/qt/spinner.cc +++ b/selfdrive/ui/qt/spinner.cc @@ -54,7 +54,9 @@ Spinner::Spinner(QWidget *parent) : QWidget(parent) { main_layout->addWidget(new TrackWidget(this), 0, 0, Qt::AlignHCenter | Qt::AlignVCenter); text = new QLabel(); + text->setWordWrap(true); text->setVisible(false); + text->setAlignment(Qt::AlignCenter); main_layout->addWidget(text, 1, 0, Qt::AlignHCenter); progress_bar = new QProgressBar(); diff --git a/selfdrive/ui/qt/spinner_aarch64 b/selfdrive/ui/qt/spinner_aarch64 index 2434da22c1..16541f2a80 100755 --- a/selfdrive/ui/qt/spinner_aarch64 +++ b/selfdrive/ui/qt/spinner_aarch64 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f9a452eb76fbb25807657d9a0205df04187331b8fe9d5a925f1e5fbed6a0ec1 -size 820976 +oid sha256:5cb58e6793b987c1dd45325bbeb1954e25352154dff5cc70b07b60bc123c3a3e +size 3099840 diff --git a/selfdrive/ui/qt/spinner_larch64 b/selfdrive/ui/qt/spinner_larch64 index ada7e05645..0af2f03244 100755 --- a/selfdrive/ui/qt/spinner_larch64 +++ b/selfdrive/ui/qt/spinner_larch64 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:705563f9cf899e54ac8dc0b924b7f2adfff35e0e5bd092630a7af2fb62b998e5 -size 667320 +oid sha256:ae8b210c237ffacab908083f231a20940d2443ee40c620d1f07de1e1e83cf5ea +size 2738568