tijiao

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

@@ -267,7 +267,7 @@ void getSensorInfo(Webs *wp){
                 sprintf(highnr, "%.3f", pSensorBuff->high_non_recov_thresh);
 
                 cJSON_AddItemToArray(pJsonArry,pJsonsub=cJSON_CreateObject()); /* 给创建的数组增加对对象*/
-                //cJSON_AddNumberToObject(pJsonsub, "sensorNum", pSensorBuff->sensor_num); 
+                cJSON_AddNumberToObject(pJsonsub, "sensorNum", pSensorBuff->sensor_num); 
                 cJSON_AddStringToObject(pJsonsub, "sensorName", pSensorBuff->sensor_name);
 
                 //cJSON_AddNumberToObject(pJsonsub, "ownerId",    pSensorBuff->owner_id);
@@ -283,35 +283,36 @@ void getSensorInfo(Webs *wp){
                 //cJSON_AddNumberToObject(pJsonsub, "SensorAccessibleFlags", pSensorBuff->SensorAccessibleFlags); 
                 cJSON_AddStringToObject(pJsonsub, "reading", reading);      /* 给对象增加内容 */    
                 cJSON_AddStringToObject(pJsonsub, "lownr", lownr);                                        
-                cJSON_AddStringToObject(pJsonsub, "lowct", lowct);                                                         
+                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);  
 
                 switch(pSensorBuff->sensor_units[1])    //sensorUinits2
                 {
-                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, "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;
                 }
 
                 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"); 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;      
                 }
          
                 pSensorBuff++;
@@ -324,7 +325,7 @@ void getSensorInfo(Webs *wp){
             // pStr = cJSON_Print(pJsonArry);
             cJSON_AddItemToObject(root, "data", pJsonArry);
             pStr = cJSON_PrintUnformatted(root);
-            printf("---> pStr %d: %s\n", strlen(pStr), pStr);
+            // printf("---> pStr %d: %s\n", strlen(pStr), pStr);
 
             websSetStatus(wp, 200);
             websWriteHeaders(wp, -1, 0);