Преглед изворни кода

1、修复阈值导入无总电源报警阈值的缺陷;2.修复初始阈值未下发控制操作缺陷。

liyuezong пре 1 година
родитељ
комит
fa56cfc7a8
4 измењених фајлова са 9 додато и 9 уклоњено
  1. BIN
      cust_data/db/pdu_dat_malaysia_back.db
  2. BIN
      cust_data/db/pdu_dat_malaysia_front.db
  3. 2 2
      pro/src/app.c
  4. 7 7
      pro/src/paras.c

BIN
cust_data/db/pdu_dat_malaysia_back.db


BIN
cust_data/db/pdu_dat_malaysia_front.db


+ 2 - 2
pro/src/app.c

@@ -116,7 +116,7 @@ static void* power_thread(void* arg)
                                                         _globalPowerMangerTemp->product_ch_type,
                                                         _pTreeACPowerMangerTemp->product_saddr,
                                                         _pTreeACPowerMangerTemp->product_ch_addr,
-                                                        _globalPowerMangerTemp, 0);
+                                                        _globalPowerMangerTemp, 1);
             }
         }
     }
@@ -129,7 +129,7 @@ static void* power_thread(void* arg)
                                                     _globalPowerMangerTemp->product_ch_type,
                                                     _globalPowerMangerTemp->product_saddr,
                                                     _globalPowerMangerTemp->product_ch_addr,
-                                                    _globalPowerMangerTemp,0);
+                                                    _globalPowerMangerTemp,1);
          log_i("TRESTHOLD ch:%d  VUP:%0.2f VDOWN:%0.2f CurUP:%0.2f PUP:%0.2f ConsUP:%0.2f",_globalPowerMangerTemp->product_ch_id,_globalPowerMangerTemp->global_over_manager.product_vol_upper_threshold,_globalPowerMangerTemp->global_over_manager.product_vol_lower_threshold,
                     _globalPowerMangerTemp->global_over_manager.product_cur_upper_threshold,_globalPowerMangerTemp->global_over_manager.product_pwr_upper_threshold,_globalPowerMangerTemp->global_over_manager.product_pwrcon_upper_threshold);
         }

+ 7 - 7
pro/src/paras.c

@@ -2887,7 +2887,7 @@ static int proc_power(char *path, int op, GlobalPowerManger *power, int flag)
 
             memset(tmp, 0, sizeof(GlobalPowerManger));
             for(x=0; x<2; x++) {
-                for(i=1; i<=CH_MAX; i++) {
+                for(i=0; i<=CH_MAX; i++) {
                     sprintf(token, "power:channel%d.addr",i);
                     r = ini_rw(dic, token, &tmp->product_saddr, sizeof(tmp->product_saddr), TYPE_INT, op, 1); if(r) break;
                     tmp->product_ch_id = i;
@@ -2987,13 +2987,13 @@ static int proc_power(char *path, int op, GlobalPowerManger *power, int flag)
                         r = dev_update_power_manage_genera_info(dm->db, 0, tmp->product_ch_id, tmp);  if(r) break;
                         r = dev_update_power_manage_over_info(dm->db, 0, tmp->product_ch_id, tmp);    if(r) break;
 
-                        if(flag) {
+                        /*if(flag) {
                             r = get_power(tmp->product_ch_id, &pwr); if(r) break;
                             tmp->_PowerInfo = pwr._PowerInfo;
                             r = g_switch_set_all_single_threshold(&dm->_globalRelaySampManger,
                                                         tmp->product_ch_type, tmp->product_saddr,
-                                                        tmp->product_ch_addr, tmp, 0);
-                        }
+                                                        tmp->product_ch_addr, tmp, 1);
+                        }*/
                     }
                 }
 
@@ -3284,13 +3284,13 @@ static int proc_power3(char *path, int op, GlobalTreeACManager *power, int flag)
                         pwr.global_over_manager = tmp->global_over_manager;
                         r = dev_update_t_ac_power_manage_over_info(dm->db, tmp);    if(r) break;
 
-                        if(flag) {
+                       /* if(flag) {
                             r = g_switch_set_all_single_threshold(&dm->_globalRelaySampManger,
                                                         pwr.product_ch_type,
                                                         tmp->product_saddr,
                                                         tmp->product_ch_addr,
-                                                        &pwr, 0);
-                        }
+                                                        &pwr, 1);
+                        }*/
                     }
                 }