sundp
/
WLE5CC_NODE_STS
1
0
Fork 1
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Revert "--- refine STS-R4 txperiod and heart-beat period" 

This reverts commit 78e652fd20.
This commit is contained in:
Yunhorn 2024-10-23 20:47:34 +08:00
parent 9b3f200fa5
commit 66bed67e4a
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LoRaWAN/App/lora_app.c
View File

@ -1475,9 +1475,13 @@ void OnYunhornSTSHeartBeatPeriodicityChanged(uint32_t periodicity)
UTIL_TIMER_Start(&YunhornSTSHeartBeatTimer); UTIL_TIMER_Start(&YunhornSTSHeartBeatTimer);
/* USER CODE BEGIN OnYunhornSTSHeartBeatPeriodicityChanged_2 */ /* USER CODE BEGIN OnYunhornSTSHeartBeatPeriodicityChanged_2 */
<<<<<<< HEAD
APP_LOG(TS_OFF, VLEVEL_M,"* STS HeartBeatPeriodicity = %u (sec)\r\n", periodicity/1000 ); APP_LOG(TS_OFF, VLEVEL_M,"* STS HeartBeatPeriodicity = %u (sec)\r\n", periodicity/1000 );
=======
APP_LOG(TS_OFF, VLEVEL_M,"* STS HeartBeatPeriodicity = %u (sec)\r\n", periodicity/1000 );
>>>>>>> parent of 78e652f (--- refine STS-R4 txperiod and heart-beat period)
/* USER CODE END OnYunhornSTSHeartBeatPeriodicityChanged_2 */ /* USER CODE END OnYunhornSTSHeartBeatPeriodicityChanged_2 */
} }

8
STS/Core/Src/yunhorn_sts_process.c
View File

@ -117,6 +117,7 @@ volatile uint8_t sts_work_mode=4;
volatile uint32_t rfac_timer=0; volatile uint32_t rfac_timer=0;
volatile uint16_t sts_sensor_install_height=3000; volatile uint16_t sts_sensor_install_height=3000;
volatile uint8_t sensor_data_ready=0; volatile uint8_t sensor_data_ready=0;
<<<<<<< HEAD
#if defined(STS_R1)||defined(STS_R5)||defined(STS_R4)||defined(STS_R1D) #if defined(STS_R1)||defined(STS_R5)||defined(STS_R4)||defined(STS_R1D)
volatile uint32_t STS_TOFScanPeriod_msec=50, STS_TxPeriod_sec=30, STS_HeartBeatTimerPeriod_sec=300; volatile uint32_t STS_TOFScanPeriod_msec=50, STS_TxPeriod_sec=30, STS_HeartBeatTimerPeriod_sec=300;
@ -126,6 +127,9 @@ volatile uint32_t STS_TOFScanPeriod_msec=50, STS_TxPeriod_sec=30, STS_HeartBeatT
volatile uint32_t STS_TOFScanPeriod_msec=5000, STS_TxPeriod_sec=10, STS_HeartBeatTimerPeriod_sec=60; volatile uint32_t STS_TOFScanPeriod_msec=5000, STS_TxPeriod_sec=10, STS_HeartBeatTimerPeriod_sec=60;
#endif #endif
=======
volatile uint32_t STS_TOFScanPeriod_msec=50, STS_TxPeriod_sec=10, STS_HeartBeatTimerPeriod_sec=60;
>>>>>>> parent of 78e652f (--- refine STS-R4 txperiod and heart-beat period)
static uint8_t outbuf[128]={0x0}; static uint8_t outbuf[128]={0x0};
extern volatile hmac_result_t hmac_result; extern volatile hmac_result_t hmac_result;
extern uint16_t sensor_id; extern uint16_t sensor_id;
@ -1621,8 +1625,12 @@ void OnRestoreSTSCFGContextProcess(void)
sampling_heartbeat_periodicity *= 1; sampling_heartbeat_periodicity *= 1;
} }
<<<<<<< HEAD
STS_HeartBeatTimerPeriod_sec = sampling_heartbeat_periodicity; STS_HeartBeatTimerPeriod_sec = sampling_heartbeat_periodicity;
APP_LOG(TS_OFF, VLEVEL_M, "\n\n sampling or heartbeat periodicity in NVM =%u sec\n",sampling_heartbeat_periodicity); APP_LOG(TS_OFF, VLEVEL_M, "\n\n sampling or heartbeat periodicity in NVM =%u sec\n",sampling_heartbeat_periodicity);
=======
APP_LOG(TS_OFF, VLEVEL_H, "\n\n sampling or heartbeat periodicity in NVM =%u sec\n",sampling_heartbeat_periodicity);
>>>>>>> parent of 78e652f (--- refine STS-R4 txperiod and heart-beat period)
if ((sts_cfg_nvm.ac[0] ==0x0 )&& (sts_cfg_nvm.ac[19]==0x0)) if ((sts_cfg_nvm.ac[0] ==0x0 )&& (sts_cfg_nvm.ac[19]==0x0))
{ // ensure it's not in production yet { // ensure it's not in production yet