Merge branch 'main' of https://gitee.com/stark1898/JT-DT-YD4N02A_4G_RTT_MRS
This commit is contained in:
commit
db30b6f7b3
|
@ -415,8 +415,6 @@ int main(void)
|
||||||
|
|
||||||
is_event_initialized = RT_FALSE;
|
is_event_initialized = RT_FALSE;
|
||||||
|
|
||||||
// ADC_ITConfig(USED_ADC, ADC_IT_AWD, DISABLE);
|
|
||||||
|
|
||||||
H308_PWR_OFF;
|
H308_PWR_OFF;
|
||||||
SysControl.last_status = SysControl.status;
|
SysControl.last_status = SysControl.status;
|
||||||
SysControl.status = kPowerDownEvent;
|
SysControl.status = kPowerDownEvent;
|
||||||
|
|
|
@ -187,7 +187,7 @@ static void H308_HandleAlarm(uint8_t count, uint8_t threshold)
|
||||||
else if ((H308.Data.lel == 0) && (count == 0))
|
else if ((H308.Data.lel == 0) && (count == 0))
|
||||||
{
|
{
|
||||||
alarm_flag = 0;
|
alarm_flag = 0;
|
||||||
H308.detection_flag = kH308Alarm;
|
H308.detection_flag = kH308Normal;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -806,7 +806,6 @@ int Nt26k_Process_Events(Nt26kEvent nt26k_recv_event, struct at_device *device,
|
||||||
#ifdef TEST_ENABLE
|
#ifdef TEST_ENABLE
|
||||||
RTC_ShowTime(); // 每次发送打印下时间,容易定位问题
|
RTC_ShowTime(); // 每次发送打印下时间,容易定位问题
|
||||||
#endif
|
#endif
|
||||||
rt_thread_mdelay(IMEI_Delay());
|
|
||||||
LOG_D("send data cnt :%d", cnt);
|
LOG_D("send data cnt :%d", cnt);
|
||||||
int result = event->send_func(device, nt26k_ops);
|
int result = event->send_func(device, nt26k_ops);
|
||||||
if (result != RT_EOK)
|
if (result != RT_EOK)
|
||||||
|
@ -837,7 +836,7 @@ int Nt26k_Process_Events(Nt26kEvent nt26k_recv_event, struct at_device *device,
|
||||||
{
|
{
|
||||||
ret = RT_ERROR;
|
ret = RT_ERROR;
|
||||||
}
|
}
|
||||||
rt_thread_mdelay(5000);
|
rt_thread_mdelay(IMEI_Delay() + 5000);//放到后面的原因是,保证了第一次发送数据的及时性
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (rt_strcmp(event->event_name, "掉电事件") == RT_EOK)
|
if (rt_strcmp(event->event_name, "掉电事件") == RT_EOK)
|
||||||
|
|
Loading…
Reference in New Issue