Browse Source

新项目出版本。

liyi 1 year ago
parent
commit
6a9397457b
4 changed files with 40 additions and 5 deletions
  1. BIN
      cust_data/logo/logo_aosens.png
  2. 29 2
      pro/config/cfg.h
  3. 2 2
      pro/src/common.c
  4. 9 1
      pub

BIN
cust_data/logo/logo_aosens.png


+ 29 - 2
pro/config/cfg.h

@@ -33,14 +33,15 @@
 //#define PRJ_YST_AC_I1_O1
 //#define PRJ_YUNNAN_AC_I1_O1
 
-#define PRJ_DUALWIRES_AC_I3_O2
+//#define PRJ_DUALWIRES_AC_I3_O2
 
 //#define PRJ_IP_AC_I3_O3
 //#define PRJ_IP_AC_I3_O1
 //#define PRJ_IP_AC_I1_O1
 //#define PRJ_IP_YUNNAN_AC_I1_O1
 //#define PRJ_IP_CHONGQING_AC_I1_O1
-
+//#define PRJ_IP_AOSENS_AC_I1_O1
+#define PRJ_IP_AOSENS_DC_I_O
 #define USE_MAIL
 #define MAIL_SEND_BUILTIN
 
@@ -418,6 +419,32 @@
     #define PROD_POWER_TYPE                     0
     #define USE_BEEP                            1
     #define USE_LED                             1
+#elif (defined PRJ_IP_AOSENS_AC_I1_O1)
+    #define LANGUAGE                            1
+    #define SMPLE_TIME                          30          //ms
+    #define SAVE_TIME                           60000       //ms
+    #define CASCADE_CNT                         0      
+
+    #define PHASE_GROUP                         8
+    #define CHANNEL_DELAY                       8
+    #define PROD_POWER_TYPE                     0
+    #define USE_BEEP                            1
+    #define USE_LED                             1    
+    #define BRD_MAX                             1
+    #define NOT_USE_CONTROL
+#elif (defined PRJ_IP_AOSENS_DC_I_O)
+    #define LANGUAGE                            0
+    #define SMPLE_TIME                          30          //ms
+    #define SAVE_TIME                           60000       //ms
+    #define CASCADE_CNT                         0      
+
+    #define PHASE_GROUP                         8
+    #define CHANNEL_DELAY                       8
+    #define PROD_POWER_TYPE                     1
+    #define USE_BEEP                            1
+    #define USE_LED                             1    
+    #define BRD_MAX                             1
+
 #else
     #error define a PRJ_XXXX please!
 #endif

+ 2 - 2
pro/src/common.c

@@ -925,7 +925,7 @@ void SetMenuAuthority(int RoleID)
 #else
          _GlobalMenuAuthority.GjsjEnabled = false;
 #endif
-        _GlobalMenuAuthority.KzbsjEnabled = true;
+        _GlobalMenuAuthority.KzbsjEnabled = false;
         _GlobalMenuAuthority.HhccszEnabled = true;
         _GlobalMenuAuthority.PzdrdcEnabled = true;
         _GlobalMenuAuthority.ShfwEnabled = true;
@@ -995,7 +995,7 @@ void SetMenuAuthority(int RoleID)
 #else
         _GlobalMenuAuthority.GjsjEnabled = true;
 #endif
-        _GlobalMenuAuthority.KzbsjEnabled = true;
+        _GlobalMenuAuthority.KzbsjEnabled = false;
         _GlobalMenuAuthority.HhccszEnabled = false;
         _GlobalMenuAuthority.PzdrdcEnabled = true;
         _GlobalMenuAuthority.ShfwEnabled = false;

+ 9 - 1
pub

@@ -18,7 +18,7 @@
 #PRJS="PRJ_SG_I3_O3"
 #PRJS="PRJ_ESOUTH_DC_I1_O4_RGB5"
 #PRJS="PRJ_TEST"
-PRJS="PRJ_TEST_AC_I1_O1"
+#PRJS="PRJ_TEST_AC_I1_O1"
 #PRJS="PRJ_TEST_AC_I3_O1"
 #PRJS="PRJ_TEST_AC_I3_O3"
 #PRJS="PRJ_INST2302_DC_OLED"
@@ -40,6 +40,8 @@ PRJS="PRJ_TEST_AC_I1_O1"
 #PRJS="PRJ_IP_AC_I1_O1"
 #PRJS="PRJ_IP_YUNNAN_AC_I1_O1"
 #PRJS="PRJ_IP_CHONGQING_AC_I1_O1"
+#PRJS="PRJ_IP_AOSENS_AC_I1_O1"
+PRJS="PRJ_IP_AOSENS_DC_I_O"
 
 fulldir=$(realpath $0)
 curdir=$(dirname $fulldir)
@@ -184,6 +186,12 @@ function do_copy()
     elif [ "$1" = "PRJ_IP_CHONGQING_AC_I1_O1" ];then
         cp -f $custdir/logo/logo_gowone.png $appdir/image/logo.png
         name=ip_ac_chongqing_in1_out1_release
+    elif [ "$1" = "PRJ_IP_AOSENS_AC_I1_O1" ];then
+        # cp -f $custdir/logo/logo_aosens.png $appdir/image/logo.png
+        name=ip_ac_in1_out1_release
+    elif [ "$1" = "PRJ_IP_AOSENS_DC_I_O" ]; then
+        cp -f $custdir/logo/logo_aosens.png $appdir/image/logo.png
+        name=ip_dc_aosens_in1_out1_release
     else
         echo error! $RPJ not define!!!
         exit 1