Merge branch 'master' of https://gogs.storlead.com/zhangbo/GD32F450_BMC_BaseCode

app/goahead-3.6.5/src/web_interface/src/dashboard.c

@@ -342,54 +342,54 @@ void getSensorInfo(Webs *wp){
             sprintf(minReading, "%.3f", pSensorBuff->min_reading);
 
             cJSON_AddItemToArray(pJsonArry,pJsonsub=cJSON_CreateObject()); /* 给创建的数组增加对对象*/
-            // cJSON_AddNumberToObject(pJsonsub, "Num", pSensorBuff->sensor_num); 
-            // cJSON_AddStringToObject(pJsonsub, "Nam", pSensorBuff->sensor_name);
-            // cJSON_AddStringToObject(pJsonsub, "rad", reading);      /* 给对象增加内容 */    
-            // cJSON_AddStringToObject(pJsonsub, "lnr", lownr);                                        
-            // cJSON_AddStringToObject(pJsonsub, "lct", lowct);   
-            // cJSON_AddStringToObject(pJsonsub, "lnc", lownc);                                                       
-            // cJSON_AddStringToObject(pJsonsub, "hnc", highnc);                 
-            // cJSON_AddStringToObject(pJsonsub, "hct", highct);   
-            // cJSON_AddStringToObject(pJsonsub, "hnr", highnr);  
-            // cJSON_AddStringToObject(pJsonsub, "max", maxReading);  
-            // cJSON_AddStringToObject(pJsonsub, "min", minReading);  
-
-            cJSON_AddNumberToObject(pJsonsub, "sensorNum", pSensorBuff->sensor_num); 
-            cJSON_AddStringToObject(pJsonsub, "sensorName", pSensorBuff->sensor_name);
-            cJSON_AddStringToObject(pJsonsub, "reading", reading);      /* 给对象增加内容 */    
-            cJSON_AddStringToObject(pJsonsub, "lownr", lownr);                                        
-            cJSON_AddStringToObject(pJsonsub, "lowct", lowct);   
-            cJSON_AddStringToObject(pJsonsub, "lownc", lownc);                                                       
-            cJSON_AddStringToObject(pJsonsub, "highnc", highnc);                 
-            cJSON_AddStringToObject(pJsonsub, "highct", highct);   
-            cJSON_AddStringToObject(pJsonsub, "highnr", highnr);  
-            cJSON_AddStringToObject(pJsonsub, "maxReading", maxReading);  
-            cJSON_AddStringToObject(pJsonsub, "minReading", minReading);  
+            cJSON_AddNumberToObject(pJsonsub, "Num", pSensorBuff->sensor_num);  //sensorNum -> Num
+            cJSON_AddStringToObject(pJsonsub, "Nam", pSensorBuff->sensor_name); //sensorName -> Nam
+            cJSON_AddStringToObject(pJsonsub, "rad", reading);      //reading -> rad
+            cJSON_AddStringToObject(pJsonsub, "lnr", lownr);        //lownr -> lnr                                 
+            cJSON_AddStringToObject(pJsonsub, "lct", lowct);        //lowct -> lct
+            cJSON_AddStringToObject(pJsonsub, "lnc", lownc);        //lownc -> lnc                                                     
+            cJSON_AddStringToObject(pJsonsub, "hnc", highnc);       //highnc -> hnc           
+            cJSON_AddStringToObject(pJsonsub, "hct", highct);       //highct -> hct
+            cJSON_AddStringToObject(pJsonsub, "hnr", highnr);       //highnr -> hnr
+            cJSON_AddStringToObject(pJsonsub, "max", maxReading);   //maxReading -> max
+            cJSON_AddStringToObject(pJsonsub, "min", minReading);   //minReading -> min
+
+            // cJSON_AddNumberToObject(pJsonsub, "sensorNum", pSensorBuff->sensor_num); 
+            // cJSON_AddStringToObject(pJsonsub, "sensorName", pSensorBuff->sensor_name);
+            // cJSON_AddStringToObject(pJsonsub, "reading", reading);      /* 给对象增加内容 */    
+            // cJSON_AddStringToObject(pJsonsub, "lownr", lownr);                                        
+            // cJSON_AddStringToObject(pJsonsub, "lowct", lowct);   
+            // cJSON_AddStringToObject(pJsonsub, "lownc", lownc);                                                       
+            // cJSON_AddStringToObject(pJsonsub, "highnc", highnc);                 
+            // cJSON_AddStringToObject(pJsonsub, "highct", highct);   
+            // cJSON_AddStringToObject(pJsonsub, "highnr", highnr);  
+            // cJSON_AddStringToObject(pJsonsub, "maxReading", maxReading);  
+            // cJSON_AddStringToObject(pJsonsub, "minReading", minReading);  
 
             switch(pSensorBuff->sensor_units[1])    //sensorUinits2 //uit
             {
-            case 0: cJSON_AddStringToObject(pJsonsub, "unit", "unspecified"); break;                    
-            case 1: cJSON_AddStringToObject(pJsonsub, "unit", "degree C"); break;
-            case 2: cJSON_AddStringToObject(pJsonsub, "unit", "degree F"); break;
-            case 3: cJSON_AddStringToObject(pJsonsub, "unit", "degree K"); break;
-            case 4: cJSON_AddStringToObject(pJsonsub, "unit", "Volts"); break;
-            case 5: cJSON_AddStringToObject(pJsonsub, "unit", "Amps"); break;
-            case 6: cJSON_AddStringToObject(pJsonsub, "unit", "Watts"); break;
-            case 18: cJSON_AddStringToObject(pJsonsub, "unit", "RPM"); break;
-            default: cJSON_AddStringToObject(pJsonsub, "unit", "unknown"); break;
+            case 0: cJSON_AddStringToObject(pJsonsub, "uit", "unspecified"); break;   //uint -> uit                 
+            case 1: cJSON_AddStringToObject(pJsonsub, "uit", "degree C"); break;
+            case 2: cJSON_AddStringToObject(pJsonsub, "uit", "degree F"); break;
+            case 3: cJSON_AddStringToObject(pJsonsub, "uit", "degree K"); break;
+            case 4: cJSON_AddStringToObject(pJsonsub, "uit", "Volts"); break;
+            case 5: cJSON_AddStringToObject(pJsonsub, "uit", "Amps"); break;
+            case 6: cJSON_AddStringToObject(pJsonsub, "uit", "Watts"); break;
+            case 18: cJSON_AddStringToObject(pJsonsub, "uit", "RPM"); break;
+            default: cJSON_AddStringToObject(pJsonsub, "uit", "unknown"); break;
             }
 
             switch(pSensorBuff->sensor_state)   //sta
-            {
-            case 0x1:  cJSON_AddStringToObject(pJsonsub, "state", "ok"); cJSON_AddStringToObject(pJsonsub, "status", "1"); break;
-            case 0x2:  cJSON_AddStringToObject(pJsonsub, "state", "Upper Non-Critical"); cJSON_AddStringToObject(pJsonsub, "status", "2"); break;    
-            case 0x4:  cJSON_AddStringToObject(pJsonsub, "state", "Upper Critical Threshold");cJSON_AddStringToObject(pJsonsub, "status", "3"); break;    
-            case 0x8:  cJSON_AddStringToObject(pJsonsub, "state", "Lower Non-Critical");cJSON_AddStringToObject(pJsonsub, "status", "2"); break;    
-            case 0x10:  cJSON_AddStringToObject(pJsonsub, "state", "Lower Critical");cJSON_AddStringToObject(pJsonsub, "status", "3"); break;    
-            case 0x20:  cJSON_AddStringToObject(pJsonsub, "state", "Access failed");cJSON_AddStringToObject(pJsonsub, "status", "3"); break;    
-            case 0x40:  cJSON_AddStringToObject(pJsonsub, "state", "Upper Non-Recoverable");cJSON_AddStringToObject(pJsonsub, "status", "3"); break;    
-            case 0x80:  cJSON_AddStringToObject(pJsonsub, "state", "Lower Non-Recoverable");cJSON_AddStringToObject(pJsonsub, "status", "3"); break;    
-            default:  cJSON_AddNumberToObject(pJsonsub, "state", pSensorBuff->sensor_state);cJSON_AddStringToObject(pJsonsub, "status", "3"); break;      
+            {                                       //state -> ste ;  status -> stu
+            case 0x1:  cJSON_AddStringToObject(pJsonsub, "ste", "ok"); cJSON_AddStringToObject(pJsonsub, "stu", "1"); break;
+            case 0x2:  cJSON_AddStringToObject(pJsonsub, "ste", "Upper Non-Critical"); cJSON_AddStringToObject(pJsonsub, "stu", "2"); break;    
+            case 0x4:  cJSON_AddStringToObject(pJsonsub, "ste", "Upper Critical Threshold");cJSON_AddStringToObject(pJsonsub, "stu", "3"); break;    
+            case 0x8:  cJSON_AddStringToObject(pJsonsub, "ste", "Lower Non-Critical");cJSON_AddStringToObject(pJsonsub, "stu", "2"); break;    
+            case 0x10:  cJSON_AddStringToObject(pJsonsub, "ste", "Lower Critical");cJSON_AddStringToObject(pJsonsub, "stu", "3"); break;    
+            case 0x20:  cJSON_AddStringToObject(pJsonsub, "ste", "Access failed");cJSON_AddStringToObject(pJsonsub, "stu", "3"); break;    
+            case 0x40:  cJSON_AddStringToObject(pJsonsub, "ste", "Upper Non-Recoverable");cJSON_AddStringToObject(pJsonsub, "stu", "3"); break;    
+            case 0x80:  cJSON_AddStringToObject(pJsonsub, "ste", "Lower Non-Recoverable");cJSON_AddStringToObject(pJsonsub, "stu", "3"); break;    
+            default:  cJSON_AddNumberToObject(pJsonsub, "ste", pSensorBuff->sensor_state);cJSON_AddStringToObject(pJsonsub, "stu", "3"); break;      
             }
      
             pSensorBuff++;

app/goahead-3.6.5/src/web_interface/src/sel.c

@@ -92,7 +92,7 @@ void GetAllSELEntriesSorted(Webs *wp)
     cJSON * root =  cJSON_CreateObject();
     cJSON  *pJsonArry,*pJsonsub;
     pJsonArry=cJSON_CreateArray();   /*创建数组*/
-    cJSON_AddItemToArray(pJsonArry,pJsonsub=cJSON_CreateObject()); /* 给创建的数组增加对对象*/
+    
 
     //初始化传感器序号和名称对应表
     for(i=0;i<MAX_SENSOR_NUMBERS;i++)
@@ -187,29 +187,31 @@ void GetAllSELEntriesSorted(Webs *wp)
                 {
                     break;
                 }
-                // cJSON_AddNumberToObject(pJsonsub, "D1", SELEventData.hdr.ID);
-                // cJSON_AddNumberToObject(pJsonsub, "D2", SELEventData.hdr.Type);
-                // cJSON_AddNumberToObject(pJsonsub, "D3", SELEventData.hdr.TimeStamp);
-                // cJSON_AddNumberToObject(pJsonsub, "D4", SELEventData.GenID[0]);
-                // cJSON_AddNumberToObject(pJsonsub, "D5", SELEventData.GenID[1]);
-                // cJSON_AddNumberToObject(pJsonsub, "D6", SELEventData.EvMRev);
-                // cJSON_AddNumberToObject(pJsonsub, "D7", SELEventData.SensorType);
-                // cJSON_AddNumberToObject(pJsonsub, "D8", SELEventData.EvtDirType);
-                // cJSON_AddNumberToObject(pJsonsub, "D9", SELEventData.EvtData1);
-                // cJSON_AddNumberToObject(pJsonsub, "D10", SELEventData.EvtData2);
-                // cJSON_AddNumberToObject(pJsonsub, "D11", SELEventData.EvtData3);
-
-                cJSON_AddNumberToObject(pJsonsub, "RecordID", SELEventData.hdr.ID);
-                cJSON_AddNumberToObject(pJsonsub, "RecordType", SELEventData.hdr.Type);
-                cJSON_AddNumberToObject(pJsonsub, "TimeStamp", SELEventData.hdr.TimeStamp);
-                cJSON_AddNumberToObject(pJsonsub, "GenID1", SELEventData.GenID[0]);
-                cJSON_AddNumberToObject(pJsonsub, "GenID2", SELEventData.GenID[1]);
-                cJSON_AddNumberToObject(pJsonsub, "EvmRev", SELEventData.EvMRev);
-                cJSON_AddNumberToObject(pJsonsub, "SensorType", SELEventData.SensorType);
-                cJSON_AddNumberToObject(pJsonsub, "EventDirType", SELEventData.EvtDirType);
-                cJSON_AddNumberToObject(pJsonsub, "EventData1", SELEventData.EvtData1);
-                cJSON_AddNumberToObject(pJsonsub, "EventData2", SELEventData.EvtData2);
-                cJSON_AddNumberToObject(pJsonsub, "EventData3", SELEventData.EvtData3);
+                cJSON_AddItemToArray(pJsonArry,pJsonsub=cJSON_CreateObject()); /* 给创建的数组增加对对象*/
+                cJSON_AddNumberToObject(pJsonsub, "D1", SELEventData.hdr.ID);    //RecordID      -> D1
+                cJSON_AddNumberToObject(pJsonsub, "D2", SELEventData.hdr.Type);  //RecordType    -> D2
+                cJSON_AddNumberToObject(pJsonsub, "D3", SELEventData.hdr.TimeStamp); //TimeStamp -> D3
+                cJSON_AddNumberToObject(pJsonsub, "D4", SELEventData.GenID[0]);      //GenID1    -> D4
+                cJSON_AddNumberToObject(pJsonsub, "D5", SELEventData.GenID[1]);      //GenID2    -> D5
+                cJSON_AddNumberToObject(pJsonsub, "D6", SELEventData.EvMRev);        //EvmRev    -> D6
+                cJSON_AddNumberToObject(pJsonsub, "D7", SELEventData.SensorType);    //SensorType    -> D7
+                cJSON_AddNumberToObject(pJsonsub, "D8", SELEventData.EvtDirType);    //EventDirType  -> D8
+                cJSON_AddNumberToObject(pJsonsub, "D9", SELEventData.EvtData1);      //EventData1    -> D9
+                cJSON_AddNumberToObject(pJsonsub, "D10", SELEventData.EvtData2);     //EventData2    -> D10
+                cJSON_AddNumberToObject(pJsonsub, "D11", SELEventData.EvtData3);     //EventData3    -> D11
+                
+                // cJSON_AddNumberToObject(pJsonsub, "RecordID", SELEventData.hdr.ID);
+                // cJSON_AddNumberToObject(pJsonsub, "RecordType", SELEventData.hdr.Type);
+                // cJSON_AddNumberToObject(pJsonsub, "TimeStamp", SELEventData.hdr.TimeStamp);
+                // cJSON_AddNumberToObject(pJsonsub, "GenID1", SELEventData.GenID[0]);
+                // cJSON_AddNumberToObject(pJsonsub, "GenID2", SELEventData.GenID[1]);
+                // cJSON_AddNumberToObject(pJsonsub, "EvmRev", SELEventData.EvMRev);
+                // cJSON_AddNumberToObject(pJsonsub, "SensorType", SELEventData.SensorType);
+                // cJSON_AddNumberToObject(pJsonsub, "EventDirType", SELEventData.EvtDirType);
+                // cJSON_AddNumberToObject(pJsonsub, "EventData1", SELEventData.EvtData1);
+                // cJSON_AddNumberToObject(pJsonsub, "EventData2", SELEventData.EvtData2);
+                // cJSON_AddNumberToObject(pJsonsub, "EventData3", SELEventData.EvtData3);
+
                 //获取传感器名称
                 //printf("sensor number %d\n", SELEventData.SensorNum);
                 if((SELEventData.SensorNum != 0xff) && (SELEventData.hdr.Type == 0x02))
@@ -223,7 +225,7 @@ void GetAllSELEntriesSorted(Webs *wp)
                         if(senNumNameTab[i].sensor_number == SELEventData.SensorNum)
                         {                        
                             //cJSON_AddStringToObject(pJsonsub, "c", senNumNameTab[i].sensor_name);
-                            cJSON_AddStringToObject(pJsonsub, "SensorName", senNumNameTab[i].sensor_name);
+                            cJSON_AddStringToObject(pJsonsub, "D12", senNumNameTab[i].sensor_name);  //SensorName -> D12
                             found_flag = 1;
                             break;
                         }
@@ -241,7 +243,7 @@ void GetAllSELEntriesSorted(Webs *wp)
                             wRet = IPMC_GetSensorName(&UDSSession, target_addr,SELEventData.SensorNum, sensorName, DEFAULT_TIMEOUT);
                         }
                         //cJSON_AddStringToObject(pJsonsub, "c", sensorName);
-                        cJSON_AddStringToObject(pJsonsub, "SensorName", senNumNameTab[i].sensor_name);
+                        cJSON_AddStringToObject(pJsonsub, "D12", senNumNameTab[i].sensor_name);     //SensorName->D12
                         if(wRet == 0)
                         {
                             //将得到的传感器名称保存到缓存中
@@ -260,7 +262,7 @@ void GetAllSELEntriesSorted(Webs *wp)
                 }
                 else
                 {
-                    cJSON_AddStringToObject(pJsonsub, "SensorName", "--");
+                    cJSON_AddStringToObject(pJsonsub, "D12", "--"); //SensorName -> D12
                 }
 
                 if(RecID == 0xffff) //last record