Changeset 459 for azure_iot_hub_riscv/trunk/app_iothub_client/src/client.c

Timestamp:

Sep 25, 2020, 7:28:35 PM (4 years ago)

Author:

coas-nagasima

Message:

Azure IoT への送信内容を、検出したpersonとcarの数を送信するよう変更。
Azure IoT CentralからLEDのON/OFFが出来るよう更新。

File:

• azure_iot_hub_riscv/trunk/app_iothub_client/src/client.c (modified) (15 diffs)

azure_iot_hub_riscv/trunk/app_iothub_client/src/client.c

@@ -23 +23 @@
 #include "serializer_devicetwin.h"
 #include "client.h"
+#include "kpu_main.h"
 
 #ifdef _MSC_VER
@@ -41 +42 @@
 bool g_use_proxy;
 HTTP_PROXY_OPTIONS g_proxy_options;
-int ledOn;
 
 static int callbackCounter;
@@ -133 +133 @@
 
 // Define the Model
-BEGIN_NAMESPACE(WeatherStation);
-
-DECLARE_MODEL(ContosoAnemometer,
-WITH_DATA(double, windSpeed),
-WITH_DATA(double, temperature),
-WITH_DATA(double, humidity),
+BEGIN_NAMESPACE(SecurityStation);
+
+DECLARE_MODEL(ContosoSecurityCamera,
+WITH_DATA(int, is_person),
+WITH_DATA(int, is_car),
 WITH_METHOD(quit),
 WITH_METHOD(turnLedOn),
@@ -153 +152 @@
 );
 
-DECLARE_DEVICETWIN_MODEL(AnemometerState,
+DECLARE_DEVICETWIN_MODEL(SecurityCameraState,
 WITH_REPORTED_PROPERTY(ThresholdR, threshold)
 );
 
-DECLARE_DEVICETWIN_MODEL(AnemometerSettings,
+DECLARE_DEVICETWIN_MODEL(SecurityCameraSettings,
 WITH_DESIRED_PROPERTY(ThresholdD, threshold, onDesiredThreshold)
 );
 
-END_NAMESPACE(WeatherStation);
+END_NAMESPACE(SecurityStation);
 
 void anemometerReportedStateCallback(int status_code, void* userContextCallback)
 {
-        AnemometerState *anemometer = (AnemometerState *)userContextCallback;
+        SecurityCameraState *anemometer = (SecurityCameraState *)userContextCallback;
 
         printf("received states \033[43m%d\033[49m, reported threshold = %.1f\n", status_code, anemometer->threshold.value);
@@ -174 +173 @@
         // Note: The argument is NOT a pointer to threshold, but instead a pointer to the MODEL
         //       that contains threshold as one of its arguments.  In this case, it
-        //       is AnemometerSettings*.
-
-        AnemometerSettings *anemometer = (AnemometerSettings *)argument;
+        //       is SecurityCameraSettings*.
+
+        SecurityCameraSettings *anemometer = (SecurityCameraSettings *)argument;
         printf("received a new desired.threshold = \033[42m%.1f\033[49m\n", anemometer->threshold.value);
 
@@ -182 +181 @@
 }
 
-METHODRETURN_HANDLE quit(ContosoAnemometer* device)
+METHODRETURN_HANDLE quit(ContosoSecurityCamera* device)
 {
         (void)device;
@@ -193 +192 @@
 }
 
-METHODRETURN_HANDLE turnLedOn(ContosoAnemometer* device)
+METHODRETURN_HANDLE turnLedOn(ContosoSecurityCamera* device)
 {
         (void)device;
         (void)printf("\033[41mTurning LED on with Method.\033[49m\r\n");
 
-        ledOn = 1;
+        digitalWrite(LED_G_PIN, LOW);
+        digitalWrite(LED_R_PIN, LOW);
+        digitalWrite(LED_B_PIN, LOW);
 
         METHODRETURN_HANDLE result = MethodReturn_Create(1, "{\"Message\":\"Turning fan on with Method\"}");
@@ -204 +205 @@
 }
 
-METHODRETURN_HANDLE turnLedOff(ContosoAnemometer* device)
+METHODRETURN_HANDLE turnLedOff(ContosoSecurityCamera* device)
 {
         (void)device;
         (void)printf("\033[44mTurning LED off with Method.\033[49m\r\n");
 
-        ledOn = 0;
+        digitalWrite(LED_G_PIN, HIGH);
+        digitalWrite(LED_R_PIN, HIGH);
+        digitalWrite(LED_B_PIN, HIGH);
 
         METHODRETURN_HANDLE result = MethodReturn_Create(0, "{\"Message\":\"Turning fan off with Method\"}");
@@ -295 +298 @@
         EVENT_INSTANCE messages[MESSAGE_COUNT];
         int msg_id = 0;
-        double avgWindSpeed = 10.0;
-        double minTemperature = 20.0;
-        double minHumidity = 60.0;
         int receiveContext = 0;
 
@@ -315 +315 @@
                         (void)printf("Failed in serializer_init.");
                 }
-                else if (SERIALIZER_REGISTER_NAMESPACE(WeatherStation) == NULL)
+                else if (SERIALIZER_REGISTER_NAMESPACE(SecurityStation) == NULL)
                 {
                         LogError("unable to SERIALIZER_REGISTER_NAMESPACE");
@@ -389 +389 @@
                                 }
 #endif // SET_TRUSTED_CERT_IN_SAMPLES
-                                AnemometerState *anemometerState = IoTHubDeviceTwin_LL_CreateAnemometerState(iotHubClientHandle);
+                                SecurityCameraState *anemometerState = IoTHubDeviceTwin_LL_CreateSecurityCameraState(iotHubClientHandle);
                                 if (anemometerState == NULL)
                                 {
-                                        printf("Failure in IoTHubDeviceTwin_LL_CreateAnemometerState");
+                                        printf("Failure in IoTHubDeviceTwin_LL_CreateSecurityCameraState");
                                 }
                                 else
                                 {
-                                        (void)printf("IoTHubDeviceTwin_LL_CreateAnemometerState...successful.\r\n");
-                                }
-                                AnemometerSettings *anemometerSettings = IoTHubDeviceTwin_LL_CreateAnemometerSettings(iotHubClientHandle);
+                                        (void)printf("IoTHubDeviceTwin_LL_CreateSecurityCameraState...successful.\r\n");
+                                }
+                                SecurityCameraSettings *anemometerSettings = IoTHubDeviceTwin_LL_CreateSecurityCameraSettings(iotHubClientHandle);
                                 if (anemometerSettings == NULL)
                                 {
-                                        printf("Failure in IoTHubDeviceTwin_LL_CreateAnemometerSettings");
+                                        printf("Failure in IoTHubDeviceTwin_LL_CreateSecurityCameraSettings");
                                 }
                                 else
                                 {
-                                        (void)printf("IoTHubDeviceTwin_LL_CreateAnemometerSettings...successful.\r\n");
-                                }
-                                ContosoAnemometer* myWeather = CREATE_MODEL_INSTANCE(WeatherStation, ContosoAnemometer);
+                                        (void)printf("IoTHubDeviceTwin_LL_CreateSecurityCameraSettings...successful.\r\n");
+                                }
+                                ContosoSecurityCamera* myWeather = CREATE_MODEL_INSTANCE(SecurityStation, ContosoSecurityCamera);
                                 if (myWeather == NULL)
                                 {
@@ -440 +440 @@
                                                 unsigned char *msgText;
                                                 size_t msgSize;
-                                                myWeather->windSpeed = avgWindSpeed + (rand() % 4 + 2);
-                                                myWeather->temperature = minTemperature + (rand() % 10);
-                                                myWeather->humidity = minHumidity + (rand() % 20);
-                                                if (SERIALIZE(&msgText, &msgSize, myWeather->windSpeed, myWeather->temperature, myWeather->humidity) != CODEFIRST_OK)
+                                                myWeather->is_person = yolo_result.person;
+                                                myWeather->is_car = yolo_result.car;
+                                                yolo_result.reset = 1;
+                                                if (SERIALIZE(&msgText, &msgSize, myWeather->is_person, myWeather->is_car) != CODEFIRST_OK)
                                                 {
                                                         (void)printf("Failed to serialize\r\n");
@@ -459 +459 @@
 
                                                         propMap = IoTHubMessage_Properties(messages[msgPos].messageHandle);
-                                                        (void)sprintf_s(propText, sizeof(propText), myWeather->temperature > anemometerSettings->threshold.value ? "true" : "false");
-                                                        if (Map_AddOrUpdate(propMap, "temperatureAlert", propText) != MAP_OK)
+                                                        (void)sprintf_s(propText, sizeof(propText), (yolo_result.person > 0) ? "true" : "false");
+                                                        if (Map_AddOrUpdate(propMap, "personAlert", propText) != MAP_OK)
                                                         {
                                                                 (void)printf("ERROR: Map_AddOrUpdate Failed!\r\n");
@@ -487 +487 @@
                                                 anemometerState->threshold.value = anemometerSettings->threshold.value;
                                                 anemometerState->threshold.status = "success";
-                                                IoTHubDeviceTwin_LL_SendReportedStateAnemometerState(anemometerState, anemometerReportedStateCallback, anemometerState);
+                                                IoTHubDeviceTwin_LL_SendReportedStateSecurityCameraState(anemometerState, anemometerReportedStateCallback, anemometerState);
                                         }
                                         iterator++;
@@ -504 +504 @@
 
                                 if (anemometerSettings != NULL)
-                                        IoTHubDeviceTwin_LL_DestroyAnemometerSettings(anemometerSettings);
+                                        IoTHubDeviceTwin_LL_DestroySecurityCameraSettings(anemometerSettings);
                                 if (anemometerState != NULL)
-                                        IoTHubDeviceTwin_LL_DestroyAnemometerState(anemometerState);
+                                        IoTHubDeviceTwin_LL_DestroySecurityCameraState(anemometerState);
                                 if (myWeather != NULL)
                                         DESTROY_MODEL_INSTANCE(myWeather);