241217

main.c

@@ -2,7 +2,7 @@
 #include "ip.h"
 #include "mqtt.h"
 #include "serial.h"
-
+#include "delay.h"
 
 
 void *serial_usart1(void *arg)
@@ -19,16 +19,18 @@ void *AppExit(void *arg)
 
       
 
-    unsigned char bufpwm1[3]={gtypeTemp,0x01,0x00};
-    unsigned char bufpwm2[3]={gtypeTemp,0x02,0x00};
-    unsigned char bufpwm3[3]={gtypeTemp,0x03,0x00};
-    unsigned char bufpwm4[3]={gtypeTemp,0x04,0x00};
     while(1)
     {    
-        Delay_Ms(0,150);
+        unsigned char bufpwm1[3]={gtypeTemp,1,0};
+        unsigned char bufpwm2[3]={gtypeTemp,2,0};
+        unsigned char bufpwm3[3]={gtypeTemp,3,0};
+        unsigned char bufpwm4[3]={gtypeTemp,4,0};
+        Delay_Ms(0,100);
         gPwmCount++;
+        printf( "%d\n",gtypeTemp);
         if(gPwmCount>20)
         {
+            //printf( "%d\n",gtypeTemp);
         gPwmCount=21;
         serial_Write(bufpwm1);
         serial_Write(bufpwm2);

mqtt.c

@@ -9,10 +9,10 @@ int rc=0;
 struct mosquitto *mosq;
 
 
-unsigned char gmodeTmep=0;
+unsigned char gmodeTemp=0;
 unsigned char gtypeTemp=0;
 unsigned char gpinTemp=0;
-unsigned char gvaltemp=0;
+unsigned char gvalTemp=0;
 unsigned char gvalt[4];
 
 
@@ -88,39 +88,39 @@ void message_0()//message_type为0时候要改变的值
         switch(i)
         {
             case 1:
-                gvalt[0]=gmodeTmep;
+                gvalt[0]= gtypeTemp;
                 gvalt[1]=1;
                 gvalt[2]=0;
-                printf("gmodeTmep:%d\n",gvalt[0]); 
-                printf("gtypeTemp:%d\n",gvalt[1]);
-                printf("gvaltemp:%d\n",gvalt[2]);
+                printf("gtypeTemp:%d\n",gvalt[0]); 
+                printf("gmodeTemp:%d\n",gvalt[1]);
+                printf("gvalTemp:%d\n",gvalt[2]);
                 serial_Write(gvalt);
                 break;
             case 2:
-                gvalt[0]=gmodeTmep;
+                gvalt[0]= gtypeTemp;
                 gvalt[1]=2;
                 gvalt[2]=0;
-                printf("gmodeTmep:%d\n",gvalt[0]); 
-                printf("gtypeTemp:%d\n",gvalt[1]);
-                printf("gvaltemp:%d\n",gvalt[2]);
+                printf("gtypeTemp:%d\n",gvalt[0]); 
+                printf("gmodeTemp:%d\n",gvalt[1]);
+                printf("gvalTemp:%d\n",gvalt[2]);
                 serial_Write(gvalt);
                 break;
             case 3:
-                gvalt[0]=gmodeTmep;
+                gvalt[0]= gtypeTemp;
                 gvalt[1]=3;
                 gvalt[2]=0;
-                printf("gmodeTmep:%d\n",gvalt[0]); 
-                printf("gtypeTemp:%d\n",gvalt[1]);
-                printf("gvaltemp:%d\n",gvalt[2]);
+                printf("gtypeTemp:%d\n",gvalt[0]); 
+                printf("gmodeTemp:%d\n",gvalt[1]);
+                printf("gvalTemp:%d\n",gvalt[2]);
                 serial_Write(gvalt);
                 break;
             case 4:
-                gvalt[0]=gmodeTmep;
+                gvalt[0]= gtypeTemp;
                 gvalt[1]=4;
                 gvalt[2]=0;
-                printf("gmodeTmep:%d\n",gvalt[0]); 
-                printf("gtypeTemp:%d\n",gvalt[1]);
-                printf("gvaltemp:%d\n",gvalt[2]);
+                printf("gtypeTemp:%d\n",gvalt[0]); 
+                printf("gmodeTemp:%d\n",gvalt[1]);
+                printf("gvalTemp:%d\n",gvalt[2]);
                 serial_Write(gvalt);
                 break;
             default:
@@ -144,17 +144,17 @@ void message_3(cJSON *body,cJSON *pwm_ctrl)//message_type为3，控制pwm
         cJSON *mode = cJSON_GetObjectItem(pwm_ctrl, "mode");   //mode=1 速度，mode=2 转向(unsigned char)
         cJSON *type = cJSON_GetObjectItem(pwm_ctrl, "type");
         cJSON *val =   cJSON_GetObjectItem(pwm_ctrl, "val");  //val为pwm的值 0~100(unsigned char)(unsigned char)
-        gmodeTmep= mode->valueint;
+        gmodeTemp= mode->valueint;
         gtypeTemp=type->valueint;
-        gvaltemp= val->valueint/2+30;
+        gvalTemp= val->valueint*3/4;
         gvalt[0]=gtypeTemp;
-        gvalt[1]=gmodeTmep;
-        gvalt[2]=gvaltemp;
+        gvalt[1]=gmodeTemp;
+        gvalt[2]=gvalTemp;
 
         gPwmCount = 0;
-        printf("gmodeTmep:%d\n",gvalt[0]); 
-        printf("gtypeTemp:%d\n",gvalt[1]);
-        printf("gvaltemp:%d\n",gvalt[2]);
+        printf("gtypeTemp:%d\n",gvalt[0]); 
+        printf("gmodeTemp:%d\n",gvalt[1]);
+        printf("gvalTemp:%d\n",gvalt[2]);
         serial_Write(gvalt);  
 }
 
@@ -168,13 +168,13 @@ void message_4(cJSON *body, cJSON *pin_setctrl)
     cJSON *pin = cJSON_GetObjectItem(pin_setctrl, "pin");
     cJSON *val = cJSON_GetObjectItem(pin_setctrl, "val");  //val为pwm的值 0~100(unsigned char)(unsigned char)
     gpinTemp=pin->valueint;
-    gvaltemp= val->valueint;
+    gvalTemp= val->valueint;
     gPwmCount=0;
     gvalt[0]=0;
     gvalt[1]=gpinTemp;
-    gvalt[2]=gvaltemp;
+    gvalt[2]=gvalTemp;
     printf("gpinTemp:%d\n",gpinTemp); 
-    printf("gvalTemp:%d\n",gvaltemp);
+    printf("gvalTemp:%d\n",gvalTemp);
     serial_Write(gvalt);
 }