Ryanwinter/components (#342)

* Extend to support receiving of pnp components

Author: ryanwinter

MXChip/AZ3166/app/nx_client.c

@@ -37,7 +37,11 @@
 #define TELEMETRY_GYROSCOPEY        "gyroscopeY"
 #define TELEMETRY_GYROSCOPEZ        "gyroscopeZ"
 #define TELEMETRY_INTERVAL_PROPERTY "telemetryInterval"
+
+// Properties
 #define LED_STATE_PROPERTY          "ledState"
+
+// Commands
 #define SET_LED_STATE_COMMAND       "setLedState"
 #define SET_DISPLAY_TEXT_COMMAND    "setDisplayText"
 

shared/src/azure_iot_connect.c

@@ -97,10 +97,10 @@ VOID connection_status_set(AZURE_IOT_NX_CONTEXT* nx_context, UINT connection_sta
 //
 //---------------------------------------------------------------------------------
 VOID connection_monitor(
-    AZURE_IOT_NX_CONTEXT* nx_context, UINT (*iothub_init)(AZURE_IOT_NX_CONTEXT* nx_context), UINT (*network_connect)())
+    AZURE_IOT_NX_CONTEXT* nx_context, UINT (*iot_initialize)(AZURE_IOT_NX_CONTEXT* nx_context), UINT (*network_connect)())
 {
     // Check parameters
-    if ((nx_context == NX_NULL) || (iothub_init == NX_NULL))
+    if ((nx_context == NX_NULL) || (iot_initialize == NX_NULL))
     {
         return;
     }
@@ -150,7 +150,7 @@ VOID connection_monitor(
 
                 // Initialize IoT Hub
                 exponential_backoff_with_jitter();
-                if (iothub_init(nx_context) == NX_SUCCESS)
+                if (iot_initialize(nx_context) == NX_SUCCESS)
                 {
                     // Connect IoT Hub
                     iothub_connect(nx_context);

shared/src/azure_iot_nx_client.c

@@ -216,6 +216,18 @@ static UINT iot_hub_initialize(AZURE_IOT_NX_CONTEXT* nx_context)
         printf("Error: device twin desired property callback set (0x%08x)\r\n", status);
     }
 
+    // Register the pnp components for receiving
+    for (int i = 0; i < nx_context->azure_iot_component_count; ++i)
+    {
+        if ((status = nx_azure_iot_hub_client_component_add(&nx_context->iothub_client,
+                 (UCHAR*)nx_context->azure_iot_components[i],
+                 strlen(nx_context->azure_iot_components[i]))))
+        {
+            printf("ERROR: nx_azure_iot_hub_client_component_add failed (0x%08x)\r\n", status);
+            break;
+        }
+    }
+
     if (status != NX_AZURE_IOT_SUCCESS)
     {
         nx_azure_iot_hub_client_deinitialize(&nx_context->iothub_client);
@@ -480,13 +492,7 @@ static UINT process_properties_shared(AZURE_IOT_NX_CONTEXT* nx_context,
         return status;
     }
 
-    if ((status = nx_azure_iot_json_reader_init(&json_reader, packet_ptr)))
-    {
-        printf("Init json reader failed!: error code = 0x%08x\r\n", status);
-        nx_packet_release(packet_ptr);
-        return status;
-    }
-
+    // reinitialize the json reader after reading the version to reset
     if ((status = nx_azure_iot_json_reader_init(&json_reader, packet_ptr)))
     {
         printf("Error: failed to initialize json reader (0x%08x)\r\n", status);
@@ -937,6 +943,23 @@ UINT azure_iot_nx_client_register_timer_callback(
     return NX_SUCCESS;
 }
 
+UINT azure_iot_nx_client_add_component(AZURE_IOT_NX_CONTEXT* nx_context, CHAR* component_name)
+{
+    if (nx_context == NULL || component_name == NULL)
+    {
+        return NX_PTR_ERROR;
+    }
+
+    if (nx_context->azure_iot_component_count >= NX_AZURE_IOT_HUB_CLIENT_MAX_COMPONENT_LIST)
+    {
+        return NX_AZURE_IOT_INSUFFICIENT_BUFFER_SPACE;
+    }
+
+    nx_context->azure_iot_components[nx_context->azure_iot_component_count] = component_name;
+    nx_context->azure_iot_component_count++;
+    return NX_SUCCESS;
+}
+
 UINT azure_iot_nx_client_sas_set(AZURE_IOT_NX_CONTEXT* context, CHAR* device_sas_key)
 {
     if (device_sas_key[0] == 0)

shared/src/azure_iot_nx_client.h

@@ -53,6 +53,10 @@ struct AZURE_IOT_NX_CONTEXT_STRUCT
     CHAR* azure_iot_model_id;
     UINT azure_iot_model_id_len;
 
+    // pnp components
+    CHAR* azure_iot_components[NX_AZURE_IOT_HUB_CLIENT_MAX_COMPONENT_LIST];
+    UINT azure_iot_component_count;
+
     // auth config
     CHAR* azure_iot_device_sas_key;
     UINT azure_iot_device_sas_key_len;
@@ -126,6 +130,8 @@ UINT azure_iot_nx_client_register_properties_complete_callback(
 UINT azure_iot_nx_client_register_timer_callback(
     AZURE_IOT_NX_CONTEXT* nx_context, func_ptr_timer callback, int32_t interval);
 
+UINT azure_iot_nx_client_add_component(AZURE_IOT_NX_CONTEXT* nx_context, CHAR* component_name);
+
 UINT azure_iot_nx_client_sas_set(AZURE_IOT_NX_CONTEXT* context, CHAR* device_sas_key);
 UINT azure_iot_nx_client_cert_set(AZURE_IOT_NX_CONTEXT* context,
     UCHAR* device_x509_cert,