Browse Source

AP_Frsky_Telem: LANDCOMPLETE switched to to ISFLYING flag

master
floaledm 9 years ago committed by Andrew Tridgell
parent
commit
33bd359463
  1. 4
      libraries/AP_Frsky_Telem/AP_Frsky_Telem.cpp
  2. 2
      libraries/AP_Frsky_Telem/AP_Frsky_Telem.h

4
libraries/AP_Frsky_Telem/AP_Frsky_Telem.cpp

@ -638,8 +638,8 @@ uint32_t AP_Frsky_Telem::calc_ap_status(void)
ap_status = (uint8_t)((_ap.control_mode+1) & AP_CONTROL_MODE_LIMIT); ap_status = (uint8_t)((_ap.control_mode+1) & AP_CONTROL_MODE_LIMIT);
// simple/super simple modes flags // simple/super simple modes flags
ap_status |= (uint8_t)(*_ap.value & AP_SSIMPLE_FLAGS)<<AP_SSIMPLE_OFFSET; ap_status |= (uint8_t)(*_ap.value & AP_SSIMPLE_FLAGS)<<AP_SSIMPLE_OFFSET;
// land complete flag // is_flying flag
ap_status |= (uint8_t)(*_ap.value & AP_LANDCOMPLETE_FLAG); ap_status |= (uint8_t)((*_ap.value & AP_ISFLYING_FLAG) ^ AP_ISFLYING_FLAG);
// armed flag // armed flag
ap_status |= (uint8_t)(AP_Notify::flags.armed)<<AP_ARMED_OFFSET; ap_status |= (uint8_t)(AP_Notify::flags.armed)<<AP_ARMED_OFFSET;
// battery failsafe flag // battery failsafe flag

2
libraries/AP_Frsky_Telem/AP_Frsky_Telem.h

@ -90,7 +90,7 @@ for FrSky SPort Passthrough
#define AP_CONTROL_MODE_LIMIT 0x1F #define AP_CONTROL_MODE_LIMIT 0x1F
#define AP_SSIMPLE_FLAGS 0x6 #define AP_SSIMPLE_FLAGS 0x6
#define AP_SSIMPLE_OFFSET 4 #define AP_SSIMPLE_OFFSET 4
#define AP_LANDCOMPLETE_FLAG 0x80 #define AP_ISFLYING_FLAG 0x80
#define AP_ARMED_OFFSET 8 #define AP_ARMED_OFFSET 8
#define AP_BATT_FS_OFFSET 9 #define AP_BATT_FS_OFFSET 9
#define AP_EKF_FS_OFFSET 10 #define AP_EKF_FS_OFFSET 10

Loading…
Cancel
Save