Ver código fonte

1、增加军工2503项目打包配置

liyuezong 11 meses atrás
pai
commit
5a2a025445
3 arquivos alterados com 31 adições e 3 exclusões
  1. 17 2
      pro/config/cfg.h
  2. 6 0
      pro/src/app.c
  3. 8 1
      pub

+ 17 - 2
pro/config/cfg.h

@@ -30,7 +30,7 @@
 //#define PRJ_ESOUTH_DC_I1_O4_RGB5
 //#define PRJ_CHANGCHUN_AC_I1_O1_OLED
 //#define PRJ_JUNGONG_KEKONG_AC_I1_O1_OLED
-#define PRJ_INSPUR_AC_I1_O1
+//#define PRJ_INSPUR_AC_I1_O1
 
 //#define PRJ_TIDA_AC_I3_O1
 //#define PRJ_INST2302_DC_OLED
@@ -40,6 +40,7 @@
 //#define PRJ_BYD_UPS_AC_I1_O1
 //#define PRJ_DUALWIRES_AC_I3_O2
 //#define PRJ_2405_AC_I1_O1_OLED
+#define PRJ_2503_AC_I1_O1_OLED
 
 //#define PRJ_IP_AC_I3_O3
 //#define PRJ_IP_AC_I3_O1
@@ -281,8 +282,22 @@
     #define BRD_MAX                             3
 
     #define USE_UI
+#elif defined PRJ_2503_AC_I1_O1_OLED
+    #define LANGUAGE                            0           //chinese
+    #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 BRD_MAX                             4
+
+    #define USE_UI
+
+    #define USE_WATCHDOG
 #elif defined PRJ_CHANGCHUN_AC_I1_O1_OLED
     #define LANGUAGE                            0           //chinese
     #define SMPLE_TIME                          30          //ms

+ 6 - 0
pro/src/app.c

@@ -1118,6 +1118,12 @@ static void* power_thread(void* arg)
             }   
 #endif
 
+#ifdef PRJ_2503_AC_I1_O1_OLED
+            if (_globalPowerMangerTemp->product_ch_id>6  )
+            {
+                _globalPowerInfo._power_info.OperAllowFlag=1;
+            }   
+#endif
             //全局记录一份数据
             if (!isErrorBreak)
             {

+ 8 - 1
pub

@@ -30,11 +30,12 @@
 #PRJS="PRJ_GOWONE_125A_AC_I3_O1"
 #PRJS="PRJ_Malaysia_AC_I3_O1"
 #PRJS="PRJ_2405_AC_I1_O1_OLED"
+PRJS="PRJ_2503_AC_I1_O1_OLED"
 #PRJS="PRJ_CHANGCHUN_AC_I1_O1_OLED"
 #PRJS="PRJ_TIDA_AC_I3_O1"
 #PRJS="PRJ_BYD_UPS_AC_I1_O1"
 #PRJS="PRJ_JUNGONG_KEKONG_AC_I1_O1_OLED"
-PRJS="PRJ_INSPUR_AC_I1_O1"
+#PRJS="PRJ_INSPUR_AC_I1_O1"
 
 #PRJS="PRJ_USASL_AC_I3_O1 PRJ_USASL_AC_I3_O3"
 #PRJS="PRJ_XIAN_AC_I1_O1_P4 PRJ_XIAN_AC_I1_O1_P8"
@@ -160,10 +161,13 @@ function do_copy()
         name=ac_in3_out1_test
     elif [ "$1" = "PRJ_TEST_AC_I1_O1" ]; then
         name=ac_in1_out1_test
+	cp -f $custdir/logo/logo_gowone.png $appdir/image/logo.png
     elif [ "$1" = "PRJ_TEST_AC_I3_O1" ]; then
         name=ac_in3_out1_test
+	cp -f $custdir/logo/logo_gowone.png $appdir/image/logo.png
     elif [ "$1" = "PRJ_TEST_AC_I3_O3" ]; then
         name=ac_in3_out3_test
+	cp -f $custdir/logo/logo_gowone.png $appdir/image/logo.png
     elif [ "$1" = "PRJ_TEST" ]; then
         name=ac_in3_out1_test
     elif [ "$1" = "PRJ_IP_AC_I3_O3" ];then
@@ -228,6 +232,9 @@ function do_copy()
     elif [ "$1" = "PRJ_2405_AC_I1_O1_OLED" ];then
         name=ac_in1_out1_2405_OLED_release
 	rm -f $appdir/Qt_Test
+    elif [ "$1" = "PRJ_2503_AC_I1_O1_OLED" ];then
+        name=ac_in1_out1_2503_OLED_release
+	rm -f $appdir/Qt_Test
     elif [ "$1" = "PRJ_CHANGCHUN_AC_I1_O1_OLED" ];then
         name=ac_in1_out1_changchun_OLED_release
 	rm -f $appdir/Qt_Test