Skip to content

Modified according to IoT Plug and Play rules #8

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

Open
wants to merge 3 commits into
base: v1/main
Choose a base branch
from
Open

Modified according to IoT Plug and Play rules #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c57c4f
Modified according to IoT Plug and Play rules
mnakai3 May 30, 2021
871aa9f
fix reported format
mnakai3 May 31, 2021
33616a0
Added acknowledgement description(ad) on reported property
mnakai3 Jul 1, 2021
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
30 changes: 20 additions & 10 deletions src/azureiot/ReButtonClient2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,10 @@ void ReButtonClient2::ReceivedProperties(JSON_Object* reportedObject)

void ReButtonClient2::ReceivedSettings(JSON_Object* desiredObject, bool complete)
{
if (strlen(Config.CustomMessagePropertyName) >= 1 && json_object_dothas_value_of_type(desiredObject, stringformat("%s.value", Config.CustomMessagePropertyName).c_str(), JSONBoolean))
if (strlen(Config.CustomMessagePropertyName) >= 1 && json_object_dothas_value_of_type(desiredObject, stringformat("%s", Config.CustomMessagePropertyName).c_str(), JSONBoolean))
{
int customMessageEnable = json_object_dotget_boolean(desiredObject, stringformat("%s.value", Config.CustomMessagePropertyName).c_str());
int customMessageEnable = json_object_dotget_boolean(desiredObject, stringformat("%s", Config.CustomMessagePropertyName).c_str());
int version = json_object_dotget_number(desiredObject, "$version");
switch (customMessageEnable)
{
case 1:
Expand All @@ -186,26 +187,31 @@ void ReButtonClient2::ReceivedSettings(JSON_Object* desiredObject, bool complete
Serial.print("CustomMessageEnable = ");
Serial.println(CustomMessageEnable ? "true" : "false");

SendPropertyCustomMessageEnableAsync();
SendPropertyCustomMessageEnableAsync(200, version);
}

if (json_object_dothas_value_of_type(desiredObject, stringformat("%s.value", PROPERTY_TELEMETRY_INTERVAL).c_str(), JSONNumber))
if (json_object_dothas_value_of_type(desiredObject, stringformat("%s", PROPERTY_TELEMETRY_INTERVAL).c_str(), JSONNumber))
{
TelemetryInterval = json_object_dotget_number(desiredObject, stringformat("%s.value", PROPERTY_TELEMETRY_INTERVAL).c_str());
TelemetryInterval = json_object_dotget_number(desiredObject, stringformat("%s", PROPERTY_TELEMETRY_INTERVAL).c_str());
int version = json_object_dotget_number(desiredObject, "$version");

Serial.print("TelemetryInterval = ");
Serial.println(TelemetryInterval);

SendPropertyTelemetryIntervalAsync();
SendPropertyTelemetryIntervalAsync(200, version);
}
}

void ReButtonClient2::SendPropertyCustomMessageEnableAsync()
void ReButtonClient2::SendPropertyCustomMessageEnableAsync(int ackCode, int ackVersion)
{
JSON_Value* reportedValue = json_value_init_object();
JSON_Object* reportedObject = json_value_get_object(reportedValue);

json_object_dotset_boolean(reportedObject, Config.CustomMessagePropertyName, CustomMessageEnable);
json_object_dotset_boolean(reportedObject, stringformat("%s.value", Config.CustomMessagePropertyName).c_str(), CustomMessageEnable);
json_object_dotset_number(reportedObject, stringformat("%s.ac", Config.CustomMessagePropertyName).c_str(), ackCode);
json_object_dotset_number(reportedObject, stringformat("%s.av", Config.CustomMessagePropertyName).c_str(), ackVersion);
json_object_dotset_string(reportedObject, stringformat("%s.ad", Config.CustomMessagePropertyName).c_str(),
stringformat("Successfully updated %s", Config.CustomMessagePropertyName).c_str());

AzureDeviceClient::UpdateReportedPropertyAsync(reportedObject);

Expand All @@ -224,12 +230,16 @@ void ReButtonClient2::SendPropertyActionCountAsync()
json_value_free(reportedValue);
}

void ReButtonClient2::SendPropertyTelemetryIntervalAsync()
void ReButtonClient2::SendPropertyTelemetryIntervalAsync(int ackCode, int ackVersion)
{
JSON_Value* reportedValue = json_value_init_object();
JSON_Object* reportedObject = json_value_get_object(reportedValue);

json_object_dotset_number(reportedObject, PROPERTY_TELEMETRY_INTERVAL, TelemetryInterval);
json_object_dotset_number(reportedObject, stringformat("%s.value", PROPERTY_TELEMETRY_INTERVAL).c_str(), TelemetryInterval);
json_object_dotset_number(reportedObject, stringformat("%s.ac", PROPERTY_TELEMETRY_INTERVAL).c_str(), ackCode);
json_object_dotset_number(reportedObject, stringformat("%s.av", PROPERTY_TELEMETRY_INTERVAL).c_str(), ackVersion);
json_object_dotset_string(reportedObject, stringformat("%s.ad", PROPERTY_TELEMETRY_INTERVAL).c_str(),
stringformat("Successfully updated %s", PROPERTY_TELEMETRY_INTERVAL).c_str());

AzureDeviceClient::UpdateReportedPropertyAsync(reportedObject);

Expand Down
4 changes: 2 additions & 2 deletions src/azureiot/ReButtonClient2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ class ReButtonClient2 : public AzureDeviceClient
void ReceivedProperties(JSON_Object* reportedObject);
void ReceivedSettings(JSON_Object* desiredObject, bool complete);

void SendPropertyCustomMessageEnableAsync();
void SendPropertyCustomMessageEnableAsync(int ackCode, int ackVersion);
void SendPropertyActionCountAsync();
void SendPropertyTelemetryIntervalAsync();
void SendPropertyTelemetryIntervalAsync(int ackCode, int ackVersion);

protected:
virtual void DeviceTwinReceived(JSON_Object* deviceTwinObject);
Expand Down