updates to make things work (stolen from other people)

icecube45 · Mar 6, 2020 · d875304 · d875304
1 parent 9ee5283
commit d875304
Show file tree

Hide file tree

Showing 94 changed files with 339 additions and 254 deletions.
diff --git a/aasdk_proto/AVChannelData.proto b/aasdk_proto/AVChannelData.proto
@@ -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";
@@ -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;
 }
diff --git a/aasdk_proto/AVChannelMessageIdsEnum.proto b/aasdk_proto/AVChannelMessageIdsEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.ids;
 

diff --git a/aasdk_proto/AVChannelSetupRequestMessage.proto b/aasdk_proto/AVChannelSetupRequestMessage.proto
@@ -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;
 }
diff --git a/aasdk_proto/AVChannelSetupStatusEnum.proto b/aasdk_proto/AVChannelSetupStatusEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 

diff --git a/aasdk_proto/AVChannelStartIndicationMessage.proto b/aasdk_proto/AVChannelStartIndicationMessage.proto
@@ -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;
 }
diff --git a/aasdk_proto/AVChannelStopIndicationMessage.proto b/aasdk_proto/AVChannelStopIndicationMessage.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.messages;
 

diff --git a/aasdk_proto/AVInputChannelData.proto b/aasdk_proto/AVInputChannelData.proto
@@ -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";
@@ -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;
 }
diff --git a/aasdk_proto/AVInputOpenRequestMessage.proto b/aasdk_proto/AVInputOpenRequestMessage.proto
@@ -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;
 }
diff --git a/aasdk_proto/AVStreamTypeEnum.proto b/aasdk_proto/AVStreamTypeEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 

diff --git a/aasdk_proto/AbsoluteInputEventData.proto b/aasdk_proto/AbsoluteInputEventData.proto
@@ -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;
 }
diff --git a/aasdk_proto/AbsoluteInputEventsData.proto b/aasdk_proto/AbsoluteInputEventsData.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "AbsoluteInputEventData.proto";
 

diff --git a/aasdk_proto/AccelData.proto b/aasdk_proto/AccelData.proto
@@ -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;
 }
diff --git a/aasdk_proto/AudioConfigData.proto b/aasdk_proto/AudioConfigData.proto
@@ -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;
 }
diff --git a/aasdk_proto/AudioFocusRequestMessage.proto b/aasdk_proto/AudioFocusRequestMessage.proto
@@ -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;
 }
diff --git a/aasdk_proto/AudioFocusResponseMessage.proto b/aasdk_proto/AudioFocusResponseMessage.proto
@@ -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;
 }
diff --git a/aasdk_proto/AudioFocusStateEnum.proto b/aasdk_proto/AudioFocusStateEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 

diff --git a/aasdk_proto/AudioFocusTypeEnum.proto b/aasdk_proto/AudioFocusTypeEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 

diff --git a/aasdk_proto/AudioTypeEnum.proto b/aasdk_proto/AudioTypeEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 

diff --git a/aasdk_proto/BindingRequestMessage.proto b/aasdk_proto/BindingRequestMessage.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.messages;
 

diff --git a/aasdk_proto/BluetoothChannelData.proto b/aasdk_proto/BluetoothChannelData.proto
@@ -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;
 }
diff --git a/aasdk_proto/BluetoothChannelMessageIdsEnum.proto b/aasdk_proto/BluetoothChannelMessageIdsEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.ids;
 

diff --git a/aasdk_proto/BluetoothPairingMethodEnum.proto b/aasdk_proto/BluetoothPairingMethodEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 

diff --git a/aasdk_proto/BluetoothPairingRequestMessage.proto b/aasdk_proto/BluetoothPairingRequestMessage.proto
@@ -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;
 }
diff --git a/aasdk_proto/BluetoothPairingResponseMessage.proto b/aasdk_proto/BluetoothPairingResponseMessage.proto
@@ -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;
 }
diff --git a/aasdk_proto/BluetoothPairingStatusEnum.proto b/aasdk_proto/BluetoothPairingStatusEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 

diff --git a/aasdk_proto/ButtonCodeEnum.proto b/aasdk_proto/ButtonCodeEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 

diff --git a/aasdk_proto/ButtonEventData.proto b/aasdk_proto/ButtonEventData.proto
@@ -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;
 }
diff --git a/aasdk_proto/ButtonEventsData.proto b/aasdk_proto/ButtonEventsData.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "ButtonEventData.proto";