Azure-Sphere-DevX · bawilless · Mar 29, 2022 · Mar 29, 2022 · Mar 29, 2022 · Mar 29, 2022
diff --git a/.gitmodules b/.gitmodules
@@ -160,9 +160,21 @@
 [submodule ".\\avnet_rsl10_2devices\\HardwareDefinitions"]
 	path = .\\avnet_rsl10_2devices\\HardwareDefinitions
 	url = https://github.com/Azure-Sphere-DevX/AzureSphereDevX.HardwareDefinitions.git
-[submodule "avnet_lightranger5/AzureSphereDevX"]
-	path = avnet_lightranger5/AzureSphereDevX
+[submodule "avnet_sensors_converge/avnet_lightranger5/AzureSphereDevX"]
+	path = avnet_sensors_converge/avnet_lightranger5/AzureSphereDevX
 	url = https://github.com/Azure-Sphere-DevX/AzureSphereDevX.git
-[submodule "avnet_lightranger5/HardwareDefinitions"]
-	path = avnet_lightranger5/HardwareDefinitions
+[submodule "avnet_sensors_converge/avnet_lightranger5/HardwareDefinitions"]
+	path = avnet_sensors_converge/avnet_lightranger5/HardwareDefinitions
+	url = https://github.com/Azure-Sphere-DevX/AzureSphereDevX.HardwareDefinitions.git
+[submodule "avnet_sensors_converge/avnet_tempHum13/AzureSphereDevX"]
+	path = avnet_sensors_converge/avnet_tempHum13/AzureSphereDevX
+	url = https://github.com/Azure-Sphere-DevX/AzureSphereDevX.git
+[submodule "avnet_sensors_converge/avnet_tempHum13/HardwareDefinitions"]
+	path = avnet_sensors_converge/avnet_tempHum13/HardwareDefinitions
+	url = https://github.com/Azure-Sphere-DevX/AzureSphereDevX.HardwareDefinitions.git
+[submodule "avnet_rsl10_2devices/AzureSphereDevX"]
+	path = avnet_rsl10_2devices/AzureSphereDevX
+	url = https://github.com/Azure-Sphere-DevX/AzureSphereDevX.git
+[submodule "avnet_rsl10_2devices/HardwareDefinitions"]
+	path = avnet_rsl10_2devices/HardwareDefinitions
 	url = https://github.com/Azure-Sphere-DevX/AzureSphereDevX.HardwareDefinitions.git
diff --git a/avnet_RTAppLab_app/AzureSphereDevX b/avnet_RTAppLab_app/AzureSphereDevX
diff --git a/avnet_RTAppLab_app/HardwareDefinitions b/avnet_RTAppLab_app/HardwareDefinitions
diff --git a/avnet_bbq_monitor/AzureSphereDevX b/avnet_bbq_monitor/AzureSphereDevX
diff --git a/avnet_bbq_monitor/HardwareDefinitions b/avnet_bbq_monitor/HardwareDefinitions
diff --git a/avnet_end_to_end/AzureSphereDevX b/avnet_end_to_end/AzureSphereDevX
diff --git a/avnet_end_to_end/IoTConnectDeviceTemplate/Avnet 2_1 DevX End to End_template.JSON b/avnet_end_to_end/IoTConnectDeviceTemplate/Avnet 2_1 DevX End to End_template.JSON
@@ -0,0 +1,85 @@
+{
+    "code": "AVTe2f",
+    "name": "AVT EndtoEnd21",
+    "authType": 2,
+    "description": "2.1 Device template for the DevX avnet_end_to_end example.",
+    "isIotEdgeEnable": false,
+    "attributes": [
+        {
+            "name": "Temperature",
+            "type": "DECIMAL",
+            "description": null,
+            "unit": "Degrees C"
+        },
+        {
+            "name": "Humidity",
+            "type": "DECIMAL",
+            "description": null,
+            "unit": "% moisture"
+        },
+        {
+            "name": "Pressure",
+            "type": "DECIMAL",
+            "description": null,
+            "unit": null
+        },
+        {
+            "name": "MsgId",
+            "type": "INTEGER"
+        }
+    ],
+    "settings": [
+        {
+            "name": "Software Version",
+            "type": "STRING",
+            "localName": "SoftwareVersion",
+            "defaultValue": "\"\"",
+            "isReadOnly": true
+        },
+        {
+            "name": "Timestamp of last startup",
+            "type": "STRING",
+            "localName": "DeviceStartUtc",
+            "defaultValue": "\" \"",
+            "isReadOnly": true
+        },
+        {
+            "name": "Current UTC time for device twin update",
+            "type": "STRING",
+            "localName": "ReportedUTC",
+            "defaultValue": "\"\"",
+            "isReadOnly": true
+        },
+        {
+            "name": "Timestamp of last connection",
+            "type": "STRING",
+            "localName": "DeviceConnectUtc",
+            "defaultValue": "\" \"",
+            "isReadOnly": true
+        },
+        {
+            "name": "Reported Humidity",
+            "type": "DECIMAL",
+            "localName": "ReportedHumidity",
+            "defaultValue": "0",
+            "isReadOnly": true
+        },
+        {
+            "name": "Desired Sample Rate",
+            "type": "INTEGER",
+            "localName": "DesiredSampleRate",
+            "defaultValue": "75",
+            "dataValidation": "0 to 120",
+            "isReadOnly": false
+        },
+        {
+            "name": "Reported Temperature",
+            "type": "DECIMAL",
+            "localName": "ReportedTemperature",
+            "defaultValue": "0",
+            "isReadOnly": true
+        }
+    ],
+    "messageVersion": "2.1",
+    "dataFrequency": 60
+}
diff --git a/avnet_end_to_end/app_manifest.json b/avnet_end_to_end/app_manifest.json
@@ -3,14 +3,14 @@
   "Name": "avnet_end_to_end",
   "ComponentId": "b217fd65-ac8d-4d7c-b62c-0d07b5df6357",
   "EntryPoint": "/bin/app",
-  "CmdArgs": [ "--ScopeID", "REPLACE_WITH_YOUR_ID_SCOPE" ],
+  "CmdArgs": [ "--ScopeID", "0ne001DB429" ],
   "Capabilities": {
     "Gpio": [ "$NETWORK_CONNECTED_LED", "$LED2" ],
     "AllowedConnections": [
       "global.azure-devices-provisioning.net",
-      "REPLACE_WITH_YOUR_IOT_HUB_ENDPOINT_URL"
+      "poc-iotc-sphere-iothub-eu.azure-devices.net"
     ],
-    "DeviceAuthentication": "REPLACE_WITH_YOUR_AZURE_SPHERE_TENANT_ID"
+    "DeviceAuthentication": "8d34f65c-532e-4dcf-a1d6-3e811c1e5c68"
   },
   "ApplicationType": "Default"
-}
+}
diff --git a/avnet_end_to_end/main.c b/avnet_end_to_end/main.c
@@ -44,7 +44,7 @@ static DX_TIMER_HANDLER(publish_message_handler)
     if (dx_isAvnetConnected()) {
 
         // Serialize telemetry as JSON
-        bool serialization_result = dx_avnetJsonSerialize(msgBuffer, sizeof(msgBuffer), NULL, 4, 
+        bool serialization_result = dx_jsonSerialize(msgBuffer, sizeof(msgBuffer), 4, 
             DX_JSON_INT, "MsgId", msgId++, 
             DX_JSON_DOUBLE, "Temperature", temperature, 
             DX_JSON_DOUBLE, "Humidity", humidity, 
@@ -54,7 +54,7 @@ static DX_TIMER_HANDLER(publish_message_handler)
 
             Log_Debug("%s\n", msgBuffer);
 
-            dx_azurePublish(msgBuffer, strlen(msgBuffer), messageProperties, NELEMS(messageProperties), &contentProperties);
+            dx_avnetPublish(msgBuffer, strlen(msgBuffer), messageProperties, NELEMS(messageProperties), &contentProperties, NULL);
 
         } else {
             Log_Debug("JSON Serialization failed: Buffer too small\n");
@@ -69,7 +69,7 @@ static DX_TIMER_HANDLER(report_properties_handler)
     float temperature = 25.05f;
     double humidity = 60.25;
 
-    if (dx_isAzureConnected()) {
+    if (dx_isAvnetConnected()) {
 
         // Update twin with current UTC (Universal Time Coordinate) in ISO format
         dx_deviceTwinReportValue(&dt_reported_utc, dx_getCurrentUtc(msgBuffer, sizeof(msgBuffer)));
@@ -152,6 +152,7 @@ static void NetworkConnectionState(bool connected)
 /// </summary>
 static void InitPeripheralsAndHandlers(void)
 {
+    dx_avnetSetDebugLevel(AVT_DEBUG_LEVEL_VERBOSE); // comment out to supress IoTConnect debug
     dx_avnetConnect(&dx_config, NETWORK_INTERFACE);
     dx_gpioSetOpen(gpio_bindings, NELEMS(gpio_bindings));
     dx_timerSetStart(timer_bindings, NELEMS(timer_bindings));

diff --git a/avnet_end_to_end/main.h b/avnet_end_to_end/main.h
@@ -4,6 +4,7 @@
 
 #include "app_exit_codes.h"
 #include "dx_azure_iot.h"
+#include "dx_avnet_iot_connect.h"
 #include "dx_config.h"
 #include "dx_json_serializer.h"
 #include "dx_terminate.h"

diff --git a/avnet_gw_send_message/AzureSphereDevX b/avnet_gw_send_message/AzureSphereDevX
diff --git a/avnet_gw_send_message/app_manifest.json b/avnet_gw_send_message/app_manifest.json
@@ -1,15 +1,16 @@
 {
   "SchemaVersion": 1,
-  "Name": "avnet_gateway_example",
-  "ComponentId": "353d8b5e-d3ab-43f7-b65a-10f14b766d21",
+  "Name": "avnet_end_to_end",
+  "ComponentId": "b217fd65-ac8d-4d7c-b62c-0d07b5df6357",
   "EntryPoint": "/bin/app",
-  "CmdArgs": ["--ScopeID", "REPLACE_WITH_YOUR_ID_SCOPE"],
+  "CmdArgs": [ "--ScopeID", "0ne001DB429" ],
   "Capabilities": {
+    "Gpio": [ "$NETWORK_CONNECTED_LED", "$LED2" ],
     "AllowedConnections": [
       "global.azure-devices-provisioning.net",
-      "REPLACE_WITH_YOUR_IOT_HUB_ENDPOINT_URL"
+      "poc-iotc-sphere-iothub-eu.azure-devices.net"
     ],
-    "DeviceAuthentication": "REPLACE_WITH_YOUR_AZURE_SPHERE_TENANT_ID"
+    "DeviceAuthentication": "8d34f65c-532e-4dcf-a1d6-3e811c1e5c68"
   },
   "ApplicationType": "Default"
-}
+}
diff --git a/avnet_gw_send_message/iotConnect Templates/devXGwDemo21_template.JSON b/avnet_gw_send_message/iotConnect Templates/devXGwDemo21_template.JSON
@@ -0,0 +1,30 @@
+{
+    "code": "devXDemo21",
+    "name": "devXDemo21",
+    "tag": "spheregwdevice",
+    "authType": 2,
+    "isIotEdgeEnable": false,
+    "attributes": [
+        {
+            "name": "temperature",
+            "type": "DECIMAL",
+            "tag": "temperaturechilddevice",
+            "unit": "C"
+        },
+        {
+            "name": "humidity",
+            "type": "DECIMAL",
+            "tag": "humiditychilddevice",
+            "unit": "% moisture"
+        },
+        {
+            "name": "pressure",
+            "type": "DECIMAL",
+            "tag": "pressurechilddevice",
+            "unit": "psi"
+        }
+    ],
+    "dataFrequency": 60,
+    "messageVersion": "2.1",
+    "msgCode": "138913Y"
+}
diff --git a/avnet_gw_send_message/iotConnect Templates/devXGwDemo_template.JSON b/avnet_gw_send_message/iotConnect Templates/devXGwDemo_template.JSON
@@ -0,0 +1,34 @@
+{
+    "code": "devXDemo",
+    "name": "devXDemo",
+    "tag": "spheregwdevice",
+    "authType": 2,
+    "description": null,
+    "isIotEdgeEnable": false,
+    "attributes": [
+        {
+            "name": "temperature",
+            "type": "NUMBER",
+            "tag": "temperaturechilddevice",
+            "description": null,
+            "unit": "C"
+        },
+        {
+            "name": "humidity",
+            "type": "NUMBER",
+            "tag": "humiditychilddevice",
+            "description": null,
+            "unit": "% moisture"
+        },
+        {
+            "name": "pressure",
+            "type": "NUMBER",
+            "tag": "pressurechilddevice",
+            "description": null,
+            "unit": "psi"
+        }
+    ],
+    "dataFrequency": 60,
+    "messageVersion": "1.0",
+    "msgCode": "1389TEE"
+}
diff --git a/avnet_gw_send_message/main.c b/avnet_gw_send_message/main.c
@@ -136,6 +136,7 @@ DX_TIMER_HANDLER_END
 /// </summary>
 static void InitPeripheralsAndHandlers(void)
 {
+    dx_avnetSetDebugLevel(AVT_DEBUG_LEVEL_INFO); // Comment out to supress IoTConnect debug
     dx_avnetConnect(&dx_config, NETWORK_INTERFACE);
     dx_timerSetStart(timers, NELEMS(timers));
     dx_deviceTwinSubscribe(device_twin_bindings, NELEMS(device_twin_bindings));
@@ -181,13 +182,13 @@ void sendChildDeviceTelemetry(const char* id, const char* key, float value){
 
     // Create serialized telemetry as JSON
     bool serialization_result = 
-        dx_avnetJsonSerialize(msgBuffer, sizeof(msgBuffer), dx_avnetFindChild(id),  1,
+        dx_jsonSerialize(msgBuffer, sizeof(msgBuffer),  1,
                             DX_JSON_DOUBLE, key, value);
 
     if (serialization_result) {
 
         Log_Debug("%s\n", msgBuffer);
-        dx_azurePublish(msgBuffer, strlen(msgBuffer), NULL, 0, NULL);
+        dx_avnetPublish(msgBuffer, strlen(msgBuffer), NULL, 0, NULL, dx_avnetFindChild(id));
 
     } else {
         Log_Debug("JSON Serialization failed: Buffer too small\n");

diff --git a/avnet_lightranger5/AzureSphereDevX b/avnet_lightranger5/AzureSphereDevX
diff --git a/avnet_rsl10_2devices/AzureSphereDevX b/avnet_rsl10_2devices/AzureSphereDevX
diff --git a/avnet_rsl10_2devices/app_manifest.json b/avnet_rsl10_2devices/app_manifest.json
@@ -1,19 +1,21 @@
 {
   "SchemaVersion": 1,
-  "Name": "AvnetRSL10Example",
+  "Name": "avnet_end_to_end",
   "ComponentId": "b217fd65-ac8d-4d7c-b62c-0d07b5df6357",
   "EntryPoint": "/bin/app",
-  "CmdArgs": [ "--ScopeID", "" ],
+  "CmdArgs": [ "--ScopeID", "0ne001DB429" ],
   "Capabilities": {
     "Gpio": [
       "$SAMPLE_RGBLED_RED",
       "$SAMPLE_RGBLED_GREEN",
       "$SAMPLE_RGBLED_BLUE"],
     "Uart": ["$SAMPLE_PMOD_UART"],
-    "AllowedConnections": ["global.azure-devices-provisioning.net",
-      "ENTER.IOT.HUB.HOSTNAME.net"],
-    "DeviceAuthentication": "00000000-0000-0000-0000-000000000000",
-    "NetworkConfig": true
+    "NetworkConfig": true,
+    "AllowedConnections": [
+      "global.azure-devices-provisioning.net",
+      "poc-iotc-sphere-iothub-eu.azure-devices.net"
+    ],
+    "DeviceAuthentication": "8d34f65c-532e-4dcf-a1d6-3e811c1e5c68"
   },
   "ApplicationType": "Default"
-}
+}
diff --git a/avnet_rsl10_2devices/main.c b/avnet_rsl10_2devices/main.c
@@ -350,6 +350,7 @@ static void InitPeripheralsAndHandlers(void)
 #endif // USE_WEB_PROXY
 
 #ifdef USE_IOT_CONNECT
+    dx_avnetSetDebugLevel(AVT_DEBUG_LEVEL_INFO); // Comment out to supress IoTConnect Debug
     dx_avnetConnect(&dx_config, NETWORK_INTERFACE);
 #else     
     dx_azureConnect(&dx_config, NETWORK_INTERFACE, IOT_PLUG_AND_PLAY_MODEL_ID);
+1 −0		CMakeLists.txt
+155 −4		include/dx_avnet_iot_connect.h
+6 −2		include/dx_azure_iot.h
+6 −0		include/dx_exit_codes.h
+53 −0		include/dx_proxy.h
+6 −0		include/dx_utilities.h
+750 −202		src/dx_avnet_iot_connect.c
+63 −14		src/dx_azure_iot.c
+236 −0		src/dx_proxy.c
+83 −0		src/dx_utilities.c
+74 −0		avnet_mt3620_sk/bbq_monitor.json
+37 −0		avnet_mt3620_sk/inc/hw/bbq_monitor.h
+74 −0		avnet_mt3620_sk_rev2/bbq_monitor.json
+37 −0		avnet_mt3620_sk_rev2/inc/hw/bbq_monitor.h
+155 −4		include/dx_avnet_iot_connect.h
+0 −1		include/dx_azure_iot.h
+3 −0		include/dx_exit_codes.h
+6 −0		include/dx_utilities.h
+752 −197		src/dx_avnet_iot_connect.c
+31 −5		src/dx_azure_iot.c
+4 −2		src/dx_proxy.c
+83 −0		src/dx_utilities.c