diff --git a/panda/board/obj/gitversion.h b/panda/board/obj/gitversion.h index ede238614..4c28076d2 100644 --- a/panda/board/obj/gitversion.h +++ b/panda/board/obj/gitversion.h @@ -1,2 +1,2 @@ extern const uint8_t gitversion[19]; -const uint8_t gitversion[19] = "DEV-bdc15322-DEBUG"; +const uint8_t gitversion[19] = "DEV-40b54686-DEBUG"; diff --git a/panda/board/obj/version b/panda/board/obj/version index 566332582..278031df7 100644 --- a/panda/board/obj/version +++ b/panda/board/obj/version @@ -1 +1 @@ -DEV-bdc15322-DEBUG \ No newline at end of file +DEV-40b54686-DEBUG \ No newline at end of file diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index 51280fadd..2816e3974 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -306,10 +306,15 @@ GalaxyQRPopup::GalaxyQRPopup(const QString &url, QWidget *parent) : DialogBase(p auto qr = qrcodegen::QrCode::encodeText(url.toUtf8().constData(), qrcodegen::QrCode::Ecc::LOW); const int qr_size = qr.getSize(); - QImage image(qr_size, qr_size, QImage::Format_RGB32); + const int quiet_zone_modules = 4; + const int qr_display_size = 520; + const int image_size = qr_size + 2 * quiet_zone_modules; + QImage image(image_size, image_size, QImage::Format_RGB32); + image.fill(qRgb(255, 255, 255)); for (int y = 0; y < qr_size; ++y) { for (int x = 0; x < qr_size; ++x) { - image.setPixel(x, y, qr.getModule(x, y) ? qRgb(0, 0, 0) : qRgb(255, 255, 255)); + image.setPixel(x + quiet_zone_modules, y + quiet_zone_modules, + qr.getModule(x, y) ? qRgb(0, 0, 0) : qRgb(255, 255, 255)); } } @@ -319,7 +324,8 @@ GalaxyQRPopup::GalaxyQRPopup(const QString &url, QWidget *parent) : DialogBase(p layout->addWidget(title); QLabel *qr_label = new QLabel(this); - qr_label->setPixmap(QPixmap::fromImage(image.scaled(400, 400, Qt::KeepAspectRatio), Qt::MonoOnly)); + qr_label->setPixmap(QPixmap::fromImage( + image.scaled(qr_display_size, qr_display_size, Qt::KeepAspectRatio), Qt::MonoOnly)); qr_label->setAlignment(Qt::AlignCenter); layout->addWidget(qr_label); diff --git a/selfdrive/ui/ui b/selfdrive/ui/ui index 7254826e9..c0e39c91d 100755 Binary files a/selfdrive/ui/ui and b/selfdrive/ui/ui differ