Browse Source

修改代码:初始化的时候不配置RTC时钟,改成在网管设置时钟时配置

zhoutao 1 month ago
parent
commit
e2f775423f

File diff suppressed because it is too large
+ 1 - 2
ips8000v3.uvguix.zt200


+ 16 - 1
ips8000v3.uvoptx

@@ -197,6 +197,21 @@
           <WinNumber>2</WinNumber>
           <ItemText>*ptm</ItemText>
         </Ww>
+        <Ww>
+          <count>8</count>
+          <WinNumber>2</WinNumber>
+          <ItemText>gWifi_stParam</ItemText>
+        </Ww>
+        <Ww>
+          <count>9</count>
+          <WinNumber>2</WinNumber>
+          <ItemText>abyAtValue</ItemText>
+        </Ww>
+        <Ww>
+          <count>10</count>
+          <WinNumber>2</WinNumber>
+          <ItemText>g_stSyncTimerParam</ItemText>
+        </Ww>
       </WatchWindow2>
       <MemoryWindow1>
         <Mm>
@@ -1848,7 +1863,7 @@
 
   <Group>
     <GroupName>src/ps</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>

+ 8 - 1
src/driverapp/driverapp_rtc.c

@@ -38,7 +38,14 @@ uint8 driverapp_rtc_init()
 {
     uint8 byFlag = 0;
 
-    byFlag = driverapp_rtc_set_init_time(); // 配置RTC初始时间
+    uint8 byYear = 0;
+    uint8 byMonth = 0;
+    uint8 byDay = 0;
+    uint8 byHour = 0;
+    uint8 byMinute = 0;
+    uint8 bySecond = 0;
+
+    byFlag = driverapp_rtc_get_current_datetime(&byYear, &byMonth, &byDay, &byHour, &byMinute, &bySecond);
     if (!byFlag)
     {
         return 0;

+ 1 - 5
src/service/sysparam/sysparam.c

@@ -114,7 +114,7 @@ void sysparam_config_init_param_with_flash_data(uint8 *pbyData, SAVE_ALL_OAM_PAR
     uint8 *pbyInstallParam = NULL;
     uint8 *pbySyncParam = NULL;
     uint8 *pbyBtsParam = NULL;
-    uint8 *pbySyncTimer = NULL;
+    // uint8 *pbySyncTimer = NULL;
 
     uint16 wDeviceLen = sizeof(SAVE_DEVICE_T);
     uint16 wNetworkLen = sizeof(SAVE_NETWORK_T);
@@ -147,10 +147,6 @@ void sysparam_config_init_param_with_flash_data(uint8 *pbyData, SAVE_ALL_OAM_PAR
     pbyBtsParam = pbyParam + byFixLen + wDeviceLen + wNetworkLen + wConfigLen + wInstallLen + wSyncLen;
     wmm_bts_set_param_with_flash_data(pbyBtsParam);
 
-    // 保存同步定时参数
-    pbySyncTimer = pbyParam + byFixLen + wDeviceLen + wNetworkLen + wConfigLen + wInstallLen + wSyncLen + wBtsLen;
-    oam_sync_timer_set_param_with_flash_data(pbySyncTimer);
-
     return;
 }
 

+ 2 - 1
src/wmm/oam_sync_timer.c

@@ -32,7 +32,7 @@ void oam_sync_timer_set_param_with_default_data()
 }
 
 // 基于flash中的数据配置设备参数
-void oam_sync_timer_set_param_with_flash_data(uint8 *pbyData)
+void oam_sync_timer_set_current_datetime(uint8 *pbyData)
 {
     SYS_MEMCPY((void *)&g_stSyncTimerParam, (void *)pbyData, sizeof(SYNC_TIMER_T));
 
@@ -115,6 +115,7 @@ void oam_sync_timer_config(uint8 *pbyData)
     {
     case ORDER_SYNC_TIMER_CURRENT_TIME: // 当前时间
         SYS_MEMCPY(g_stSyncTimerParam.abyCurrentTime, pstLtv->abyData, byLen);
+        oam_sync_timer_set_current_datetime(g_stSyncTimerParam.abyCurrentTime);
         break;
     case ORDER_SYNC_TIMER_SWITCH: // 定时开关
         SYS_MEMCPY(&g_stSyncTimerParam.byTimerSwitch, pstLtv->abyData, byLen);

+ 1 - 1
src/wmm/oam_sync_timer.h

@@ -39,5 +39,5 @@ void oam_sync_timer_config(uint8 *pbyData);
 
 // 内部接口
 void oam_sync_timer_set_param_with_default_data();
-void oam_sync_timer_set_param_with_flash_data(uint8 *pbyData);
+void oam_sync_timer_set_current_datetime(uint8 *pbyData);
 #endif

Some files were not shown because too many files changed in this diff