Diff: Wificonnect.cpp

Revision:

4:33b80026a3ee

Parent:

3:32b328935a54

--- a/Wificonnect.cpp	Wed Aug 21 08:45:28 2019 +0000
+++ b/Wificonnect.cpp	Thu Aug 22 08:16:51 2019 +0000
@@ -51,7 +51,12 @@
     uint16_t Trials = CONNECTION_TRIAL_MAX;
 
     pc.baud(115200);
-
+    if(firstCycle==1)
+    {
+        window_state=0;
+        blind_state=0;
+        led_state=0;
+    }
     printf("\n");
     printf("************************************************************\n");
     printf("***   STM32 IoT Discovery kit for STM32L475 MCU          ***\n");
@@ -79,7 +84,7 @@
             printf("> ERROR : CANNOT get MAC address\n");
         }
     
-        if( WIFI_Connect(MBED_CONF_APP_WIFI_SSID, MBED_CONF_APP_WIFI_PASSWORD, WIFI_ECN_WPA_PSK)== WIFI_STATUS_OK) {
+        if( WIFI_Connect(MBED_CONF_APP_WIFI_SSID, MBED_CONF_APP_WIFI_PASSWORD, WIFI_ECN_WPA2_PSK)== WIFI_STATUS_OK) {
         
             printf("> es-wifi module connected \n");
             if(WIFI_GetIP_Address(IP_Addr) == WIFI_STATUS_OK) {
@@ -117,7 +122,7 @@
   
     while(1)
     {
-        tick.attach(&update_state,1);
+      //  tick.attach(&update_state,1);
         if(Socket != -1) 
         {
             if(WIFI_ReceiveData(Socket, RxData, sizeof(RxData), &Datalen, WIFI_READ_TIMEOUT) == WIFI_STATUS_OK){
@@ -126,6 +131,7 @@
                     printf("%s \n",RxData);
                     printf("%d \n",motor1_state);
                     Data_Receive(RxData);
+                    update_state();
                     if(WIFI_SendData(Socket, TxData, sizeof(TxData), &Datalen, WIFI_WRITE_TIMEOUT) != WIFI_STATUS_OK) 
                     {
                         printf("> ERROR : Failed to send Data.\n");   
@@ -150,21 +156,20 @@
 {
 
  TxData[0]=(char)(AutoMode+48);
- TxData[1]=(char)(motor1_state+48);
- TxData[2]=(char)(motor2_state+48);
+ TxData[1]=(char)(window_state+48);
+ TxData[2]=(char)(blind_state+48);
  TxData[3]=(char)(T_dust_value+48);
  TxData[4]=(char)(cds_state+48);
  TxData[5]=(char)(led_state+48);
-
- TxData[6]='f';
- TxData[7]='f';
- TxData[8]='f';
- TxData[9]='f';
- TxData[10]='f';
- TxData[11]='f';
- TxData[12]='f';
- TxData[13]='f';
- TxData[14]='f';
+ TxData[6]='2';
+ TxData[7]='5';
+ TxData[8]='5';
+ TxData[9]='2';
+ TxData[10]='5';
+ TxData[11]='5';
+ TxData[12]='2';
+ TxData[13]='5';
+ TxData[14]='5';
  TxData[15]='\n';
 
 }