Skip to content

core: Add support to mavlink2rest 0.11.7 #814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 28, 2022
Merged

core: Add support to mavlink2rest 0.11.7 #814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
deaa9cb
core: tools: mavlink2rest: Update mavlink2rest to 0.11.7
patrickelectric Feb 25, 2022
0c5a350
core: frontend: components: HealthTrayMenu: Use new mavlink2rest webs…
patrickelectric Feb 25, 2022
1999098
core: frontend: components: mavlink-inspector: Use new mavlink2rest w…
patrickelectric Feb 25, 2022
8e45811
core: frontend: common: Add JSONValue
patrickelectric Feb 25, 2022
da87070
core: frontend: types: Use new mavlink2rest websocket struct
patrickelectric Feb 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/frontend/src/components/health/HealthTrayMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@ export default Vue.extend({
return temperature_limit !== undefined
},
battery_voltage(): string {
const voltage_microvolts = mavlink_store_get(mavlink, 'SYS_STATUS.messageData.voltage_battery') as number
const voltage_microvolts = mavlink_store_get(mavlink, 'SYS_STATUS.messageData.message.voltage_battery') as number
return (voltage_microvolts as number / 1000).toFixed(2)
},

battery_current(): string {
const current_centiampere = mavlink_store_get(mavlink, 'SYS_STATUS.messageData.current_battery') as number
const current_centiampere = mavlink_store_get(mavlink, 'SYS_STATUS.messageData.message.current_battery') as number
return (current_centiampere as number / 100).toFixed(2)
},
disk_usage_percent(): number {
Expand Down
9 changes: 5 additions & 4 deletions core/frontend/src/components/mavlink-inspector/MavlinkInspector.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,10 @@ class MAVLinkMessageTable {
this.tables = {}
}

add(message: Dictionary<any>): void {
const message_timed = message
add(mavlink_message: Dictionary<any>): void {
const message_timed = mavlink_message
message_timed.timestamp = new Date()
const { message } = mavlink_message
if (message.type in this.tables) {
this.tables[message.type].push(message_timed)
if (this.tables[message.type].length > this.size_limit) {
Expand Down Expand Up @@ -144,8 +145,8 @@ export default Vue.extend({
components: {
},
filters: {
prettyPrint(message: any) {
return prettify(message)
prettyPrint(mavlink_message: any) {
return prettify(mavlink_message.message)
},
},
data() {
Expand Down
7 changes: 7 additions & 0 deletions core/frontend/src/types/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
/** Represents a BlueOS service, with the necessary information to identify it on the system */

export type JSONValue =
| string
| number
| boolean
| { [x: string]: JSONValue }
| Array<JSONValue>;

export interface Dictionary<T> {
[key: string]: T;
}
Expand Down
14 changes: 13 additions & 1 deletion core/frontend/src/types/mavlink.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
import { JSONValue } from '@/types/common'

export interface MavlinkHeader {
system_id: number,
component_id: number,
sequence: number
}
export interface MavlinkData {
header: MavlinkHeader,
message: JSONValue
}

export interface MavlinkMessage {
messageName: string
messageData: {[key: string]: {value: string|number}}
messageData: MavlinkData
requestedMessageRate: number
timestamp: Date
}
2 changes: 1 addition & 1 deletion core/tools/mavlink2rest/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e

LOCAL_BINARY_PATH="/usr/bin/mavlink2rest"

VERSION=t0.11.6
VERSION=t0.11.7

# By default we install armv7
REMOTE_BINARY_URL="https://github.com/patrickelectric/mavlink2rest/releases/download/${VERSION}/mavlink2rest-armv7-unknown-linux-musleabihf"
Expand Down