更新配置，改传感器名字翻译

pro/config/cfg.h

@@ -2,11 +2,11 @@
 #define __CONFIG_Hx__
 
 
-#define VERSION                         "V0.0.1"
+#define VERSION                                 "V0.0.1"
 
 
-#define PROD_ID                         0
-#define PROD_TYPE                       1
+#define PROD_ID                                 0
+#define PROD_TYPE                               1
 
 
 /////////////customer demannd//////////////////////
@@ -15,8 +15,8 @@
 //#define PRJ_USASL_AC_I3_O1
 //#define PRJ_USASL_AC_I3_O3
 //#define PRJ_ITK_AC_I1_O1
-//#define PRJ_ITK_AC_I3_O1
-#define PRJ_STSC_I3_O3
+#define PRJ_ITK_AC_I3_O1
+//#define PRJ_STSC_I3_O3
 //#define PRJ_INSPUR_DC_I_DC_O
 //#define PRJ_ANDERSON_AC_I3_O3
 //#define PRJ_HYPERTEC_AC_I3_O1
@@ -24,14 +24,13 @@
 
 
 #if (defined PRJ_XIAN_AC_I1_O1_P4) || (defined PRJ_XIAN_AC_I1_O1_P8)  //GOM037
-#define LANGUAGE                        0           //chinese
-#define SMPLE_TIME                      30          //ms
-#define SAVE_TIME                       60000       //ms
-#define CASCADE_CNT                     5
-
-#define MAX_CHN_COUNT                   16
-#define PHASE_GROUP_CNT                 8
+#define LANGUAGE                            0           //chinese
+#define SMPLE_TIME                          30          //ms
+#define SAVE_TIME                           60000       //ms
+#define CASCADE_CNT                         5
 
+#define MAX_CHN_COUNT                       16
+#define PHASE_GROUP_CNT                     8
 
 #ifdef PRJ_XIAN_AC_I1_O1_P4
 //#define GOM037PDU_GC20_04K_125H        //ac_in1_out1_40a_p4_5ch_nologo_cn
@@ -44,17 +43,17 @@
 #define USE_SMTP
 #define SMTP_SEND_BUILTIN
 
-#define PROD_POWER_TYPE                 0
-#define IN_INDEX_MAP                    {3,2,0,1}
+#define PROD_POWER_TYPE                     0
+#define IN_INDEX_MAP                        {3,2,0,1}
 #elif (defined PRJ_USASL_AC_I3_O1) || (defined PRJ_USASL_AC_I3_O3)
 
-#define LANGUAGE                        1           //english
-#define SMPLE_TIME                      30          //ms
-#define SAVE_TIME                       60000       //ms
-#define CASCADE_CNT                     5
+#define LANGUAGE                            1           //english
+#define SMPLE_TIME                          30          //ms
+#define SAVE_TIME                           60000       //ms
+#define CASCADE_CNT                         5
 
-#define MAX_CHN_COUNT                   16
-#define PHASE_GROUP_CNT                 8
+#define MAX_CHN_COUNT                       16
+#define PHASE_GROUP_CNT                     8
 
 #define USE_SMTP
 #define SMTP_SEND_BUILTIN
@@ -68,13 +67,13 @@
 #endif
 #elif (defined PRJ_ITK_AC_I1_O1) || (defined PRJ_ITK_AC_I3_O1)
 
-#define LANGUAGE                        2           //russia
-#define SMPLE_TIME                      30          //ms
-#define SAVE_TIME                       60000       //ms
-#define CASCADE_CNT                     5
+#define LANGUAGE                            2           //russia
+#define SMPLE_TIME                          30          //ms
+#define SAVE_TIME                           60000       //ms
+#define CASCADE_CNT                         5
 
-#define MAX_CHN_COUNT                   16
-#define PHASE_GROUP_CNT                 8
+#define MAX_CHN_COUNT                       16
+#define PHASE_GROUP_CNT                     8
 
 #define USE_SMTP
 #define SMTP_SEND_BUILTIN
@@ -87,13 +86,13 @@
 
 #elif (defined PRJ_LITECH_AC_I1_O1) || (defined PRJ_LITECH_AC_I3_O1)
 
-#define LANGUAGE                        1           //english
-#define SMPLE_TIME                      30          //ms
-#define SAVE_TIME                       60000       //ms
-#define CASCADE_CNT                     5
+#define LANGUAGE                            1           //english
+#define SMPLE_TIME                          30          //ms
+#define SAVE_TIME                           60000       //ms
+#define CASCADE_CNT                         5
 
-#define MAX_CHN_COUNT                   16
-#define PHASE_GROUP_CNT                 8
+#define MAX_CHN_COUNT                       16
+#define PHASE_GROUP_CNT                     8
 
 #define USE_SMTP
 #define SMTP_SEND_BUILTIN
@@ -104,34 +103,34 @@
 #define PROD_POWER_TYPE                 5
 #endif
 #elif defined PRJ_STSC_I3_O3
-#define LANGUAGE                        1           //english
-#define SMPLE_TIME                      30          //ms
-#define SAVE_TIME                       60000       //ms
-#define CASCADE_CNT                     5
+#define LANGUAGE                            1           //english
+#define SMPLE_TIME                          30          //ms
+#define SAVE_TIME                           60000       //ms
+#define CASCADE_CNT                         5
 
-#define MAX_CHN_COUNT                   24
-#define PHASE_GROUP_CNT                 8
+#define MAX_CHN_COUNT                       24
+#define PHASE_GROUP_CNT                     8
 
 #define USE_SMTP
 #define SMTP_SEND_BUILTIN
 
-#define PROD_POWER_TYPE                 3
+#define PROD_POWER_TYPE                     3
 #elif defined PRJ_ANDERSON_AC_I3_O3
 
-#define LANGUAGE                        1           //english
-#define SMPLE_TIME                      30          //ms
-#define SAVE_TIME                       60000       //ms
-#define CASCADE_CNT                     5
+#define LANGUAGE                            1           //english
+#define SMPLE_TIME                          30          //ms
+#define SAVE_TIME                           60000       //ms
+#define CASCADE_CNT                         5
 
-#define MAX_CHN_COUNT                   24
-#define PHASE_GROUP_CNT                 8
+#define MAX_CHN_COUNT                       24
+#define PHASE_GROUP_CNT                     8
 
 #define USE_SMTP
 #define SMTP_SEND_BUILTIN
 
 #define SW_STATIC_PORT_START
-#define SW_PORT_INDEX_START             0
-#define SW_PORT_INDEX_END               21
+#define SW_PORT_INDEX_START                 0
+#define SW_PORT_INDEX_END                   21
 #elif defined PRJ_HYPERTEC_AC_I3_O1
 //ac_in3_out1_36ch_nologo_en_hypertec
 #define USE_SMTP
@@ -140,13 +139,13 @@
 #undef PHASE_GROUP_CNT
 #undef CHANNEL_DELAY_SEC
 
-#define PHASE_GROUP_CNT                 6
-#define CHANNEL_DELAY_SEC               6
+#define PHASE_GROUP_CNT                     6
+#define CHANNEL_DELAY_SEC                   6
 #elif defined PRJ_INSPUR_DC_I_DC_O
 #define USE_SMTP
 #define SMTP_SEND_BUILTIN
 
-#define PROD_POWER_TYPE                 1
+#define PROD_POWER_TYPE                     1
 #elif defined PRJ_TEST
 //#define USE_SMTP
 //#define SMTP_SEND_BUILTIN
@@ -155,14 +154,13 @@
 //#define MQTT_SERVER_BUILTIN
 
 #undef MAX_CHN_COUNT
-#define MAX_CHN_COUNT                   2//4
+#define MAX_CHN_COUNT                       2//4
 
-#define PROD_POWER_TYPE                 3
+#define PROD_POWER_TYPE                     3
 #else
 #error define a PRJ_XXXX please!
 #endif
 
-
 #endif
 
 

pro/src/app.c

@@ -1967,7 +1967,7 @@ int _global_device_manage_init(GlobalDeviceManager* _globalDeviceManager)
     chn = 1 ;
     nTac_chn=3;
 
-    int nGroups=CHANNEL_DELAY_SEC;
+    //int nGroups=CHANNEL_DELAY_SEC;
     char strLog[200]={"MODBUS"};
     dev_Alarm_Run_message(_globalDeviceManager,language_alarm_Init_Success[0],strLog);
     log_d("GCPDU init begin!");

pro/src/appweb_handle.c

@@ -1877,8 +1877,7 @@ static void sensorStatusMonitoring(void* conn)
             memset(_overSensorBackInfoTemp,0,sizeof(_OverSensorBackInfo));
             //基本信息
             _overSensorBackInfoTemp->sensorId = _globalSensorManagerTemp->sensor_id;
-            memcpy(&_overSensorBackInfoTemp->sensorName,&_globalSensorManagerTemp->sensor_name,sizeof(_overSensorBackInfoTemp->sensorName));
-            //strcpy(_overSensorBackInfoTemp->sensorName,_globalSensorManagerTemp->sensor_name);
+            strcpy(_overSensorBackInfoTemp->sensorName,language_sensor_name[__globalDeviceManage._globalDevInfo.product_language][(int)_globalSensorManagerTemp->sensor_type]);
             _overSensorBackInfoTemp->sensorType = _globalSensorManagerTemp->sensor_type;
             memcpy(&_overSensorBackInfoTemp->comSlogan,&_globalSensorManagerTemp->sensor_port_name,sizeof(_overSensorBackInfoTemp->comSlogan));
             //strcpy(_overSensorBackInfoTemp->comSlogan,_globalSensorManagerTemp->sensor_port_name);
@@ -2341,7 +2340,8 @@ static void sensorStatusMonitoring(void* conn)
             memset(_overSensorBackInfoTemp, 0, sizeof(_OverSensorBackInfo));
             // 基本信息
             _overSensorBackInfoTemp->sensorId = _globalSensorMangerSTemp->sensor_id;
-            strcpy(_overSensorBackInfoTemp->sensorName, _globalSensorMangerSTemp->sensor_name);
+            strcpy(_overSensorBackInfoTemp->sensorName,language_sensor_name[__globalDeviceManage._globalDevInfo.product_language][(int)_globalSensorMangerSTemp->sensor_type]);
+
             _overSensorBackInfoTemp->sensorType = _globalSensorMangerSTemp->sensor_type;
             strcpy(_overSensorBackInfoTemp->comSlogan, _globalSensorMangerSTemp->sensor_port_name);
             // 485独有

pro/src/json_handle.c

@@ -2860,8 +2860,8 @@ char *ws_sensor_status_ack_to_json(GlobalSensorManger *_globalSensorManger)
         memset(_overSensorBackInfoTemp, 0, sizeof(_OverSensorBackInfo));
         // 基本信息
         _overSensorBackInfoTemp->sensorId = _globalSensorManagerTemp->sensor_id;
-        memcpy(&_overSensorBackInfoTemp->sensorName, &_globalSensorManagerTemp->sensor_name, sizeof(_overSensorBackInfoTemp->sensorName));
-        // strcpy(_overSensorBackInfoTemp->sensorName,_globalSensorManagerTemp->sensor_name);
+        strcpy(_overSensorBackInfoTemp->sensorName,language_sensor_name[__globalDeviceManage._globalDevInfo.product_language][(int)_globalSensorManagerTemp->sensor_type]);
+        
         _overSensorBackInfoTemp->sensorType = _globalSensorManagerTemp->sensor_type;
         memcpy(&_overSensorBackInfoTemp->comSlogan, &_globalSensorManagerTemp->sensor_port_name, sizeof(_overSensorBackInfoTemp->comSlogan));
         // strcpy(_overSensorBackInfoTemp->comSlogan,_globalSensorManagerTemp->sensor_port_name);

pro/src/language_common.c

@@ -284,7 +284,7 @@ const char language_firmware_upgrade[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 const char language_back_factor_upgrade[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
 {
     "恢复出厂设置",
-    "firmware upgrade",
+    "Return to factory settings",
     "Восстановление заводских настроек",
     " "
 } ;
@@ -637,4 +637,51 @@ const char language_sensor_access[LANGUAGE_TYPE][LANGUAGE_SIZE] =
     "Access",
     "Вход",
     " "
-} ;
+} ;
+
+const char* language_sensor_name[LANGUAGE_TYPE][8] = 
+{
+    {
+        "温湿度传感器",
+        "烟雾传感器",
+        "水浸传感器",
+        "门禁传感器",
+        "燃气传感器",
+        "气压传感器",
+        "空调传感器",
+        "温度传感器",
+    },
+
+    {
+        "Temperature and humidity sensor",
+        "Smoke sensor",
+        "Water Leak Sensor",
+        "Access Control Sensor",
+        "Gas Sensor",
+        "Pressure Sensor",
+        "Air Conditioner Infrared Sensor",
+        "Temperature sensor",
+    },
+    
+    {
+        "Датчик температуры и влажности",
+        "Датчик дыма",
+        "Датчик воды",
+        "Датчик доступа",
+        "Датчик подачи газа",
+        "Датчик давления",
+        "Инфракрасный датчик кондиционера",
+        "Датчик температуры",
+    },
+
+    {
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+    },
+};

pro/src/language_common.h

@@ -160,4 +160,6 @@ extern const char language_exceed[LANGUAGE_TYPE][LANGUAGE_SIZE];
 extern const char language_sensor_smoke[LANGUAGE_TYPE][LANGUAGE_SIZE];
 extern const char language_sensor_access[LANGUAGE_TYPE][LANGUAGE_SIZE];
 
+extern const char* language_sensor_name[LANGUAGE_TYPE][8];
+
 #endif

pub

@@ -14,12 +14,12 @@
 #PRJS="PRJ_RELEASE_AC_I1_O1"
 #PRJS="PRJ_RELEASE_AC_I3_O1"
 #PRJS="PRJ_RELEASE_AC_I3_O3"
-PRJS="PRJ_STSC_I3_O3"
+#PRJS="PRJ_STSC_I3_O3"
 #PRJS="PRJ_TEST"
 
 #PRJS="PRJ_USASL_AC_I3_O1 PRJ_USASL_AC_I3_O3"
 #PRJS="PRJ_XIAN_AC_I1_O1_P4 PRJ_XIAN_AC_I1_O1_P8"
-#PRJS="PRJ_ITK_AC_I1_O1 PRJ_ITK_AC_I3_O1"
+PRJS="PRJ_ITK_AC_I1_O1 PRJ_ITK_AC_I3_O1"
 #PRJS="PRJ_LITECH_AC_I1_O1 PRJ_LITECH_AC_I3_O1"
 #PRJS="PRJ_RELEASE_DC_I_DC_O PRJ_RELEASE_AC_I1_O1 PRJ_RELEASE_AC_I3_O1 PRJ_RELEASE_AC_I3_O3"
 
@@ -59,6 +59,8 @@ function do_copy()
     
     rm -f $curdir/output/t113i/etc/network/interfaces
     mkdir -p $curdir/output/t113i/root/run/app/image
+
+    rm -rf $curdir/output/t113i/root/run/web
     cp -rf $custdir/web/general  $curdir/output/t113i/root/run/web
     
     if [ "$1" = "PRJ_XIAN_AC_I1_O1_P4" ]; then