合并old分支
This commit is contained in:
parent
81ce05254e
commit
10c9705078
26
main.c
26
main.c
@ -3504,7 +3504,7 @@ int main(int argc, char *argv[])
|
|||||||
pthread_detach(pt_mqtt_recv);
|
pthread_detach(pt_mqtt_recv);
|
||||||
LOG_I("pthread_create mqtt_recv success\n");
|
LOG_I("pthread_create mqtt_recv success\n");
|
||||||
}
|
}
|
||||||
|
#if 0
|
||||||
ret = pthread_create(&pt_removeduplicatetag,NULL,thread_remove_duplicate_tag,NULL);
|
ret = pthread_create(&pt_removeduplicatetag,NULL,thread_remove_duplicate_tag,NULL);
|
||||||
if(ret!=0){
|
if(ret!=0){
|
||||||
LOG_I("pthread_create remove duplicate tag send fail\n");
|
LOG_I("pthread_create remove duplicate tag send fail\n");
|
||||||
@ -3521,7 +3521,7 @@ int main(int argc, char *argv[])
|
|||||||
LOG_I("pthread_create removelog success\n");
|
LOG_I("pthread_create removelog success\n");
|
||||||
pthread_detach(pt_removelog);
|
pthread_detach(pt_removelog);
|
||||||
}
|
}
|
||||||
#if 0
|
|
||||||
ret = pthread_create(&pt_readqr,NULL,thread_readqr,NULL);
|
ret = pthread_create(&pt_readqr,NULL,thread_readqr,NULL);
|
||||||
if(ret!=0){
|
if(ret!=0){
|
||||||
LOG_I("pthread_create readqr fail\n");
|
LOG_I("pthread_create readqr fail\n");
|
||||||
@ -3530,7 +3530,7 @@ int main(int argc, char *argv[])
|
|||||||
LOG_I("pthread_create readqr success\n");
|
LOG_I("pthread_create readqr success\n");
|
||||||
pthread_detach(pt_readqr);
|
pthread_detach(pt_readqr);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
ret = pthread_create(&pt_reporttag,NULL,thread_reporttag,NULL);
|
ret = pthread_create(&pt_reporttag,NULL,thread_reporttag,NULL);
|
||||||
if(ret!=0){
|
if(ret!=0){
|
||||||
LOG_I("pthread_create reporttag fail\n");
|
LOG_I("pthread_create reporttag fail\n");
|
||||||
@ -3548,15 +3548,15 @@ int main(int argc, char *argv[])
|
|||||||
LOG_I("pthread_create keycheck success\n");
|
LOG_I("pthread_create keycheck success\n");
|
||||||
pthread_detach(pt_keycheck);
|
pthread_detach(pt_keycheck);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
ret = pthread_create(&pt_station_heartbeat,NULL,thread_station_heartbeat,NULL);
|
//ret = pthread_create(&pt_station_heartbeat,NULL,thread_station_heartbeat,NULL);
|
||||||
if(ret!=0){
|
//if(ret!=0){
|
||||||
LOG_I("pthread_create station_heartbeat fail\n");
|
// LOG_I("pthread_create station_heartbeat fail\n");
|
||||||
system("reboot");
|
// system("reboot");
|
||||||
}else{
|
//}else{
|
||||||
LOG_I("pthread_create station_heartbeat success\n");
|
// LOG_I("pthread_create station_heartbeat success\n");
|
||||||
pthread_detach(pt_station_heartbeat);
|
// pthread_detach(pt_station_heartbeat);
|
||||||
}
|
//}
|
||||||
|
|
||||||
// 心跳检测线程移到MQTT连接成功后启动,避免MQTT未连接时上报失败
|
// 心跳检测线程移到MQTT连接成功后启动,避免MQTT未连接时上报失败
|
||||||
// ret = pthread_create(&pt_heartbeat_check,NULL,thread_heartbeat_check,NULL);
|
// ret = pthread_create(&pt_heartbeat_check,NULL,thread_heartbeat_check,NULL);
|
||||||
@ -3567,7 +3567,7 @@ int main(int argc, char *argv[])
|
|||||||
// pthread_detach(pt_heartbeat_check);
|
// pthread_detach(pt_heartbeat_check);
|
||||||
// }
|
// }
|
||||||
|
|
||||||
#if 1
|
#if 0
|
||||||
//ret = pthread_create(&pt_simulate_light,NULL,thread_simulate_light,NULL);
|
//ret = pthread_create(&pt_simulate_light,NULL,thread_simulate_light,NULL);
|
||||||
//if(ret!=0){
|
//if(ret!=0){
|
||||||
// LOG_I("pthread_create simulate_light fail\n");
|
// LOG_I("pthread_create simulate_light fail\n");
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user