From 7e9763bdb0b412f3bab043fbcb7bc2f4531f0320 Mon Sep 17 00:00:00 2001 From: pankore <86098180+pankore@users.noreply.github.com> Date: Thu, 24 Aug 2023 16:04:32 +0800 Subject: [PATCH 1/3] Fix Read Product Appearance --- src/platform/Ameba/FactoryDataProvider.cpp | 15 +++++++++++++++ src/platform/Ameba/FactoryDataProvider.h | 2 ++ 2 files changed, 17 insertions(+) diff --git a/src/platform/Ameba/FactoryDataProvider.cpp b/src/platform/Ameba/FactoryDataProvider.cpp index ad1441b10593ba..91f2ccf6ded434 100644 --- a/src/platform/Ameba/FactoryDataProvider.cpp +++ b/src/platform/Ameba/FactoryDataProvider.cpp @@ -31,6 +31,7 @@ #include using namespace ::chip::DeviceLayer::Internal; +using namespace chip::app::Clusters::BasicInformation; namespace chip { namespace DeviceLayer { @@ -664,5 +665,19 @@ CHIP_ERROR FactoryDataProvider::GetRotatingDeviceIdUniqueId(MutableByteSpan & un return err; } +CHIP_ERROR FactoryDataProvider::GetProductFinish(ProductFinishEnum * finish) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + *finish = ProductFinishEnum::kFabric; + return err; +} + +CHIP_ERROR FactoryDataProvider::GetProductPrimaryColor(ColorEnum * primaryColor) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + *primaryColor = ColorEnum::kPurple; + return err; +} + } // namespace DeviceLayer } // namespace chip diff --git a/src/platform/Ameba/FactoryDataProvider.h b/src/platform/Ameba/FactoryDataProvider.h index 51e7156c2befdc..c0f09c300dd0a2 100644 --- a/src/platform/Ameba/FactoryDataProvider.h +++ b/src/platform/Ameba/FactoryDataProvider.h @@ -60,6 +60,8 @@ class FactoryDataProvider : public chip::Credentials::DeviceAttestationCredentia CHIP_ERROR GetHardwareVersion(uint16_t & hardwareVersion) override; CHIP_ERROR GetHardwareVersionString(char * buf, size_t bufSize) override; CHIP_ERROR GetRotatingDeviceIdUniqueId(MutableByteSpan & uniqueIdSpan) override; + CHIP_ERROR GetProductFinish(app::Clusters::BasicInformation::ProductFinishEnum * finish) override; + CHIP_ERROR GetProductPrimaryColor(app::Clusters::BasicInformation::ColorEnum * primaryColor) override; bool kReadFromFlash = false; From 6aced6339115053695644ca1329691729d7fa0bd Mon Sep 17 00:00:00 2001 From: pankore <86098180+pankore@users.noreply.github.com> Date: Thu, 24 Aug 2023 16:21:13 +0800 Subject: [PATCH 2/3] Updated product finish to other and product color to black --- src/platform/Ameba/FactoryDataProvider.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/Ameba/FactoryDataProvider.cpp b/src/platform/Ameba/FactoryDataProvider.cpp index 91f2ccf6ded434..83cf61a23fc115 100644 --- a/src/platform/Ameba/FactoryDataProvider.cpp +++ b/src/platform/Ameba/FactoryDataProvider.cpp @@ -668,14 +668,14 @@ CHIP_ERROR FactoryDataProvider::GetRotatingDeviceIdUniqueId(MutableByteSpan & un CHIP_ERROR FactoryDataProvider::GetProductFinish(ProductFinishEnum * finish) { CHIP_ERROR err = CHIP_NO_ERROR; - *finish = ProductFinishEnum::kFabric; + *finish = ProductFinishEnum::kOther; return err; } CHIP_ERROR FactoryDataProvider::GetProductPrimaryColor(ColorEnum * primaryColor) { CHIP_ERROR err = CHIP_NO_ERROR; - *primaryColor = ColorEnum::kPurple; + *primaryColor = ColorEnum::kBlack; return err; } From a41ec4bee7a8715005ddd7dd2e7ae2c630ea36de Mon Sep 17 00:00:00 2001 From: pankore <86098180+pankore@users.noreply.github.com> Date: Thu, 24 Aug 2023 16:34:57 +0800 Subject: [PATCH 3/3] ran restyle-diff.sh --- src/platform/Ameba/FactoryDataProvider.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/Ameba/FactoryDataProvider.cpp b/src/platform/Ameba/FactoryDataProvider.cpp index 83cf61a23fc115..541a2256423257 100644 --- a/src/platform/Ameba/FactoryDataProvider.cpp +++ b/src/platform/Ameba/FactoryDataProvider.cpp @@ -668,14 +668,14 @@ CHIP_ERROR FactoryDataProvider::GetRotatingDeviceIdUniqueId(MutableByteSpan & un CHIP_ERROR FactoryDataProvider::GetProductFinish(ProductFinishEnum * finish) { CHIP_ERROR err = CHIP_NO_ERROR; - *finish = ProductFinishEnum::kOther; + *finish = ProductFinishEnum::kOther; return err; } CHIP_ERROR FactoryDataProvider::GetProductPrimaryColor(ColorEnum * primaryColor) { CHIP_ERROR err = CHIP_NO_ERROR; - *primaryColor = ColorEnum::kBlack; + *primaryColor = ColorEnum::kBlack; return err; }