1、增加stsc配置

pro/src/app.c

@@ -1150,7 +1150,7 @@ void sensor_alarm(GlobalSensorManger *_globalSensorMangerTemp, int nAlarmType)
         break;
 
     default:
-        break;
+        return;
     }
     if (!(pValthreshold && penable && pValData && pSave))
     {
@@ -1367,8 +1367,10 @@ void* sensor_thread(void* arg)
                 if(_globalDeviceManager->_globalDevInfo.product_pwr_type == SmartPDU_AC ||
                 _globalDeviceManager->_globalDevInfo.product_pwr_type == SmartPDU_DC)
                 {
-                    _globalDeviceManager->single_mmap->total_temp.temperature = _globalSensorInfo.val1 *100;
-                    _globalDeviceManager->single_mmap->total_temp.humidity = _globalSensorInfo.val2 *100;
+                    if(_globalDeviceManager->single_mmap) {
+                        _globalDeviceManager->single_mmap->total_temp.temperature = _globalSensorInfo.val1 *100;
+                        _globalDeviceManager->single_mmap->total_temp.humidity = _globalSensorInfo.val2 *100;
+                    }
                 }else
                 {
                     if (_globalDeviceManager->triphasic_mmap)
@@ -1902,7 +1904,7 @@ int _global_device_manage_init(GlobalDeviceManager* _globalDeviceManager)
     log_d("GCPDU init begin!");
     ResetChmData(0);
 
-
+#if 1
     //初始化传感器列表
     INIT_LIST_HEAD(&_globalDeviceManager->_globalSensorManger.list);
     INIT_LIST_HEAD(&_globalDeviceManager->g_new_global_breaker.list);
@@ -1930,9 +1932,6 @@ int _global_device_manage_init(GlobalDeviceManager* _globalDeviceManager)
     else
         log_d("get breaker info ok.");
 
-#if 1
-    //创建modbus采集线程 继电器控制线程
-    #if(OS_HANDWARE==1)
     _globalDeviceManager->dev_samp_flag = true;
     thread_start(THREAD_ID_POWER, power_thread, _globalDeviceManager, 20*MB, 0);
     thread_start(THREAD_ID_SENSOR, sensor_thread, _globalDeviceManager, 10*MB, 0);
@@ -1942,9 +1941,6 @@ int _global_device_manage_init(GlobalDeviceManager* _globalDeviceManager)
     thread_start(THREAD_ID_BREAKER, breaker_thread, _globalDeviceManager, 5*MB, 0);
 
     dev_Alarm_Run_message(_globalDeviceManager,language_alarm_Init_Success[0],"Server Thread");
-    
-   #endif
-    //创建传感器采集控制线程
 
     ret = dev_get_ntp_info(_globalDeviceManager->db,  &_globalNTPManager);
     if (ret == -1)

pro/src/sys.c

@@ -940,6 +940,7 @@ int sys_get_disk_ava_MB(char *path)
     int avaMB = (st.f_frsize*st.f_bavail)/(1024*1024);
     //int freeMB = (st.f_frsize*st.f_bfree)/(1024*1024);
     //printf("____ava: %dMB, free %dMB\n", avaMB, freeMB);
+	LOGD("___ RomAvailable rom: %dMB\n", avaMB);
 
     return avaMB;
 }
@@ -948,7 +949,7 @@ int sys_get_disk_ava_MB(char *path)
 int sys_get_mem_ava_MB(void)
 {
     int r;
-    long v1=0,v2;
+    long v1=0,v2=0;
     char buf[32];
     struct sysinfo info;
 
@@ -1183,7 +1184,6 @@ static void mem_check(void)
 
     if(mem_cnt%ROM_PERIOD==0) {
         avaMB = sys_get_disk_ava_MB("/");
-        LOGD("___ available rom: %dMB, threshold: %dMB\n", avaMB, ROM_THRD);
         if(avaMB<ROM_THRD) {
             flag = 1;
         }

pub

@@ -1,23 +1,25 @@
 
-#PRJ="PRJ_XIAN_P4"
-#PRJ="PRJ_XIAN_P8"
-#PRJ="PRJ_ITK_AC_I1_O1"
-#PRJ="PRJ_ITK_AC_I3_O1"
-#PRJ="PRJ_LITECH_AC_I1_O1"
-#PRJ="PRJ_LITECH_AC_I3_O1"
-#PRJ="PRJ_ANDERSON"
-#PRJ="PRJ_USASL_AC_I3_O1"
-#PRJ="PRJ_USASL_AC_I3_O3"
-#PRJ="PRJ_HYPERTEC"
-#PRJ="PRJ_INSPUR"
-#PRJ="PRJ_GOWONE_AC_I1_O1"
-#PRJ="PRJ_GOWONE_AC_I3_O1"
-#PRJ="PRJ_GOWONE_AC_I3_O3"
-#PRJ="PRJ_TEST"
-
-#PRJS="PRJ_ITK_AC_I1_O1 PRJ_ITK_AC_I3_O1 PRJ_USASL_AC_I3_O1 PRJ_USASL_AC_I3_O3 PRJ_XIAN_P4 PRJ_XIAN_P8"
+#PRJS="PRJ_XIAN_P4"
+#PRJS="PRJ_XIAN_P8"
+#PRJS="PRJ_ITK_AC_I1_O1"
+#PRJS="PRJ_ITK_AC_I3_O1"
+#PRJS="PRJ_LITECH_AC_I1_O1"
+#PRJS="PRJ_LITECH_AC_I3_O1"
+#PRJS="PRJ_ANDERSON"
+#PRJS="PRJ_USASL_AC_I3_O1"
+#PRJS="PRJ_USASL_AC_I3_O3"
+#PRJS="PRJ_HYPERTEC"
+#PRJS="PRJ_INSPUR"
+#PRJS="PRJ_GOWONE_AC_I1_O1"
+#PRJS="PRJ_GOWONE_AC_I3_O1"
+#PRJS="PRJ_GOWONE_AC_I3_O3"
+#PRJS="PRJ_STSC_I3_O3"
 #PRJS="PRJ_TEST"
-PRJS="PRJ_ANDERSON"
+
+#PRJS="PRJ_USASL_AC_I3_O1 PRJ_USASL_AC_I3_O3"
+#PRJS="PRJ_TEST"
+#PRJS="PRJ_ANDERSON"
+PRJS="PRJ_XIAN_P4 PRJ_XIAN_P8 PRJ_ITK_AC_I1_O1 PRJ_ITK_AC_I3_O1 PRJ_STSC_I3_O3"
 
 fulldir=$(realpath $0)
 curdir=$(dirname $fulldir)
@@ -51,14 +53,16 @@ function do_copy()
         cp -f $custdir/logo/logo_neuter.png $curdir/output/t113i/root/run/app/image/logo.png
     elif [ "$PRJ" = "PRJ_ITK_AC_I1_O1" ]; then
         name=ac_in1_out1_russia_itk
-        cp -rf $custdir/web/general  $curdir/output/t113i/root/run/web
+        #cp -rf $custdir/web/general  $curdir/output/t113i/root/run/web
+        cp -rf $custdir/web816/general  $curdir/output/t113i/root/run/web
         cp -rf $custdir/cfg/cfg_russia_itk.h  $curdir/pro/config/cfg.h
 
         cp -f $custdir/db/ac_i1_o1_russian.db $curdir/output/t113i/root/run/app/pdu_dat.db
         cp -f $custdir/logo/logo_itk.png $curdir/output/t113i/root/run/app/image/logo.png
     elif [ "$PRJ" = "PRJ_ITK_AC_I3_O1" ]; then
         name=ac_in3_out1_russia_itk
-        cp -rf $custdir/web/general  $curdir/output/t113i/root/run/web
+        #cp -rf $custdir/web/general  $curdir/output/t113i/root/run/web
+        cp -rf $custdir/web816/general  $curdir/output/t113i/root/run/web
         cp -rf $custdir/cfg/cfg_russia_itk.h  $curdir/pro/config/cfg.h
 
         cp -f $custdir/db/ac_i3_o1_russian.db $curdir/output/t113i/root/run/app/pdu_dat.db
@@ -108,14 +112,16 @@ function do_copy()
         cp -f $custdir/logo/logo_neuter.png $curdir/output/t113i/root/run/app/image/logo.png
     elif [ "$PRJ" = "PRJ_USASL_AC_I3_O1" ]; then
         name=ac_in3_out1_usa_sl
-        cp -rf $custdir/web/general  $curdir/output/t113i/root/run/web
+        #cp -rf $custdir/web/general  $curdir/output/t113i/root/run/web
+        cp -rf $custdir/web816/general  $curdir/output/t113i/root/run/web
         cp -rf $custdir/cfg/cfg_usa_sl.h  $curdir/pro/config/cfg.h
         
         cp -f $custdir/db/ac_i3_o1_english.db $curdir/output/t113i/root/run/app/pdu_dat.db
         cp -f $custdir/logo/logo_neuter.png $curdir/output/t113i/root/run/app/image/logo.png
     elif [ "$PRJ" = "PRJ_USASL_AC_I3_O3" ]; then
         name=ac_in3_out3_usa_sl
-        cp -rf $custdir/web/general  $curdir/output/t113i/root/run/web
+        #cp -rf $custdir/web/general  $curdir/output/t113i/root/run/web
+        cp -rf $custdir/web816/general  $curdir/output/t113i/root/run/web
         cp -rf $custdir/cfg/cfg_hypertec.h  $curdir/pro/config/cfg.h
         
         cp -f $custdir/db/ac_i3_o3_english.db $curdir/output/t113i/root/run/app/pdu_dat.db
@@ -141,6 +147,13 @@ function do_copy()
         
         cp -f $custdir/db/ac_i3_o1_chinese.db $curdir/output/t113i/root/run/app/pdu_dat.db
         cp -f $custdir/logo/logo_neuter.png $curdir/output/t113i/root/run/app/image/logo.png
+    elif [ "$PRJ" = "PRJ_STSC_I3_O3" ]; then
+        name=dc_in3_out3_stsc
+        cp -rf $custdir/web/general  $curdir/output/t113i/root/run/web
+        cp -rf $custdir/cfg/cfg_general.h  $curdir/pro/config/cfg.h
+        
+        cp -f $custdir/db/ac_i3_o3_english.db $curdir/output/t113i/root/run/app/pdu_dat.db
+        cp -f $custdir/logo/logo_neuter.png $curdir/output/t113i/root/run/app/image/logo.png
     else
         echo error! $RPJ not define!!!
         exit 1