Revision cda6b590
change BOM constants to near actual value
scout/scoutsim/src/sim_frame.cpp | ||
---|---|---|
144 | 144 |
teleop_scoutname = "scout1"; |
145 | 145 |
|
146 | 146 |
//Emitter default values |
147 |
em_aperture = PI / 3.0;
|
|
148 |
em_distance = 1.0;
|
|
147 |
em_aperture = BOM_EM_APERTURE;
|
|
148 |
em_distance = BOM_EM_DISTANCE;
|
|
149 | 149 |
|
150 | 150 |
|
151 | 151 |
teleop_pub = nh.advertise< ::messages::set_motors>("/scout1/set_motors", 1000); |
... | ... | |
797 | 797 |
emitter_pos = m_it->second->get_pos(); |
798 | 798 |
|
799 | 799 |
if(is_inrange(bom_pos, emitter_pos, em_aperture, em_distance) && |
800 |
is_inrange(emitter_pos, bom_pos, BOM_APERTURE, BOM_DISTANCE)) {
|
|
800 |
is_inrange(emitter_pos, bom_pos, BOM_REC_APERTURE, BOM_REC_DISTANCE)) {
|
|
801 | 801 |
string em_id_str = m_it->first.substr(m_it->first.find("_")+1); |
802 | 802 |
emitter_id = atoi(em_id_str.c_str()); |
803 | 803 |
return emitter_id; |
Also available in: Unified diff