add code
This commit is contained in:
parent
e9c1d1139b
commit
589874215e
@ -312,7 +312,7 @@ int SensorScheduler::GetNextDuration(int short_addr, int &next_task_id) {
|
|||||||
if (duration < 0 || duration > eigen_value_send_interval_) {
|
if (duration < 0 || duration > eigen_value_send_interval_) {
|
||||||
zlog_warn(zct, "[Nxt] exception duration: %d", duration);
|
zlog_warn(zct, "[Nxt] exception duration: %d", duration);
|
||||||
duration = eigen_value_send_interval_;
|
duration = eigen_value_send_interval_;
|
||||||
}esle if(duration < 9){
|
}else if(duration < 9){
|
||||||
zlog_warn(zct, "[Nxt] exception duration: %d", duration);
|
zlog_warn(zct, "[Nxt] exception duration: %d", duration);
|
||||||
duration = 10;
|
duration = 10;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1006,7 +1006,7 @@ void Uart::WriteDatFile(int sampleRate, std::string &strMeasurementID, int iChan
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
zlog_info(zct, "fopen FIle vecData.size : %d end ", vecData.size());
|
zlog_info(zct, "fopen file vecData.size : %d end ", vecData.size());
|
||||||
wave_channel.wave_timestamp = nowTimetamp;
|
wave_channel.wave_timestamp = nowTimetamp;
|
||||||
g_mapWaveChannel[strMeasurementID] = wave_channel;
|
g_mapWaveChannel[strMeasurementID] = wave_channel;
|
||||||
Json::Value valWaveData;
|
Json::Value valWaveData;
|
||||||
|
|||||||
@ -591,6 +591,10 @@ int Uart::TaskResp(ScheduleTask scheduleTask){
|
|||||||
UpdateData[99] = tmp;
|
UpdateData[99] = tmp;
|
||||||
mssleep(10000);
|
mssleep(10000);
|
||||||
WriteToUart((const char*)UpdateData, 100);
|
WriteToUart((const char*)UpdateData, 100);
|
||||||
|
mssleep(50000);
|
||||||
|
WriteToUart((const char*)UpdateData, 100);
|
||||||
|
mssleep(50000);
|
||||||
|
WriteToUart((const char*)UpdateData, 100);
|
||||||
int iRet = CheckZigbeeACK();
|
int iRet = CheckZigbeeACK();
|
||||||
if (iRet == 0) {
|
if (iRet == 0) {
|
||||||
zlog_info(zct, "TaskResp ACK send success,shortAddr = %02x%02x", UINT16_HIGH(scheduleTask.shortAddr),UINT16_LOW(scheduleTask.shortAddr));
|
zlog_info(zct, "TaskResp ACK send success,shortAddr = %02x%02x", UINT16_HIGH(scheduleTask.shortAddr),UINT16_LOW(scheduleTask.shortAddr));
|
||||||
@ -641,6 +645,10 @@ int Uart::WaveResp(uint16_t shortAddr){
|
|||||||
}
|
}
|
||||||
sendData[7] = tmp;
|
sendData[7] = tmp;
|
||||||
WriteToUart((const char*)sendData, 8);
|
WriteToUart((const char*)sendData, 8);
|
||||||
|
mssleep(50000);
|
||||||
|
WriteToUart((const char*)sendData, 8);
|
||||||
|
mssleep(50000);
|
||||||
|
WriteToUart((const char*)sendData, 8);
|
||||||
int iRet = CheckZigbeeACK();
|
int iRet = CheckZigbeeACK();
|
||||||
if (iRet == 0) {
|
if (iRet == 0) {
|
||||||
zlog_info(zct, "WaveResp ACK send success,shortAddr = %x", shortAddr);
|
zlog_info(zct, "WaveResp ACK send success,shortAddr = %x", shortAddr);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user