Merge branch 'xcjk' of http://121.42.8.157:13000/software-l/server into xcjk

ant.cpp

@@ -1077,6 +1077,7 @@ void sit_list_v::init_site(const std::string &ids /*= ""*/)
 		//site_ptr->m_area_id = area_id;
 		site_ptr->m_power_check_enable = power_alarm;
 		site_ptr->m_device_type_id = device_type_id;
+		site_ptr->m_num_dims = 1;//矿上全部是一维的，默认一维就好了
 		//site_ptr->m_num_dims = dimension;
 		//site_ptr->m_scale = scale;
 		//site_ptr->m_down_stream_idx = down_stream_idx;

message.cpp

@@ -393,6 +393,8 @@ void message_pdoa_locinfo::load(zistream& is)
     }
 
 	if(tof > 0){
-		logn_info(3,"[pdoa] card_type=%d, card_id=%d, ct=%d, status=%d, call_type=%d, rav=%d, acc=.2f, tof=%llu, ant_id=%d, rssi=%d, poa1=%.2f, poa2=%.2f, poa3=%.2f", m_card_type, m_card_id, m_card_ct, m_batty_status, m_callinfo, m_rav, m_acc, m_tof, m_ant_id, m_rssi, m_poa[0], m_poa[1], m_poa[2]);
+		//修改错位问题，少打了一个%
+		logn_info(3,"[pdoa] card_type=%d, card_id=%d, ct=%d, status=%d, call_type=%d, rav=%d, acc=%.2f, tof=%llu, ant_id=%d, rssi=%d, poa1=%.2f, poa2=%.2f, poa3=%.2f", 
+			m_card_type, m_card_id, m_card_ct, m_batty_status, m_callinfo, m_rav, m_acc, m_tof, m_ant_id, m_rssi, m_poa[0], m_poa[1], m_poa[2]);
 	}
 }