Update cockpit joystick api#168
Open
joaoantoniocardoso wants to merge 4 commits intobluerobotics:masterfrom
Open
Update cockpit joystick api#168joaoantoniocardoso wants to merge 4 commits intobluerobotics:masterfrom
joaoantoniocardoso wants to merge 4 commits intobluerobotics:masterfrom
Conversation
joaoantoniocardoso
force-pushed
the
update_cockpit_joystick_api
branch
6 times, most recently
from
dfac5d0 to
3d396a9
Compare
joaoantoniocardoso
force-pushed
the
update_cockpit_joystick_api
branch
from
3d396a9 to
91626ca
Compare
joaoantoniocardoso
force-pushed
the
update_cockpit_joystick_api
branch
3 times, most recently
from
3afed83 to
3cd8cda
Compare
joaoantoniocardoso
force-pushed
the
update_cockpit_joystick_api
branch
3 times, most recently
from
3f686ce to
e3aa2bc
Compare
…suggestions from R&D charts
…o the joystick action
…o the mapping suggestion
joaoantoniocardoso
force-pushed
the
update_cockpit_joystick_api
branch
from
e3aa2bc to
08b7dac
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
cockpit_extras.json:{ "targetSystem": "Cockpit", "targetCockpitApiVersion": "1.0.0", "widgets": [ { "name": "RadCam (192.168.2.191)", "iframeUrl": "#/?uuid=bc071802-2c6d-8301-ac36-bc0718022c6d&cockpit_mode=true", "iframeIcon": "/assets/logo.svg", "version": "0.2.0-beta.12", "startCollapsed": true, "useVehicleAddressAsBaseUrl": true, "collapsibleContainerName": "RadCam (192.168.2.191)" } ], "actions": [ { "id": "radcam_white_balance_bc071802-2c6d-8301-ac36-bc0718022c6d", "name": "RadCam One-Push White Balance (192.168.2.191)", "type": "http-request", "config": { "name": "RadCam One-Push White Balance (192.168.2.191)", "url": "http://{{ vehicle-address }}/extensionv2/radcammanager/v1/camera/control", "method": "POST", "headers": { "Content-Type": "application/json" }, "urlParams": {}, "body": "{\"action\":\"setImageAdjustmentEx\",\"camera_uuid\":\"bc071802-2c6d-8301-ac36-bc0718022c6d\",\"json\":{\"onceAWB\":1}}" }, "version": "0.2.0-beta.12" } ], "joystickSuggestions": [ { "name": "RadCam only", "buttonMappingSuggestions": [ { "actionProtocol": "cockpit-modifier-key", "actionName": "Shift", "actionId": "shift", "button": 0, "modifierKey": "regular", "description": "Enable shift modifier" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Mode manual", "actionId": "Mode manual", "button": 1, "modifierKey": "regular", "description": "Switch to manual flight mode" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Mode depth hold", "actionId": "Mode depth hold", "button": 2, "modifierKey": "regular", "description": "Switch to depth hold mode" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Mode stabilize", "actionId": "Mode stabilize", "button": 3, "modifierKey": "regular", "description": "Switch to stabilize mode" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Camera Mount Tilt Down", "actionId": "Mount tilt down", "button": 4, "modifierKey": "regular", "description": "Move camera mount down" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Camera Mount Tilt Up", "actionId": "Mount tilt up", "button": 5, "modifierKey": "regular", "description": "Move camera mount up" }, { "actionProtocol": "data-lake-variable", "actionName": "Camera focus decrease", "actionId": "camera-focus-decrease", "button": 6, "modifierKey": "regular", "description": "Decrease camera focus distance" }, { "actionProtocol": "data-lake-variable", "actionName": "Camera focus increase", "actionId": "camera-focus-increase", "button": 7, "modifierKey": "regular", "description": "Increase camera focus distance" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Disarm", "actionId": "Disarm", "button": 8, "modifierKey": "regular", "description": "Disarm vehicle" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Arm", "actionId": "Arm", "button": 9, "modifierKey": "regular", "description": "Arm vehicle" }, { "actionProtocol": "cockpit-action", "actionName": "Toggle recording all streams", "actionId": "toggle_recording_all_streams", "button": 11, "modifierKey": "regular", "description": "Toggle recording all streams" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Gain inc", "actionId": "Gain inc", "button": 12, "modifierKey": "regular", "description": "Increase gain" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Gain dec", "actionId": "Gain dec", "button": 13, "modifierKey": "regular", "description": "Decrease gain" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Lights1 dimmer", "actionId": "Lights1 dimmer", "button": 14, "modifierKey": "regular", "description": "Dim lights" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Lights1 brighter", "actionId": "Lights1 brighter", "button": 15, "modifierKey": "regular", "description": "Brighten lights" }, { "actionProtocol": "cockpit-action", "actionName": "Toggle bottom bar", "actionId": "toggle_bottom_bar", "button": 16, "modifierKey": "regular", "description": "Toggle bottom UI bar" }, { "actionProtocol": "cockpit-action", "actionName": "Take a Snapshot", "actionId": "take_snapshot", "button": 2, "modifierKey": "shift", "description": "Take a snapshot" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Mode acro", "actionId": "Mode acro", "button": 3, "modifierKey": "shift", "description": "Switch to acro flight mode" }, { "actionProtocol": "data-lake-variable", "actionName": "Camera zoom decrease", "actionId": "camera-zoom-decrease", "button": 6, "modifierKey": "shift", "description": "Decrease camera zoom level" }, { "actionProtocol": "data-lake-variable", "actionName": "Camera zoom increase", "actionId": "camera-zoom-increase", "button": 7, "modifierKey": "shift", "description": "Increase camera zoom level" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Trim pitch inc", "actionId": "Trim pitch inc", "button": 12, "modifierKey": "shift", "description": "Increase pitch trim" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Trim pitch dec", "actionId": "Trim pitch dec", "button": 13, "modifierKey": "shift", "description": "Decrease pitch trim" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Trim roll dec", "actionId": "Trim roll dec", "button": 14, "modifierKey": "shift", "description": "Decrease roll trim" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Trim roll inc", "actionId": "Trim roll inc", "button": 15, "modifierKey": "shift", "description": "Increase roll trim" }, { "actionProtocol": "cockpit-action", "actionName": "Toggle top bar", "actionId": "toggle_top_bar", "button": 16, "modifierKey": "shift", "description": "Toggle top UI bar" } ], "version": "0.2.0-beta.12" }, { "name": "RadCam with gripper", "buttonMappingSuggestions": [ { "actionProtocol": "cockpit-modifier-key", "actionName": "Shift", "actionId": "shift", "button": 0, "modifierKey": "regular", "description": "Enable shift modifier" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Mode manual", "actionId": "Mode manual", "button": 1, "modifierKey": "regular", "description": "Switch to manual flight mode" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Mode depth hold", "actionId": "Mode depth hold", "button": 2, "modifierKey": "regular", "description": "Switch to depth hold mode" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Mode stabilize", "actionId": "Mode stabilize", "button": 3, "modifierKey": "regular", "description": "Switch to stabilize mode" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Camera Mount Tilt Down", "actionId": "Mount tilt down", "button": 4, "modifierKey": "regular", "description": "Move camera mount down" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Camera Mount Tilt Up", "actionId": "Mount tilt up", "button": 5, "modifierKey": "regular", "description": "Move camera mount up" }, { "actionProtocol": "data-lake-variable", "actionName": "Camera focus decrease", "actionId": "camera-focus-decrease", "button": 6, "modifierKey": "regular", "description": "Decrease camera focus distance" }, { "actionProtocol": "data-lake-variable", "actionName": "Camera focus increase", "actionId": "camera-focus-increase", "button": 7, "modifierKey": "regular", "description": "Increase camera focus distance" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Disarm", "actionId": "Disarm", "button": 8, "modifierKey": "regular", "description": "Disarm vehicle" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Arm", "actionId": "Arm", "button": 9, "modifierKey": "regular", "description": "Arm vehicle" }, { "actionProtocol": "cockpit-action", "actionName": "Toggle recording all streams", "actionId": "toggle_recording_all_streams", "button": 11, "modifierKey": "regular", "description": "Toggle recording all streams" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Gain inc", "actionId": "Gain inc", "button": 12, "modifierKey": "regular", "description": "Increase gain" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Gain dec", "actionId": "Gain dec", "button": 13, "modifierKey": "regular", "description": "Decrease gain" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Lights1 dimmer", "actionId": "Lights1 dimmer", "button": 14, "modifierKey": "regular", "description": "Dim lights" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Lights1 brighter", "actionId": "Lights1 brighter", "button": 15, "modifierKey": "regular", "description": "Brighten lights" }, { "actionProtocol": "cockpit-action", "actionName": "Toggle bottom bar", "actionId": "toggle_bottom_bar", "button": 16, "modifierKey": "regular", "description": "Toggle bottom UI bar" }, { "actionProtocol": "cockpit-action", "actionName": "Take a Snapshot", "actionId": "take_snapshot", "button": 2, "modifierKey": "shift", "description": "Take a snapshot" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Mode acro", "actionId": "Mode acro", "button": 3, "modifierKey": "shift", "description": "Switch to acro flight mode" }, { "actionProtocol": "data-lake-variable", "actionName": "Camera zoom decrease", "actionId": "camera-zoom-decrease", "button": 6, "modifierKey": "shift", "description": "Decrease camera zoom level" }, { "actionProtocol": "data-lake-variable", "actionName": "Camera zoom increase", "actionId": "camera-zoom-increase", "button": 7, "modifierKey": "shift", "description": "Increase camera zoom level" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Trim pitch inc", "actionId": "Trim pitch inc", "button": 12, "modifierKey": "shift", "description": "Increase pitch trim" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Trim pitch dec", "actionId": "Trim pitch dec", "button": 13, "modifierKey": "shift", "description": "Decrease pitch trim" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Trim roll dec", "actionId": "Trim roll dec", "button": 14, "modifierKey": "shift", "description": "Decrease roll trim" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Trim roll inc", "actionId": "Trim roll inc", "button": 15, "modifierKey": "shift", "description": "Increase roll trim" }, { "actionProtocol": "cockpit-action", "actionName": "Toggle top bar", "actionId": "toggle_top_bar", "button": 16, "modifierKey": "shift", "description": "Toggle top UI bar" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Open Gripper", "actionId": "Actuator 1 max momentary", "button": 4, "modifierKey": "shift", "description": "Open gripper" }, { "actionProtocol": "mavlink-manual-control", "actionName": "Close Gripper", "actionId": "Actuator 1 min momentary", "button": 5, "modifierKey": "shift", "description": "Close gripper" } ], "version": "0.2.0-beta.12" }, { "name": "RadCam (camera bc071802-2c6d-8301-ac36-bc0718022c6d)", "buttonMappingSuggestions": [ { "actionProtocol": "cockpit-action", "actionName": "RadCam One-Push White Balance (192.168.2.191)", "actionId": "radcam_white_balance_bc071802-2c6d-8301-ac36-bc0718022c6d", "button": 10, "modifierKey": "regular", "description": "Run One-Push White Balance once" } ], "version": "0.2.0-beta.12" } ] }