解决 北向bug

pro/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 2.8)
 
-set(CHIP t113i)
+#set(CHIP t113i)
 #set(CHIP t113s)
 
 

pro/src/app.c

@@ -1112,7 +1112,7 @@ static void* power_thread(void* arg)
                     for(int i = 0; i < 3;i++)
                     {
                         c_data +=  (_globalDeviceManager->triphasic_mmap->i_total.pw_i_total[i].i_total_consumption / 100);
-                        p_data +=  (_globalDeviceManager->triphasic_mmap->i_total.pw_i_total[i].i_total_power / 100);                      
+                        p_data +=  (_globalDeviceManager->triphasic_mmap->i_total.pw_i_total[i].i_total_power / 10);                      
                     }
                     __globalDeviceManage.north_user.total_elec_energy = c_data;
                     __globalDeviceManage.north_user.total_power = p_data;

pro/src/cascade_slave.c

@@ -458,7 +458,7 @@ void cascade_slave_write(uint32_t addr, uint16_t val)
             case SPAECIL_USER_SET_1 ... SPAECIL_USER_SET_64:
             {
                 int step = addr - SPAECIL_USER_SET_1;
-                uint16_t * offset_addr = (uint16_t*)(north_specil[SPAECIL_USER_STATUS].addr + step);
+                uint16_t * offset_addr = (uint16_t*)(north_specil[N_SPAECIL_STA].addr + step);
                 uint16_t buff[16] = {0};
                 if(*offset_addr != val)
                 {

pub

@@ -21,7 +21,7 @@ PRJS="PRJ_STSC_I3_O3"
 #PRJS="PRJ_TEST_AC_I1_O1"
 #PRJS="PRJ_TEST_AC_I3_O1"
 #PRJS="PRJ_INST2302_DC_OLED"
-PRJS="PRJ_INST2106_AC_I1_O1_OLED"
+#PRJS="PRJ_INST2106_AC_I1_O1_OLED"
 
 #PRJS="PRJ_USASL_AC_I3_O1 PRJ_USASL_AC_I3_O3"
 #PRJS="PRJ_XIAN_AC_I1_O1_P4 PRJ_XIAN_AC_I1_O1_P8"
@@ -32,6 +32,7 @@ PRJS="PRJ_INST2106_AC_I1_O1_OLED"
 #PRJS="PRJ_LITECH_AC_I1_O1 PRJ_LITECH_AC_I3_O1 PRJ_XIAN_AC_I1_O1_P4 PRJ_XIAN_AC_I1_O1_P8"
 #PRJS="PRJ_IP_AC_I3_O3"
 #PRJS="PRJ_IP_AC_I3_O1"
+#PRJS="PRJ_IP_AC_I1_O1"
 fulldir=$(realpath $0)
 curdir=$(dirname $fulldir)
 
@@ -161,6 +162,9 @@ function do_copy()
     elif [ "$1" = "PRJ_IP_AC_I3_O1" ];then  
         name=ip_ac_in3_out1_release
         cp -f $custdir/logo/logo_neuter.png $appdir/image/logo.png
+    elif [ "$1" = "PRJ_IP_AC_I1_O1" ];then  
+        name=ip_ac_in1_out1_release
+        cp -f $custdir/logo/logo_neuter.png $appdir/image/logo.png
     else
         echo error! $RPJ not define!!!
         exit 1