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

Convert reporting from C to C++ #3424

Merged
merged 1 commit into from
Oct 24, 2020
Merged

Convert reporting from C to C++ #3424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
0 ...porting/reporting-default-configuration.c → ...rting/reporting-default-configuration.cpp
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/app/reporting/reporting.c → src/app/reporting/reporting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ void emberAfPluginReportingStackStatusCallback(EmberStatus status)
}
}

void emberAfPluginReportingInitCallback(void)
extern "C" void emberAfPluginReportingInitCallback(void)
{
// On device initialization, any attributes that have been set up to report
// should generate an attribute report.
Expand All @@ -171,7 +171,7 @@ void emberAfPluginReportingInitCallback(void)
scheduleTick();
}

void emberAfPluginReportingTickEventHandler(void)
extern "C" void emberAfPluginReportingTickEventHandler(void)
{
EmberApsFrame * apsFrame = NULL;
EmberAfStatus status;
Expand Down
8 changes: 4 additions & 4 deletions src/app/util/types_stub.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1963,10 +1963,6 @@ typedef struct
#define emberAfPluginColorControlServerComputePwmFromHsvCallback(endpoint) (void) 0
#define emberAfPluginColorControlServerComputePwmFromTempCallback(endpoint) (void) 0

#ifdef __cplusplus
} // extern "C"
#endif // __cplusplus

/**
* @brief Macro that copies the token value from non-volatile storage into a RAM
* location. This macro can only be used with tokens that are defined using
Expand Down Expand Up @@ -2002,4 +1998,8 @@ typedef struct

uint32_t halCommonGetInt32uMillisecondTick(void);

#ifdef __cplusplus
} // extern "C"
#endif // __cplusplus

#endif // TYPES_STUB_H