Revision 4:33b80026a3ee, committed 2019-08-22

Comitter:

ascension2

Date:

Thu Aug 22 08:16:51 2019 +0000

Parent:

3:32b328935a54

Commit message:

final
;

Changed in this revision

--- a/LEDcontrol.cpp	Wed Aug 21 08:45:28 2019 +0000
+++ b/LEDcontrol.cpp	Thu Aug 22 08:16:51 2019 +0000
@@ -36,7 +36,7 @@
             pwmRed.write(0);     
             pwmGreen.write(0);  
             pwmBlue.write(0);
-            cds_state=0;
+            cds_state=1;
         }
        else 
         {   
@@ -47,8 +47,9 @@
             pwmRed.write(red_value);     
             pwmGreen.write(green_value);  
             pwmBlue.write(blue_value); 
-            cds_state=1;
+            cds_state=0;
         }
+        
     if((AutoMode==1)&&(blind_state==1)&&(cdsCount==5))
      {
         motor2CCW(10); // close
@@ -66,17 +67,18 @@
     { 
       if(cdsData<0.7f)
         {
-           cds_state=0;
+           cds_state=1;
         }
        else 
         {   
-          cds_state=1;
+          cds_state=0;
         }
         pwmRed.write(red_value);     
         pwmGreen.write(green_value);  
         pwmBlue.write(blue_value);  
      
     }    
+   
 }   
 void setRGB(float Red,float Green,float Blue,int led_info)
 {
@@ -104,7 +106,8 @@
         green_value = Green*variation;
         led_state=1;
     }
-    else if(led_info ==2) //user input value
+    
+    if((led_info ==2)||(AutoMode==1)) //user input value
     {
         red_value = Red*variation;
         blue_value = Blue*variation;

--- a/MotorControl.cpp	Wed Aug 21 08:45:28 2019 +0000
+++ b/MotorControl.cpp	Thu Aug 22 08:16:51 2019 +0000
@@ -12,7 +12,7 @@
 int motor2_state;
 int window_state;
 int blind_state;
-void MotorControl();
+
 
 void motor1Stop();
 void motor1CW(float speed);
@@ -23,66 +23,72 @@
 void motor2CCW(float speed);
 
 
-void MotorControl()
-{
-   
-}
+
 
 void motor1CW(float speed)
 {
+if(window_state==0)
+{
 motor1_state=1;
 window_state=1;
 M1_a=1;
 M1_b=0;
 M1_en.write((speed/100));
-
+}
 int i ;
-for(i=0; i<20000000;i++){ }
+for(i=0; i<11000000;i++){ }
 motor1Stop();
 }
 
 void motor1CCW(float speed)
 {
+if(window_state==1)
+{
 motor1_state=0;
 window_state=0;
 M1_a=0;
 M1_b=1;
 M1_en.write((speed/100));
-
+}
 int i ;
-for(i=0; i<20000000;i++){ }
+for(i=0; i<11000000;i++){ }
 motor1Stop();
 }
 
 void motor1Stop()
 {
+    
 M1_a=0;
 M1_b=0;
 motor1_state=2;
 }
 void motor2CW(float speed)
 {
+if(blind_state==0)
+{
 motor2_state=1;
 blind_state=1;
 M2_a=1;
 M2_b=0;
 M2_en.write((speed/100));
-
-
+}
 int i ;
-for(i=0; i<20000000;i++){ }
-motor1Stop();
+for(i=0; i<18000000;i++){ }
+motor2Stop();
 }
 
 void motor2CCW(float speed)
 {
+if(blind_state==1)
+{
 motor2_state=0;
 blind_state=0;
 M2_a=0;
 M2_b=1;
+}
 int i ;
-for(i=0; i<20000000;i++){ }
-motor1Stop();
+for(i=0; i<18000000;i++){ }
+motor2Stop();
 
 }
 

--- 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';
 
 }

--- a/mbed_app.json	Wed Aug 21 08:45:28 2019 +0000
+++ b/mbed_app.json	Thu Aug 22 08:16:51 2019 +0000
@@ -2,12 +2,12 @@
     "config": {
         "wifi-ssid": {
             "help": "WiFi SSID",
-            "value": "\"IOT_SW_2.4G\""
+             "value": "\"kyjee803\""
 
         },
         "wifi-password": {
             "help": "WiFi Password",
-            "value": "\"IOT00700\""
+             "value": "\"107803kz!\""
      
         },
         "server-ip-1": {
@@ -20,11 +20,11 @@
         },
         "server-ip-3": {
             "help": "TCP server IP address 3rd value",
-            "value": "10"
+            "value": "8"
         },
         "server-ip-4": {
             "help": "TCP server IP address 4th value",
-            "value": "147"
+            "value": "110"
         }
     }
 }
\ No newline at end of file