Browse Source

1、解决三相延时参数无刷新的bug
2、添加dns配置文件

guohui 2 years ago
parent
commit
aee15ab0c6
4 changed files with 27 additions and 4 deletions
  1. 13 0
      output/t113i/etc/dnsmasq.conf
  2. 1 3
      pro/src/app.c
  3. 10 0
      pro/src/cascade_slave.c
  4. 3 1
      pro/src/websocket_handle.c

+ 13 - 0
output/t113i/etc/dnsmasq.conf

@@ -0,0 +1,13 @@
+
+interface=eth0
+
+server=8.8.8.8
+server=114.114.114.114
+
+
+no-hosts
+no-resolv
+
+resolv-fil=/etc/dnsmasq.conf
+
+

+ 1 - 3
pro/src/app.c

@@ -536,12 +536,10 @@ void* power_thread(void* arg)
                     __globalDeviceManage.triphasic_mmap->chn_info[_chn].chn_freq  = _globalTotalPowerInfo._power_info.freq * 1000;
                     __globalDeviceManage.triphasic_mmap->chn_info[_chn].chn_power  = _globalTotalPowerInfo._power_info.power * 1000;
                     __globalDeviceManage.triphasic_mmap->chn_info[_chn].chn_factor  = _globalTotalPowerInfo._power_info.factor * 1000;
-                    
+                    _globalDeviceManager->triphasic_mmap->chn_status[_chn] = _globalPowerInfo._power_info.status;
                     _globalDeviceManager->triphasic_mmap->open_delay[_chn] = _globalPowerMangerTemp->product_ch_start_delay;
                     _globalDeviceManager->triphasic_mmap->close_delay[_chn] = _globalPowerMangerTemp->product_ch_stop_delay;
 
-
-
                     //累加总电源信息
                     _globalTotalPowerInfo.product_id = _globalDeviceManager->_global_device_info->product_id;
                     _globalTotalPowerInfo.product_ch_id = 0 ; //总电源通道信息为0

+ 10 - 0
pro/src/cascade_slave.c

@@ -441,6 +441,8 @@ void cascade_slave_write(uint32_t addr, uint16_t val)
                     if((start_chn+1) == _globalPowerMangerTemp->product_ch_id)
                     {
                         int ret = 0;
+
+                        _globalPowerMangerTemp->product_ch_start_delay = val;
                         if (__globalDeviceManage._global_device_info->product_pwr_type == SmartPDU_Tree_AC_Tree)
                         {
                             ret = g_switch_set_t_ac_start_time_delay(&__globalDeviceManage._globalRelaySampManger, 
@@ -475,6 +477,8 @@ void cascade_slave_write(uint32_t addr, uint16_t val)
                     if((start_chn+1) == _globalPowerMangerTemp->product_ch_id)
                     {
                         int ret = 0;
+
+                        _globalPowerMangerTemp->product_ch_stop_delay = val;
                         if (__globalDeviceManage._global_device_info->product_pwr_type == SmartPDU_Tree_AC_Tree)
                         {
                             ret = g_switch_set_t_ac_stop_time_delay(&__globalDeviceManage._globalRelaySampManger, 
@@ -509,6 +513,9 @@ void cascade_slave_write(uint32_t addr, uint16_t val)
                     {
                         int t_ac_CtrlType=0;
                         int nRet = 0;
+
+                        _globalPowerMangerTemp->product_ch_status = val;
+
                         GlobalTreeACManager *_globalTACManager = NULL;
                         list_for_each_entry(_globalTACManager, &_globalPowerMangerTemp->list_Tree_AC, list_Tree_AC)
                         {
@@ -535,6 +542,7 @@ void cascade_slave_write(uint32_t addr, uint16_t val)
                                 }else{
                                     phsts=0;
                                 }
+
                                 nRet= g_switch_set_t_ac_phchn_ctrl(&__globalDeviceManage._globalRelaySampManger,
                                                      _globalTACManager->product_saddr, 
                                                      _globalTACManager->product_ch_addr - 1, 
@@ -588,6 +596,8 @@ void cascade_slave_write(uint32_t addr, uint16_t val)
                     {
                         if (_globalPowerMangerTemp == NULL)
                             break;
+
+                        _globalPowerMangerTemp->product_ch_status = val;
                         int rec = g_switch_set_all_ctrl(&__globalDeviceManage._globalRelaySampManger, _globalPowerMangerTemp->product_ch_type, _globalPowerMangerTemp->product_saddr, val);
                         // printf("rec = %d 0x%x\n",rec,val);
                     }

+ 3 - 1
pro/src/websocket_handle.c

@@ -29,13 +29,15 @@ static ws_handle_t wsHandle;
 
 static int ws_broadcast(ws_handle_t *wh, void *data, int len) 
 {
+    int r=-1;
     mg_conn_t *c;
 
     for (c=wh->mgr.conns; c!=NULL; c=c->next) {
         mg_ws_send(c, data, len, WEBSOCKET_OP_TEXT);
+        r = 0;
     }
 
-    return 0;
+    return r;
 }