tijiao

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

@@ -152,7 +152,6 @@ void getSysInfo(Webs *wp){
     cJSON_AddStringToObject(data, "title", sysInfo.title);
     cJSON_AddStringToObject(data, "text", sysInfo.text);
 
-
     pStr = cJSON_PrintUnformatted(root);
 
     printf("---> cJSON Str:\n%s\n", pStr);
@@ -306,15 +305,15 @@ void getSensorInfo(Webs *wp){
 
                 switch(pSensorBuff->sensor_state)
                 {
-                case 0x1:  cJSON_AddStringToObject(pJsonsub, "state", "ok"); break;
-                case 0x2:  cJSON_AddStringToObject(pJsonsub, "state", "Upper Non-Critical"); break;    
-                case 0x4:  cJSON_AddStringToObject(pJsonsub, "state", "Upper Critical Threshold"); break;    
-                case 0x8:  cJSON_AddStringToObject(pJsonsub, "state", "Lower Non-Critical"); break;    
-                case 0x10:  cJSON_AddStringToObject(pJsonsub, "state", "Lower Critical"); break;    
-                case 0x20:  cJSON_AddStringToObject(pJsonsub, "state", "Access failed"); break;    
-                case 0x40:  cJSON_AddStringToObject(pJsonsub, "state", "Upper Non-Recoverable"); break;    
-                case 0x80:  cJSON_AddStringToObject(pJsonsub, "state", "Lower Non-Recoverable"); break;    
-                default:  cJSON_AddNumberToObject(pJsonsub, "state", pSensorBuff->sensor_state); break;      
+                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;      
                 }
          
                 pSensorBuff++;