微调

pro/src/paras.c

@@ -1849,31 +1849,31 @@ static int proc_sensor(char *path, int op, GlobalSensorManger *sensor)
                 r = proc_sensor(path, PARAS_CHECK, tmp); if(r) break;
 
                 sprintf(token, "sensor:sensor%d.id", i);
-                r = ini_rw(dic, token, &psensor->sensor_id, sizeof(psensor->sensor_id), TYPE_INT, op); if(r) break;
+                r = ini_rw(dic, token, &tmp->sensor_id, sizeof(tmp->sensor_id), TYPE_INT, op); if(r) break;
 
                 sprintf(token, "sensor:sensor%d.type", i);
-                r = ini_rw(dic, token, &psensor->sensor_type, sizeof(psensor->sensor_type), TYPE_INT, op); if(r) break;
+                r = ini_rw(dic, token, &tmp->sensor_type, sizeof(tmp->sensor_type), TYPE_INT, op); if(r) break;
 
                 sprintf(token, "sensor:sensor%d.name", i);
-                r = ini_rw(dic, token, psensor->sensor_name, sizeof(psensor->sensor_name), TYPE_STR, op); if(r) break;
+                r = ini_rw(dic, token, tmp->sensor_name, sizeof(tmp->sensor_name), TYPE_STR, op); if(r) break;
 
                 sprintf(token, "sensor:sensor%d.iface", i);
-                r = ini_rw(dic, token, &psensor->sensor_interface_type, sizeof(psensor->sensor_interface_type), TYPE_INT, op); if(r) break;
+                r = ini_rw(dic, token, &tmp->sensor_interface_type, sizeof(tmp->sensor_interface_type), TYPE_INT, op); if(r) break;
 
                 sprintf(token, "sensor:sensor%d.port", i);
-                r = ini_rw(dic, token, psensor->sensor_port_name, sizeof(psensor->sensor_port_name), TYPE_STR, op); if(r) break;
+                r = ini_rw(dic, token, tmp->sensor_port_name, sizeof(tmp->sensor_port_name), TYPE_STR, op); if(r) break;
 
                 sprintf(token, "sensor:sensor%d.addr", i);
-                r = ini_rw(dic, token, &psensor->sensor_addr, sizeof(psensor->sensor_addr), TYPE_INT, op); if(r) break;
+                r = ini_rw(dic, token, &tmp->sensor_addr, sizeof(tmp->sensor_addr), TYPE_INT, op); if(r) break;
 
                 sprintf(token, "sensor:sensor%d.baudrate", i);
-                r = ini_rw(dic, token, &psensor->sensor_baud, sizeof(psensor->sensor_baud), TYPE_INT, op); if(r) break;
+                r = ini_rw(dic, token, &tmp->sensor_baud, sizeof(tmp->sensor_baud), TYPE_INT, op); if(r) break;
 
                 sprintf(token, "sensor:sensor%d.vcnt", i);
-                r = ini_rw(dic, token, &psensor->sensor_val_count, sizeof(psensor->sensor_val_count), TYPE_INT, op); if(r) break;
+                r = ini_rw(dic, token, &tmp->sensor_val_count, sizeof(tmp->sensor_val_count), TYPE_INT, op); if(r) break;
 
                 //////////////////////
-                GlobalSensorOverManage *pover=&psensor->over_manager;
+                GlobalSensorOverManage *pover=&tmp->over_manager;
                 for(j=1; j<=2; j++) {
                     for(k=1; k<=2; k++) {
                         if(j==1) {
@@ -2914,7 +2914,7 @@ int paras_alarm_xport(char *path, int io)
 
     pwr3 = is_power3();
     get_curtime_str(temp,sizeof(temp));
-    sprintf(path, "/tmp/alarm_%s.ini", temp);
+    sprintf(path, "/tmp/power_%s.ini", temp);
     if(io==PARAS_IMPORT) {
         if(pwr3) {
             r = proc_power(path, PARAS_READ, NULL);