Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 14:38:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Camera: add support for Runcam 2 4k

Browse Source
This commit is contained in:
Cam84Fr 2023-01-26 22:30:41 +01:00 committed by Peter Barker
parent b238ed8dd9
commit de8fa1a31a
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libraries/AP_Camera/AP_RunCam.cpp
View File

@ -34,7 +34,7 @@ const AP_Param::GroupInfo AP_RunCam::var_info[] = {
// @Param: TYPE // @Param: TYPE
// @DisplayName: RunCam device type // @DisplayName: RunCam device type
// @Description: RunCam deviee type used to determine OSD menu structure and shutter options. // @Description: RunCam deviee type used to determine OSD menu structure and shutter options.
// @Values: 0:Disabled, 1:RunCam Split Micro/RunCam with UART, 2:RunCam Split, 3:RunCam Split4 4k, 4:RunCam Hybrid/RunCam Thumb Pro // @Values: 0:Disabled, 1:RunCam Split Micro/RunCam with UART, 2:RunCam Split, 3:RunCam Split4 4k, 4:RunCam Hybrid/RunCam Thumb Pro, 5:Runcam 2 4k
AP_GROUPINFO_FLAGS("TYPE", 1, AP_RunCam, _cam_type, int(DeviceType::Disabled), AP_PARAM_FLAG_ENABLE), AP_GROUPINFO_FLAGS("TYPE", 1, AP_RunCam, _cam_type, int(DeviceType::Disabled), AP_PARAM_FLAG_ENABLE),
// @Param: FEATURES // @Param: FEATURES
@ -64,7 +64,7 @@ const AP_Param::GroupInfo AP_RunCam::var_info[] = {
// @Param: CONTROL // @Param: CONTROL
// @DisplayName: RunCam control option // @DisplayName: RunCam control option
// @Description: Specifies the allowed actions required to enter the OSD menu // @Description: Specifies the allowed actions required to enter the OSD menu and other option like autorecording
// @Bitmask: 0:Stick yaw right,1:Stick roll right,2:3-position switch,3:2-position switch,4:Autorecording enabled // @Bitmask: 0:Stick yaw right,1:Stick roll right,2:3-position switch,3:2-position switch,4:Autorecording enabled
// @User: Advanced // @User: Advanced
AP_GROUPINFO("CONTROL", 6, AP_RunCam, _cam_control_option, uint8_t(ControlOption::STICK_ROLL_RIGHT) | uint8_t(ControlOption::TWO_POS_SWITCH)), AP_GROUPINFO("CONTROL", 6, AP_RunCam, _cam_control_option, uint8_t(ControlOption::STICK_ROLL_RIGHT) | uint8_t(ControlOption::TWO_POS_SWITCH)),
@ -114,6 +114,7 @@ AP_RunCam::Menu AP_RunCam::_menus[RUNCAM_MAX_DEVICE_TYPES] = {
{ 0, { 0 }}, // Split { 0, { 0 }}, // Split
{ 6, { 4, 10, 3, 3, 7 }}, // Split4 4K { 6, { 4, 10, 3, 3, 7 }}, // Split4 4K
{ 1, { 0 }}, // Hybrid, simple mode switch { 1, { 0 }}, // Hybrid, simple mode switch
{ 6, { 3, 10, 2, 2, 8 }}, // Runcam 2 4K
}; };
AP_RunCam::AP_RunCam() AP_RunCam::AP_RunCam()
@ -153,8 +154,8 @@ void AP_RunCam::init()
return; return;
} }
// Split requires two mode presses to get into the menu // Split and Runcam 2 4k requires two mode presses to get into the menu
if (_cam_type.get() == int8_t(DeviceType::Split)) { if (_cam_type.get() == int8_t(DeviceType::Split) || _cam_type.get() == int8_t(DeviceType::Run24k)) {
_menu_enter_level = -1; _menu_enter_level = -1;
_in_menu = -1; _in_menu = -1;
} }
@ -549,12 +550,12 @@ void AP_RunCam::handle_2_key_simulation_process(Event ev)
case Event::IN_MENU_ENTER: case Event::IN_MENU_ENTER:
// in a sub-menu and save-and-exit was selected // in a sub-menu and save-and-exit was selected
if (_in_menu > 1 && get_top_menu_length() > 0 && _sub_menu_pos == (get_sub_menu_length(_top_menu_pos) - 1)) { if (_in_menu > 1 && get_top_menu_length() > 0 && _sub_menu_pos == (get_sub_menu_length(_top_menu_pos) - 1) && DeviceType(_cam_type.get()) != DeviceType::Run24k) {
simulate_camera_button(ControlOperation::RCDEVICE_PROTOCOL_SIMULATE_WIFI_BTN, _button_delay_ms); simulate_camera_button(ControlOperation::RCDEVICE_PROTOCOL_SIMULATE_WIFI_BTN, _button_delay_ms);
_sub_menu_pos = 0; _sub_menu_pos = 0;
_in_menu--; _in_menu--;
// in the top-menu and save-and-exit was selected // in the top-menu and save-and-exit was selected
} else if (_in_menu == 1 && get_top_menu_length() > 0 && _top_menu_pos == (get_top_menu_length() - 1)) { } else if (_in_menu == 1 && get_top_menu_length() > 0 && _top_menu_pos == (get_top_menu_length() - 1) && DeviceType(_cam_type.get()) != DeviceType::Run24k) {
simulate_camera_button(ControlOperation::RCDEVICE_PROTOCOL_SIMULATE_WIFI_BTN, _mode_delay_ms); simulate_camera_button(ControlOperation::RCDEVICE_PROTOCOL_SIMULATE_WIFI_BTN, _mode_delay_ms);
_in_menu--; _in_menu--;
_state = State::EXITING_MENU; _state = State::EXITING_MENU;
@ -710,7 +711,7 @@ void AP_RunCam::handle_5_key_simulation_response(const Request& request)
// command to start recording // command to start recording
AP_RunCam::ControlOperation AP_RunCam::start_recording_command() const { AP_RunCam::ControlOperation AP_RunCam::start_recording_command() const {
if (DeviceType(_cam_type.get()) == DeviceType::Split4k || DeviceType(_cam_type.get()) == DeviceType::Hybrid) { if (DeviceType(_cam_type.get()) == DeviceType::Split4k || DeviceType(_cam_type.get()) == DeviceType::Hybrid || DeviceType(_cam_type.get()) == DeviceType::Run24k) {
return ControlOperation::RCDEVICE_PROTOCOL_SIMULATE_POWER_BTN; return ControlOperation::RCDEVICE_PROTOCOL_SIMULATE_POWER_BTN;
} else { } else {
return ControlOperation::RCDEVICE_PROTOCOL_CHANGE_START_RECORDING; return ControlOperation::RCDEVICE_PROTOCOL_CHANGE_START_RECORDING;
@ -719,7 +720,7 @@ AP_RunCam::ControlOperation AP_RunCam::start_recording_command() const {
// command to stop recording // command to stop recording
AP_RunCam::ControlOperation AP_RunCam::stop_recording_command() const { AP_RunCam::ControlOperation AP_RunCam::stop_recording_command() const {
if (DeviceType(_cam_type.get()) == DeviceType::Split4k || DeviceType(_cam_type.get()) == DeviceType::Hybrid) { if (DeviceType(_cam_type.get()) == DeviceType::Split4k || DeviceType(_cam_type.get()) == DeviceType::Hybrid || DeviceType(_cam_type.get()) == DeviceType::Run24k) {
return ControlOperation::RCDEVICE_PROTOCOL_SIMULATE_POWER_BTN; return ControlOperation::RCDEVICE_PROTOCOL_SIMULATE_POWER_BTN;
} else { } else {
return ControlOperation::RCDEVICE_PROTOCOL_CHANGE_STOP_RECORDING; return ControlOperation::RCDEVICE_PROTOCOL_CHANGE_STOP_RECORDING;

5
libraries/AP_Camera/AP_RunCam.h
View File

@ -62,6 +62,7 @@ public:
Split = 2, // camera and video support Split = 2, // camera and video support
Split4k = 3, // video support only + 5key OSD Split4k = 3, // video support only + 5key OSD
Hybrid = 4, // video support + QR mode switch Hybrid = 4, // video support + QR mode switch
Run24k = 5, // camera and video support like Split but recording command like Split4k
}; };
// operation of camera button simulation // operation of camera button simulation
@ -107,7 +108,7 @@ public:
private: private:
// definitions prefixed with RCDEVICE taken from https://support.runcam.com/hc/en-us/articles/360014537794-RunCam-Device-Protocol // definitions prefixed with RCDEVICE taken from https://support.runcam.com/hc/en-us/articles/360014537794-RunCam-Device-Protocol
// possible supported features // possible supported features
// RunCam Split 3S micro reports 0x77 (POWER, WIFI, MODE, SETTING, DPORT, START) // RunCam 2 4k and Split 3S micro reports 0x77 (POWER, WIFI, MODE, SETTING, DPORT, START)
// RunCam Split 2S reports 0x57 (POWER, WIFI, MODE, SETTING, START) // RunCam Split 2S reports 0x57 (POWER, WIFI, MODE, SETTING, START)
// RunCam Racer 3 reports 0x08 (OSD) // RunCam Racer 3 reports 0x08 (OSD)
enum class Feature { enum class Feature {
@ -216,7 +217,7 @@ private:
static const uint8_t RUNCAM_NUM_EXPECTED_RESPONSES = 4; static const uint8_t RUNCAM_NUM_EXPECTED_RESPONSES = 4;
static const uint8_t RUNCAM_MAX_MENUS = 1; static const uint8_t RUNCAM_MAX_MENUS = 1;
static const uint8_t RUNCAM_MAX_MENU_LENGTH = 6; static const uint8_t RUNCAM_MAX_MENU_LENGTH = 6;
static const uint8_t RUNCAM_MAX_DEVICE_TYPES = 4; static const uint8_t RUNCAM_MAX_DEVICE_TYPES = 5;
// supported features, usually probed from the device // supported features, usually probed from the device
AP_Int16 _features; AP_Int16 _features;