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

Rename CecKeyCode to CecKeyCodeEnum to match spec #30497

Merged
merged 12 commits into from
Nov 20, 2023
Merged

Rename CecKeyCode to CecKeyCodeEnum to match spec #30497

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c7e571b
Rename CecKeyCode to CecKeyCodeEnum to match spec
andy31415 Nov 15, 2023
e5580ea
Fix PR number
andy31415 Nov 15, 2023
0f7f72a
Ran zap_convert_all.py
andy31415 Nov 15, 2023
7375774
Restyle
andy31415 Nov 15, 2023
8141404
Minor change to kick CI
andy31415 Nov 15, 2023
13ec370
Fix for compilation
andreilitvin Nov 16, 2023
4143949
Restyle
andreilitvin Nov 16, 2023
c6a0712
Mass rename CecKeyCodeEnum to CECKeyCodeEnum
andy31415 Nov 17, 2023
1eb0cdc
Zap regen
andy31415 Nov 17, 2023
8e098b6
Merge branch 'master' into rename_cec_key_code
andy31415 Nov 17, 2023
ca4541d
Update Darwin availability annotations.
bzbarsky-apple Nov 18, 2023
41da733
Merge branch 'master' into rename_cec_key_code
andy31415 Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions data_model/clusters/KeypadInput.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Davis, CA 95616, USA
</feature>
</features>
<dataTypes>
<enum name="CecKeyCodeEnum">
<enum name="CECKeyCodeEnum">
<item value="0" name="Select">
<mandatoryConform/>
</item>
Expand Down Expand Up @@ -348,7 +348,7 @@ Davis, CA 95616, USA
<command id="0x00" name="SendKey" response="SendKeyResponse">
<access invokePrivilege="operate"/>
<mandatoryConform/>
<field id="0" name="KeyCode" type="CecKeyCodeEnum">
<field id="0" name="KeyCode" type="CECKeyCodeEnum">
<mandatoryConform/>
</field>
</command>
Expand Down
4 changes: 2 additions & 2 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3366,7 +3366,7 @@ server cluster LowPower = 1288 {

/** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
server cluster KeypadInput = 1289 {
enum CecKeyCode : enum8 {
enum CECKeyCodeEnum : enum8 {
kSelect = 0;
kUp = 1;
kDown = 2;
Expand Down Expand Up @@ -3475,7 +3475,7 @@ server cluster KeypadInput = 1289 {
readonly attribute int16u clusterRevision = 65533;

request struct SendKeyRequest {
CecKeyCode keyCode = 0;
CECKeyCodeEnum keyCode = 0;
}

response struct SendKeyResponse = 1 {
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1313,7 +1313,7 @@ server cluster LowPower = 1288 {

/** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
server cluster KeypadInput = 1289 {
enum CecKeyCode : enum8 {
enum CECKeyCodeEnum : enum8 {
kSelect = 0;
kUp = 1;
kDown = 2;
Expand Down Expand Up @@ -1422,7 +1422,7 @@ server cluster KeypadInput = 1289 {
readonly attribute int16u clusterRevision = 65533;

request struct SendKeyRequest {
CecKeyCode keyCode = 0;
CECKeyCodeEnum keyCode = 0;
}

response struct SendKeyResponse = 1 {
Expand Down
6 changes: 3 additions & 3 deletions examples/placeholder/linux/apps/app1/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5829,7 +5829,7 @@ client cluster LowPower = 1288 {

/** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
client cluster KeypadInput = 1289 {
enum CecKeyCode : enum8 {
enum CECKeyCodeEnum : enum8 {
kSelect = 0;
kUp = 1;
kDown = 2;
Expand Down Expand Up @@ -5938,7 +5938,7 @@ client cluster KeypadInput = 1289 {
readonly attribute int16u clusterRevision = 65533;

request struct SendKeyRequest {
CecKeyCode keyCode = 0;
CECKeyCodeEnum keyCode = 0;
}

response struct SendKeyResponse = 1 {
Expand All @@ -5951,7 +5951,7 @@ client cluster KeypadInput = 1289 {

/** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
server cluster KeypadInput = 1289 {
enum CecKeyCode : enum8 {
enum CECKeyCodeEnum : enum8 {
kSelect = 0;
kUp = 1;
kDown = 2;
Expand Down
6 changes: 3 additions & 3 deletions examples/placeholder/linux/apps/app2/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5788,7 +5788,7 @@ client cluster LowPower = 1288 {

/** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
client cluster KeypadInput = 1289 {
enum CecKeyCode : enum8 {
enum CECKeyCodeEnum : enum8 {
kSelect = 0;
kUp = 1;
kDown = 2;
Expand Down Expand Up @@ -5897,7 +5897,7 @@ client cluster KeypadInput = 1289 {
readonly attribute int16u clusterRevision = 65533;

request struct SendKeyRequest {
CecKeyCode keyCode = 0;
CECKeyCodeEnum keyCode = 0;
}

response struct SendKeyResponse = 1 {
Expand All @@ -5910,7 +5910,7 @@ client cluster KeypadInput = 1289 {

/** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
server cluster KeypadInput = 1289 {
enum CecKeyCode : enum8 {
enum CECKeyCodeEnum : enum8 {
kSelect = 0;
kUp = 1;
kDown = 2;
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-app/android/java/KeypadInputManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void KeypadInputManager::NewManager(jint endpoint, jobject manager)
chip::app::Clusters::KeypadInput::SetDefaultDelegate(static_cast<EndpointId>(endpoint), mgr);
}

void KeypadInputManager::HandleSendKey(CommandResponseHelper<SendKeyResponseType> & helper, const CecKeyCode & keyCode)
void KeypadInputManager::HandleSendKey(CommandResponseHelper<SendKeyResponseType> & helper, const CECKeyCodeEnum & keyCode)
{
Commands::SendKeyResponse::Type response;

Expand Down
2 changes: 1 addition & 1 deletion examples/tv-app/android/java/KeypadInputManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class KeypadInputManager : public KeypadInputDelegate
void InitializeWithObjects(jobject managerObject);

void HandleSendKey(CommandResponseHelper<SendKeyResponseType> & helper,
const chip::app::Clusters::KeypadInput::CecKeyCode & keyCode) override;
const chip::app::Clusters::KeypadInput::CECKeyCodeEnum & keyCode) override;

uint32_t GetFeatureMap(chip::EndpointId endpoint) override;

Expand Down
2 changes: 1 addition & 1 deletion examples/tv-app/tv-common/clusters/keypad-input/KeypadInputManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
using chip::app::CommandResponseHelper;
using KeypadInputDelegate = chip::app::Clusters::KeypadInput::Delegate;
using SendKeyResponseType = chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::Type;
using CecKeyCodeType = chip::app::Clusters::KeypadInput::CecKeyCode;
using CecKeyCodeType = chip::app::Clusters::KeypadInput::CECKeyCodeEnum;

class KeypadInputManager : public KeypadInputDelegate
{
Expand Down
4 changes: 2 additions & 2 deletions examples/tv-app/tv-common/tv-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2107,7 +2107,7 @@ server cluster LowPower = 1288 {

/** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
server cluster KeypadInput = 1289 {
enum CecKeyCode : enum8 {
enum CECKeyCodeEnum : enum8 {
kSelect = 0;
kUp = 1;
kDown = 2;
Expand Down Expand Up @@ -2216,7 +2216,7 @@ server cluster KeypadInput = 1289 {
readonly attribute int16u clusterRevision = 65533;

request struct SendKeyRequest {
CecKeyCode keyCode = 0;
CECKeyCodeEnum keyCode = 0;
}

response struct SendKeyResponse = 1 {
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1663,7 +1663,7 @@ JNI_METHOD(jboolean, keypadInput_1sendKey)
ChipLogError(AppServer, "MatterCallbackHandlerJNI.SetUp failed %" CHIP_ERROR_FORMAT, err.Format()));

err = CastingServer::GetInstance()->KeypadInput_SendKey(
&endpoint, static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(keyCode),
&endpoint, static_cast<chip::app::Clusters::KeypadInput::CECKeyCodeEnum>(keyCode),
[](CHIP_ERROR err) { TvCastingAppJNIMgr().getMediaCommandResponseHandler(KeypadInput_SendKey).Handle(err); });
VerifyOrExit(CHIP_NO_ERROR == err,
ChipLogError(AppServer, "CastingServer.KeypadInput_SendKey failed %" CHIP_ERROR_FORMAT, err.Format()));
Expand Down
2 changes: 1 addition & 1 deletion .../tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2154,7 +2154,7 @@ - (void)keypadInput_sendKey:(ContentApp * _Nonnull)contentApp
[ConversionUtils convertToCppTargetEndpointInfoFrom:contentApp outTargetEndpointInfo:endpoint];

return castingServer->KeypadInput_SendKey(&endpoint,
static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(keyCode), responseFunction);
static_cast<chip::app::Clusters::KeypadInput::CECKeyCodeEnum>(keyCode), responseFunction);
}];
}

Expand Down
2 changes: 1 addition & 1 deletion examples/tv-casting-app/tv-casting-common/include/CastingServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ class CastingServer : public AppDelegate
/**
* @brief Keypad Input cluster
*/
CHIP_ERROR KeypadInput_SendKey(TargetEndpointInfo * endpoint, const chip::app::Clusters::KeypadInput::CecKeyCode keyCode,
CHIP_ERROR KeypadInput_SendKey(TargetEndpointInfo * endpoint, const chip::app::Clusters::KeypadInput::CECKeyCodeEnum keyCode,
std::function<void(CHIP_ERROR)> responseCallback);

/**
Expand Down
3 changes: 2 additions & 1 deletion examples/tv-casting-app/tv-casting-common/include/KeypadInput.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ class SendKeyCommand : public MediaCommandBase<chip::app::Clusters::KeypadInput:
public:
SendKeyCommand() : MediaCommandBase(chip::app::Clusters::KeypadInput::Id) {}

CHIP_ERROR Invoke(const chip::app::Clusters::KeypadInput::CecKeyCode keyCode, std::function<void(CHIP_ERROR)> responseCallback);
CHIP_ERROR Invoke(const chip::app::Clusters::KeypadInput::CECKeyCodeEnum keyCode,
std::function<void(CHIP_ERROR)> responseCallback);
};
2 changes: 1 addition & 1 deletion examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,7 @@ CHIP_ERROR CastingServer::TargetNavigator_SubscribeToCurrentTarget(
* @brief Keypad Input cluster
*/
CHIP_ERROR CastingServer::KeypadInput_SendKey(TargetEndpointInfo * endpoint,
const chip::app::Clusters::KeypadInput::CecKeyCode keyCode,
const chip::app::Clusters::KeypadInput::CECKeyCodeEnum keyCode,
std::function<void(CHIP_ERROR)> responseCallback)
{
ReturnErrorOnFailure(mSendKeyCommand.SetTarget(mActiveTargetVideoPlayerInfo, endpoint->GetEndpointId()));
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-casting-app/tv-casting-common/src/KeypadInput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
using namespace chip;
using namespace chip::app::Clusters;

CHIP_ERROR SendKeyCommand::Invoke(const chip::app::Clusters::KeypadInput::CecKeyCode keyCode,
CHIP_ERROR SendKeyCommand::Invoke(const chip::app::Clusters::KeypadInput::CECKeyCodeEnum keyCode,
std::function<void(CHIP_ERROR)> responseCallback)
{
KeypadInput::Commands::SendKey::Type request;
Expand Down
4 changes: 2 additions & 2 deletions examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1626,7 +1626,7 @@ client cluster LowPower = 1288 {

/** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
client cluster KeypadInput = 1289 {
enum CecKeyCode : enum8 {
enum CECKeyCodeEnum : enum8 {
kSelect = 0;
kUp = 1;
kDown = 2;
Expand Down Expand Up @@ -1735,7 +1735,7 @@ client cluster KeypadInput = 1289 {
readonly attribute int16u clusterRevision = 65533;

request struct SendKeyRequest {
CecKeyCode keyCode = 0;
CECKeyCodeEnum keyCode = 0;
}

response struct SendKeyResponse = 1 {
Expand Down
4 changes: 2 additions & 2 deletions scripts/py_matter_idl/matter_idl/tests/inputs/large_all_clusters_app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3250,7 +3250,7 @@ server cluster LowPower = 1288 {
}

server cluster KeypadInput = 1289 {
enum CecKeyCode : ENUM8 {
enum CECKeyCodeEnum : ENUM8 {
kSelect = 0;
kUp = 1;
kDown = 2;
Expand Down Expand Up @@ -3355,7 +3355,7 @@ server cluster KeypadInput = 1289 {
readonly attribute int16u clusterRevision = 65533;

request struct SendKeyRequest {
CecKeyCode keyCode = 0;
CECKeyCodeEnum keyCode = 0;
}

response struct SendKeyResponse = 1 {
Expand Down
3 changes: 2 additions & 1 deletion src/app/CompatEnumNames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
* is meant to be included at the end of cluster-enums.h, after all the normal
* enum definitions are available.
*/

#pragma once

namespace chip {
Expand Down Expand Up @@ -61,6 +60,8 @@ using ApplicationLauncherStatusEnum = StatusEnum;
namespace KeypadInput {
// https://github.com/project-chip/connectedhomeip/pull/30316 renamed this
using KeypadInputStatusEnum = StatusEnum;
// https://github.com/project-chip/connectedhomeip/pull/30497 renamed this
using CecKeyCode = CECKeyCodeEnum;
} // namespace KeypadInput

namespace Channel {
Expand Down
2 changes: 1 addition & 1 deletion src/app/clusters/keypad-input-server/keypad-input-delegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace KeypadInput {
class Delegate
{
public:
virtual void HandleSendKey(CommandResponseHelper<Commands::SendKeyResponse::Type> & helper, const CecKeyCode & keyCode) = 0;
virtual void HandleSendKey(CommandResponseHelper<Commands::SendKeyResponse::Type> & helper, const CECKeyCodeEnum & keyCode) = 0;

bool HasFeature(chip::EndpointId endpoint, Feature feature);

Expand Down
4 changes: 2 additions & 2 deletions src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ limitations under the License.

<command source="client" code="0x00" name="SendKey" response="SendKeyResponse" optional="false">
<description>Upon receipt, this SHALL process a keycode as input to the media device.</description>
<arg name="KeyCode" type="CecKeyCode"/>
<arg name="KeyCode" type="CECKeyCodeEnum"/>
</command>

<command source="server" code="0x01" name="SendKeyResponse" optional="false">
Expand All @@ -44,7 +44,7 @@ limitations under the License.
<item name="InvalidKeyInCurrentState" value="0x02"/>
</enum>

<enum name="CecKeyCode" type="enum8">
<enum name="CECKeyCodeEnum" type="enum8">
<cluster code="0x0509"/>
<item name="Select" value="0x00"/>
<item name="Up" value="0x01"/>
Expand Down
4 changes: 2 additions & 2 deletions src/controller/data_model/controller-clusters.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6585,7 +6585,7 @@ client cluster LowPower = 1288 {

/** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
client cluster KeypadInput = 1289 {
enum CecKeyCode : enum8 {
enum CECKeyCodeEnum : enum8 {
kSelect = 0;
kUp = 1;
kDown = 2;
Expand Down Expand Up @@ -6694,7 +6694,7 @@ client cluster KeypadInput = 1289 {
readonly attribute int16u clusterRevision = 65533;

request struct SendKeyRequest {
CecKeyCode keyCode = 0;
CECKeyCodeEnum keyCode = 0;
}

response struct SendKeyResponse = 1 {
Expand Down
6 changes: 3 additions & 3 deletions src/controller/python/chip/clusters/Objects.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading