Skip to content

Commit

Permalink
Pull request project-chip#412: Print QR Code URL in logs in EFR32 Win…
Browse files Browse the repository at this point in the history
…dow Covering App

Merge in WMN_TOOLS/matter from cherry-pick/wifi_window_qr_code_to_1.0.2 to RC_1.0.2-1.0

Squashed commit of the following:

commit 16dbf3d73757f8983ab702b037889c6e7e31619b
Author: Manav Mehta <mamehta@silabs.com>
Date:   Fri Dec 9 21:24:18 2022 +0530

    Restore folder structure after cherry-pick

commit 1867fa24963c101db358730234db658a093028cb
Author: kurvaSai <111514131+kurvaSai@users.noreply.github.com>
Date:   Tue Nov 8 16:46:41 2022 +0530

    Window Covering App QR Code Fix (project-chip#23539)

commit 91a08360963d542b54e4e18670c9ac454c2c2d56
Author: Manav Mehta <mamehta@silabs.com>
Date:   Fri Dec 9 21:21:20 2022 +0530

    Correction in temporary cherry-pick folder structure

... and 1 more commit
  • Loading branch information
Manav Mehta authored and Manav Mehta committed Dec 12, 2022
1 parent 76bc623 commit 0ed0650
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions examples/window-app/silabs/efr32/src/WindowAppImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
#include <platform/CHIPDeviceLayer.h>
#ifdef QR_CODE_ENABLED
#include <qrcodegen.h>
#else
#include "EFR32DeviceDataProvider.h"
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
#include <setup_payload/SetupPayload.h>
#endif // QR_CODE_ENABLED
#include <sl_simple_button_instances.h>

Expand Down Expand Up @@ -54,6 +58,8 @@ SilabsLCD slLCD;
#define LCD_ICON_TIMEOUT 1000

using namespace chip::app::Clusters::WindowCovering;
using namespace chip;
using namespace ::chip::DeviceLayer;
#define APP_STATE_LED &sl_led_led0
#define APP_ACTION_LED &sl_led_led1

Expand Down Expand Up @@ -212,6 +218,21 @@ CHIP_ERROR WindowAppImpl::Init()
slLCD.Init();
#endif

#ifndef QR_CODE_ENABLED
// Create buffer for QR code that can fit max size and null terminator.
char qrCodeBuffer[chip::QRCodeBasicSetupPayloadGenerator::kMaxQRCodeBase38RepresentationLength + 1];
chip::MutableCharSpan QRCode(qrCodeBuffer);

if (EFR32::EFR32DeviceDataProvider::GetDeviceDataProvider().GetSetupPayload(QRCode) == CHIP_NO_ERROR)
{
PrintQrCodeURL(QRCode);
}
else
{
EFR32_LOG("Getting QR code failed!");
}
#endif // QR_CODE_ENABLED

return CHIP_NO_ERROR;
}

Expand Down

0 comments on commit 0ed0650

Please sign in to comment.