add client to dataChangeHandler

This commit is contained in:
StalderT 2018-01-31 09:45:31 +01:00 committed by Stefan Profanter
parent e4e3f1e6eb
commit 65db398dcb
6 changed files with 8 additions and 7 deletions

View File

@ -6,7 +6,7 @@
#ifdef UA_ENABLE_SUBSCRIPTIONS
static void
handler_TheAnswerChanged(UA_UInt32 monId, UA_DataValue *value, void *context) {
handler_TheAnswerChanged(UA_Client *client, UA_UInt32 monId, UA_DataValue *value, void *context) {
printf("The Answer has changed!\n");
}
#endif

View File

@ -43,7 +43,7 @@ static void stopHandler(int sign) {
}
static void
handler_currentTimeChanged(UA_UInt32 monId, UA_DataValue *value, void *context) {
handler_currentTimeChanged(UA_Client *client, UA_UInt32 monId, UA_DataValue *value, void *context) {
UA_LOG_INFO(logger, UA_LOGCATEGORY_USERLAND, "currentTime has changed!");
if(UA_Variant_hasScalarType(&value->value, &UA_TYPES[UA_TYPES_DATETIME])) {
UA_DateTime raw_date = *(UA_DateTime *) value->value.data;

View File

@ -597,8 +597,8 @@ UA_Client_Subscriptions_manuallySendPublishRequest(UA_Client *client);
/* Addition of monitored DataChanges */
/* TODO for v0.4: Rename method to _DataChange. */
typedef void (*UA_MonitoredItemHandlingFunction)(UA_UInt32 monId, UA_DataValue *value,
void *context);
typedef void (*UA_MonitoredItemHandlingFunction)(UA_Client *client, UA_UInt32 monId,
UA_DataValue *value, void *context);
UA_StatusCode UA_EXPORT
UA_Client_Subscriptions_addMonitoredItems(UA_Client *client, const UA_UInt32 subscriptionId,

View File

@ -424,7 +424,8 @@ UA_Client_processPublishResponse(UA_Client *client, UA_PublishRequest *request,
continue;
}
mon->handler.dataChangeHandler(mon->monitoredItemId, &mitemNot->value, mon->handlerContext);
mon->handler.dataChangeHandler(client, mon->monitoredItemId,
&mitemNot->value, mon->handlerContext);
}
continue;
}

View File

@ -53,7 +53,7 @@ static void teardown(void) {
UA_Boolean notificationReceived;
UA_UInt32 countNotificationReceived = 0;
static void monitoredItemHandler(UA_UInt32 monId, UA_DataValue *value, void *context) {
static void monitoredItemHandler(UA_Client *client, UA_UInt32 monId, UA_DataValue *value, void *context) {
notificationReceived = true;
countNotificationReceived++;
}

View File

@ -360,7 +360,7 @@ translateBrowsePathsToNodeIdsRequest(UA_Client *client) {
static void
monitoredItemHandler(UA_UInt32 monId, UA_DataValue *value, void *context) {
monitoredItemHandler(UA_Client *client, UA_UInt32 monId, UA_DataValue *value, void *context) {
}