Skip to content
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

Jump to bottom

Add cellular_status and cellular_modem_info #309

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Add cellular_status and cellular_modem_info #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a870eba
add cellular status to telem server and telem
asimopunov Dec 22, 2022
5327690
expand cellular_status msg
asimopunov Jan 18, 2023
5be6911
change cell id to string
asimopunov Jan 18, 2023
82c5ffc
update cellular_status extensions
asimopunov Jan 27, 2023
e31ae97
add nic info message
asimopunov Jan 27, 2023
dcfd62c
update modem_info and cellular_status msgs
asimopunov Feb 12, 2023
f5305d3
change iccid to string
asimopunov Feb 13, 2023
e94f2bf
add comp_info_basic and onboard_comp_status
asimopunov Feb 14, 2023
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
135 changes: 135 additions & 0 deletions protos/telemetry/telemetry.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@ service TelemetryService {
rpc SubscribeHealth(SubscribeHealthRequest) returns(stream HealthResponse) {}
// Subscribe to 'RC status' updates.
rpc SubscribeRcStatus(SubscribeRcStatusRequest) returns(stream RcStatusResponse) {}
// Subscribe to 'Cellular status' updates.
rpc SubscribeCellularStatus(SubscribeCellularStatusRequest) returns(stream CellularStatusResponse) {}
// Subscribe to 'MODEM_INFO' updates.
rpc SubscribeModemInfo(SubscribeModemInfoRequest) returns(stream ModemInfoResponse) {}
// Subscribe to 'Onboard computer status' updates.
rpc SubscribeOnboardComputerStatus(SubscribeOnboardComputerStatusRequest) returns(stream OnboardComputerStatusResponse) {}
// Subscribe to 'Component info basic' updates.
rpc SubscribeComponentInfoBasic(SubscribeComponentInfoBasicRequest) returns(stream ComponentInfoBasicResponse) {}
// Subscribe to 'status text' updates.
rpc SubscribeStatusText(SubscribeStatusTextRequest) returns(stream StatusTextResponse) {}
// Subscribe to 'actuator control target' updates.
Expand Down Expand Up @@ -105,6 +113,14 @@ service TelemetryService {
rpc SetRateBattery(SetRateBatteryRequest) returns(SetRateBatteryResponse) {}
// Set rate to 'RC status' updates.
rpc SetRateRcStatus(SetRateRcStatusRequest) returns(SetRateRcStatusResponse) {}
// Set rate to 'Cellular status' updates.
rpc SetRateCellularStatus(SetRateCellularStatusRequest) returns(SetRateCellularStatusResponse) {}
// Set rate to 'MODEM_INFO' updates.
rpc SetRateModemInfo(SetRateModemInfoRequest) returns(SetRateModemInfoResponse) {}
// Set rate to 'Onboard computer status' updates.
rpc SetRateOnboardComputerStatus(SetRateOnboardComputerStatusRequest) returns(SetRateOnboardComputerStatusResponse) {}
// Set rate to 'Component info basic' updates.
rpc SetRateComponentInfoBasic(SetRateComponentInfoBasicRequest) returns(SetRateComponentInfoBasicResponse) {}
// Set rate to 'actuator control target' updates.
rpc SetRateActuatorControlTarget(SetRateActuatorControlTargetRequest) returns(SetRateActuatorControlTargetResponse) {}
// Set rate to 'actuator output status' updates.
Expand Down Expand Up @@ -226,6 +242,26 @@ message RcStatusResponse {
RcStatus rc_status = 1; // The next RC status
}

message SubscribeCellularStatusRequest {}
message CellularStatusResponse {
CellularStatus cellular_status = 1; // The next cellular status
}

message SubscribeModemInfoRequest {}
message ModemInfoResponse {
ModemInfo modem_info = 1; // The next modem info
}

message SubscribeOnboardComputerStatusRequest {}
message OnboardComputerStatusResponse {
OnboardComputerStatus onboard_computer_status = 1; // The next 'onboard computer status'
}

message SubscribeComponentInfoBasicRequest {}
message ComponentInfoBasicResponse {
ComponentInfoBasic component_info_basic = 1; // The next 'component info basic'
}

message SubscribeStatusTextRequest {}
message StatusTextResponse {
StatusText status_text = 1; // The next 'status text'
Expand Down Expand Up @@ -404,10 +440,43 @@ message SetRateBatteryResponse {
message SetRateRcStatusRequest {
double rate_hz = 1; // The requested rate (in Hertz)
}

message SetRateCellularStatusRequest {
double rate_hz = 1; // The requested rate (in Hertz)
}

message SetRateModemInfoRequest {
double rate_hz = 1; // The requested rate (in Hertz)
}

message SetRateOnboardComputerStatusRequest {
double rate_hz = 1; // The requested rate (in Hertz)
}

message SetRateComponentInfoBasicRequest {
double rate_hz = 1; // The requested rate (in Hertz)
}

message SetRateRcStatusResponse {
TelemetryResult telemetry_result = 1;
}

message SetRateCellularStatusResponse {
TelemetryResult telemetry_result = 1;
}

message SetRateModemInfoResponse {
TelemetryResult telemetry_result = 1;
}

message SetRateOnboardComputerStatusResponse {
TelemetryResult telemetry_result = 1;
}

message SetRateComponentInfoBasicResponse {
TelemetryResult telemetry_result = 1;
}

message SetRateActuatorControlTargetRequest {
double rate_hz = 1; // The requested rate (in Hertz)
}
Expand Down Expand Up @@ -643,6 +712,72 @@ message RcStatus {
float signal_strength_percent = 3 [(mavsdk.options.default_value)="NaN"]; // Signal strength (range: 0 to 100, NaN if unknown)
}

// Cellular modem status type.
message CellularStatus {
uint32 status = 1;
uint32 failure_reason = 2;
uint32 type = 3;
uint32 quality = 4;
uint32 mcc = 5;
uint32 mnc = 6;
uint32 lac = 7;
uint32 band_number = 8;
float band_frequency = 9;
uint32 channel_number = 10;
float rx_level = 11;
float tx_level = 12;
float rx_quality = 13;
uint32 link_tx_rate = 14;
uint32 link_rx_rate = 15;
uint32 bit_error_rate = 16;
uint32 instance_number = 17;
string cell_tower_id = 18;
}

// Modem information.
message ModemInfo {
uint32 instance_number = 1;
uint64 imei = 2; //Unique Modem International Mobile Equipment Identity Number
uint64 imsi = 3; //Current SIM International mobile subscriber identity.
string modem_id = 4;
string iccid = 5; //Integrated Circuit Card Identification Number of SIM Card
string firmware_version = 6; //The firmware version installed on the modem
string modem_model_name = 7;
}

message OnboardComputerStatus{
uint64 time_usec = 1;
uint32 uptime = 2;
uint32 type = 3;
repeated uint32 cpu_cores = 4;
repeated uint32 cpu_combined = 5;
repeated uint32 gpu_cores = 6;
repeated uint32 gpu_combined = 7;
uint32 temperature_board = 8;
repeated uint32 temperature_core = 9;
repeated uint32 fan_speed = 10;
uint32 ram_usage = 11;
uint32 ram_total = 12;
repeated uint32 storage_type = 13;
repeated uint32 storage_usage = 14;
repeated uint32 storage_total = 15;
repeated uint32 link_type = 16;
repeated uint32 link_tx_rate = 17;
repeated uint32 link_rx_rate = 18;
repeated uint32 link_tx_max = 19;
repeated uint32 link_rx_max = 20;
}

message ComponentInfoBasic {
uint32 time_boot_ms = 1;
uint64 capabilities = 2;
string vendor_name = 3;
string model_name = 4;
string software_version = 5;
string hardware_version = 6;
string serial_number = 7;
}

// Status types.
enum StatusTextType {
STATUS_TEXT_TYPE_DEBUG = 0; // Debug
Expand Down
105 changes: 105 additions & 0 deletions protos/telemetry_server/telemetry_server.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ service TelemetryServerService {
rpc PublishRawGps(PublishRawGpsRequest) returns(PublishRawGpsResponse) { option (mavsdk.options.async_type) = SYNC; }
// Publish to 'battery' updates.
rpc PublishBattery(PublishBatteryRequest) returns(PublishBatteryResponse) { option (mavsdk.options.async_type) = SYNC; }
// Publish to 'cellular_status' updates.
rpc PublishCellularStatus(PublishCellularStatusRequest) returns(PublishCellularStatusResponse) { option (mavsdk.options.async_type) = SYNC; }
// Publish to 'modem_info' updates.
rpc PublishModemInfo(PublishModemInfoRequest) returns(PublishModemInfoResponse) { option (mavsdk.options.async_type) = SYNC; }
// Publish to 'obc_status' updates.
rpc PublishOnboardComputerStatus(PublishOnboardComputerStatusRequest) returns(PublishOnboardComputerStatusResponse) { option (mavsdk.options.async_type) = SYNC; }
// Publish to 'component_info_basic' updates.
rpc PublishComponentInfoBasic(PublishComponentInfoBasicRequest) returns(PublishComponentInfoBasicResponse) { option (mavsdk.options.async_type) = SYNC; }
// Publish to 'status text' updates.
rpc PublishStatusText(PublishStatusTextRequest) returns(PublishStatusTextResponse) { option (mavsdk.options.async_type) = SYNC; }
// Publish to 'odometry' updates.
Expand Down Expand Up @@ -83,6 +91,22 @@ message PublishBatteryRequest {
Battery battery = 1; // The next 'battery' state
}

message PublishCellularStatusRequest {
CellularStatus cellular_status = 1; // The next Cellular status
}

message PublishModemInfoRequest {
ModemInfo modem_info = 1; // The next modem info
}

message PublishOnboardComputerStatusRequest {
OnboardComputerStatus obc_status = 1; // The next OBC status
}

message PublishComponentInfoBasicRequest {
ComponentInfoBasic component_info_basic = 1; // The next component info basic
}

message PublishRcStatusRequest {
RcStatus rc_status = 1; // The next RC status
}
Expand Down Expand Up @@ -143,6 +167,21 @@ message PublishBatteryResponse {
TelemetryServerResult telemetry_server_result = 1;
}

message PublishCellularStatusResponse {
TelemetryServerResult telemetry_server_result = 1;
}

message PublishModemInfoResponse {
TelemetryServerResult telemetry_server_result = 1;
}

message PublishOnboardComputerStatusResponse {
TelemetryServerResult telemetry_server_result = 1;
}

message PublishComponentInfoBasicResponse {
TelemetryServerResult telemetry_server_result = 1;
}

message PublishStatusTextResponse {
TelemetryServerResult telemetry_server_result = 1;
Expand Down Expand Up @@ -294,6 +333,72 @@ message RcStatus {
float signal_strength_percent = 3 [(mavsdk.options.default_value)="NaN"]; // Signal strength (range: 0 to 100, NaN if unknown)
}

// Cellular modem status type.
message CellularStatus {
uint32 status = 1;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By the way, this is how I added status flags for the winch as a separate proto message: https://github.com/mavlink/MAVSDK-Proto/pull/308/files#diff-c29712674081664a7c33c32b2a4772848836bbbe76c1f1de17d5cb82b9f512acR73-R88

I.e. all bit flags from MAVLink became Booleans in Proto.

uint32 failure_reason = 2;
uint32 type = 3;
uint32 quality = 4;
uint32 mcc = 5;
uint32 mnc = 6;
uint32 lac = 7;
uint32 band_number = 8;
float band_frequency = 9;
uint32 channel_number = 10;
float rx_level = 11;
float tx_level = 12;
float rx_quality = 13;
uint32 link_tx_rate = 14;
uint32 link_rx_rate = 15;
uint32 bit_error_rate = 16;
uint32 instance_number = 17;
string cell_tower_id = 18;
}

// Modem information.
message ModemInfo {
uint32 instance_number = 1;
uint64 imei = 2; //Unique Modem International Mobile Equipment Identity Number
uint64 imsi = 3; //Current SIM International mobile subscriber identity.
string modem_id = 4;
string iccid = 5; //Integrated Circuit Card Identification Number of SIM Card
string firmware_version = 6; //The firmware version installed on the modem
string modem_model_name = 7;
}

message OnboardComputerStatus{
uint64 time_usec = 1;
uint32 uptime = 2;
uint32 type = 3;
repeated uint32 cpu_cores = 4;
repeated uint32 cpu_combined = 5;
repeated uint32 gpu_cores = 6;
repeated uint32 gpu_combined = 7;
uint32 temperature_board = 8;
repeated uint32 temperature_core = 9;
repeated uint32 fan_speed = 10;
uint32 ram_usage = 11;
uint32 ram_total = 12;
repeated uint32 storage_type = 13;
repeated uint32 storage_usage = 14;
repeated uint32 storage_total = 15;
repeated uint32 link_type = 16;
repeated uint32 link_tx_rate = 17;
repeated uint32 link_rx_rate = 18;
repeated uint32 link_tx_max = 19;
repeated uint32 link_rx_max = 20;
}

message ComponentInfoBasic {
uint32 time_boot_ms = 1;
uint64 capabilities = 2;
string vendor_name = 3;
string model_name = 4;
string software_version = 5;
string hardware_version = 6;
string serial_number = 7;
}

// Status types.
enum StatusTextType {
STATUS_TEXT_TYPE_DEBUG = 0; // Debug
Expand Down