Browse Source

AP_GPS: Delete unnecessary code.

mission-4.1.18
murata 8 years ago committed by Randy Mackay
parent
commit
b77941c4f2
  1. 25
      libraries/AP_GPS/AP_GPS_SBP.cpp

25
libraries/AP_GPS/AP_GPS_SBP.cpp

@ -109,7 +109,7 @@ AP_GPS_SBP::_sbp_process() @@ -109,7 +109,7 @@ AP_GPS_SBP::_sbp_process()
//This switch reads one character at a time,
//parsing it into buffers until a full message is dispatched
switch(parser_state.state) {
switch (parser_state.state) {
case sbp_parser_state_t::WAITING:
if (temp == SBP_PREAMBLE) {
parser_state.n_read = 0;
@ -167,7 +167,7 @@ AP_GPS_SBP::_sbp_process() @@ -167,7 +167,7 @@ AP_GPS_SBP::_sbp_process()
crc_error_counter += 1;
}
parser_state.state = sbp_parser_state_t::WAITING;
parser_state.state = sbp_parser_state_t::WAITING;
}
break;
@ -182,7 +182,7 @@ AP_GPS_SBP::_sbp_process() @@ -182,7 +182,7 @@ AP_GPS_SBP::_sbp_process()
//INVARIANT: A fully received message with correct CRC is currently in parser_state
void
AP_GPS_SBP::_sbp_process_message() {
switch(parser_state.msg_type) {
switch (parser_state.msg_type) {
case SBP_HEARTBEAT_MSGTYPE:
last_heatbeat_received_ms = AP_HAL::millis();
break;
@ -244,10 +244,9 @@ AP_GPS_SBP::_attempt_state_update() @@ -244,10 +244,9 @@ AP_GPS_SBP::_attempt_state_update()
bool ret = false;
if (now - last_heatbeat_received_ms > SBP_TIMEOUT_HEATBEAT) {
state.status = AP_GPS::NO_GPS;
Debug("No Heartbeats from Piksi! Driver Ready to Die!");
ret = false;
} else if (last_pos_llh_rtk.tow == last_vel_ned.tow
&& abs((int32_t) (last_gps_time.tow - last_vel_ned.tow)) < 10000
@ -280,13 +279,13 @@ AP_GPS_SBP::_attempt_state_update() @@ -280,13 +279,13 @@ AP_GPS_SBP::_attempt_state_update()
state.location.alt = (int32_t) (pos_llh->height*1e2);
state.num_sats = pos_llh->n_sats;
if (pos_llh->flags == 0)
if (pos_llh->flags == 0) {
state.status = AP_GPS::GPS_OK_FIX_3D;
else if (pos_llh->flags == 2)
} else if (pos_llh->flags == 2) {
state.status = AP_GPS::GPS_OK_FIX_3D_RTK_FLOAT;
else if (pos_llh->flags == 1)
} else if (pos_llh->flags == 1) {
state.status = AP_GPS::GPS_OK_FIX_3D_RTK_FIXED;
}
last_full_update_tow = last_vel_ned.tow;
last_full_update_cpu_ms = now;
@ -302,12 +301,10 @@ AP_GPS_SBP::_attempt_state_update() @@ -302,12 +301,10 @@ AP_GPS_SBP::_attempt_state_update()
ret = true;
} else {
//No timeouts yet, no data yet, nothing has happened.
ret = false;
}
}
return ret;
@ -322,7 +319,7 @@ AP_GPS_SBP::_detect(struct SBP_detect_state &state, uint8_t data) @@ -322,7 +319,7 @@ AP_GPS_SBP::_detect(struct SBP_detect_state &state, uint8_t data)
// looks like our preamble we'll try to read the full message length,
// calculating the CRC. If the CRC matches, we have an SBP GPS!
switch(state.state) {
switch (state.state) {
case SBP_detect_state::WAITING:
if (data == SBP_PREAMBLE) {
state.n_read = 0;

Loading…
Cancel
Save