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

Fix compatibility with latest Android Auto #2

Merged
merged 13 commits into from
Aug 7, 2019
Merged

Fix compatibility with latest Android Auto #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9ee5283
Merge remote-tracking branch 'remotes/origin/development'
f1xpl Apr 7, 2018
516a98c
Updated channels
borconi Apr 8, 2019
1be914a
Update from borconi/AAProto
abraha2d Jul 4, 2019
68bd1d8
Merge remote-tracking branch 'origin/development'
abraha2d Jul 4, 2019
5f4ec33
Put package names back to f1x.aasdk
abraha2d Jul 4, 2019
8aec5b4
Fix whitespace
abraha2d Jul 4, 2019
8ffa3d3
Merge pull request #1 from abraha2d/development
borconi Jul 4, 2019
3c402da
Fix runtime error about touch_event.action_index
abraha2d Jul 5, 2019
b9cd29a
Fix whitespace
abraha2d Jul 5, 2019
ba04fa9
Fix runtime error about AVInputOpenRequest
abraha2d Jul 5, 2019
df25ec9
Merge pull request #2 from abraha2d/development
borconi Jul 10, 2019
5045f58
[opencardev/crankshaft#357] Fix parsing error due to required field i…
abraha2d Jul 12, 2019
361380e
Update aasdk_proto/WifiChannelData.proto to be proto2 instead of proto3
abraha2d Jul 16, 2019
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
8 changes: 4 additions & 4 deletions aasdk_proto/AVChannelData.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

import "AVStreamTypeEnum.proto";
import "AudioTypeEnum.proto";
Expand All @@ -27,9 +27,9 @@ package f1x.aasdk.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;
}
2 changes: 1 addition & 1 deletion aasdk_proto/AVChannelMessageIdsEnum.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.proto.ids;

Expand Down
4 changes: 2 additions & 2 deletions aasdk_proto/AVChannelSetupRequestMessage.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.proto.messages;

message AVChannelSetupRequest
{
uint32 config_index = 1;
required uint32 config_index = 1;
}
2 changes: 1 addition & 1 deletion aasdk_proto/AVChannelSetupStatusEnum.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.proto.enums;

Expand Down
6 changes: 3 additions & 3 deletions aasdk_proto/AVChannelStartIndicationMessage.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.proto.messages;

message AVChannelStartIndication
{
int32 session = 1;
uint32 config = 2;
required int32 session = 1;
required uint32 config = 2;
}
2 changes: 1 addition & 1 deletion aasdk_proto/AVChannelStopIndicationMessage.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.proto.messages;

Expand Down
8 changes: 4 additions & 4 deletions aasdk_proto/AVInputChannelData.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

import "AVStreamTypeEnum.proto";
import "AudioConfigData.proto";
Expand All @@ -25,7 +25,7 @@ package f1x.aasdk.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;
}
10 changes: 5 additions & 5 deletions aasdk_proto/AVInputOpenRequestMessage.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.proto.messages;

message AVInputOpenRequest
{
bool open = 1;
bool anc = 2;
bool ec = 3;
int32 max_unacked = 4;
required bool open = 1;
optional bool anc = 2;
optional bool ec = 3;
optional int32 max_unacked = 4;
}
2 changes: 1 addition & 1 deletion aasdk_proto/AVStreamTypeEnum.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.proto.enums;

Expand Down
6 changes: 3 additions & 3 deletions aasdk_proto/AbsoluteInputEventData.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.proto.data;

message AbsoluteInputEvent
{
uint32 scan_code = 1;
int32 value = 2;
required uint32 scan_code = 1;
required int32 value = 2;
}
2 changes: 1 addition & 1 deletion aasdk_proto/AbsoluteInputEventsData.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

import "AbsoluteInputEventData.proto";

Expand Down
8 changes: 4 additions & 4 deletions aasdk_proto/AccelData.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.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;
}
8 changes: 4 additions & 4 deletions aasdk_proto/AudioConfigData.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.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;
}
4 changes: 2 additions & 2 deletions aasdk_proto/AudioFocusRequestMessage.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

import "AudioFocusTypeEnum.proto";

package f1x.aasdk.proto.messages;

message AudioFocusRequest
{
enums.AudioFocusType.Enum audio_focus_type = 1;
required enums.AudioFocusType.Enum audio_focus_type = 1;
}
4 changes: 2 additions & 2 deletions aasdk_proto/AudioFocusResponseMessage.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

import "AudioFocusStateEnum.proto";

package f1x.aasdk.proto.messages;

message AudioFocusResponse
{
enums.AudioFocusState.Enum audio_focus_state = 1;
required enums.AudioFocusState.Enum audio_focus_state = 1;
}
2 changes: 1 addition & 1 deletion aasdk_proto/AudioFocusStateEnum.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.proto.enums;

Expand Down
2 changes: 1 addition & 1 deletion aasdk_proto/AudioFocusTypeEnum.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.proto.enums;

Expand Down
2 changes: 1 addition & 1 deletion aasdk_proto/AudioTypeEnum.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.proto.enums;

Expand Down
2 changes: 1 addition & 1 deletion aasdk_proto/BindingRequestMessage.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.proto.messages;

Expand Down
4 changes: 2 additions & 2 deletions aasdk_proto/BluetoothChannelData.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

import "BluetoothPairingMethodEnum.proto";

package f1x.aasdk.proto.data;

message BluetoothChannel
{
string adapter_address = 1;
required string adapter_address = 1;
repeated enums.BluetoothPairingMethod.Enum supported_pairing_methods = 2;
}
2 changes: 1 addition & 1 deletion aasdk_proto/BluetoothChannelMessageIdsEnum.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.proto.ids;

Expand Down
2 changes: 1 addition & 1 deletion aasdk_proto/BluetoothPairingMethodEnum.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.proto.enums;

Expand Down
6 changes: 3 additions & 3 deletions aasdk_proto/BluetoothPairingRequestMessage.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

import "BluetoothPairingMethodEnum.proto";

package f1x.aasdk.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;
}
6 changes: 3 additions & 3 deletions aasdk_proto/BluetoothPairingResponseMessage.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

import "BluetoothPairingStatusEnum.proto";

package f1x.aasdk.proto.messages;

message BluetoothPairingResponse
{
bool already_paired = 1;
enums.BluetoothPairingStatus.Enum status = 2;
required bool already_paired = 1;
required enums.BluetoothPairingStatus.Enum status = 2;
}
2 changes: 1 addition & 1 deletion aasdk_proto/BluetoothPairingStatusEnum.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.proto.enums;

Expand Down
2 changes: 1 addition & 1 deletion aasdk_proto/ButtonCodeEnum.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.proto.enums;

Expand Down
10 changes: 5 additions & 5 deletions aasdk_proto/ButtonEventData.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

package f1x.aasdk.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;
}
2 changes: 1 addition & 1 deletion aasdk_proto/ButtonEventsData.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with aasdk. If not, see <http://www.gnu.org/licenses/>.
*/

syntax="proto3";
syntax="proto2";

import "ButtonEventData.proto";

Expand Down
Loading