Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop dual fix customer #358

Merged
merged 1 commit into from
Jan 3, 2025
Merged

Develop dual fix customer #358

merged 1 commit into from
Jan 3, 2025

Conversation

haiwentelink
Copy link
Collaborator

!!!!!!!!!! Please delete the instructions below and replace with PR description

If you have an issue number, please use a syntax of
Fixes #12345 and a brief change description

If you do not have an issue number, please have a good description of
the problem and the fix. Help the reviewer understand what to expect.

Make sure you delete these instructions (to prove you have read them).

!!!!!!!!!! Instructions end

@fengtai-telink fengtai-telink force-pushed the develop_dual_fix_customer branch from 3e37ea6 to e0255ce Compare December 24, 2024 02:39
@haiwentelink haiwentelink force-pushed the develop_dual_fix_customer branch 3 times, most recently from 1ac3915 to 1f690c8 Compare December 25, 2024 03:20
@haiwentelink haiwentelink force-pushed the develop_dual_fix_customer branch from 1f690c8 to e7b9e81 Compare December 30, 2024 06:53
@haiwentelink haiwentelink reopened this Dec 30, 2024
@haiwentelink haiwentelink force-pushed the develop_dual_fix_customer branch 4 times, most recently from 0d91545 to 53353ae Compare December 30, 2024 09:19
@haiwentelink haiwentelink force-pushed the develop_dual_fix_customer branch 3 times, most recently from f8878a1 to 8240c09 Compare January 2, 2025 02:34
@haiwentelink haiwentelink force-pushed the develop_dual_fix_customer branch from 8240c09 to 2975a9d Compare January 2, 2025 04:07
damien0x0023
damien0x0023 approved these changes Jan 2, 2025
View reviewed changes
Copy link
Collaborator

@damien0x0023 damien0x0023 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's generally okay on code style.
Please add some content into this PR description.
Regarding the comments, you may refine them if have spare time.

config/telink/chip-module/Kconfig.defaults
@@ -265,6 +265,11 @@ config COMPRESS_LZMA
default y if SOC_RISCV_TELINK_TL321X
default n

config CUSTOMER_MODE
bool "control the demo code"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest to replace it with "Enable/Disable Customer Mode"

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@damien0x0023 should not use enable , so change to control , or CI wil fail which will check enable words in descriptor.

examples/lighting-app/telink/src/ZclCallbacks.cpp Outdated
@@ -33,6 +33,14 @@ using namespace chip::app::Clusters;
void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
uint8_t * value)
{
#if CONFIG_CUSTOMER_MODE
/* user mode , add the customer code here for cb*/
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

customer mode

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will change

examples/platform/telink/common/include/AppTaskCommon.h Outdated
#elif CONFIG_SOC_RISCV_TELINK_TL321X
#define ZB_NVS_PARTITION slot1_partition
#define ZB_NVS_PARTITION_DEVICE FIXED_PARTITION_DEVICE(ZB_NVS_PARTITION)
#define ZB_NVS_START_ADR FIXED_PARTITION_OFFSET(ZB_NVS_PARTITION)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If possible, we may move the line 49&50 after the condition clauses so that we can remove the line 54&55.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will change

examples/platform/telink/common/src/AppTaskCommon.cpp Outdated
@@ -143,6 +146,8 @@ void FactoryResetExtHandler(void)
{
// Erase the user parameters partition to reset mode settings
flash_erase(flash_para_dev, USER_PARTITION_OFFSET, USER_PARTITION_SIZE);
// Need to erase zb nvs part in factory mode
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Erase ZigBee NVS data during factory reset"

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will change

examples/platform/telink/common/src/AppTaskCommon.cpp Outdated
if (user_para.val == USER_ZB_SW_VAL)
{
sBoot_zb = 1;
/* if switch from zb , need to get all the cluster info from zb */
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If switching from ZigBee mode, get all existing clusters information.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will change

examples/platform/telink/common/src/AppTaskCommon.cpp Outdated
@@ -257,25 +273,28 @@ CHIP_ERROR AppTaskCommon::StartApp(void)
* a given timeframe.
*/
flash_read(flash_para_dev, USER_PARTITION_OFFSET, &user_para, sizeof(user_para));
/* Boot from Zigbee , need to clean the user parameters sector first and set a flag */
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If booting from Zigbee mode, set a flag and clean deprecated parameter sectors.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will change

examples/platform/telink/common/src/AppTaskCommon.cpp
@@ -333,13 +352,16 @@ CHIP_ERROR AppTaskCommon::InitCommonParts(void)
CHIP_ERROR err;

PrintFirmwareInfo();
#if CONFIG_CUSTOMER_MODE

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be better to add some description here to remind developers, e.g. "/* Leave empty condition clause for development on customers' boards */"

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will change

examples/platform/telink/common/src/AppTaskCommon.cpp
@@ -823,6 +845,24 @@ void AppTaskCommon::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /*
#if CONFIG_DUAL_MODE_SWTICH
case DeviceEventType::kCommissioningComplete: {
uint8_t val = USER_MATTER_PAIR_VAL;
#if CONFIG_CUSTOMER_MODE
/* need to add here to update the cluster information , only in the zb switch and touchlink is paired*/
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update all cluster information, only if switching from ZigBee mode and the touchlink is paired.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will change

examples/platform/telink/common/src/AppTaskCommon.cpp Outdated
if (user_para.val == USER_ZB_SW_VAL && user_para.on_net)
{
Protocols::InteractionModel::Status status;
/* Switch from the touch link, need to restore previous values */
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If switching from the touch link, restore the previous light status values

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will change

@haiwentelink
riscv: telink: add dual mode for b92 and buteo and CI.
55d3a7b 
- clean the boot flag in init part .
- add the kDnsstimer to protect from init to dnss .
- add special proc for ikea.
- add the user-para proc in matter.
- add 2m flash for buteo ,and 4m for b92.
- update CI for b92 and tl3218x .
- fix the switch logic part .

Signed-off-by: Haiwen Xia <[email protected]>
@haiwentelink haiwentelink force-pushed the develop_dual_fix_customer branch from 2975a9d to 55d3a7b Compare January 2, 2025 11:48
@haiwentelink haiwentelink merged commit 0bfa808 into develop_dual Jan 3, 2025
64 checks passed
@haiwentelink haiwentelink deleted the develop_dual_fix_customer branch January 3, 2025 01:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@s07641069 s07641069 s07641069 approved these changes

@damien0x0023 damien0x0023 damien0x0023 approved these changes

@andy-liu-telink andy-liu-telink Awaiting requested review from andy-liu-telink

Assignees
No one assigned
Labels
config examples github platform telink workflows
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@haiwentelink @damien0x0023 @s07641069