From 1f9d8aa006cb869b7c7ab19c71045f4b9cbc7428 Mon Sep 17 00:00:00 2001 From: Emil Borconi-Szedressy Date: Thu, 4 Jul 2019 13:49:51 +0100 Subject: [PATCH] Add files via upload - Corrected files --- AVChannelData.proto | 10 +++++----- AVChannelMessageIdsEnum.proto | 4 ++-- AVChannelSetupRequestMessage.proto | 6 +++--- AVChannelSetupResponseMessage.proto | 2 +- AVChannelSetupStatusEnum.proto | 4 ++-- AVChannelStartIndicationMessage.proto | 8 ++++---- AVChannelStopIndicationMessage.proto | 4 ++-- AVInputChannelData.proto | 10 +++++----- AVInputOpenRequestMessage.proto | 12 ++++++------ AVInputOpenResponseMessage.proto | 2 +- AVMediaAckIndicationMessage.proto | 2 +- AVStreamTypeEnum.proto | 4 ++-- AbsoluteInputEventData.proto | 8 ++++---- AbsoluteInputEventsData.proto | 4 ++-- AccelData.proto | 10 +++++----- AudioConfigData.proto | 10 +++++----- AudioFocusRequestMessage.proto | 6 +++--- AudioFocusResponseMessage.proto | 6 +++--- AudioFocusStateEnum.proto | 4 ++-- AudioFocusTypeEnum.proto | 4 ++-- AudioTypeEnum.proto | 4 ++-- AuthCompleteIndicationMessage.proto | 2 +- BindingRequestMessage.proto | 4 ++-- BindingResponseMessage.proto | 2 +- BluetoothChannelData.proto | 6 +++--- BluetoothChannelMessageIdsEnum.proto | 4 ++-- BluetoothPairingMethodEnum.proto | 4 ++-- BluetoothPairingRequestMessage.proto | 8 ++++---- BluetoothPairingResponseMessage.proto | 8 ++++---- BluetoothPairingStatusEnum.proto | 4 ++-- ButtonCodeEnum.proto | 4 ++-- ButtonEventData.proto | 12 ++++++------ ButtonEventsData.proto | 4 ++-- ChannelDescriptorData.proto | 22 ++++++++++++---------- ChannelOpenRequestMessage.proto | 8 ++++---- ChannelOpenResponseMessage.proto | 2 +- CompassData.proto | 10 +++++----- ControlMessageIdsEnum.proto | 4 ++-- DiagnosticsData.proto | 6 +++--- DoorData.proto | 8 ++++---- DrivingStatusData.proto | 2 +- DrivingStatusEnum.proto | 4 ++-- EnvironmentData.proto | 10 +++++----- FuelLevelData.proto | 10 +++++----- GPSLocationData.proto | 18 +++++++++--------- GearData.proto | 6 +++--- GearEnum.proto | 4 ++-- GyroData.proto | 10 +++++----- HVACData.proto | 8 ++++---- HeadlightStatusEnum.proto | 4 ++-- IndicatorStatusEnum.proto | 4 ++-- InputChannelData.proto | 8 ++++---- InputChannelMessageIdsEnum.proto | 5 +++-- InputEventIndicationMessage.proto | 16 ++++++++-------- LightData.proto | 10 +++++----- MediaChannelData.proto | 26 ++++++++++++++++++++++++++ NavigationChannelData.proto | 10 +++++----- NavigationFocusRequestMessage.proto | 6 +++--- NavigationFocusResponseMessage.proto | 6 +++--- NavigationImageOptionsData.proto | 11 ++++++----- NightModeData.proto | 2 +- OdometerData.proto | 8 ++++---- ParkingBrakeData.proto | 6 +++--- PassengerData.proto | 6 +++--- PingRequestMessage.proto | 6 +++--- PingResponseMessage.proto | 6 +++--- RPMData.proto | 6 +++--- RelativeInputEventData.proto | 8 ++++---- RelativeInputEventsData.proto | 4 ++-- SensorChannelData.proto | 4 ++-- SensorChannelMessageIdsEnum.proto | 4 ++-- SensorData.proto | 6 +++--- SensorEventIndicationMessage.proto | 4 ++-- SensorStartRequestMessage.proto | 8 ++++---- SensorStartResponseMessage.proto | 2 +- SensorTypeEnum.proto | 4 ++-- ServiceDiscoveryRequestMessage.proto | 8 ++++---- ServiceDiscoveryResponseMessage.proto | 26 +++++++++++++------------- ShutdownReasonEnum.proto | 4 ++-- ShutdownRequestMessage.proto | 6 +++--- ShutdownResponseMessage.proto | 4 ++-- SpeedData.proto | 10 +++++----- StatusEnum.proto | 5 +++-- SteeringWheelData.proto | 8 ++++---- TouchActionEnum.proto | 8 +++++--- TouchConfigData.proto | 8 ++++---- TouchEventData.proto | 8 ++++---- TouchLocationData.proto | 10 +++++----- VendorExtensionChannelData.proto | 8 ++++---- VersionResponseStatusEnum.proto | 4 ++-- VideoConfigData.proto | 16 ++++++++-------- VideoFPSEnum.proto | 4 ++-- VideoFocusIndicationMessage.proto | 8 ++++---- VideoFocusModeEnum.proto | 4 ++-- VideoFocusReasonEnum.proto | 4 ++-- VideoFocusRequestMessage.proto | 10 +++++----- VideoResolutionEnum.proto | 4 ++-- 97 files changed, 354 insertions(+), 321 deletions(-) create mode 100644 MediaChannelData.proto diff --git a/AVChannelData.proto b/AVChannelData.proto index ada297c..535e98c 100644 --- a/AVChannelData.proto +++ b/AVChannelData.proto @@ -16,20 +16,20 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "AVStreamTypeEnum.proto"; import "AudioTypeEnum.proto"; import "AudioConfigData.proto"; import "VideoConfigData.proto"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message AVChannel { - enums.AVStreamType.Enum stream_type = 1; - enums.AudioType.Enum audio_type = 2; + required enums.AVStreamType.Enum stream_type = 1; + optional enums.AudioType.Enum audio_type = 2; repeated AudioConfig audio_configs = 3; repeated VideoConfig video_configs = 4; - bool available_while_in_call = 5; + optional bool available_while_in_call = 5; } diff --git a/AVChannelMessageIdsEnum.proto b/AVChannelMessageIdsEnum.proto index 85c7b83..d4982b4 100644 --- a/AVChannelMessageIdsEnum.proto +++ b/AVChannelMessageIdsEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.ids; +package gb.xxy.trial.proto.ids; message AVChannelMessage { diff --git a/AVChannelSetupRequestMessage.proto b/AVChannelSetupRequestMessage.proto index 8d4510d..70746ee 100644 --- a/AVChannelSetupRequestMessage.proto +++ b/AVChannelSetupRequestMessage.proto @@ -16,11 +16,11 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message AVChannelSetupRequest { - uint32 config_index = 1; + required uint32 config_index = 1; } diff --git a/AVChannelSetupResponseMessage.proto b/AVChannelSetupResponseMessage.proto index f9bc325..e0bc968 100644 --- a/AVChannelSetupResponseMessage.proto +++ b/AVChannelSetupResponseMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "AVChannelSetupStatusEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message AVChannelSetupResponse { diff --git a/AVChannelSetupStatusEnum.proto b/AVChannelSetupStatusEnum.proto index b5bc6a2..5b2253d 100644 --- a/AVChannelSetupStatusEnum.proto +++ b/AVChannelSetupStatusEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message AVChannelSetupStatus { diff --git a/AVChannelStartIndicationMessage.proto b/AVChannelStartIndicationMessage.proto index c45cb74..661a945 100644 --- a/AVChannelStartIndicationMessage.proto +++ b/AVChannelStartIndicationMessage.proto @@ -16,12 +16,12 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message AVChannelStartIndication { - int32 session = 1; - uint32 config = 2; + required int32 session = 1; + required uint32 config = 2; } diff --git a/AVChannelStopIndicationMessage.proto b/AVChannelStopIndicationMessage.proto index bb7897d..44e92b5 100644 --- a/AVChannelStopIndicationMessage.proto +++ b/AVChannelStopIndicationMessage.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message AVChannelStopIndication { diff --git a/AVInputChannelData.proto b/AVInputChannelData.proto index 432eb05..d9e7a87 100644 --- a/AVInputChannelData.proto +++ b/AVInputChannelData.proto @@ -16,16 +16,16 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "AVStreamTypeEnum.proto"; import "AudioConfigData.proto"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message AVInputChannel { - enums.AVStreamType.Enum stream_type = 1; - AudioConfig audio_config = 2; - bool available_while_in_call = 3; + required enums.AVStreamType.Enum stream_type = 1; + required AudioConfig audio_config = 2; + optional bool available_while_in_call = 3; } diff --git a/AVInputOpenRequestMessage.proto b/AVInputOpenRequestMessage.proto index 0c242fa..339a98c 100644 --- a/AVInputOpenRequestMessage.proto +++ b/AVInputOpenRequestMessage.proto @@ -16,14 +16,14 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message AVInputOpenRequest { - bool open = 1; - bool anc = 2; - bool ec = 3; - int32 max_unacked = 4; + required bool open = 1; + required bool anc = 2; + required bool ec = 3; + required int32 max_unacked = 4; } diff --git a/AVInputOpenResponseMessage.proto b/AVInputOpenResponseMessage.proto index fbfbd5e..7cfaf4b 100644 --- a/AVInputOpenResponseMessage.proto +++ b/AVInputOpenResponseMessage.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message AVInputOpenResponse { diff --git a/AVMediaAckIndicationMessage.proto b/AVMediaAckIndicationMessage.proto index 52fc32c..35f459a 100644 --- a/AVMediaAckIndicationMessage.proto +++ b/AVMediaAckIndicationMessage.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message AVMediaAckIndication { diff --git a/AVStreamTypeEnum.proto b/AVStreamTypeEnum.proto index 22f4b31..6f1bbc4 100644 --- a/AVStreamTypeEnum.proto +++ b/AVStreamTypeEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message AVStreamType { diff --git a/AbsoluteInputEventData.proto b/AbsoluteInputEventData.proto index 03dfce0..8de2238 100644 --- a/AbsoluteInputEventData.proto +++ b/AbsoluteInputEventData.proto @@ -16,12 +16,12 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message AbsoluteInputEvent { - uint32 scan_code = 1; - int32 value = 2; + required uint32 scan_code = 1; + required int32 value = 2; } diff --git a/AbsoluteInputEventsData.proto b/AbsoluteInputEventsData.proto index 0bd47ad..914c410 100644 --- a/AbsoluteInputEventsData.proto +++ b/AbsoluteInputEventsData.proto @@ -16,11 +16,11 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "AbsoluteInputEventData.proto"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message AbsoluteInputEvents { diff --git a/AccelData.proto b/AccelData.proto index c6a0d97..9441ecd 100644 --- a/AccelData.proto +++ b/AccelData.proto @@ -16,13 +16,13 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message Accel { - int32 acceleration_x = 1; - int32 acceleration_y = 2; - int32 acceleration_z = 3; + required int32 acceleration_x = 1; + required int32 acceleration_y = 2; + required int32 acceleration_z = 3; } diff --git a/AudioConfigData.proto b/AudioConfigData.proto index 63d2f85..c79fbf1 100644 --- a/AudioConfigData.proto +++ b/AudioConfigData.proto @@ -16,13 +16,13 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message AudioConfig { - uint32 sample_rate = 1; - uint32 bit_depth = 2; - uint32 channel_count = 3; + required uint32 sample_rate = 1; + required uint32 bit_depth = 2; + required uint32 channel_count = 3; } diff --git a/AudioFocusRequestMessage.proto b/AudioFocusRequestMessage.proto index 13ca72c..018839f 100644 --- a/AudioFocusRequestMessage.proto +++ b/AudioFocusRequestMessage.proto @@ -16,13 +16,13 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "AudioFocusTypeEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message AudioFocusRequest { - enums.AudioFocusType.Enum audio_focus_type = 1; + required enums.AudioFocusType.Enum audio_focus_type = 1; } diff --git a/AudioFocusResponseMessage.proto b/AudioFocusResponseMessage.proto index efd1934..ab876dd 100644 --- a/AudioFocusResponseMessage.proto +++ b/AudioFocusResponseMessage.proto @@ -16,13 +16,13 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "AudioFocusStateEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message AudioFocusResponse { - enums.AudioFocusState.Enum audio_focus_state = 1; + required enums.AudioFocusState.Enum audio_focus_state = 1; } diff --git a/AudioFocusStateEnum.proto b/AudioFocusStateEnum.proto index f195053..29dab59 100644 --- a/AudioFocusStateEnum.proto +++ b/AudioFocusStateEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message AudioFocusState { diff --git a/AudioFocusTypeEnum.proto b/AudioFocusTypeEnum.proto index a44b7a3..8dcf616 100644 --- a/AudioFocusTypeEnum.proto +++ b/AudioFocusTypeEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message AudioFocusType { diff --git a/AudioTypeEnum.proto b/AudioTypeEnum.proto index 5e57ede..abc1db7 100644 --- a/AudioTypeEnum.proto +++ b/AudioTypeEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message AudioType { diff --git a/AuthCompleteIndicationMessage.proto b/AuthCompleteIndicationMessage.proto index ea2aeed..a0c9bc2 100644 --- a/AuthCompleteIndicationMessage.proto +++ b/AuthCompleteIndicationMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "StatusEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message AuthCompleteIndication { diff --git a/BindingRequestMessage.proto b/BindingRequestMessage.proto index 694f72a..76a688a 100644 --- a/BindingRequestMessage.proto +++ b/BindingRequestMessage.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message BindingRequest { diff --git a/BindingResponseMessage.proto b/BindingResponseMessage.proto index 35b1c87..2364d60 100644 --- a/BindingResponseMessage.proto +++ b/BindingResponseMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "StatusEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message BindingResponse { diff --git a/BluetoothChannelData.proto b/BluetoothChannelData.proto index af74d04..3fef61a 100644 --- a/BluetoothChannelData.proto +++ b/BluetoothChannelData.proto @@ -16,14 +16,14 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "BluetoothPairingMethodEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message BluetoothChannel { - string adapter_address = 1; + required string adapter_address = 1; repeated enums.BluetoothPairingMethod.Enum supported_pairing_methods = 2; } diff --git a/BluetoothChannelMessageIdsEnum.proto b/BluetoothChannelMessageIdsEnum.proto index 2188334..77822db 100644 --- a/BluetoothChannelMessageIdsEnum.proto +++ b/BluetoothChannelMessageIdsEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.ids; +package gb.xxy.trial.proto.ids; message BluetoothChannelMessage { diff --git a/BluetoothPairingMethodEnum.proto b/BluetoothPairingMethodEnum.proto index 299a746..26c8b5c 100644 --- a/BluetoothPairingMethodEnum.proto +++ b/BluetoothPairingMethodEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message BluetoothPairingMethod { diff --git a/BluetoothPairingRequestMessage.proto b/BluetoothPairingRequestMessage.proto index 30f63ba..7c352b9 100644 --- a/BluetoothPairingRequestMessage.proto +++ b/BluetoothPairingRequestMessage.proto @@ -16,14 +16,14 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "BluetoothPairingMethodEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message BluetoothPairingRequest { - string phone_address = 1; - enums.BluetoothPairingMethod.Enum pairing_method = 2; + required string phone_address = 1; + required enums.BluetoothPairingMethod.Enum pairing_method = 2; } diff --git a/BluetoothPairingResponseMessage.proto b/BluetoothPairingResponseMessage.proto index 94af3d1..54f4af4 100644 --- a/BluetoothPairingResponseMessage.proto +++ b/BluetoothPairingResponseMessage.proto @@ -16,14 +16,14 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "BluetoothPairingStatusEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message BluetoothPairingResponse { - bool already_paired = 1; - enums.BluetoothPairingStatus.Enum status = 2; + required bool already_paired = 1; + required enums.BluetoothPairingStatus.Enum status = 2; } diff --git a/BluetoothPairingStatusEnum.proto b/BluetoothPairingStatusEnum.proto index 449027e..bd9e7e1 100644 --- a/BluetoothPairingStatusEnum.proto +++ b/BluetoothPairingStatusEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message BluetoothPairingStatus { diff --git a/ButtonCodeEnum.proto b/ButtonCodeEnum.proto index 483f60c..eb13b82 100644 --- a/ButtonCodeEnum.proto +++ b/ButtonCodeEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message ButtonCode { diff --git a/ButtonEventData.proto b/ButtonEventData.proto index c90149f..193a95c 100644 --- a/ButtonEventData.proto +++ b/ButtonEventData.proto @@ -16,14 +16,14 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message ButtonEvent { - uint32 scan_code = 1; - bool is_pressed = 2; - uint32 meta = 3; - bool long_press = 4; + required uint32 scan_code = 1; + required bool is_pressed = 2; + optional uint32 meta = 3; + optional bool long_press = 4; } diff --git a/ButtonEventsData.proto b/ButtonEventsData.proto index 64fe962..e3ca316 100644 --- a/ButtonEventsData.proto +++ b/ButtonEventsData.proto @@ -16,11 +16,11 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "ButtonEventData.proto"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message ButtonEvents { diff --git a/ChannelDescriptorData.proto b/ChannelDescriptorData.proto index 5d0501e..b4b11b8 100644 --- a/ChannelDescriptorData.proto +++ b/ChannelDescriptorData.proto @@ -16,7 +16,7 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "SensorChannelData.proto"; import "AVChannelData.proto"; @@ -25,17 +25,19 @@ import "AVInputChannelData.proto"; import "BluetoothChannelData.proto"; import "NavigationChannelData.proto"; import "VendorExtensionChannelData.proto"; +import "MediaChannelData.proto"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message ChannelDescriptor { - uint32 channel_id = 1; - SensorChannel sensor_channel = 2; - AVChannel av_channel = 3; - InputChannel input_channel = 4; - AVInputChannel av_input_channel = 5; - BluetoothChannel bluetooth_channel = 6; - NavigationChannel navigation_channel = 8; - VendorExtensionChannel vendor_extension_channel = 12; + required uint32 channel_id = 1; + optional SensorChannel sensor_channel = 2; + optional AVChannel av_channel = 3; + optional InputChannel input_channel = 4; + optional AVInputChannel av_input_channel = 5; + optional BluetoothChannel bluetooth_channel = 6; + optional NavigationChannel navigation_channel = 8; + optional MediaInfoChannel media_infoChannel = 9; + optional VendorExtensionChannel vendor_extension_channel = 12; } diff --git a/ChannelOpenRequestMessage.proto b/ChannelOpenRequestMessage.proto index c91875a..f1e2fd9 100644 --- a/ChannelOpenRequestMessage.proto +++ b/ChannelOpenRequestMessage.proto @@ -16,12 +16,12 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message ChannelOpenRequest { - int32 priority = 1; - int32 channel_id = 2; + required int32 priority = 1; + required int32 channel_id = 2; } diff --git a/ChannelOpenResponseMessage.proto b/ChannelOpenResponseMessage.proto index e526872..fff8b55 100644 --- a/ChannelOpenResponseMessage.proto +++ b/ChannelOpenResponseMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "StatusEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message ChannelOpenResponse { diff --git a/CompassData.proto b/CompassData.proto index 9101a23..229604d 100644 --- a/CompassData.proto +++ b/CompassData.proto @@ -16,13 +16,13 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message Compass { - int32 bearing =1; - int32 pitch = 2; - int32 roll = 3; + required int32 bearing =1; + required int32 pitch = 2; + required int32 roll = 3; } diff --git a/ControlMessageIdsEnum.proto b/ControlMessageIdsEnum.proto index 3c413aa..cdbfa81 100644 --- a/ControlMessageIdsEnum.proto +++ b/ControlMessageIdsEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.ids; +package gb.xxy.trial.proto.ids; message ControlMessage { diff --git a/DiagnosticsData.proto b/DiagnosticsData.proto index c2acde1..878ef1d 100644 --- a/DiagnosticsData.proto +++ b/DiagnosticsData.proto @@ -16,11 +16,11 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message Diagnostics { - bytes diagnostics = 1; + required bytes diagnostics = 1; } diff --git a/DoorData.proto b/DoorData.proto index eb2fe87..3001409 100644 --- a/DoorData.proto +++ b/DoorData.proto @@ -16,13 +16,13 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message Door { - bool hood_open = 1; - bool boot_open = 2; + required bool hood_open = 1; + required bool boot_open = 2; repeated bool door_open = 3; } diff --git a/DrivingStatusData.proto b/DrivingStatusData.proto index 5c37c8e..70477b6 100644 --- a/DrivingStatusData.proto +++ b/DrivingStatusData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message DrivingStatus { diff --git a/DrivingStatusEnum.proto b/DrivingStatusEnum.proto index 918ecf8..e7b94bd 100644 --- a/DrivingStatusEnum.proto +++ b/DrivingStatusEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message DrivingStatus { diff --git a/EnvironmentData.proto b/EnvironmentData.proto index 22cca39..13b7ac9 100644 --- a/EnvironmentData.proto +++ b/EnvironmentData.proto @@ -16,13 +16,13 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message Environment { - int32 temperature =1; - int32 pressure = 2; - int32 rain = 3; + required int32 temperature =1; + required int32 pressure = 2; + required int32 rain = 3; } diff --git a/FuelLevelData.proto b/FuelLevelData.proto index e2b871f..ac6d038 100644 --- a/FuelLevelData.proto +++ b/FuelLevelData.proto @@ -16,13 +16,13 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message FuelLevel { - int32 fuel_level = 1; - int32 range = 2; - bool low_fuel = 3; + required int32 fuel_level = 1; + required int32 range = 2; + required bool low_fuel = 3; } diff --git a/GPSLocationData.proto b/GPSLocationData.proto index e63521c..724b85d 100644 --- a/GPSLocationData.proto +++ b/GPSLocationData.proto @@ -16,17 +16,17 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message GPSLocation { - uint64 timestamp = 1; - int32 latitude = 2; - int32 longitude = 3; - uint32 accuracy = 4; - int32 altitude = 5; - int32 speed = 6; - int32 bearing = 7; + required uint64 timestamp = 1; + required int32 latitude = 2; + required int32 longitude = 3; + required uint32 accuracy = 4; + optional int32 altitude = 5; + optional int32 speed = 6; + optional int32 bearing = 7; } diff --git a/GearData.proto b/GearData.proto index fe98037..e5f90f4 100644 --- a/GearData.proto +++ b/GearData.proto @@ -16,13 +16,13 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "GearEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message Gear { - enums.Gear.Enum gear = 1; + required enums.Gear.Enum gear = 1; } diff --git a/GearEnum.proto b/GearEnum.proto index 8a81836..6500f68 100644 --- a/GearEnum.proto +++ b/GearEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message Gear { diff --git a/GyroData.proto b/GyroData.proto index bdc41da..1c7d6dd 100644 --- a/GyroData.proto +++ b/GyroData.proto @@ -16,13 +16,13 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message Gyro { - int32 rotation_speed_x = 1; - int32 rotation_speed_y = 2; - int32 rotation_speed_z = 3; + required int32 rotation_speed_x = 1; + required int32 rotation_speed_y = 2; + required int32 rotation_speed_z = 3; } diff --git a/HVACData.proto b/HVACData.proto index 53d2ed7..6d27542 100644 --- a/HVACData.proto +++ b/HVACData.proto @@ -16,12 +16,12 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message HVAC { - int32 target_temperature = 1; - int32 current_temperature = 2; + required int32 target_temperature = 1; + required int32 current_temperature = 2; } diff --git a/HeadlightStatusEnum.proto b/HeadlightStatusEnum.proto index 69981a5..16fb4e4 100644 --- a/HeadlightStatusEnum.proto +++ b/HeadlightStatusEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message HeadlightStatus { diff --git a/IndicatorStatusEnum.proto b/IndicatorStatusEnum.proto index aad2266..fa51757 100644 --- a/IndicatorStatusEnum.proto +++ b/IndicatorStatusEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message IndicatorStatus { diff --git a/InputChannelData.proto b/InputChannelData.proto index dc60ceb..3228026 100644 --- a/InputChannelData.proto +++ b/InputChannelData.proto @@ -16,15 +16,15 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "TouchConfigData.proto"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message InputChannel { repeated uint32 supported_keycodes = 1; - TouchConfig touch_screen_config = 2; - TouchConfig touch_pad_config = 3; + optional TouchConfig touch_screen_config = 2; + optional TouchConfig touch_pad_config = 3; } diff --git a/InputChannelMessageIdsEnum.proto b/InputChannelMessageIdsEnum.proto index 595defe..ade092c 100644 --- a/InputChannelMessageIdsEnum.proto +++ b/InputChannelMessageIdsEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.ids; +package gb.xxy.trial.proto.ids; message InputChannelMessage { @@ -28,5 +28,6 @@ message InputChannelMessage INPUT_EVENT_INDICATION = 0x8001; BINDING_REQUEST = 0x8002; BINDING_RESPONSE = 0x8003; + } } diff --git a/InputEventIndicationMessage.proto b/InputEventIndicationMessage.proto index a0bb66b..579ea08 100644 --- a/InputEventIndicationMessage.proto +++ b/InputEventIndicationMessage.proto @@ -16,21 +16,21 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "TouchEventData.proto"; import "ButtonEventsData.proto"; import "AbsoluteInputEventsData.proto"; import "RelativeInputEventsData.proto"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message InputEventIndication { - uint64 timestamp = 1; - int32 disp_channel = 2; - data.TouchEvent touch_event = 3; - data.ButtonEvents button_event = 4; - data.AbsoluteInputEvents absolute_input_event = 5; - data.RelativeInputEvents relative_input_event = 6; + required uint64 timestamp = 1; + optional int32 disp_channel = 2; + optional data.TouchEvent touch_event = 3; + optional data.ButtonEvents button_event = 4; + optional data.AbsoluteInputEvents absolute_input_event = 5; + optional data.RelativeInputEvents relative_input_event = 6; } diff --git a/LightData.proto b/LightData.proto index 3ce5ed9..dc3d47f 100644 --- a/LightData.proto +++ b/LightData.proto @@ -16,16 +16,16 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "HeadlightStatusEnum.proto"; import "IndicatorStatusEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message Light { - enums.HeadlightStatus.Enum headlight = 1; - enums.IndicatorStatus.Enum indicator = 2; - bool hazard_light_on = 3; + required enums.HeadlightStatus.Enum headlight = 1; + required enums.IndicatorStatus.Enum indicator = 2; + required bool hazard_light_on = 3; } diff --git a/MediaChannelData.proto b/MediaChannelData.proto new file mode 100644 index 0000000..1813fc5 --- /dev/null +++ b/MediaChannelData.proto @@ -0,0 +1,26 @@ +/* +* This file is part of aasdk library project. +* Copyright (C) 2018 f1x.studio (Michal Szwaj) +* +* aasdk is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 3 of the License, or +* (at your option) any later version. + +* aasdk is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with aasdk. If not, see . +*/ + +syntax="proto2"; + +package gb.xxy.trial.proto.data; + +message MediaInfoChannel +{ + +} diff --git a/NavigationChannelData.proto b/NavigationChannelData.proto index ce7a0ad..1172819 100644 --- a/NavigationChannelData.proto +++ b/NavigationChannelData.proto @@ -16,15 +16,15 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "NavigationImageOptionsData.proto"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message NavigationChannel { - uint32 minimum_interval_ms = 1; - uint32 type = 2; - NavigationImageOptions image_options = 3; + required uint32 minimum_interval_ms = 1; + required uint32 type = 2; + required NavigationImageOptions image_options = 3; } diff --git a/NavigationFocusRequestMessage.proto b/NavigationFocusRequestMessage.proto index a276e87..19a6ea0 100644 --- a/NavigationFocusRequestMessage.proto +++ b/NavigationFocusRequestMessage.proto @@ -16,11 +16,11 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message NavigationFocusRequest { - uint32 type = 1; + required uint32 type = 1; } diff --git a/NavigationFocusResponseMessage.proto b/NavigationFocusResponseMessage.proto index 3c7c6de..62f79e9 100644 --- a/NavigationFocusResponseMessage.proto +++ b/NavigationFocusResponseMessage.proto @@ -16,11 +16,11 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message NavigationFocusResponse { - uint32 type = 1; + required uint32 type = 1; } diff --git a/NavigationImageOptionsData.proto b/NavigationImageOptionsData.proto index b3fdb3c..38c8bda 100644 --- a/NavigationImageOptionsData.proto +++ b/NavigationImageOptionsData.proto @@ -1,3 +1,4 @@ + /* * This file is part of aasdk library project. * Copyright (C) 2018 f1x.studio (Michal Szwaj) @@ -16,13 +17,13 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message NavigationImageOptions { - int32 width = 1; - int32 height = 2; - int32 colour_depth_bits = 3; + required int32 width = 1; + required int32 height = 2; + required int32 colour_depth_bits = 3; } diff --git a/NightModeData.proto b/NightModeData.proto index bd360b7..eaf4ea6 100644 --- a/NightModeData.proto +++ b/NightModeData.proto @@ -18,7 +18,7 @@ syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message NightMode { diff --git a/OdometerData.proto b/OdometerData.proto index 3c9087c..06a8697 100644 --- a/OdometerData.proto +++ b/OdometerData.proto @@ -16,12 +16,12 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message Odometer { - int32 total_mileage = 1; - int32 trip_mileage = 2; + required int32 total_mileage = 1; + required int32 trip_mileage = 2; } diff --git a/ParkingBrakeData.proto b/ParkingBrakeData.proto index 9222067..48e3a58 100644 --- a/ParkingBrakeData.proto +++ b/ParkingBrakeData.proto @@ -16,11 +16,11 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message ParkingBrake { - bool parking_brake = 1; + required bool parking_brake = 1; } diff --git a/PassengerData.proto b/PassengerData.proto index c844304..07a0b09 100644 --- a/PassengerData.proto +++ b/PassengerData.proto @@ -16,11 +16,11 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message Passenger { - bool passenger_present = 1; + required bool passenger_present = 1; } diff --git a/PingRequestMessage.proto b/PingRequestMessage.proto index 5eca54f..2e0f4a5 100644 --- a/PingRequestMessage.proto +++ b/PingRequestMessage.proto @@ -16,11 +16,11 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message PingRequest { - int64 timestamp = 1; + required int64 timestamp = 1; } diff --git a/PingResponseMessage.proto b/PingResponseMessage.proto index d73d67f..07c073b 100644 --- a/PingResponseMessage.proto +++ b/PingResponseMessage.proto @@ -16,11 +16,11 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message PingResponse { - int64 timestamp = 1; + required int64 timestamp = 1; } diff --git a/RPMData.proto b/RPMData.proto index 52492fb..2caa024 100644 --- a/RPMData.proto +++ b/RPMData.proto @@ -16,11 +16,11 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message RPM { - int32 rpm = 1; + required int32 rpm = 1; } diff --git a/RelativeInputEventData.proto b/RelativeInputEventData.proto index 4c6e241..aab6876 100644 --- a/RelativeInputEventData.proto +++ b/RelativeInputEventData.proto @@ -16,12 +16,12 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message RelativeInputEvent { - uint32 scan_code = 1; - int32 delta = 2; + required uint32 scan_code = 1; + required int32 delta = 2; } diff --git a/RelativeInputEventsData.proto b/RelativeInputEventsData.proto index c195073..9647ef3 100644 --- a/RelativeInputEventsData.proto +++ b/RelativeInputEventsData.proto @@ -16,11 +16,11 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "RelativeInputEventData.proto"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message RelativeInputEvents { diff --git a/SensorChannelData.proto b/SensorChannelData.proto index 6292892..a75fae4 100644 --- a/SensorChannelData.proto +++ b/SensorChannelData.proto @@ -16,11 +16,11 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "SensorData.proto"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message SensorChannel { diff --git a/SensorChannelMessageIdsEnum.proto b/SensorChannelMessageIdsEnum.proto index c578e57..54a2b8b 100644 --- a/SensorChannelMessageIdsEnum.proto +++ b/SensorChannelMessageIdsEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.ids; +package gb.xxy.trial.proto.ids; message SensorChannelMessage { diff --git a/SensorData.proto b/SensorData.proto index e0ae04d..489ed63 100644 --- a/SensorData.proto +++ b/SensorData.proto @@ -16,13 +16,13 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "SensorTypeEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message Sensor { - enums.SensorType.Enum type = 1; + required enums.SensorType.Enum type = 1; } diff --git a/SensorEventIndicationMessage.proto b/SensorEventIndicationMessage.proto index e386505..d199103 100644 --- a/SensorEventIndicationMessage.proto +++ b/SensorEventIndicationMessage.proto @@ -16,7 +16,7 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "GPSLocationData.proto"; import "CompassData.proto"; @@ -38,7 +38,7 @@ import "LightData.proto"; import "AccelData.proto"; import "GyroData.proto"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message SensorEventIndication { diff --git a/SensorStartRequestMessage.proto b/SensorStartRequestMessage.proto index ff99ec0..8be307d 100644 --- a/SensorStartRequestMessage.proto +++ b/SensorStartRequestMessage.proto @@ -16,14 +16,14 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "SensorTypeEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message SensorStartRequestMessage { - enums.SensorType.Enum sensor_type = 1; - int64 refresh_interval = 2; + required enums.SensorType.Enum sensor_type = 1; + required int64 refresh_interval = 2; } diff --git a/SensorStartResponseMessage.proto b/SensorStartResponseMessage.proto index a4bf3dc..4f1b268 100644 --- a/SensorStartResponseMessage.proto +++ b/SensorStartResponseMessage.proto @@ -20,7 +20,7 @@ syntax="proto2"; import "StatusEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message SensorStartResponseMessage { diff --git a/SensorTypeEnum.proto b/SensorTypeEnum.proto index ccd9402..7877bdc 100644 --- a/SensorTypeEnum.proto +++ b/SensorTypeEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message SensorType { diff --git a/ServiceDiscoveryRequestMessage.proto b/ServiceDiscoveryRequestMessage.proto index 9d8f1d8..b28921f 100644 --- a/ServiceDiscoveryRequestMessage.proto +++ b/ServiceDiscoveryRequestMessage.proto @@ -16,12 +16,12 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message ServiceDiscoveryRequest { - string device_name = 4; - string device_brand = 5; + required string device_name = 4; + required string device_brand = 5; } diff --git a/ServiceDiscoveryResponseMessage.proto b/ServiceDiscoveryResponseMessage.proto index 59765f2..2ccce8d 100644 --- a/ServiceDiscoveryResponseMessage.proto +++ b/ServiceDiscoveryResponseMessage.proto @@ -16,24 +16,24 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "ChannelDescriptorData.proto"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message ServiceDiscoveryResponse { repeated data.ChannelDescriptor channels = 1; - string head_unit_name = 2; - string car_model = 3; - string car_year = 4; - string car_serial = 5; - bool left_hand_drive_vehicle = 6; - string headunit_manufacturer = 7; - string headunit_model = 8; - string sw_build = 9; - string sw_version = 10; - bool can_play_native_media_during_vr = 11; - bool hide_clock = 12; + required string head_unit_name = 2; + required string car_model = 3; + required string car_year = 4; + required string car_serial = 5; + required bool left_hand_drive_vehicle = 6; + required string headunit_manufacturer = 7; + required string headunit_model = 8; + required string sw_build = 9; + required string sw_version = 10; + required bool can_play_native_media_during_vr = 11; + optional bool hide_clock = 12; } diff --git a/ShutdownReasonEnum.proto b/ShutdownReasonEnum.proto index 6853aa1..d61575a 100644 --- a/ShutdownReasonEnum.proto +++ b/ShutdownReasonEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message ShutdownReason { diff --git a/ShutdownRequestMessage.proto b/ShutdownRequestMessage.proto index c67bc99..5c27c8d 100644 --- a/ShutdownRequestMessage.proto +++ b/ShutdownRequestMessage.proto @@ -16,13 +16,13 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "ShutdownReasonEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message ShutdownRequest { - enums.ShutdownReason.Enum reason = 1; + required enums.ShutdownReason.Enum reason = 1; } diff --git a/ShutdownResponseMessage.proto b/ShutdownResponseMessage.proto index be6850a..29718cc 100644 --- a/ShutdownResponseMessage.proto +++ b/ShutdownResponseMessage.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message ShutdownResponse { diff --git a/SpeedData.proto b/SpeedData.proto index 9143d8f..7d583c6 100644 --- a/SpeedData.proto +++ b/SpeedData.proto @@ -16,13 +16,13 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message Speed { - int32 speed = 1; - bool cruise_engaged = 2; - bool cruise_set_speed = 3; + required int32 speed = 1; + optional bool cruise_engaged = 2; + optional bool cruise_set_speed = 3; } diff --git a/StatusEnum.proto b/StatusEnum.proto index 9369268..e623841 100644 --- a/StatusEnum.proto +++ b/StatusEnum.proto @@ -1,3 +1,4 @@ + /* * This file is part of aasdk library project. * Copyright (C) 2018 f1x.studio (Michal Szwaj) @@ -16,9 +17,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message Status { diff --git a/SteeringWheelData.proto b/SteeringWheelData.proto index 31f83a4..88c3cac 100644 --- a/SteeringWheelData.proto +++ b/SteeringWheelData.proto @@ -16,12 +16,12 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message SteeringWheel { - int32 steering_angle = 1; - int32 wheel_speed = 2; + required int32 steering_angle = 1; + required int32 wheel_speed = 2; } diff --git a/TouchActionEnum.proto b/TouchActionEnum.proto index 5d7df0b..7b0d196 100644 --- a/TouchActionEnum.proto +++ b/TouchActionEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message TouchAction { @@ -26,6 +26,8 @@ message TouchAction { PRESS = 0; RELEASE = 1; - DRAG = 2; + DRAG = 2; + POINTER_DOWN=5; + POINTER_UP=6; } } diff --git a/TouchConfigData.proto b/TouchConfigData.proto index 82b7cac..73f33d2 100644 --- a/TouchConfigData.proto +++ b/TouchConfigData.proto @@ -16,12 +16,12 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message TouchConfig { - uint32 width = 1; - uint32 height = 2; + required uint32 width = 1; + required uint32 height = 2; } diff --git a/TouchEventData.proto b/TouchEventData.proto index 61e7064..d6d30ca 100644 --- a/TouchEventData.proto +++ b/TouchEventData.proto @@ -16,16 +16,16 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "TouchLocationData.proto"; import "TouchActionEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message TouchEvent { repeated data.TouchLocation touch_location = 1; - uint32 action_index = 2; - enums.TouchAction.Enum touch_action = 3; + required uint32 action_index = 2; + required enums.TouchAction.Enum touch_action = 3; } diff --git a/TouchLocationData.proto b/TouchLocationData.proto index f372d2e..8e5067c 100644 --- a/TouchLocationData.proto +++ b/TouchLocationData.proto @@ -16,13 +16,13 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message TouchLocation { - uint32 x = 1; - uint32 y = 2; - uint32 pointer_id = 3; + required uint32 x = 1; + required uint32 y = 2; + required uint32 pointer_id = 3; } diff --git a/VendorExtensionChannelData.proto b/VendorExtensionChannelData.proto index a8e7983..00c9b21 100644 --- a/VendorExtensionChannelData.proto +++ b/VendorExtensionChannelData.proto @@ -16,13 +16,13 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message VendorExtensionChannel { - string name = 1; + required string name = 1; repeated string package_white_list = 2; - bytes data = 3; + optional bytes data = 3; } diff --git a/VersionResponseStatusEnum.proto b/VersionResponseStatusEnum.proto index fc0dc94..b246522 100644 --- a/VersionResponseStatusEnum.proto +++ b/VersionResponseStatusEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message VersionResponseStatus { diff --git a/VideoConfigData.proto b/VideoConfigData.proto index 64a47cd..fba9011 100644 --- a/VideoConfigData.proto +++ b/VideoConfigData.proto @@ -16,19 +16,19 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "VideoResolutionEnum.proto"; import "VideoFPSEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.data; +package gb.xxy.trial.proto.data; message VideoConfig { - enums.VideoResolution.Enum video_resolution = 1; - enums.VideoFPS.Enum video_fps = 2; - uint32 margin_width = 3; - uint32 margin_height = 4; - uint32 dpi = 5; - uint32 additional_depth = 6; + required enums.VideoResolution.Enum video_resolution = 1; + required enums.VideoFPS.Enum video_fps = 2; + required uint32 margin_width = 3; + required uint32 margin_height = 4; + required uint32 dpi = 5; + optional uint32 additional_depth = 6; } diff --git a/VideoFPSEnum.proto b/VideoFPSEnum.proto index 4b5ac32..2c737d5 100644 --- a/VideoFPSEnum.proto +++ b/VideoFPSEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message VideoFPS { diff --git a/VideoFocusIndicationMessage.proto b/VideoFocusIndicationMessage.proto index 423759e..9ee53fc 100644 --- a/VideoFocusIndicationMessage.proto +++ b/VideoFocusIndicationMessage.proto @@ -16,14 +16,14 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "VideoFocusModeEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message VideoFocusIndication { - enums.VideoFocusMode.Enum focus_mode = 1; - bool unrequested = 2; + required enums.VideoFocusMode.Enum focus_mode = 1; + required bool unrequested = 2; } diff --git a/VideoFocusModeEnum.proto b/VideoFocusModeEnum.proto index 0be8938..bef0be9 100644 --- a/VideoFocusModeEnum.proto +++ b/VideoFocusModeEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message VideoFocusMode { diff --git a/VideoFocusReasonEnum.proto b/VideoFocusReasonEnum.proto index 26c1bfb..e3cb50d 100644 --- a/VideoFocusReasonEnum.proto +++ b/VideoFocusReasonEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message VideoFocusReason { diff --git a/VideoFocusRequestMessage.proto b/VideoFocusRequestMessage.proto index 828b75f..ab15088 100644 --- a/VideoFocusRequestMessage.proto +++ b/VideoFocusRequestMessage.proto @@ -16,16 +16,16 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; import "VideoFocusModeEnum.proto"; import "VideoFocusReasonEnum.proto"; -package uk.co.borconi.emil.aagateway.proto.messages; +package gb.xxy.trial.proto.messages; message VideoFocusRequest { - int32 disp_index = 1; - enums.VideoFocusMode.Enum focus_mode = 2; - enums.VideoFocusReason.Enum focus_reason = 3; + required int32 disp_index = 1; + required enums.VideoFocusMode.Enum focus_mode = 2; + required enums.VideoFocusReason.Enum focus_reason = 3; } diff --git a/VideoResolutionEnum.proto b/VideoResolutionEnum.proto index cfbd2eb..8017af9 100644 --- a/VideoResolutionEnum.proto +++ b/VideoResolutionEnum.proto @@ -16,9 +16,9 @@ * along with aasdk. If not, see . */ -syntax="proto3"; +syntax="proto2"; -package uk.co.borconi.emil.aagateway.proto.enums; +package gb.xxy.trial.proto.enums; message VideoResolution {