Skip to content

Commit 7b50e1f

Browse files
restyled-commitsrestyled-commits
committed
Restyled by clang-format
1 parent a1561e8 commit 7b50e1f

File tree

2 files changed

+52
-46
lines changed

2 files changed

+52
-46
lines changed

‎examples/tv-app/tv-common/shell/AppTvShellCommands.cpp

+4-6
Original file line numberDiff line numberDiff line change
@@ -205,15 +205,13 @@ static CHIP_ERROR PrintAllCommands()
205205
streamer_printf(sout,
206206
" add-admin-vendor <vid> Add vendor ID to list which will receive admin privileges. Usage: app "
207207
"add-admin-vendor 65521\r\n");
208-
streamer_printf(sout,
209-
" app list List installed apps. Usage: app list");
208+
streamer_printf(sout, " app list List installed apps. Usage: app list");
210209
streamer_printf(sout,
211210
" app install <vid> <pid> Install app with given vendor ID and product ID. Usage: app install "
212211
"65521 32768\r\n");
213-
streamer_printf(
214-
sout,
215-
" app uninstall <vid> <pid> Uinstall app at given vendor ID and product ID. Usage: app uninstall "
216-
"65521 32768\r\n");
212+
streamer_printf(sout,
213+
" app uninstall <vid> <pid> Uinstall app at given vendor ID and product ID. Usage: app uninstall "
214+
"65521 32768\r\n");
217215
#endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
218216
#if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
219217
streamer_printf(sout, " print-app-access Print all ACLs for app platform fabric. Usage: app print-app-access\r\n");

‎examples/tv-app/tv-common/src/AppTv.cpp

+48-40
Original file line numberDiff line numberDiff line change
@@ -573,14 +573,16 @@ void ContentAppFactoryImpl::AddAdminVendorId(uint16_t vendorId)
573573
void ContentAppFactoryImpl::AddUninstalledContentApp(uint16_t vendorId, uint16_t productId)
574574
{
575575
auto make_default_supported_clusters = []() {
576-
return std::vector<ContentApp::SupportedCluster>{ { Descriptor::Id }, { ApplicationBasic::Id },
577-
{ KeypadInput::Id }, { ApplicationLauncher::Id } };
576+
return std::vector<ContentApp::SupportedCluster>{
577+
{ Descriptor::Id }, { ApplicationBasic::Id }, { KeypadInput::Id }, { ApplicationLauncher::Id }
578+
};
578579
};
579580

580-
auto ptr = std::make_unique<ContentAppImpl>("Vendor1", vendorId, "exampleid", productId, "Version1",
581-
"0", make_default_supported_clusters());
581+
auto ptr = std::make_unique<ContentAppImpl>("Vendor1", vendorId, "exampleid", productId, "Version1", "0",
582+
make_default_supported_clusters());
582583

583-
ptr.get()->GetApplicationBasicDelegate()->SetApplicationStatus(app::Clusters::ApplicationBasic::ApplicationStatusEnum::kNotInstalled);
584+
ptr.get()->GetApplicationBasicDelegate()->SetApplicationStatus(
585+
app::Clusters::ApplicationBasic::ApplicationStatusEnum::kNotInstalled);
584586

585587
mContentApps.emplace_back(std::move(ptr));
586588
}
@@ -597,46 +599,51 @@ void ContentAppFactoryImpl::InstallContentApp(uint16_t vendorId, uint16_t produc
597599
ChipLogProgress(DeviceLayer, "ContentAppFactoryImpl: InstallContentApp vendorId=%d productId=%d ", vendorId, productId);
598600
if (vendorId == 1 && productId == 11)
599601
{
600-
auto ptr = std::make_unique<ContentAppImpl>("Vendor1", vendorId, "exampleid", productId, "Version1",
601-
"34567890", make_default_supported_clusters());
602+
auto ptr = std::make_unique<ContentAppImpl>("Vendor1", vendorId, "exampleid", productId, "Version1", "34567890",
603+
make_default_supported_clusters());
602604

603-
ptr.get()->GetApplicationBasicDelegate()->SetApplicationStatus(app::Clusters::ApplicationBasic::ApplicationStatusEnum::kInstalled);
605+
ptr.get()->GetApplicationBasicDelegate()->SetApplicationStatus(
606+
app::Clusters::ApplicationBasic::ApplicationStatusEnum::kInstalled);
604607

605608
mContentApps.emplace_back(std::move(ptr));
606609
}
607610
else if (vendorId == 65521 && productId == 32769)
608611
{
609-
auto ptr = std::make_unique<ContentAppImpl>("Vendor2", vendorId, "exampleString", productId, "Version2",
610-
"20202021", make_default_supported_clusters());
612+
auto ptr = std::make_unique<ContentAppImpl>("Vendor2", vendorId, "exampleString", productId, "Version2", "20202021",
613+
make_default_supported_clusters());
611614

612-
ptr.get()->GetApplicationBasicDelegate()->SetApplicationStatus(app::Clusters::ApplicationBasic::ApplicationStatusEnum::kInstalled);
615+
ptr.get()->GetApplicationBasicDelegate()->SetApplicationStatus(
616+
app::Clusters::ApplicationBasic::ApplicationStatusEnum::kInstalled);
613617

614618
mContentApps.emplace_back(std::move(ptr));
615619
}
616620
else if (vendorId == 9050 && productId == 22)
617621
{
618622
auto ptr = std::make_unique<ContentAppImpl>("Vendor3", vendorId, "App3", productId, "Version3", "20202021",
619-
make_default_supported_clusters());
623+
make_default_supported_clusters());
620624

621-
ptr.get()->GetApplicationBasicDelegate()->SetApplicationStatus(app::Clusters::ApplicationBasic::ApplicationStatusEnum::kInstalled);
625+
ptr.get()->GetApplicationBasicDelegate()->SetApplicationStatus(
626+
app::Clusters::ApplicationBasic::ApplicationStatusEnum::kInstalled);
622627

623628
mContentApps.emplace_back(std::move(ptr));
624629
}
625630
else if (vendorId == 1111 && productId == 22)
626631
{
627-
auto ptr = std::make_unique<ContentAppImpl>("TestSuiteVendor", vendorId, "applicationId", productId, "v2",
628-
"20202021", make_default_supported_clusters());
632+
auto ptr = std::make_unique<ContentAppImpl>("TestSuiteVendor", vendorId, "applicationId", productId, "v2", "20202021",
633+
make_default_supported_clusters());
629634

630-
ptr.get()->GetApplicationBasicDelegate()->SetApplicationStatus(app::Clusters::ApplicationBasic::ApplicationStatusEnum::kInstalled);
635+
ptr.get()->GetApplicationBasicDelegate()->SetApplicationStatus(
636+
app::Clusters::ApplicationBasic::ApplicationStatusEnum::kInstalled);
631637

632638
mContentApps.emplace_back(std::move(ptr));
633639
}
634640
else
635641
{
636-
auto ptr = std::make_unique<ContentAppImpl>("NewAppVendor", vendorId, "newAppApplicationId", productId, "v2",
637-
"20202021", make_default_supported_clusters());
642+
auto ptr = std::make_unique<ContentAppImpl>("NewAppVendor", vendorId, "newAppApplicationId", productId, "v2", "20202021",
643+
make_default_supported_clusters());
638644

639-
ptr.get()->GetApplicationBasicDelegate()->SetApplicationStatus(app::Clusters::ApplicationBasic::ApplicationStatusEnum::kInstalled);
645+
ptr.get()->GetApplicationBasicDelegate()->SetApplicationStatus(
646+
app::Clusters::ApplicationBasic::ApplicationStatusEnum::kInstalled);
640647

641648
mContentApps.emplace_back(std::move(ptr));
642649
}
@@ -675,26 +682,26 @@ std::string ApplicationBasicStatusToString(app::Clusters::ApplicationBasic::Appl
675682
{
676683
switch (status)
677684
{
678-
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kStopped:
679-
return "kStopped";
680-
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kActiveVisibleFocus:
681-
return "kActiveVisibleFocus";
682-
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kActiveHidden:
683-
return "kActiveHidden";
684-
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kActiveVisibleNotFocus:
685-
return "kActiveVisibleNotFocus";
686-
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kNotInstalled:
687-
return "kNotInstalled";
688-
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kInstalling:
689-
return "kInstalling";
690-
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kInstallationFailed:
691-
return "kInstallationFailed";
692-
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kInstalled:
693-
return "kInstalled";
694-
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kUnknownEnumValue:
695-
return "kUnknownEnumValue";
696-
default:
697-
return "UnknownEnumValue";
685+
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kStopped:
686+
return "kStopped";
687+
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kActiveVisibleFocus:
688+
return "kActiveVisibleFocus";
689+
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kActiveHidden:
690+
return "kActiveHidden";
691+
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kActiveVisibleNotFocus:
692+
return "kActiveVisibleNotFocus";
693+
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kNotInstalled:
694+
return "kNotInstalled";
695+
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kInstalling:
696+
return "kInstalling";
697+
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kInstallationFailed:
698+
return "kInstallationFailed";
699+
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kInstalled:
700+
return "kInstalled";
701+
case app::Clusters::ApplicationBasic::ApplicationStatusEnum::kUnknownEnumValue:
702+
return "kUnknownEnumValue";
703+
default:
704+
return "UnknownEnumValue";
698705
}
699706
}
700707

@@ -704,7 +711,8 @@ void ContentAppFactoryImpl::PrintInstalledApps()
704711
{
705712
auto app = contentApp.get();
706713

707-
ChipLogProgress(DeviceLayer, "Content app vid=%d pid=%d is on ep=%d with app's basic status=%s", app->GetApplicationBasicDelegate()->HandleGetVendorId(),
714+
ChipLogProgress(DeviceLayer, "Content app vid=%d pid=%d is on ep=%d with app's basic status=%s",
715+
app->GetApplicationBasicDelegate()->HandleGetVendorId(),
708716
app->GetApplicationBasicDelegate()->HandleGetProductId(), app->GetEndpointId(),
709717
ApplicationBasicStatusToString(app->GetApplicationBasicDelegate()->HandleGetStatus()).c_str());
710718
}

0 commit comments

Comments
 (0)