Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 00:35:39 +03:00
Code Issues Wiki Activity

avoid change camera mode and turn on wifi when arming

Browse source
This commit is contained in:
azol 2018-06-23 13:43:26 +08:00
parent 7fa9399575
commit 5b2dd46367
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/io/rcdevice_cam.c
View file

@ -93,7 +93,12 @@ static void rcdeviceCameraControlProcess(void)
switch (i) { switch (i) {
case BOXCAMERA1: case BOXCAMERA1:
if (isFeatureSupported(RCDEVICE_PROTOCOL_FEATURE_SIMULATE_WIFI_BUTTON)) { if (isFeatureSupported(RCDEVICE_PROTOCOL_FEATURE_SIMULATE_WIFI_BUTTON)) {
behavior = RCDEVICE_PROTOCOL_CAM_CTRL_SIMULATE_WIFI_BTN; // avoid display wifi page when arming, in the next firmware(>2.0) of rcsplit we have change the wifi page logic:
// when the wifi was turn on it won't turn off the analog video output,
// and just put a wifi indicator on the right top of the video output. here is for the old split firmware
if (!ARMING_FLAG(ARMED) && ((getArmingDisableFlags() & ARMING_DISABLED_RUNAWAY_TAKEOFF) == 0)) {
behavior = RCDEVICE_PROTOCOL_CAM_CTRL_SIMULATE_WIFI_BTN;
}
} }
break; break;
case BOXCAMERA2: case BOXCAMERA2:
@ -103,7 +108,10 @@ static void rcdeviceCameraControlProcess(void)
break; break;
case BOXCAMERA3: case BOXCAMERA3:
if (isFeatureSupported(RCDEVICE_PROTOCOL_FEATURE_CHANGE_MODE)) { if (isFeatureSupported(RCDEVICE_PROTOCOL_FEATURE_CHANGE_MODE)) {
behavior = RCDEVICE_PROTOCOL_CAM_CTRL_CHANGE_MODE; // avoid change camera mode when arming
if (!ARMING_FLAG(ARMED) && ((getArmingDisableFlags() & ARMING_DISABLED_RUNAWAY_TAKEOFF) == 0)) {
behavior = RCDEVICE_PROTOCOL_CAM_CTRL_CHANGE_MODE;
}
} }
break; break;
default: default: