Просмотр исходного кода

1、清了一下alarm表数据,段错误崩溃暂时未出现
2、误改到通道数,恢复

guohui лет назад: 2
Родитель
Сommit
7affea70eb
3 измененных файлов с 7 добавлено и 4 удалено
  1. 1 1
      pro/config/cfg.h
  2. 4 2
      pro/src/app.c
  3. 2 1
      pro/src/appweb_handle.c

+ 1 - 1
pro/config/cfg.h

@@ -60,7 +60,7 @@
     #endif
     
     #undef MAX_CHN_COUNT
-    #define MAX_CHN_COUNT               16//24
+    #define MAX_CHN_COUNT               24
 #endif
 
 ////////////////////////////////////////////////////

+ 4 - 2
pro/src/app.c

@@ -2331,7 +2331,8 @@ int _global_device_manage_init(GlobalDeviceManager* _globalDeviceManager)
             }
         }
     }
-    
+
+#if 1
     sprintf(strLog,"%s$|$通道",language_alarm_Init_Success[0]);
     char number[10];
     sprintf(number,"%d",chn-1);
@@ -2416,7 +2417,8 @@ int _global_device_manage_init(GlobalDeviceManager* _globalDeviceManager)
     dev_Alarm_Run_message(_globalDeviceManager, language_alarm_Init_Success[0], "NTP");
     thread_start(THREAD_ID_SNMP, snmp_thread, _globalDeviceManager, 10 * MB, 0);
     dev_Alarm_Run_message(_globalDeviceManager, language_alarm_Init_Success[0], "SNMP");
-    
+ #endif
+
     // 初始化web
     websocket_init();
     appweb_init();

+ 2 - 1
pro/src/appweb_handle.c

@@ -189,12 +189,13 @@ static void http_mg_cb(struct mg_connection *c, int ev, void *ev_data)
 
     if (ev == MG_EV_HTTP_MSG) {
         struct mg_http_message *hm = ev_data;
+        
         for(i=0; i<h->cnt; i++) {
             if (h->fn[i].f && h->fn[i].uri && mg_match(hm->uri, mg_str(h->fn[i].uri), NULL)) {
                 h->fn[i].f(&s);
                 flag = 1;
             }
-        } 
+        }
 
         if (flag==0) {
             struct mg_http_serve_opts opts = {.root_dir = h->rootDir};