Skip to content

Commit

Permalink
Sync examples gen/ folder with zap-templates/ (#4097)
Browse files Browse the repository at this point in the history 
The `gen/` folder of `examples/` apps has not been updated with the latest changes from
`src/app/zap-templates`.

Those changes are:
 * Add back `client-command-macro.h` files
 * Update the command/response decoding code in `gen/call-command-handler.cpp`
 * Use `{{asUnderlyingZclType}}` in more places instead of using `zap-templates/override.js` which relies on labels to decide on the underlying type.
  • Loading branch information
@vivien-apple @pull
vivien-apple authored and pull[bot] committed Dec 9, 2020
1 parent be64435 commit 1541126
Show file tree
Hide file tree
Showing 15 changed files with 25,958 additions and 426 deletions.
12 changes: 6 additions & 6 deletions examples/all-clusters-app/all-clusters-common/gen/af-structs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ typedef struct _DebtPayload
{
uint32_t collectionTime;
uint32_t amountCollected;
EmberAfRepaymentDebtType debtType;
uint8_t debtType;
uint32_t outstandingDebt;
} EmberAfDebtPayload;

Expand All @@ -93,7 +93,7 @@ typedef struct _DeviceInformationRecord
uint16_t deviceId;
uint8_t version;
uint8_t groupIdCount;
EmberAfDeviceInformationRecordSort sort;
uint8_t sort;
} EmberAfDeviceInformationRecord;

// Struct for DiscoverAttributesInfoRecord
Expand Down Expand Up @@ -128,7 +128,7 @@ typedef struct _EventConfigurationPayload
// Struct for EventLogPayload
typedef struct _EventLogPayload
{
EmberAfEventLogId logId;
uint8_t logId;
uint16_t eventId;
uint32_t eventTime;
uint8_t * eventData;
Expand Down Expand Up @@ -316,7 +316,7 @@ typedef struct _ScheduleEntryFriendlyCreditSwitchTimes
typedef struct _ScheduleEntryRateSwitchTimes
{
uint16_t startTime;
EmberAfPriceTier priceTier;
uint8_t priceTier;
} EmberAfScheduleEntryRateSwitchTimes;

// Struct for ScheduledPhase
Expand Down Expand Up @@ -347,7 +347,7 @@ typedef struct _Smac
typedef struct _SnapshotResponsePayload
{
uint8_t snapshotScheduleId;
EmberAfSnapshotScheduleConfirmation snapshotScheduleConfirmation;
uint8_t snapshotScheduleConfirmation;
} EmberAfSnapshotResponsePayload;

// Struct for SnapshotSchedulePayload
Expand All @@ -356,7 +356,7 @@ typedef struct _SnapshotSchedulePayload
uint8_t snapshotScheduleId;
uint32_t snapshotStartTime;
uint32_t snapshotSchedule;
EmberAfSnapshotPayloadType snapshotPayloadType;
uint8_t snapshotPayloadType;
uint32_t snapshotCause;
} EmberAfSnapshotSchedulePayload;

Expand Down
1,479 changes: 1,137 additions & 342 deletions examples/all-clusters-app/all-clusters-common/gen/call-command-handler.cpp
View file

Large diffs are not rendered by default.

13 changes: 8 additions & 5 deletions examples/all-clusters-app/all-clusters-common/gen/callback.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1918,7 +1918,8 @@ bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t group
* @param groupList
*/

bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, uint8_t * groupList);
bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount,
/* TYPE WARNING: array array defaults to */ uint8_t * groupList);

/**
* @brief Groups Cluster RemoveGroupResponse Command callback
Expand Down Expand Up @@ -1959,7 +1960,8 @@ bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(uint16_t groupId, uint8_t
* @param groupList
*/

bool emberAfGroupsClusterGetGroupMembershipCallback(uint8_t groupCount, uint8_t * groupList);
bool emberAfGroupsClusterGetGroupMembershipCallback(uint8_t groupCount,
/* TYPE WARNING: array array defaults to */ uint8_t * groupList);

/**
* @brief Groups Cluster RemoveAllGroups Command callback
Expand Down Expand Up @@ -2118,7 +2120,7 @@ bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t group
*/

bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount,
uint8_t * sceneList);
/* TYPE WARNING: array array defaults to */ uint8_t * sceneList);

/**
* @brief Scenes Cluster RemoveAllScenesResponse Command callback
Expand Down Expand Up @@ -2157,7 +2159,8 @@ bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, uint16_t gro
*/

bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime,
uint8_t * sceneName, uint8_t * extensionFieldSets);
uint8_t * sceneName,
/* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets);

/**
* @brief Scenes Cluster AddScene Command callback
Expand All @@ -2169,7 +2172,7 @@ bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t grou
*/

bool emberAfScenesClusterAddSceneCallback(uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName,
uint8_t * extensionFieldSets);
/* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets);

/**
* @brief Scenes Cluster GetSceneMembership Command callback
Expand Down
6,165 changes: 6,165 additions & 0 deletions examples/all-clusters-app/all-clusters-common/gen/client-command-macro.h
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions examples/lighting-app/lighting-common/gen/af-structs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ typedef struct _DebtPayload
{
uint32_t collectionTime;
uint32_t amountCollected;
EmberAfRepaymentDebtType debtType;
uint8_t debtType;
uint32_t outstandingDebt;
} EmberAfDebtPayload;

Expand All @@ -93,7 +93,7 @@ typedef struct _DeviceInformationRecord
uint16_t deviceId;
uint8_t version;
uint8_t groupIdCount;
EmberAfDeviceInformationRecordSort sort;
uint8_t sort;
} EmberAfDeviceInformationRecord;

// Struct for DiscoverAttributesInfoRecord
Expand Down Expand Up @@ -128,7 +128,7 @@ typedef struct _EventConfigurationPayload
// Struct for EventLogPayload
typedef struct _EventLogPayload
{
EmberAfEventLogId logId;
uint8_t logId;
uint16_t eventId;
uint32_t eventTime;
uint8_t * eventData;
Expand Down Expand Up @@ -316,7 +316,7 @@ typedef struct _ScheduleEntryFriendlyCreditSwitchTimes
typedef struct _ScheduleEntryRateSwitchTimes
{
uint16_t startTime;
EmberAfPriceTier priceTier;
uint8_t priceTier;
} EmberAfScheduleEntryRateSwitchTimes;

// Struct for ScheduledPhase
Expand Down Expand Up @@ -347,7 +347,7 @@ typedef struct _Smac
typedef struct _SnapshotResponsePayload
{
uint8_t snapshotScheduleId;
EmberAfSnapshotScheduleConfirmation snapshotScheduleConfirmation;
uint8_t snapshotScheduleConfirmation;
} EmberAfSnapshotResponsePayload;

// Struct for SnapshotSchedulePayload
Expand All @@ -356,7 +356,7 @@ typedef struct _SnapshotSchedulePayload
uint8_t snapshotScheduleId;
uint32_t snapshotStartTime;
uint32_t snapshotSchedule;
EmberAfSnapshotPayloadType snapshotPayloadType;
uint8_t snapshotPayloadType;
uint32_t snapshotCause;
} EmberAfSnapshotSchedulePayload;

Expand Down
177 changes: 125 additions & 52 deletions examples/lighting-app/lighting-common/gen/call-command-handler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,29 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand
uint8_t optionMask;
uint8_t optionOverride;

moveMode = (*(uint8_t *) (cmd->buffer + payloadOffset));
payloadOffset += sizeof(uint8_t);

rate = (*(uint8_t *) (cmd->buffer + payloadOffset));
payloadOffset += sizeof(uint8_t);

optionMask = (*(uint8_t *) (cmd->buffer + payloadOffset));
payloadOffset += sizeof(uint8_t);

optionOverride = (*(uint8_t *) (cmd->buffer + payloadOffset));
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
moveMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
payloadOffset += 1;
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
payloadOffset += 1;
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
payloadOffset += 1;
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);

wasHandled = emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride);
break;
Expand All @@ -120,16 +133,29 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand
uint8_t optionMask;
uint8_t optionOverride;

level = (*(uint8_t *) (cmd->buffer + payloadOffset));
payloadOffset += sizeof(uint8_t);

transitionTime = (*(uint16_t *) (cmd->buffer + payloadOffset));
payloadOffset += sizeof(uint16_t);

optionMask = (*(uint8_t *) (cmd->buffer + payloadOffset));
payloadOffset += sizeof(uint8_t);

optionOverride = (*(uint8_t *) (cmd->buffer + payloadOffset));
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
level = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
payloadOffset += 1;
if (cmd->bufLen < payloadOffset + 2)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
payloadOffset += 2;
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
payloadOffset += 1;
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);

wasHandled = emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride);
break;
Expand All @@ -139,10 +165,17 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand
uint8_t level;
uint16_t transitionTime;

level = (*(uint8_t *) (cmd->buffer + payloadOffset));
payloadOffset += sizeof(uint8_t);

transitionTime = (*(uint16_t *) (cmd->buffer + payloadOffset));
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
level = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
payloadOffset += 1;
if (cmd->bufLen < payloadOffset + 2)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);

wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime);
break;
Expand All @@ -152,10 +185,17 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand
uint8_t moveMode;
uint8_t rate;

moveMode = (*(uint8_t *) (cmd->buffer + payloadOffset));
payloadOffset += sizeof(uint8_t);

rate = (*(uint8_t *) (cmd->buffer + payloadOffset));
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
moveMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
payloadOffset += 1;
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);

wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate);
break;
Expand All @@ -168,19 +208,35 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand
uint8_t optionMask;
uint8_t optionOverride;

stepMode = (*(uint8_t *) (cmd->buffer + payloadOffset));
payloadOffset += sizeof(uint8_t);

stepSize = (*(uint8_t *) (cmd->buffer + payloadOffset));
payloadOffset += sizeof(uint8_t);

transitionTime = (*(uint16_t *) (cmd->buffer + payloadOffset));
payloadOffset += sizeof(uint16_t);

optionMask = (*(uint8_t *) (cmd->buffer + payloadOffset));
payloadOffset += sizeof(uint8_t);

optionOverride = (*(uint8_t *) (cmd->buffer + payloadOffset));
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
stepMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
payloadOffset += 1;
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
stepSize = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
payloadOffset += 1;
if (cmd->bufLen < payloadOffset + 2)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
payloadOffset += 2;
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
payloadOffset += 1;
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);

wasHandled = emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride);
break;
Expand All @@ -191,13 +247,23 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand
uint8_t stepSize;
uint16_t transitionTime;

stepMode = (*(uint8_t *) (cmd->buffer + payloadOffset));
payloadOffset += sizeof(uint8_t);

stepSize = (*(uint8_t *) (cmd->buffer + payloadOffset));
payloadOffset += sizeof(uint8_t);

transitionTime = (*(uint16_t *) (cmd->buffer + payloadOffset));
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
stepMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
payloadOffset += 1;
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
stepSize = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
payloadOffset += 1;
if (cmd->bufLen < payloadOffset + 2)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);

wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime);
break;
Expand All @@ -207,10 +273,17 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand
uint8_t optionMask;
uint8_t optionOverride;

optionMask = (*(uint8_t *) (cmd->buffer + payloadOffset));
payloadOffset += sizeof(uint8_t);

optionOverride = (*(uint8_t *) (cmd->buffer + payloadOffset));
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
payloadOffset += 1;
if (cmd->bufLen < payloadOffset + 1)
{
return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
}
optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);

wasHandled = emberAfLevelControlClusterStopCallback(optionMask, optionOverride);
break;
Expand Down
Loading

0 comments on commit 1541126

Please sign in to comment.