Skip to content

Commit

Permalink
add direct commands and properties (#377)
Browse files Browse the repository at this point in the history 
* add direct commands and properties

Signed-off-by: Ryan Winter <[email protected]>

* add cert include

Signed-off-by: Ryan Winter <[email protected]>

* fix redirect link

Signed-off-by: Ryan Winter <[email protected]>

---------

Signed-off-by: Ryan Winter <[email protected]>
  • Loading branch information
@ryanwinter
ryanwinter authored Feb 27, 2023
1 parent 1d86714 commit 1dc7f70
Show file tree
Hide file tree
Showing 2 changed files with 179 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Microchip/ATSAME54-XPRO/readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ For guidance on connecting additional devices, see [Getting started with IoT dev
* Ethernet cable
* Optional (for temperature reporting):
* [Weather Click](https://www.mikroe.com/weather-click) sensor. You can add this sensor to the device to monitor weather conditions. If you don't have this sensor, you can still complete this tutorial.
* [mikroBUS Xplained Pro](https://www.microchip.com/Developmenttools/ProductDetails/ATMBUSADAPTER-XPRO) adapter. Use this adapter to attach the Weather Click sensor to the Microchip E54. If you don't have the sensor and this.
* [mikroBUS Xplained Pro](https://www.microchip.com/development-tool/atmbusadapter-xpro) adapter. Use this adapter to attach the Weather Click sensor to the Microchip E54. If you don't have the sensor and this.

## Steps

Expand Down
186 changes: 178 additions & 8 deletions STMicroelectronics/B-U585I-IOT02A/app/nx_client.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include <stdio.h>

#include "b_u585i_iot02a.h"
#include "b_u585i_iot02a_env_sensors.h"

#include "nx_api.h"
Expand All @@ -15,18 +16,72 @@
#include "azure_iot_nx_client.h"

#include "azure_config.h"
#include "azure_device_x509_cert_config.h"
#include "azure_pnp_info.h"
#include "stm_networking.h"

#define IOT_MODEL_ID "dtmi:azurertos:devkit:gsg;2"

#define TELEMETRY_TEMPERATURE "temperature"
#define TELEMETRY_PRESSURE "pressure"
#define TELEMETRY_HUMIDITY "humidity"
#define TELEMETRY_HUMIDITY "humidity"
#define TELEMETRY_TEMPERATURE "temperature"
#define TELEMETRY_PRESSURE "pressure"
#define TELEMETRY_INTERVAL_PROPERTY "telemetryInterval"
#define LED_STATE_PROPERTY "ledState"
#define SET_LED_STATE_COMMAND "setLedState"

static AZURE_IOT_NX_CONTEXT azure_iot_nx_client;

static int32_t telemetry_interval = 10;

static UINT append_device_info_properties(NX_AZURE_IOT_JSON_WRITER* json_writer)
{
if (nx_azure_iot_json_writer_append_property_with_string_value(json_writer,
(UCHAR*)DEVICE_INFO_MANUFACTURER_PROPERTY_NAME,
sizeof(DEVICE_INFO_MANUFACTURER_PROPERTY_NAME) - 1,
(UCHAR*)DEVICE_INFO_MANUFACTURER_PROPERTY_VALUE,
sizeof(DEVICE_INFO_MANUFACTURER_PROPERTY_VALUE) - 1) ||
nx_azure_iot_json_writer_append_property_with_string_value(json_writer,
(UCHAR*)DEVICE_INFO_MODEL_PROPERTY_NAME,
sizeof(DEVICE_INFO_MODEL_PROPERTY_NAME) - 1,
(UCHAR*)DEVICE_INFO_MODEL_PROPERTY_VALUE,
sizeof(DEVICE_INFO_MODEL_PROPERTY_VALUE) - 1) ||
nx_azure_iot_json_writer_append_property_with_string_value(json_writer,
(UCHAR*)DEVICE_INFO_SW_VERSION_PROPERTY_NAME,
sizeof(DEVICE_INFO_SW_VERSION_PROPERTY_NAME) - 1,
(UCHAR*)DEVICE_INFO_SW_VERSION_PROPERTY_VALUE,
sizeof(DEVICE_INFO_SW_VERSION_PROPERTY_VALUE) - 1) ||
nx_azure_iot_json_writer_append_property_with_string_value(json_writer,
(UCHAR*)DEVICE_INFO_OS_NAME_PROPERTY_NAME,
sizeof(DEVICE_INFO_OS_NAME_PROPERTY_NAME) - 1,
(UCHAR*)DEVICE_INFO_OS_NAME_PROPERTY_VALUE,
sizeof(DEVICE_INFO_OS_NAME_PROPERTY_VALUE) - 1) ||
nx_azure_iot_json_writer_append_property_with_string_value(json_writer,
(UCHAR*)DEVICE_INFO_PROCESSOR_ARCHITECTURE_PROPERTY_NAME,
sizeof(DEVICE_INFO_PROCESSOR_ARCHITECTURE_PROPERTY_NAME) - 1,
(UCHAR*)DEVICE_INFO_PROCESSOR_ARCHITECTURE_PROPERTY_VALUE,
sizeof(DEVICE_INFO_PROCESSOR_ARCHITECTURE_PROPERTY_VALUE) - 1) ||
nx_azure_iot_json_writer_append_property_with_string_value(json_writer,
(UCHAR*)DEVICE_INFO_PROCESSOR_MANUFACTURER_PROPERTY_NAME,
sizeof(DEVICE_INFO_PROCESSOR_MANUFACTURER_PROPERTY_NAME) - 1,
(UCHAR*)DEVICE_INFO_PROCESSOR_MANUFACTURER_PROPERTY_VALUE,
sizeof(DEVICE_INFO_PROCESSOR_MANUFACTURER_PROPERTY_VALUE) - 1) ||
nx_azure_iot_json_writer_append_property_with_double_value(json_writer,
(UCHAR*)DEVICE_INFO_TOTAL_STORAGE_PROPERTY_NAME,
sizeof(DEVICE_INFO_TOTAL_STORAGE_PROPERTY_NAME) - 1,
DEVICE_INFO_TOTAL_STORAGE_PROPERTY_VALUE,
2) ||
nx_azure_iot_json_writer_append_property_with_double_value(json_writer,
(UCHAR*)DEVICE_INFO_TOTAL_MEMORY_PROPERTY_NAME,
sizeof(DEVICE_INFO_TOTAL_MEMORY_PROPERTY_NAME) - 1,
DEVICE_INFO_TOTAL_MEMORY_PROPERTY_VALUE,
2))
{
return NX_NOT_SUCCESSFUL;
}

return NX_AZURE_IOT_SUCCESS;
}

static UINT append_device_telemetry(NX_AZURE_IOT_JSON_WRITER* json_writer)
{
float temperature;
Expand All @@ -38,29 +93,140 @@ static UINT append_device_telemetry(NX_AZURE_IOT_JSON_WRITER* json_writer)
printf("ERROR: BSP_ENV_SENSOR_GetValue\r\n");
}

if (BSP_ENV_SENSOR_GetValue(1, ENV_PRESSURE, &pressure) != BSP_ERROR_NONE)
if (BSP_ENV_SENSOR_GetValue(0, ENV_HUMIDITY, &humidity) != BSP_ERROR_NONE)
{
printf("ERROR: BSP_ENV_SENSOR_GetValue\r\n");
}

if (BSP_ENV_SENSOR_GetValue(0, ENV_HUMIDITY, &humidity) != BSP_ERROR_NONE)
if (BSP_ENV_SENSOR_GetValue(1, ENV_PRESSURE, &pressure) != BSP_ERROR_NONE)
{
printf("ERROR: BSP_ENV_SENSOR_GetValue\r\n");
}

if (nx_azure_iot_json_writer_append_property_with_double_value(
json_writer, (UCHAR*)TELEMETRY_TEMPERATURE, sizeof(TELEMETRY_TEMPERATURE) - 1, temperature, 2) ||
json_writer, (UCHAR*)TELEMETRY_HUMIDITY, sizeof(TELEMETRY_HUMIDITY) - 1, humidity, 2) ||
nx_azure_iot_json_writer_append_property_with_double_value(
json_writer, (UCHAR*)TELEMETRY_PRESSURE, sizeof(TELEMETRY_PRESSURE) - 1, pressure, 2) ||
json_writer, (UCHAR*)TELEMETRY_TEMPERATURE, sizeof(TELEMETRY_TEMPERATURE) - 1, temperature, 2) ||
nx_azure_iot_json_writer_append_property_with_double_value(
json_writer, (UCHAR*)TELEMETRY_HUMIDITY, sizeof(TELEMETRY_HUMIDITY) - 1, humidity, 2))
json_writer, (UCHAR*)TELEMETRY_PRESSURE, sizeof(TELEMETRY_PRESSURE) - 1, pressure, 2))
{
return NX_NOT_SUCCESSFUL;
}

return NX_AZURE_IOT_SUCCESS;
}

static void set_led_state(bool level)
{
if (level)
{
printf("\tLED is turned ON\r\n");
BSP_LED_On(LED_RED);
}
else
{
printf("\tLED is turned OFF\r\n");
BSP_LED_Off(LED_RED);
}
}

static void command_received_cb(AZURE_IOT_NX_CONTEXT* nx_context_ptr,
const UCHAR* component,
USHORT component_length,
const UCHAR* method,
USHORT method_length,
UCHAR* payload,
USHORT payload_length,
VOID* context_ptr,
USHORT context_length)
{
UINT status;

if (strncmp((CHAR*)method, SET_LED_STATE_COMMAND, method_length) == 0)
{
bool arg = (strncmp((CHAR*)payload, "true", payload_length) == 0);
set_led_state(arg);

if ((status = nx_azure_iot_hub_client_command_message_response(
&nx_context_ptr->iothub_client, 200, context_ptr, context_length, NULL, 0, NX_WAIT_FOREVER)))
{
printf("Direct method response failed! (0x%08x)\r\n", status);
return;
}

azure_iot_nx_client_publish_bool_property(&azure_iot_nx_client, NULL, LED_STATE_PROPERTY, arg);
}
else
{
printf("Direct method is not for this device\r\n");

if ((status = nx_azure_iot_hub_client_command_message_response(
&nx_context_ptr->iothub_client, 501, context_ptr, context_length, NULL, 0, NX_WAIT_FOREVER)))
{
printf("Direct method response failed! (0x%08x)\r\n", status);
return;
}
}
}

static void writable_property_received_cb(AZURE_IOT_NX_CONTEXT* nx_context,
const UCHAR* component_name,
UINT component_name_len,
UCHAR* property_name,
UINT property_name_len,
NX_AZURE_IOT_JSON_READER* json_reader_ptr,
UINT version)
{
UINT status;

if (strncmp((CHAR*)property_name, TELEMETRY_INTERVAL_PROPERTY, property_name_len) == 0)
{
status = nx_azure_iot_json_reader_token_int32_get(json_reader_ptr, &telemetry_interval);
if (status == NX_AZURE_IOT_SUCCESS)
{
printf("Updating %s to %ld\r\n", TELEMETRY_INTERVAL_PROPERTY, telemetry_interval);

// Confirm reception back to hub
azure_nx_client_respond_int_writable_property(
nx_context, NULL, TELEMETRY_INTERVAL_PROPERTY, telemetry_interval, 200, version);

azure_nx_client_periodic_interval_set(nx_context, telemetry_interval);
}
}
}

static void property_received_cb(AZURE_IOT_NX_CONTEXT* nx_context,
const UCHAR* component_name,
UINT component_name_len,
UCHAR* property_name,
UINT property_name_len,
NX_AZURE_IOT_JSON_READER* json_reader_ptr,
UINT version)
{
UINT status;

if (strncmp((CHAR*)property_name, TELEMETRY_INTERVAL_PROPERTY, property_name_len) == 0)
{
status = nx_azure_iot_json_reader_token_int32_get(json_reader_ptr, &telemetry_interval);
if (status == NX_AZURE_IOT_SUCCESS)
{
printf("Updating %s to %ld\r\n", TELEMETRY_INTERVAL_PROPERTY, telemetry_interval);
azure_nx_client_periodic_interval_set(nx_context, telemetry_interval);
}
}
}

static void properties_complete_cb(AZURE_IOT_NX_CONTEXT* nx_context)
{
// Device twin processing is done, send out property updates
azure_iot_nx_client_publish_properties(nx_context, DEVICE_INFO_COMPONENT_NAME, append_device_info_properties);
azure_iot_nx_client_publish_bool_property(nx_context, NULL, LED_STATE_PROPERTY, false);
azure_iot_nx_client_publish_int_writable_property(
nx_context, NULL, TELEMETRY_INTERVAL_PROPERTY, telemetry_interval);

printf("\r\nStarting Main loop\r\n");
}

static void telemetry_cb(AZURE_IOT_NX_CONTEXT* nx_context)
{
azure_iot_nx_client_publish_telemetry(&azure_iot_nx_client, NULL, append_device_telemetry);
Expand All @@ -84,6 +250,10 @@ UINT azure_iot_nx_client_entry(
}

// Register the callbacks
azure_iot_nx_client_register_command_callback(&azure_iot_nx_client, command_received_cb);
azure_iot_nx_client_register_writable_property_callback(&azure_iot_nx_client, writable_property_received_cb);
azure_iot_nx_client_register_property_callback(&azure_iot_nx_client, property_received_cb);
azure_iot_nx_client_register_properties_complete_callback(&azure_iot_nx_client, properties_complete_cb);
azure_iot_nx_client_register_timer_callback(&azure_iot_nx_client, telemetry_cb, telemetry_interval);

// Setup authentication
Expand Down

0 comments on commit 1dc7f70

Please sign in to comment.