Просмотр исходного кода

修改 : 频率追踪更新方式;

(cherry picked from commit ca7b3d8c0a31d6b1bdb9876d2b48446357df28c4)

# Conflicts:
#	README.md
#	dtu/dtu_main_t536/app/set.c
#	dtu/dtu_main_t536/main_mod.c
lch 1 месяц назад
Родитель
Сommit
2bec6694a2
3 измененных файлов с 17 добавлено и 6 удалено
  1. 1 1
      README.md
  2. 13 5
      dtu/dtu_main_t536/app/set.c
  3. 3 0
      dtu/dtu_main_t536/main_mod.c

+ 1 - 1
README.md

@@ -83,4 +83,4 @@
 02. 修改: 为提高液晶响应速度将主循环休眠时间修改为10ms。
 
 # 202601(04-11)
-01. 增加 : 频率追踪投退下发到RV核;
+01. 增加 : 频率追踪投退下发到RV核;

+ 13 - 5
dtu/dtu_main_t536/app/set.c

@@ -4161,14 +4161,14 @@ void check_shmdata_change(void)
 {
     static uint8_t suc_freq_track = 0xff;
     struct t_shmdata_cvalue t_cvale = {0};
+    
+    printf("check_shmdata_change\r\n");
 
-    if (0xff == suc_freq_track)
+    if (suc_freq_track != pRunSet->bTT_FREQ)
     {
         t_cvale.uc_freq_track = pRunSet->bTT_FREQ;
-    }
-    else if (suc_freq_track != pRunSet->bTT_FREQ)
-    {
         shm_packet_write_v2(SHM_ADDR_R_MACHINEPARAM, (uint8_t *)&t_cvale, sizeof(struct t_shmdata_cvalue));
+        suc_freq_track = pRunSet->bTT_FREQ;
     }
 }
 
@@ -6688,7 +6688,15 @@ bool  MakeRunSet(bool bFirst)
 
 	m_runsection=pRunSet->section;
 
-	create_set_data_txt();	
+#if !defined CPU_FUXI
+    create_set_data_txt();
+#else
+    extern int g_l_shm_init;
+    if (0 == g_l_shm_init)
+    {
+        check_shmdata_change();
+    }
+#endif
 	return bRet;
 }
 /******************************************************************************

+ 3 - 0
dtu/dtu_main_t536/main_mod.c

@@ -31,6 +31,7 @@
 #include <pthread.h>
 // #include <alchemy/task.h>
 
+int g_l_shm_init = 0xff;
 static int m_reset; //¿´ÃŹ·¸´Î»±äÁ¿
 struct completion *g_exit_completion_gprs_net_IEC_proc;
 static int g_exit_flag;
@@ -319,8 +320,10 @@ int di_do_adc (void *unused)
 	struct shmem_fd shmem_fd;
 	if (share_mem_init_v2(&shmem_fd) < 0){
 		printf("--->shmem_init fail !!!\r\n");
+        g_l_shm_init = -1;
 		return -1;
 	} else {
+        g_l_shm_init = 0;
 		printf("--->shmem_init success !!!\r\n");
 	}