网页，马来西亚，2503项目

pro/config/cfg.h

@@ -37,10 +37,10 @@
 //#define PRJ_INST2106_AC_I1_O1_OLED
 //#define PRJ_YST_AC_I1_O1
 //#define PRJ_YUNNAN_AC_I1_O1
-#define PRJ_BYD_UPS_AC_I1_O1
+//#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_2503_AC_I1_O1_OLED
 
 //#define PRJ_IP_AC_I3_O3
 //#define PRJ_IP_AC_I3_O1
@@ -60,6 +60,11 @@
 
 //#define PRJ_TCT_AC_I3_O1
 
+//#define PRJ_New_Malaysia_AC_I3_O1
+
+
+
+
 #define USE_MAIL
 #define MAIL_SEND_BUILTIN
 
@@ -207,6 +212,11 @@
     #define PROD_POWER_TYPE                     5
     #define USE_UI
     #define USE_BEEP
+
+    #define USE_WATCHDOG
+    #define SENSOR_ACCESS_NONE
+
+
 #elif defined PRJ_709_AC_I3_O1_OLED
 
     #define LANGUAGE                            0           //chinese
@@ -352,6 +362,7 @@
     #define BRD_MAX                             4
 
     #define USE_UI
+    #define NO_SENSOR_UI                        
 
     #define USE_WATCHDOG
 
@@ -520,6 +531,29 @@
     
     #define BRD_MAX                             8
 
+#elif defined PRJ_New_Malaysia_AC_I3_O1
+
+    #define LANGUAGE 1      // //english
+    #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 5
+
+    #define USE_WATCHDOG
+//    #define USE_LOGO_LITECH
+
+    #define NEW_GPIO
+
+    #define USE_BEEP                            1
+    #define USE_LED                             1
+    
+    #define BRD_MAX                             3
+
+
 #elif defined PRJ_IP_AC_I3_O3
     #define LANGUAGE                            0
     #define SMPLE_TIME                          30          //ms

pro/ui/menu.c

@@ -28,9 +28,12 @@ enum {
     MENU_SYSTEM=0,
     MENU_INPUT,
     MENU_OUTPUT,
+#ifndef NO_SENSOR_UI
     MENU_SENSOR,
+#endif
     MENU_MODBUS,
 
+
     MENU_MAX
 };
 enum {
@@ -600,7 +603,9 @@ static int menu_key_handle(menu_handle_t *h, key_val_t *kv)
     h->ch_out_max = get_ch_out_max(h);
     switch(h->menu.menu_id) {
         case MENU_SYSTEM:
+#ifndef NO_SENSOR_UI
         case MENU_SENSOR:
+#endif
         {
             if(h->menu.menu_lv==0) {
                 if(h->uflag&UFLAG_FLIP || ((kv->key==KEY_UP || kv->key==KEY_DOWN) && kv->type==TYPE_SHORT)) {
@@ -711,7 +716,9 @@ static int menu_key_handle(menu_handle_t *h, key_val_t *kv)
         {
             r = menu_modbus_key_handle(h, kv);
         }
+
         break;
+
     }
 
     return r;
@@ -796,18 +803,19 @@ int menu_handle(void)
             menu_output_paint(h, font1, font2, item_h, &kv);
         }
         break;
-
+#ifndef NO_SENSOR_UI
         case MENU_SENSOR:
         {
             menu_sensor_paint(h, font1, font2, item_h, &kv);
         }
         break;
-
+#endif
         case MENU_MODBUS:
         {
             menu_modbus_paint(h, font1, font2, item_h, &kv);
         }
         break;
+
     }
     h->uflag = 0;
     //printf("___ menu_id: %d, menu_lv: %d\n", h->menu.menu_id, h->menu.menu_lv);

pub

@@ -30,10 +30,10 @@
 #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_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_BYD_UPS_AC_I1_O1"
 #PRJS="PRJ_JUNGONG_KEKONG_AC_I1_O1_OLED"
 #PRJS="PRJ_INSPUR_AC_I1_O1"
 
@@ -61,6 +61,10 @@ PRJS="PRJ_BYD_UPS_AC_I1_O1"
 #PRJS="PRJ_709_AC_I3_O1_OLED"
 
 
+#PRJS="PRJ_New_Malaysia_AC_I3_O1"
+
+
+
 fulldir=$(realpath $0)
 curdir=$(dirname $fulldir)
 ip_flag=0
@@ -241,15 +245,20 @@ function do_copy()
 	cp -f $custdir/db/pdu_dat_malaysia_front.db $appdir/pdu_dat.db
 	cp -f $custdir/logo/logo_litech.png $appdir/image/logo.png
         cp -f $custdir/qt/rgb_lcd/S90PDUApp      $rootdir/etc/init.d/
+    elif [ "$1" = "PRJ_New_Malaysia_AC_I3_O1" ];then
+        name=ac_Malaysia_new_back_in3_out1_release
+        cp -f $custdir/db/pdu_dat_new_malaysia_back.db $appdir/pdu_dat.db
+        cp -f $custdir/logo/logo_neuter.png $appdir/image/logo.png
+        cp -f $custdir/qt/rgb_lcd/S90PDUApp      $rootdir/etc/init.d/
     elif [ "$1" = "PRJ_2405_AC_I1_O1_OLED" ];then
         name=ac_in1_out1_2405_OLED_release
 	rm -f $appdir/Qt_Test
     elif [ "$1" = "PRJ_709_AC_I3_O1_OLED" ];then
         name=ac_in3_out1_709_oled_release
         rm -f $appdir/Qt_Test	
-    elif [ "$1" = "PRJ_2405_AC_I1_O1_OLED" ];then
+    elif [ "$1" = "PRJ_2503_AC_I1_O1_OLED" ];then
         name=ac_in1_out1_2503_OLED_release
-	rm -f $appdir/Qt_Test
+	    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