|
@@ -2887,7 +2887,7 @@ static int proc_power(char *path, int op, GlobalPowerManger *power, int flag)
|
|
|
|
|
|
|
|
memset(tmp, 0, sizeof(GlobalPowerManger));
|
|
memset(tmp, 0, sizeof(GlobalPowerManger));
|
|
|
for(x=0; x<2; x++) {
|
|
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);
|
|
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;
|
|
r = ini_rw(dic, token, &tmp->product_saddr, sizeof(tmp->product_saddr), TYPE_INT, op, 1); if(r) break;
|
|
|
tmp->product_ch_id = i;
|
|
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_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;
|
|
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;
|
|
r = get_power(tmp->product_ch_id, &pwr); if(r) break;
|
|
|
tmp->_PowerInfo = pwr._PowerInfo;
|
|
tmp->_PowerInfo = pwr._PowerInfo;
|
|
|
r = g_switch_set_all_single_threshold(&dm->_globalRelaySampManger,
|
|
r = g_switch_set_all_single_threshold(&dm->_globalRelaySampManger,
|
|
|
tmp->product_ch_type, tmp->product_saddr,
|
|
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;
|
|
pwr.global_over_manager = tmp->global_over_manager;
|
|
|
r = dev_update_t_ac_power_manage_over_info(dm->db, tmp); if(r) break;
|
|
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,
|
|
r = g_switch_set_all_single_threshold(&dm->_globalRelaySampManger,
|
|
|
pwr.product_ch_type,
|
|
pwr.product_ch_type,
|
|
|
tmp->product_saddr,
|
|
tmp->product_saddr,
|
|
|
tmp->product_ch_addr,
|
|
tmp->product_ch_addr,
|
|
|
- &pwr, 0);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ &pwr, 1);
|
|
|
|
|
+ }*/
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|