Skip to content

Commit

Permalink
Fix two CHIP_ERROR values overlapping. (#12630)
Browse files Browse the repository at this point in the history
CHIP_ERROR_ANOTHER_COMMISSIONING_IN_PROGRESS and
CHIP_ERROR_IM_MALFORMED_COMMAND_STATUS_IB have the same value,
probably due to undetected merge conflict.
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Aug 1, 2023
1 parent 1043989 commit 3947181
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/lib/core/CHIPError.h
Original file line number Diff line number Diff line change
Expand Up @@ -2207,15 +2207,6 @@ using CHIP_ERROR = ::chip::ChipError;
*/
#define CHIP_ERROR_IM_STATUS_CODE_RECEIVED CHIP_CORE_ERROR(0xca)

/*
* @def CHIP_ERROR_ANOTHER_COMMISSIONING_IN_PROGRESS
*
* @brief
* Indicates that the commissioning window on the device is already open, and another
* commissioning is in progress
*/
#define CHIP_ERROR_ANOTHER_COMMISSIONING_IN_PROGRESS CHIP_CORE_ERROR(0xcb)

/**
* @def CHIP_ERROR_IM_MALFORMED_COMMAND_STATUS_IB
*
Expand Down Expand Up @@ -2315,6 +2306,15 @@ using CHIP_ERROR = ::chip::ChipError;
*/
#define CHIP_ERROR_IM_MALFORMED_EVENT_REPORT_IB CHIP_CORE_ERROR(0xd5)

/*
* @def CHIP_ERROR_ANOTHER_COMMISSIONING_IN_PROGRESS
*
* @brief
* Indicates that the commissioning window on the device is already open, and another
* commissioning is in progress
*/
#define CHIP_ERROR_ANOTHER_COMMISSIONING_IN_PROGRESS CHIP_CORE_ERROR(0xd6)

/**
* @}
*/
Expand Down

0 comments on commit 3947181

Please sign in to comment.