From 22594be77c28613e9b71bdf3202e435463f758ed Mon Sep 17 00:00:00 2001 From: Eric Marsman Date: Mon, 29 Feb 2016 20:02:59 +0000 Subject: [PATCH] re-compiled with libprotoc 2.4.1 - should be no changes --- gen/cpp/openxc.pb.c | 2 +- gen/cpp/openxc.pb.h | 2 +- gen/java/com/openxc/BinaryMessages.java | 8568 ++++++++++--------------------- gen/python/openxc_pb2.py | 385 +- 4 files changed, 2882 insertions(+), 6075 deletions(-) diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c index c15a218d..f834836d 100644 --- a/gen/cpp/openxc.pb.c +++ b/gen/cpp/openxc.pb.c @@ -1,5 +1,5 @@ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.3.1 at Wed Dec 9 21:31:24 2015. */ +/* Generated by nanopb-0.3.1 at Mon Feb 29 19:42:01 2016. */ #include "openxc.pb.h" diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h index 17bb77d4..11386e3e 100644 --- a/gen/cpp/openxc.pb.h +++ b/gen/cpp/openxc.pb.h @@ -1,5 +1,5 @@ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.3.1 at Wed Dec 9 21:31:24 2015. */ +/* Generated by nanopb-0.3.1 at Mon Feb 29 19:42:01 2016. */ #ifndef PB_OPENXC_PB_H_INCLUDED #define PB_OPENXC_PB_H_INCLUDED diff --git a/gen/java/com/openxc/BinaryMessages.java b/gen/java/com/openxc/BinaryMessages.java index bd84bd14..534b2231 100644 --- a/gen/java/com/openxc/BinaryMessages.java +++ b/gen/java/com/openxc/BinaryMessages.java @@ -10,319 +10,86 @@ public final class BinaryMessages { } public interface VehicleMessageOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional .openxc.VehicleMessage.Type type = 1; - /** - * optional .openxc.VehicleMessage.Type type = 1; - */ boolean hasType(); - /** - * optional .openxc.VehicleMessage.Type type = 1; - */ com.openxc.BinaryMessages.VehicleMessage.Type getType(); - + // optional .openxc.CanMessage can_message = 2; - /** - * optional .openxc.CanMessage can_message = 2; - */ boolean hasCanMessage(); - /** - * optional .openxc.CanMessage can_message = 2; - */ com.openxc.BinaryMessages.CanMessage getCanMessage(); - /** - * optional .openxc.CanMessage can_message = 2; - */ com.openxc.BinaryMessages.CanMessageOrBuilder getCanMessageOrBuilder(); - + // optional .openxc.SimpleMessage simple_message = 3; - /** - * optional .openxc.SimpleMessage simple_message = 3; - */ boolean hasSimpleMessage(); - /** - * optional .openxc.SimpleMessage simple_message = 3; - */ com.openxc.BinaryMessages.SimpleMessage getSimpleMessage(); - /** - * optional .openxc.SimpleMessage simple_message = 3; - */ com.openxc.BinaryMessages.SimpleMessageOrBuilder getSimpleMessageOrBuilder(); - + // optional .openxc.DiagnosticResponse diagnostic_response = 4; - /** - * optional .openxc.DiagnosticResponse diagnostic_response = 4; - */ boolean hasDiagnosticResponse(); - /** - * optional .openxc.DiagnosticResponse diagnostic_response = 4; - */ com.openxc.BinaryMessages.DiagnosticResponse getDiagnosticResponse(); - /** - * optional .openxc.DiagnosticResponse diagnostic_response = 4; - */ com.openxc.BinaryMessages.DiagnosticResponseOrBuilder getDiagnosticResponseOrBuilder(); - + // optional .openxc.ControlCommand control_command = 5; - /** - * optional .openxc.ControlCommand control_command = 5; - */ boolean hasControlCommand(); - /** - * optional .openxc.ControlCommand control_command = 5; - */ com.openxc.BinaryMessages.ControlCommand getControlCommand(); - /** - * optional .openxc.ControlCommand control_command = 5; - */ com.openxc.BinaryMessages.ControlCommandOrBuilder getControlCommandOrBuilder(); - + // optional .openxc.CommandResponse command_response = 6; - /** - * optional .openxc.CommandResponse command_response = 6; - */ boolean hasCommandResponse(); - /** - * optional .openxc.CommandResponse command_response = 6; - */ com.openxc.BinaryMessages.CommandResponse getCommandResponse(); - /** - * optional .openxc.CommandResponse command_response = 6; - */ com.openxc.BinaryMessages.CommandResponseOrBuilder getCommandResponseOrBuilder(); - + // optional uint64 timestamp = 7; - /** - * optional uint64 timestamp = 7; - */ boolean hasTimestamp(); - /** - * optional uint64 timestamp = 7; - */ long getTimestamp(); } - /** - * Protobuf type {@code openxc.VehicleMessage} - */ public static final class VehicleMessage extends com.google.protobuf.GeneratedMessage implements VehicleMessageOrBuilder { // Use VehicleMessage.newBuilder() to construct. - private VehicleMessage(com.google.protobuf.GeneratedMessage.Builder builder) { + private VehicleMessage(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private VehicleMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private VehicleMessage(boolean noInit) {} + private static final VehicleMessage defaultInstance; public static VehicleMessage getDefaultInstance() { return defaultInstance; } - + public VehicleMessage getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private VehicleMessage( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - int rawValue = input.readEnum(); - com.openxc.BinaryMessages.VehicleMessage.Type value = com.openxc.BinaryMessages.VehicleMessage.Type.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(1, rawValue); - } else { - bitField0_ |= 0x00000001; - type_ = value; - } - break; - } - case 18: { - com.openxc.BinaryMessages.CanMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - subBuilder = canMessage_.toBuilder(); - } - canMessage_ = input.readMessage(com.openxc.BinaryMessages.CanMessage.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(canMessage_); - canMessage_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - case 26: { - com.openxc.BinaryMessages.SimpleMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - subBuilder = simpleMessage_.toBuilder(); - } - simpleMessage_ = input.readMessage(com.openxc.BinaryMessages.SimpleMessage.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(simpleMessage_); - simpleMessage_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000004; - break; - } - case 34: { - com.openxc.BinaryMessages.DiagnosticResponse.Builder subBuilder = null; - if (((bitField0_ & 0x00000008) == 0x00000008)) { - subBuilder = diagnosticResponse_.toBuilder(); - } - diagnosticResponse_ = input.readMessage(com.openxc.BinaryMessages.DiagnosticResponse.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(diagnosticResponse_); - diagnosticResponse_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000008; - break; - } - case 42: { - com.openxc.BinaryMessages.ControlCommand.Builder subBuilder = null; - if (((bitField0_ & 0x00000010) == 0x00000010)) { - subBuilder = controlCommand_.toBuilder(); - } - controlCommand_ = input.readMessage(com.openxc.BinaryMessages.ControlCommand.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(controlCommand_); - controlCommand_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000010; - break; - } - case 50: { - com.openxc.BinaryMessages.CommandResponse.Builder subBuilder = null; - if (((bitField0_ & 0x00000020) == 0x00000020)) { - subBuilder = commandResponse_.toBuilder(); - } - commandResponse_ = input.readMessage(com.openxc.BinaryMessages.CommandResponse.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(commandResponse_); - commandResponse_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000020; - break; - } - case 56: { - bitField0_ |= 0x00000040; - timestamp_ = input.readUInt64(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.VehicleMessage.class, com.openxc.BinaryMessages.VehicleMessage.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public VehicleMessage parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new VehicleMessage(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_fieldAccessorTable; } - - /** - * Protobuf enum {@code openxc.VehicleMessage.Type} - */ + public enum Type implements com.google.protobuf.ProtocolMessageEnum { - /** - * CAN = 1; - */ CAN(0, 1), - /** - * SIMPLE = 2; - */ SIMPLE(1, 2), - /** - * DIAGNOSTIC = 3; - */ DIAGNOSTIC(2, 3), - /** - * CONTROL_COMMAND = 4; - */ CONTROL_COMMAND(3, 4), - /** - * COMMAND_RESPONSE = 5; - */ COMMAND_RESPONSE(4, 5), ; - - /** - * CAN = 1; - */ + public static final int CAN_VALUE = 1; - /** - * SIMPLE = 2; - */ public static final int SIMPLE_VALUE = 2; - /** - * DIAGNOSTIC = 3; - */ public static final int DIAGNOSTIC_VALUE = 3; - /** - * CONTROL_COMMAND = 4; - */ public static final int CONTROL_COMMAND_VALUE = 4; - /** - * COMMAND_RESPONSE = 5; - */ public static final int COMMAND_RESPONSE_VALUE = 5; - - + + public final int getNumber() { return value; } - + public static Type valueOf(int value) { switch (value) { case 1: return CAN; @@ -333,7 +100,7 @@ public final class BinaryMessages { default: return null; } } - + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; @@ -345,7 +112,7 @@ public final class BinaryMessages { return Type.valueOf(number); } }; - + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { return getDescriptor().getValues().get(index); @@ -358,9 +125,11 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.VehicleMessage.getDescriptor().getEnumTypes().get(0); } - - private static final Type[] VALUES = values(); - + + private static final Type[] VALUES = { + CAN, SIMPLE, DIAGNOSTIC, CONTROL_COMMAND, COMMAND_RESPONSE, + }; + public static Type valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { @@ -369,161 +138,104 @@ public final class BinaryMessages { } return VALUES[desc.getIndex()]; } - + private final int index; private final int value; - + private Type(int index, int value) { this.index = index; this.value = value; } - + // @@protoc_insertion_point(enum_scope:openxc.VehicleMessage.Type) } - + private int bitField0_; // optional .openxc.VehicleMessage.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; private com.openxc.BinaryMessages.VehicleMessage.Type type_; - /** - * optional .openxc.VehicleMessage.Type type = 1; - */ public boolean hasType() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional .openxc.VehicleMessage.Type type = 1; - */ public com.openxc.BinaryMessages.VehicleMessage.Type getType() { return type_; } - + // optional .openxc.CanMessage can_message = 2; public static final int CAN_MESSAGE_FIELD_NUMBER = 2; private com.openxc.BinaryMessages.CanMessage canMessage_; - /** - * optional .openxc.CanMessage can_message = 2; - */ public boolean hasCanMessage() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional .openxc.CanMessage can_message = 2; - */ public com.openxc.BinaryMessages.CanMessage getCanMessage() { return canMessage_; } - /** - * optional .openxc.CanMessage can_message = 2; - */ public com.openxc.BinaryMessages.CanMessageOrBuilder getCanMessageOrBuilder() { return canMessage_; } - + // optional .openxc.SimpleMessage simple_message = 3; public static final int SIMPLE_MESSAGE_FIELD_NUMBER = 3; private com.openxc.BinaryMessages.SimpleMessage simpleMessage_; - /** - * optional .openxc.SimpleMessage simple_message = 3; - */ public boolean hasSimpleMessage() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional .openxc.SimpleMessage simple_message = 3; - */ public com.openxc.BinaryMessages.SimpleMessage getSimpleMessage() { return simpleMessage_; } - /** - * optional .openxc.SimpleMessage simple_message = 3; - */ public com.openxc.BinaryMessages.SimpleMessageOrBuilder getSimpleMessageOrBuilder() { return simpleMessage_; } - + // optional .openxc.DiagnosticResponse diagnostic_response = 4; public static final int DIAGNOSTIC_RESPONSE_FIELD_NUMBER = 4; private com.openxc.BinaryMessages.DiagnosticResponse diagnosticResponse_; - /** - * optional .openxc.DiagnosticResponse diagnostic_response = 4; - */ public boolean hasDiagnosticResponse() { return ((bitField0_ & 0x00000008) == 0x00000008); } - /** - * optional .openxc.DiagnosticResponse diagnostic_response = 4; - */ public com.openxc.BinaryMessages.DiagnosticResponse getDiagnosticResponse() { return diagnosticResponse_; } - /** - * optional .openxc.DiagnosticResponse diagnostic_response = 4; - */ public com.openxc.BinaryMessages.DiagnosticResponseOrBuilder getDiagnosticResponseOrBuilder() { return diagnosticResponse_; } - + // optional .openxc.ControlCommand control_command = 5; public static final int CONTROL_COMMAND_FIELD_NUMBER = 5; private com.openxc.BinaryMessages.ControlCommand controlCommand_; - /** - * optional .openxc.ControlCommand control_command = 5; - */ public boolean hasControlCommand() { return ((bitField0_ & 0x00000010) == 0x00000010); } - /** - * optional .openxc.ControlCommand control_command = 5; - */ public com.openxc.BinaryMessages.ControlCommand getControlCommand() { return controlCommand_; } - /** - * optional .openxc.ControlCommand control_command = 5; - */ public com.openxc.BinaryMessages.ControlCommandOrBuilder getControlCommandOrBuilder() { return controlCommand_; } - + // optional .openxc.CommandResponse command_response = 6; public static final int COMMAND_RESPONSE_FIELD_NUMBER = 6; private com.openxc.BinaryMessages.CommandResponse commandResponse_; - /** - * optional .openxc.CommandResponse command_response = 6; - */ public boolean hasCommandResponse() { return ((bitField0_ & 0x00000020) == 0x00000020); } - /** - * optional .openxc.CommandResponse command_response = 6; - */ public com.openxc.BinaryMessages.CommandResponse getCommandResponse() { return commandResponse_; } - /** - * optional .openxc.CommandResponse command_response = 6; - */ public com.openxc.BinaryMessages.CommandResponseOrBuilder getCommandResponseOrBuilder() { return commandResponse_; } - + // optional uint64 timestamp = 7; public static final int TIMESTAMP_FIELD_NUMBER = 7; private long timestamp_; - /** - * optional uint64 timestamp = 7; - */ public boolean hasTimestamp() { return ((bitField0_ & 0x00000040) == 0x00000040); } - /** - * optional uint64 timestamp = 7; - */ public long getTimestamp() { return timestamp_; } - + private void initFields() { type_ = com.openxc.BinaryMessages.VehicleMessage.Type.CAN; canMessage_ = com.openxc.BinaryMessages.CanMessage.getDefaultInstance(); @@ -537,11 +249,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -568,12 +280,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -607,83 +319,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.VehicleMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.VehicleMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.VehicleMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.VehicleMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.VehicleMessage parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.VehicleMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.VehicleMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.VehicleMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.VehicleMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.VehicleMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.VehicleMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.VehicleMessage} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.VehicleMessageOrBuilder { @@ -691,21 +414,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.VehicleMessage.class, com.openxc.BinaryMessages.VehicleMessage.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.VehicleMessage.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -721,7 +441,7 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); type_ = com.openxc.BinaryMessages.VehicleMessage.Type.CAN; @@ -760,20 +480,20 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000040); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_VehicleMessage_descriptor; + return com.openxc.BinaryMessages.VehicleMessage.getDescriptor(); } - + public com.openxc.BinaryMessages.VehicleMessage getDefaultInstanceForType() { return com.openxc.BinaryMessages.VehicleMessage.getDefaultInstance(); } - + public com.openxc.BinaryMessages.VehicleMessage build() { com.openxc.BinaryMessages.VehicleMessage result = buildPartial(); if (!result.isInitialized()) { @@ -781,7 +501,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.VehicleMessage buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.VehicleMessage result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.VehicleMessage buildPartial() { com.openxc.BinaryMessages.VehicleMessage result = new com.openxc.BinaryMessages.VehicleMessage(this); int from_bitField0_ = bitField0_; @@ -838,7 +568,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.VehicleMessage) { return mergeFrom((com.openxc.BinaryMessages.VehicleMessage)other); @@ -847,7 +577,7 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.VehicleMessage other) { if (other == com.openxc.BinaryMessages.VehicleMessage.getDefaultInstance()) return this; if (other.hasType()) { @@ -874,47 +604,109 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.VehicleMessage parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.VehicleMessage) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 8: { + int rawValue = input.readEnum(); + com.openxc.BinaryMessages.VehicleMessage.Type value = com.openxc.BinaryMessages.VehicleMessage.Type.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(1, rawValue); + } else { + bitField0_ |= 0x00000001; + type_ = value; + } + break; + } + case 18: { + com.openxc.BinaryMessages.CanMessage.Builder subBuilder = com.openxc.BinaryMessages.CanMessage.newBuilder(); + if (hasCanMessage()) { + subBuilder.mergeFrom(getCanMessage()); + } + input.readMessage(subBuilder, extensionRegistry); + setCanMessage(subBuilder.buildPartial()); + break; + } + case 26: { + com.openxc.BinaryMessages.SimpleMessage.Builder subBuilder = com.openxc.BinaryMessages.SimpleMessage.newBuilder(); + if (hasSimpleMessage()) { + subBuilder.mergeFrom(getSimpleMessage()); + } + input.readMessage(subBuilder, extensionRegistry); + setSimpleMessage(subBuilder.buildPartial()); + break; + } + case 34: { + com.openxc.BinaryMessages.DiagnosticResponse.Builder subBuilder = com.openxc.BinaryMessages.DiagnosticResponse.newBuilder(); + if (hasDiagnosticResponse()) { + subBuilder.mergeFrom(getDiagnosticResponse()); + } + input.readMessage(subBuilder, extensionRegistry); + setDiagnosticResponse(subBuilder.buildPartial()); + break; + } + case 42: { + com.openxc.BinaryMessages.ControlCommand.Builder subBuilder = com.openxc.BinaryMessages.ControlCommand.newBuilder(); + if (hasControlCommand()) { + subBuilder.mergeFrom(getControlCommand()); + } + input.readMessage(subBuilder, extensionRegistry); + setControlCommand(subBuilder.buildPartial()); + break; + } + case 50: { + com.openxc.BinaryMessages.CommandResponse.Builder subBuilder = com.openxc.BinaryMessages.CommandResponse.newBuilder(); + if (hasCommandResponse()) { + subBuilder.mergeFrom(getCommandResponse()); + } + input.readMessage(subBuilder, extensionRegistry); + setCommandResponse(subBuilder.buildPartial()); + break; + } + case 56: { + bitField0_ |= 0x00000040; + timestamp_ = input.readUInt64(); + break; + } } } - return this; } + private int bitField0_; - + // optional .openxc.VehicleMessage.Type type = 1; private com.openxc.BinaryMessages.VehicleMessage.Type type_ = com.openxc.BinaryMessages.VehicleMessage.Type.CAN; - /** - * optional .openxc.VehicleMessage.Type type = 1; - */ public boolean hasType() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional .openxc.VehicleMessage.Type type = 1; - */ public com.openxc.BinaryMessages.VehicleMessage.Type getType() { return type_; } - /** - * optional .openxc.VehicleMessage.Type type = 1; - */ public Builder setType(com.openxc.BinaryMessages.VehicleMessage.Type value) { if (value == null) { throw new NullPointerException(); @@ -924,29 +716,20 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional .openxc.VehicleMessage.Type type = 1; - */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); type_ = com.openxc.BinaryMessages.VehicleMessage.Type.CAN; onChanged(); return this; } - + // optional .openxc.CanMessage can_message = 2; private com.openxc.BinaryMessages.CanMessage canMessage_ = com.openxc.BinaryMessages.CanMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.CanMessage, com.openxc.BinaryMessages.CanMessage.Builder, com.openxc.BinaryMessages.CanMessageOrBuilder> canMessageBuilder_; - /** - * optional .openxc.CanMessage can_message = 2; - */ public boolean hasCanMessage() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional .openxc.CanMessage can_message = 2; - */ public com.openxc.BinaryMessages.CanMessage getCanMessage() { if (canMessageBuilder_ == null) { return canMessage_; @@ -954,9 +737,6 @@ public final class BinaryMessages { return canMessageBuilder_.getMessage(); } } - /** - * optional .openxc.CanMessage can_message = 2; - */ public Builder setCanMessage(com.openxc.BinaryMessages.CanMessage value) { if (canMessageBuilder_ == null) { if (value == null) { @@ -970,9 +750,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000002; return this; } - /** - * optional .openxc.CanMessage can_message = 2; - */ public Builder setCanMessage( com.openxc.BinaryMessages.CanMessage.Builder builderForValue) { if (canMessageBuilder_ == null) { @@ -984,9 +761,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000002; return this; } - /** - * optional .openxc.CanMessage can_message = 2; - */ public Builder mergeCanMessage(com.openxc.BinaryMessages.CanMessage value) { if (canMessageBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && @@ -1003,9 +777,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000002; return this; } - /** - * optional .openxc.CanMessage can_message = 2; - */ public Builder clearCanMessage() { if (canMessageBuilder_ == null) { canMessage_ = com.openxc.BinaryMessages.CanMessage.getDefaultInstance(); @@ -1016,17 +787,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000002); return this; } - /** - * optional .openxc.CanMessage can_message = 2; - */ public com.openxc.BinaryMessages.CanMessage.Builder getCanMessageBuilder() { bitField0_ |= 0x00000002; onChanged(); return getCanMessageFieldBuilder().getBuilder(); } - /** - * optional .openxc.CanMessage can_message = 2; - */ public com.openxc.BinaryMessages.CanMessageOrBuilder getCanMessageOrBuilder() { if (canMessageBuilder_ != null) { return canMessageBuilder_.getMessageOrBuilder(); @@ -1034,9 +799,6 @@ public final class BinaryMessages { return canMessage_; } } - /** - * optional .openxc.CanMessage can_message = 2; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.CanMessage, com.openxc.BinaryMessages.CanMessage.Builder, com.openxc.BinaryMessages.CanMessageOrBuilder> getCanMessageFieldBuilder() { @@ -1050,20 +812,14 @@ public final class BinaryMessages { } return canMessageBuilder_; } - + // optional .openxc.SimpleMessage simple_message = 3; private com.openxc.BinaryMessages.SimpleMessage simpleMessage_ = com.openxc.BinaryMessages.SimpleMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.SimpleMessage, com.openxc.BinaryMessages.SimpleMessage.Builder, com.openxc.BinaryMessages.SimpleMessageOrBuilder> simpleMessageBuilder_; - /** - * optional .openxc.SimpleMessage simple_message = 3; - */ public boolean hasSimpleMessage() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional .openxc.SimpleMessage simple_message = 3; - */ public com.openxc.BinaryMessages.SimpleMessage getSimpleMessage() { if (simpleMessageBuilder_ == null) { return simpleMessage_; @@ -1071,9 +827,6 @@ public final class BinaryMessages { return simpleMessageBuilder_.getMessage(); } } - /** - * optional .openxc.SimpleMessage simple_message = 3; - */ public Builder setSimpleMessage(com.openxc.BinaryMessages.SimpleMessage value) { if (simpleMessageBuilder_ == null) { if (value == null) { @@ -1087,9 +840,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000004; return this; } - /** - * optional .openxc.SimpleMessage simple_message = 3; - */ public Builder setSimpleMessage( com.openxc.BinaryMessages.SimpleMessage.Builder builderForValue) { if (simpleMessageBuilder_ == null) { @@ -1101,9 +851,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000004; return this; } - /** - * optional .openxc.SimpleMessage simple_message = 3; - */ public Builder mergeSimpleMessage(com.openxc.BinaryMessages.SimpleMessage value) { if (simpleMessageBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && @@ -1120,9 +867,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000004; return this; } - /** - * optional .openxc.SimpleMessage simple_message = 3; - */ public Builder clearSimpleMessage() { if (simpleMessageBuilder_ == null) { simpleMessage_ = com.openxc.BinaryMessages.SimpleMessage.getDefaultInstance(); @@ -1133,17 +877,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000004); return this; } - /** - * optional .openxc.SimpleMessage simple_message = 3; - */ public com.openxc.BinaryMessages.SimpleMessage.Builder getSimpleMessageBuilder() { bitField0_ |= 0x00000004; onChanged(); return getSimpleMessageFieldBuilder().getBuilder(); } - /** - * optional .openxc.SimpleMessage simple_message = 3; - */ public com.openxc.BinaryMessages.SimpleMessageOrBuilder getSimpleMessageOrBuilder() { if (simpleMessageBuilder_ != null) { return simpleMessageBuilder_.getMessageOrBuilder(); @@ -1151,9 +889,6 @@ public final class BinaryMessages { return simpleMessage_; } } - /** - * optional .openxc.SimpleMessage simple_message = 3; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.SimpleMessage, com.openxc.BinaryMessages.SimpleMessage.Builder, com.openxc.BinaryMessages.SimpleMessageOrBuilder> getSimpleMessageFieldBuilder() { @@ -1167,20 +902,14 @@ public final class BinaryMessages { } return simpleMessageBuilder_; } - + // optional .openxc.DiagnosticResponse diagnostic_response = 4; private com.openxc.BinaryMessages.DiagnosticResponse diagnosticResponse_ = com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.DiagnosticResponse, com.openxc.BinaryMessages.DiagnosticResponse.Builder, com.openxc.BinaryMessages.DiagnosticResponseOrBuilder> diagnosticResponseBuilder_; - /** - * optional .openxc.DiagnosticResponse diagnostic_response = 4; - */ public boolean hasDiagnosticResponse() { return ((bitField0_ & 0x00000008) == 0x00000008); } - /** - * optional .openxc.DiagnosticResponse diagnostic_response = 4; - */ public com.openxc.BinaryMessages.DiagnosticResponse getDiagnosticResponse() { if (diagnosticResponseBuilder_ == null) { return diagnosticResponse_; @@ -1188,9 +917,6 @@ public final class BinaryMessages { return diagnosticResponseBuilder_.getMessage(); } } - /** - * optional .openxc.DiagnosticResponse diagnostic_response = 4; - */ public Builder setDiagnosticResponse(com.openxc.BinaryMessages.DiagnosticResponse value) { if (diagnosticResponseBuilder_ == null) { if (value == null) { @@ -1204,9 +930,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000008; return this; } - /** - * optional .openxc.DiagnosticResponse diagnostic_response = 4; - */ public Builder setDiagnosticResponse( com.openxc.BinaryMessages.DiagnosticResponse.Builder builderForValue) { if (diagnosticResponseBuilder_ == null) { @@ -1218,9 +941,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000008; return this; } - /** - * optional .openxc.DiagnosticResponse diagnostic_response = 4; - */ public Builder mergeDiagnosticResponse(com.openxc.BinaryMessages.DiagnosticResponse value) { if (diagnosticResponseBuilder_ == null) { if (((bitField0_ & 0x00000008) == 0x00000008) && @@ -1237,9 +957,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000008; return this; } - /** - * optional .openxc.DiagnosticResponse diagnostic_response = 4; - */ public Builder clearDiagnosticResponse() { if (diagnosticResponseBuilder_ == null) { diagnosticResponse_ = com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance(); @@ -1250,17 +967,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000008); return this; } - /** - * optional .openxc.DiagnosticResponse diagnostic_response = 4; - */ public com.openxc.BinaryMessages.DiagnosticResponse.Builder getDiagnosticResponseBuilder() { bitField0_ |= 0x00000008; onChanged(); return getDiagnosticResponseFieldBuilder().getBuilder(); } - /** - * optional .openxc.DiagnosticResponse diagnostic_response = 4; - */ public com.openxc.BinaryMessages.DiagnosticResponseOrBuilder getDiagnosticResponseOrBuilder() { if (diagnosticResponseBuilder_ != null) { return diagnosticResponseBuilder_.getMessageOrBuilder(); @@ -1268,9 +979,6 @@ public final class BinaryMessages { return diagnosticResponse_; } } - /** - * optional .openxc.DiagnosticResponse diagnostic_response = 4; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.DiagnosticResponse, com.openxc.BinaryMessages.DiagnosticResponse.Builder, com.openxc.BinaryMessages.DiagnosticResponseOrBuilder> getDiagnosticResponseFieldBuilder() { @@ -1284,20 +992,14 @@ public final class BinaryMessages { } return diagnosticResponseBuilder_; } - + // optional .openxc.ControlCommand control_command = 5; private com.openxc.BinaryMessages.ControlCommand controlCommand_ = com.openxc.BinaryMessages.ControlCommand.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.ControlCommand, com.openxc.BinaryMessages.ControlCommand.Builder, com.openxc.BinaryMessages.ControlCommandOrBuilder> controlCommandBuilder_; - /** - * optional .openxc.ControlCommand control_command = 5; - */ public boolean hasControlCommand() { return ((bitField0_ & 0x00000010) == 0x00000010); } - /** - * optional .openxc.ControlCommand control_command = 5; - */ public com.openxc.BinaryMessages.ControlCommand getControlCommand() { if (controlCommandBuilder_ == null) { return controlCommand_; @@ -1305,9 +1007,6 @@ public final class BinaryMessages { return controlCommandBuilder_.getMessage(); } } - /** - * optional .openxc.ControlCommand control_command = 5; - */ public Builder setControlCommand(com.openxc.BinaryMessages.ControlCommand value) { if (controlCommandBuilder_ == null) { if (value == null) { @@ -1321,9 +1020,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000010; return this; } - /** - * optional .openxc.ControlCommand control_command = 5; - */ public Builder setControlCommand( com.openxc.BinaryMessages.ControlCommand.Builder builderForValue) { if (controlCommandBuilder_ == null) { @@ -1335,9 +1031,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000010; return this; } - /** - * optional .openxc.ControlCommand control_command = 5; - */ public Builder mergeControlCommand(com.openxc.BinaryMessages.ControlCommand value) { if (controlCommandBuilder_ == null) { if (((bitField0_ & 0x00000010) == 0x00000010) && @@ -1354,9 +1047,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000010; return this; } - /** - * optional .openxc.ControlCommand control_command = 5; - */ public Builder clearControlCommand() { if (controlCommandBuilder_ == null) { controlCommand_ = com.openxc.BinaryMessages.ControlCommand.getDefaultInstance(); @@ -1367,17 +1057,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000010); return this; } - /** - * optional .openxc.ControlCommand control_command = 5; - */ public com.openxc.BinaryMessages.ControlCommand.Builder getControlCommandBuilder() { bitField0_ |= 0x00000010; onChanged(); return getControlCommandFieldBuilder().getBuilder(); } - /** - * optional .openxc.ControlCommand control_command = 5; - */ public com.openxc.BinaryMessages.ControlCommandOrBuilder getControlCommandOrBuilder() { if (controlCommandBuilder_ != null) { return controlCommandBuilder_.getMessageOrBuilder(); @@ -1385,9 +1069,6 @@ public final class BinaryMessages { return controlCommand_; } } - /** - * optional .openxc.ControlCommand control_command = 5; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.ControlCommand, com.openxc.BinaryMessages.ControlCommand.Builder, com.openxc.BinaryMessages.ControlCommandOrBuilder> getControlCommandFieldBuilder() { @@ -1401,20 +1082,14 @@ public final class BinaryMessages { } return controlCommandBuilder_; } - + // optional .openxc.CommandResponse command_response = 6; private com.openxc.BinaryMessages.CommandResponse commandResponse_ = com.openxc.BinaryMessages.CommandResponse.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.CommandResponse, com.openxc.BinaryMessages.CommandResponse.Builder, com.openxc.BinaryMessages.CommandResponseOrBuilder> commandResponseBuilder_; - /** - * optional .openxc.CommandResponse command_response = 6; - */ public boolean hasCommandResponse() { return ((bitField0_ & 0x00000020) == 0x00000020); } - /** - * optional .openxc.CommandResponse command_response = 6; - */ public com.openxc.BinaryMessages.CommandResponse getCommandResponse() { if (commandResponseBuilder_ == null) { return commandResponse_; @@ -1422,9 +1097,6 @@ public final class BinaryMessages { return commandResponseBuilder_.getMessage(); } } - /** - * optional .openxc.CommandResponse command_response = 6; - */ public Builder setCommandResponse(com.openxc.BinaryMessages.CommandResponse value) { if (commandResponseBuilder_ == null) { if (value == null) { @@ -1438,9 +1110,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000020; return this; } - /** - * optional .openxc.CommandResponse command_response = 6; - */ public Builder setCommandResponse( com.openxc.BinaryMessages.CommandResponse.Builder builderForValue) { if (commandResponseBuilder_ == null) { @@ -1452,9 +1121,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000020; return this; } - /** - * optional .openxc.CommandResponse command_response = 6; - */ public Builder mergeCommandResponse(com.openxc.BinaryMessages.CommandResponse value) { if (commandResponseBuilder_ == null) { if (((bitField0_ & 0x00000020) == 0x00000020) && @@ -1471,9 +1137,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000020; return this; } - /** - * optional .openxc.CommandResponse command_response = 6; - */ public Builder clearCommandResponse() { if (commandResponseBuilder_ == null) { commandResponse_ = com.openxc.BinaryMessages.CommandResponse.getDefaultInstance(); @@ -1484,17 +1147,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000020); return this; } - /** - * optional .openxc.CommandResponse command_response = 6; - */ public com.openxc.BinaryMessages.CommandResponse.Builder getCommandResponseBuilder() { bitField0_ |= 0x00000020; onChanged(); return getCommandResponseFieldBuilder().getBuilder(); } - /** - * optional .openxc.CommandResponse command_response = 6; - */ public com.openxc.BinaryMessages.CommandResponseOrBuilder getCommandResponseOrBuilder() { if (commandResponseBuilder_ != null) { return commandResponseBuilder_.getMessageOrBuilder(); @@ -1502,9 +1159,6 @@ public final class BinaryMessages { return commandResponse_; } } - /** - * optional .openxc.CommandResponse command_response = 6; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.CommandResponse, com.openxc.BinaryMessages.CommandResponse.Builder, com.openxc.BinaryMessages.CommandResponseOrBuilder> getCommandResponseFieldBuilder() { @@ -1518,237 +1172,98 @@ public final class BinaryMessages { } return commandResponseBuilder_; } - + // optional uint64 timestamp = 7; private long timestamp_ ; - /** - * optional uint64 timestamp = 7; - */ public boolean hasTimestamp() { return ((bitField0_ & 0x00000040) == 0x00000040); } - /** - * optional uint64 timestamp = 7; - */ public long getTimestamp() { return timestamp_; } - /** - * optional uint64 timestamp = 7; - */ public Builder setTimestamp(long value) { bitField0_ |= 0x00000040; timestamp_ = value; onChanged(); return this; } - /** - * optional uint64 timestamp = 7; - */ public Builder clearTimestamp() { bitField0_ = (bitField0_ & ~0x00000040); timestamp_ = 0L; onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:openxc.VehicleMessage) } - + static { defaultInstance = new VehicleMessage(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.VehicleMessage) } - + public interface CanMessageOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional int32 bus = 1; - /** - * optional int32 bus = 1; - */ boolean hasBus(); - /** - * optional int32 bus = 1; - */ int getBus(); - + // optional uint32 id = 2; - /** - * optional uint32 id = 2; - */ boolean hasId(); - /** - * optional uint32 id = 2; - */ int getId(); - + // optional bytes data = 3; - /** - * optional bytes data = 3; - */ boolean hasData(); - /** - * optional bytes data = 3; - */ com.google.protobuf.ByteString getData(); - + // optional .openxc.CanMessage.FrameFormat frame_format = 4; - /** - * optional .openxc.CanMessage.FrameFormat frame_format = 4; - */ boolean hasFrameFormat(); - /** - * optional .openxc.CanMessage.FrameFormat frame_format = 4; - */ com.openxc.BinaryMessages.CanMessage.FrameFormat getFrameFormat(); } - /** - * Protobuf type {@code openxc.CanMessage} - */ public static final class CanMessage extends com.google.protobuf.GeneratedMessage implements CanMessageOrBuilder { // Use CanMessage.newBuilder() to construct. - private CanMessage(com.google.protobuf.GeneratedMessage.Builder builder) { + private CanMessage(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private CanMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private CanMessage(boolean noInit) {} + private static final CanMessage defaultInstance; public static CanMessage getDefaultInstance() { return defaultInstance; } - + public CanMessage getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private CanMessage( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - bus_ = input.readInt32(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - id_ = input.readUInt32(); - break; - } - case 26: { - bitField0_ |= 0x00000004; - data_ = input.readBytes(); - break; - } - case 32: { - int rawValue = input.readEnum(); - com.openxc.BinaryMessages.CanMessage.FrameFormat value = com.openxc.BinaryMessages.CanMessage.FrameFormat.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(4, rawValue); - } else { - bitField0_ |= 0x00000008; - frameFormat_ = value; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.CanMessage.class, com.openxc.BinaryMessages.CanMessage.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_fieldAccessorTable; } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public CanMessage parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new CanMessage(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - /** - * Protobuf enum {@code openxc.CanMessage.FrameFormat} - */ + public enum FrameFormat implements com.google.protobuf.ProtocolMessageEnum { - /** - * STANDARD = 1; - */ STANDARD(0, 1), - /** - * EXTENDED = 2; - */ EXTENDED(1, 2), ; - - /** - * STANDARD = 1; - */ + public static final int STANDARD_VALUE = 1; - /** - * EXTENDED = 2; - */ public static final int EXTENDED_VALUE = 2; - - + + public final int getNumber() { return value; } - + public static FrameFormat valueOf(int value) { switch (value) { case 1: return STANDARD; @@ -1756,7 +1271,7 @@ public final class BinaryMessages { default: return null; } } - + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; @@ -1768,7 +1283,7 @@ public final class BinaryMessages { return FrameFormat.valueOf(number); } }; - + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { return getDescriptor().getValues().get(index); @@ -1781,9 +1296,11 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.CanMessage.getDescriptor().getEnumTypes().get(0); } - - private static final FrameFormat[] VALUES = values(); - + + private static final FrameFormat[] VALUES = { + STANDARD, EXTENDED, + }; + public static FrameFormat valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { @@ -1792,83 +1309,59 @@ public final class BinaryMessages { } return VALUES[desc.getIndex()]; } - + private final int index; private final int value; - + private FrameFormat(int index, int value) { this.index = index; this.value = value; } - + // @@protoc_insertion_point(enum_scope:openxc.CanMessage.FrameFormat) } - + private int bitField0_; // optional int32 bus = 1; public static final int BUS_FIELD_NUMBER = 1; private int bus_; - /** - * optional int32 bus = 1; - */ public boolean hasBus() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional int32 bus = 1; - */ public int getBus() { return bus_; } - + // optional uint32 id = 2; public static final int ID_FIELD_NUMBER = 2; private int id_; - /** - * optional uint32 id = 2; - */ public boolean hasId() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional uint32 id = 2; - */ public int getId() { return id_; } - + // optional bytes data = 3; public static final int DATA_FIELD_NUMBER = 3; private com.google.protobuf.ByteString data_; - /** - * optional bytes data = 3; - */ public boolean hasData() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional bytes data = 3; - */ public com.google.protobuf.ByteString getData() { return data_; } - + // optional .openxc.CanMessage.FrameFormat frame_format = 4; public static final int FRAME_FORMAT_FIELD_NUMBER = 4; private com.openxc.BinaryMessages.CanMessage.FrameFormat frameFormat_; - /** - * optional .openxc.CanMessage.FrameFormat frame_format = 4; - */ public boolean hasFrameFormat() { return ((bitField0_ & 0x00000008) == 0x00000008); } - /** - * optional .openxc.CanMessage.FrameFormat frame_format = 4; - */ public com.openxc.BinaryMessages.CanMessage.FrameFormat getFrameFormat() { return frameFormat_; } - + private void initFields() { bus_ = 0; id_ = 0; @@ -1879,11 +1372,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -1901,12 +1394,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -1928,83 +1421,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.CanMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.CanMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.CanMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.CanMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.CanMessage parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.CanMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.CanMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.CanMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.CanMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.CanMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.CanMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.CanMessage} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.CanMessageOrBuilder { @@ -2012,21 +1516,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.CanMessage.class, com.openxc.BinaryMessages.CanMessage.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.CanMessage.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -2037,7 +1538,7 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); bus_ = 0; @@ -2050,20 +1551,20 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000008); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_descriptor; + return com.openxc.BinaryMessages.CanMessage.getDescriptor(); } - + public com.openxc.BinaryMessages.CanMessage getDefaultInstanceForType() { return com.openxc.BinaryMessages.CanMessage.getDefaultInstance(); } - + public com.openxc.BinaryMessages.CanMessage build() { com.openxc.BinaryMessages.CanMessage result = buildPartial(); if (!result.isInitialized()) { @@ -2071,7 +1572,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.CanMessage buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.CanMessage result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.CanMessage buildPartial() { com.openxc.BinaryMessages.CanMessage result = new com.openxc.BinaryMessages.CanMessage(this); int from_bitField0_ = bitField0_; @@ -2096,7 +1607,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.CanMessage) { return mergeFrom((com.openxc.BinaryMessages.CanMessage)other); @@ -2105,7 +1616,7 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.CanMessage other) { if (other == com.openxc.BinaryMessages.CanMessage.getDefaultInstance()) return this; if (other.hasBus()) { @@ -2123,113 +1634,116 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.CanMessage parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.CanMessage) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + bus_ = input.readInt32(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + id_ = input.readUInt32(); + break; + } + case 26: { + bitField0_ |= 0x00000004; + data_ = input.readBytes(); + break; + } + case 32: { + int rawValue = input.readEnum(); + com.openxc.BinaryMessages.CanMessage.FrameFormat value = com.openxc.BinaryMessages.CanMessage.FrameFormat.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(4, rawValue); + } else { + bitField0_ |= 0x00000008; + frameFormat_ = value; + } + break; + } } } - return this; } + private int bitField0_; - + // optional int32 bus = 1; private int bus_ ; - /** - * optional int32 bus = 1; - */ public boolean hasBus() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional int32 bus = 1; - */ public int getBus() { return bus_; } - /** - * optional int32 bus = 1; - */ public Builder setBus(int value) { bitField0_ |= 0x00000001; bus_ = value; onChanged(); return this; } - /** - * optional int32 bus = 1; - */ public Builder clearBus() { bitField0_ = (bitField0_ & ~0x00000001); bus_ = 0; onChanged(); return this; } - + // optional uint32 id = 2; private int id_ ; - /** - * optional uint32 id = 2; - */ public boolean hasId() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional uint32 id = 2; - */ public int getId() { return id_; } - /** - * optional uint32 id = 2; - */ public Builder setId(int value) { bitField0_ |= 0x00000002; id_ = value; onChanged(); return this; } - /** - * optional uint32 id = 2; - */ public Builder clearId() { bitField0_ = (bitField0_ & ~0x00000002); id_ = 0; onChanged(); return this; } - + // optional bytes data = 3; private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY; - /** - * optional bytes data = 3; - */ public boolean hasData() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional bytes data = 3; - */ public com.google.protobuf.ByteString getData() { return data_; } - /** - * optional bytes data = 3; - */ public Builder setData(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); @@ -2239,33 +1753,21 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional bytes data = 3; - */ public Builder clearData() { bitField0_ = (bitField0_ & ~0x00000004); data_ = getDefaultInstance().getData(); onChanged(); return this; } - + // optional .openxc.CanMessage.FrameFormat frame_format = 4; private com.openxc.BinaryMessages.CanMessage.FrameFormat frameFormat_ = com.openxc.BinaryMessages.CanMessage.FrameFormat.STANDARD; - /** - * optional .openxc.CanMessage.FrameFormat frame_format = 4; - */ public boolean hasFrameFormat() { return ((bitField0_ & 0x00000008) == 0x00000008); } - /** - * optional .openxc.CanMessage.FrameFormat frame_format = 4; - */ public com.openxc.BinaryMessages.CanMessage.FrameFormat getFrameFormat() { return frameFormat_; } - /** - * optional .openxc.CanMessage.FrameFormat frame_format = 4; - */ public Builder setFrameFormat(com.openxc.BinaryMessages.CanMessage.FrameFormat value) { if (value == null) { throw new NullPointerException(); @@ -2275,421 +1777,122 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional .openxc.CanMessage.FrameFormat frame_format = 4; - */ public Builder clearFrameFormat() { bitField0_ = (bitField0_ & ~0x00000008); frameFormat_ = com.openxc.BinaryMessages.CanMessage.FrameFormat.STANDARD; onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:openxc.CanMessage) } - + static { defaultInstance = new CanMessage(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.CanMessage) } - + public interface ControlCommandOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional .openxc.ControlCommand.Type type = 1; - /** - * optional .openxc.ControlCommand.Type type = 1; - */ boolean hasType(); - /** - * optional .openxc.ControlCommand.Type type = 1; - */ com.openxc.BinaryMessages.ControlCommand.Type getType(); - + // optional .openxc.DiagnosticControlCommand diagnostic_request = 2; - /** - * optional .openxc.DiagnosticControlCommand diagnostic_request = 2; - */ boolean hasDiagnosticRequest(); - /** - * optional .openxc.DiagnosticControlCommand diagnostic_request = 2; - */ com.openxc.BinaryMessages.DiagnosticControlCommand getDiagnosticRequest(); - /** - * optional .openxc.DiagnosticControlCommand diagnostic_request = 2; - */ com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder getDiagnosticRequestOrBuilder(); - + // optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; - /** - * optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; - */ boolean hasPassthroughModeRequest(); - /** - * optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; - */ com.openxc.BinaryMessages.PassthroughModeControlCommand getPassthroughModeRequest(); - /** - * optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; - */ com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder getPassthroughModeRequestOrBuilder(); - + // optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; - /** - * optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; - */ boolean hasAcceptanceFilterBypassCommand(); - /** - * optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; - */ com.openxc.BinaryMessages.AcceptanceFilterBypassCommand getAcceptanceFilterBypassCommand(); - /** - * optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; - */ com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder getAcceptanceFilterBypassCommandOrBuilder(); - + // optional .openxc.PayloadFormatCommand payload_format_command = 5; - /** - * optional .openxc.PayloadFormatCommand payload_format_command = 5; - */ boolean hasPayloadFormatCommand(); - /** - * optional .openxc.PayloadFormatCommand payload_format_command = 5; - */ com.openxc.BinaryMessages.PayloadFormatCommand getPayloadFormatCommand(); - /** - * optional .openxc.PayloadFormatCommand payload_format_command = 5; - */ com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder getPayloadFormatCommandOrBuilder(); - + // optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; - /** - * optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; - */ boolean hasPredefinedObd2RequestsCommand(); - /** - * optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; - */ com.openxc.BinaryMessages.PredefinedObd2RequestsCommand getPredefinedObd2RequestsCommand(); - /** - * optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; - */ com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder getPredefinedObd2RequestsCommandOrBuilder(); - + // optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; - /** - * optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; - */ boolean hasModemConfigurationCommand(); - /** - * optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; - */ com.openxc.BinaryMessages.ModemConfigurationCommand getModemConfigurationCommand(); - /** - * optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; - */ com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder getModemConfigurationCommandOrBuilder(); - + // optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; - /** - * optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; - */ boolean hasRtcConfigurationCommand(); - /** - * optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; - */ com.openxc.BinaryMessages.RTCConfigurationCommand getRtcConfigurationCommand(); - /** - * optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; - */ com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder getRtcConfigurationCommandOrBuilder(); } - /** - * Protobuf type {@code openxc.ControlCommand} - */ public static final class ControlCommand extends com.google.protobuf.GeneratedMessage implements ControlCommandOrBuilder { // Use ControlCommand.newBuilder() to construct. - private ControlCommand(com.google.protobuf.GeneratedMessage.Builder builder) { + private ControlCommand(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private ControlCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private ControlCommand(boolean noInit) {} + private static final ControlCommand defaultInstance; public static ControlCommand getDefaultInstance() { return defaultInstance; } - + public ControlCommand getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private ControlCommand( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - int rawValue = input.readEnum(); - com.openxc.BinaryMessages.ControlCommand.Type value = com.openxc.BinaryMessages.ControlCommand.Type.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(1, rawValue); - } else { - bitField0_ |= 0x00000001; - type_ = value; - } - break; - } - case 18: { - com.openxc.BinaryMessages.DiagnosticControlCommand.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - subBuilder = diagnosticRequest_.toBuilder(); - } - diagnosticRequest_ = input.readMessage(com.openxc.BinaryMessages.DiagnosticControlCommand.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(diagnosticRequest_); - diagnosticRequest_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - case 26: { - com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - subBuilder = passthroughModeRequest_.toBuilder(); - } - passthroughModeRequest_ = input.readMessage(com.openxc.BinaryMessages.PassthroughModeControlCommand.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(passthroughModeRequest_); - passthroughModeRequest_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000004; - break; - } - case 34: { - com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder subBuilder = null; - if (((bitField0_ & 0x00000008) == 0x00000008)) { - subBuilder = acceptanceFilterBypassCommand_.toBuilder(); - } - acceptanceFilterBypassCommand_ = input.readMessage(com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(acceptanceFilterBypassCommand_); - acceptanceFilterBypassCommand_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000008; - break; - } - case 42: { - com.openxc.BinaryMessages.PayloadFormatCommand.Builder subBuilder = null; - if (((bitField0_ & 0x00000010) == 0x00000010)) { - subBuilder = payloadFormatCommand_.toBuilder(); - } - payloadFormatCommand_ = input.readMessage(com.openxc.BinaryMessages.PayloadFormatCommand.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(payloadFormatCommand_); - payloadFormatCommand_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000010; - break; - } - case 50: { - com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder subBuilder = null; - if (((bitField0_ & 0x00000020) == 0x00000020)) { - subBuilder = predefinedObd2RequestsCommand_.toBuilder(); - } - predefinedObd2RequestsCommand_ = input.readMessage(com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(predefinedObd2RequestsCommand_); - predefinedObd2RequestsCommand_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000020; - break; - } - case 58: { - com.openxc.BinaryMessages.ModemConfigurationCommand.Builder subBuilder = null; - if (((bitField0_ & 0x00000040) == 0x00000040)) { - subBuilder = modemConfigurationCommand_.toBuilder(); - } - modemConfigurationCommand_ = input.readMessage(com.openxc.BinaryMessages.ModemConfigurationCommand.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(modemConfigurationCommand_); - modemConfigurationCommand_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000040; - break; - } - case 66: { - com.openxc.BinaryMessages.RTCConfigurationCommand.Builder subBuilder = null; - if (((bitField0_ & 0x00000080) == 0x00000080)) { - subBuilder = rtcConfigurationCommand_.toBuilder(); - } - rtcConfigurationCommand_ = input.readMessage(com.openxc.BinaryMessages.RTCConfigurationCommand.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(rtcConfigurationCommand_); - rtcConfigurationCommand_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000080; - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.ControlCommand.class, com.openxc.BinaryMessages.ControlCommand.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public ControlCommand parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new ControlCommand(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_fieldAccessorTable; } - - /** - * Protobuf enum {@code openxc.ControlCommand.Type} - */ + public enum Type implements com.google.protobuf.ProtocolMessageEnum { - /** - * VERSION = 1; - */ VERSION(0, 1), - /** - * DEVICE_ID = 2; - */ DEVICE_ID(1, 2), - /** - * DIAGNOSTIC = 3; - */ DIAGNOSTIC(2, 3), - /** - * PASSTHROUGH = 4; - */ PASSTHROUGH(3, 4), - /** - * ACCEPTANCE_FILTER_BYPASS = 5; - */ ACCEPTANCE_FILTER_BYPASS(4, 5), - /** - * PAYLOAD_FORMAT = 6; - */ PAYLOAD_FORMAT(5, 6), - /** - * PREDEFINED_OBD2_REQUESTS = 7; - */ PREDEFINED_OBD2_REQUESTS(6, 7), - /** - * MODEM_CONFIGURATION = 8; - */ MODEM_CONFIGURATION(7, 8), - /** - * RTC_CONFIGURATION = 9; - */ RTC_CONFIGURATION(8, 9), - /** - * SD_MOUNT_STATUS = 10; - */ SD_MOUNT_STATUS(9, 10), ; - - /** - * VERSION = 1; - */ + public static final int VERSION_VALUE = 1; - /** - * DEVICE_ID = 2; - */ public static final int DEVICE_ID_VALUE = 2; - /** - * DIAGNOSTIC = 3; - */ public static final int DIAGNOSTIC_VALUE = 3; - /** - * PASSTHROUGH = 4; - */ public static final int PASSTHROUGH_VALUE = 4; - /** - * ACCEPTANCE_FILTER_BYPASS = 5; - */ public static final int ACCEPTANCE_FILTER_BYPASS_VALUE = 5; - /** - * PAYLOAD_FORMAT = 6; - */ public static final int PAYLOAD_FORMAT_VALUE = 6; - /** - * PREDEFINED_OBD2_REQUESTS = 7; - */ public static final int PREDEFINED_OBD2_REQUESTS_VALUE = 7; - /** - * MODEM_CONFIGURATION = 8; - */ public static final int MODEM_CONFIGURATION_VALUE = 8; - /** - * RTC_CONFIGURATION = 9; - */ public static final int RTC_CONFIGURATION_VALUE = 9; - /** - * SD_MOUNT_STATUS = 10; - */ public static final int SD_MOUNT_STATUS_VALUE = 10; - - + + public final int getNumber() { return value; } - + public static Type valueOf(int value) { switch (value) { case 1: return VERSION; @@ -2705,7 +1908,7 @@ public final class BinaryMessages { default: return null; } } - + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; @@ -2717,7 +1920,7 @@ public final class BinaryMessages { return Type.valueOf(number); } }; - + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { return getDescriptor().getValues().get(index); @@ -2730,9 +1933,11 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.ControlCommand.getDescriptor().getEnumTypes().get(0); } - - private static final Type[] VALUES = values(); - + + private static final Type[] VALUES = { + VERSION, DEVICE_ID, DIAGNOSTIC, PASSTHROUGH, ACCEPTANCE_FILTER_BYPASS, PAYLOAD_FORMAT, PREDEFINED_OBD2_REQUESTS, MODEM_CONFIGURATION, RTC_CONFIGURATION, SD_MOUNT_STATUS, + }; + public static Type valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { @@ -2741,189 +1946,120 @@ public final class BinaryMessages { } return VALUES[desc.getIndex()]; } - + private final int index; private final int value; - + private Type(int index, int value) { this.index = index; this.value = value; } - + // @@protoc_insertion_point(enum_scope:openxc.ControlCommand.Type) } - + private int bitField0_; // optional .openxc.ControlCommand.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; private com.openxc.BinaryMessages.ControlCommand.Type type_; - /** - * optional .openxc.ControlCommand.Type type = 1; - */ public boolean hasType() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional .openxc.ControlCommand.Type type = 1; - */ public com.openxc.BinaryMessages.ControlCommand.Type getType() { return type_; } - + // optional .openxc.DiagnosticControlCommand diagnostic_request = 2; public static final int DIAGNOSTIC_REQUEST_FIELD_NUMBER = 2; private com.openxc.BinaryMessages.DiagnosticControlCommand diagnosticRequest_; - /** - * optional .openxc.DiagnosticControlCommand diagnostic_request = 2; - */ public boolean hasDiagnosticRequest() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional .openxc.DiagnosticControlCommand diagnostic_request = 2; - */ public com.openxc.BinaryMessages.DiagnosticControlCommand getDiagnosticRequest() { return diagnosticRequest_; } - /** - * optional .openxc.DiagnosticControlCommand diagnostic_request = 2; - */ public com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder getDiagnosticRequestOrBuilder() { return diagnosticRequest_; } - + // optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; public static final int PASSTHROUGH_MODE_REQUEST_FIELD_NUMBER = 3; private com.openxc.BinaryMessages.PassthroughModeControlCommand passthroughModeRequest_; - /** - * optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; - */ public boolean hasPassthroughModeRequest() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; - */ public com.openxc.BinaryMessages.PassthroughModeControlCommand getPassthroughModeRequest() { return passthroughModeRequest_; } - /** - * optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; - */ public com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder getPassthroughModeRequestOrBuilder() { return passthroughModeRequest_; } - + // optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; public static final int ACCEPTANCE_FILTER_BYPASS_COMMAND_FIELD_NUMBER = 4; private com.openxc.BinaryMessages.AcceptanceFilterBypassCommand acceptanceFilterBypassCommand_; - /** - * optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; - */ public boolean hasAcceptanceFilterBypassCommand() { return ((bitField0_ & 0x00000008) == 0x00000008); } - /** - * optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; - */ public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand getAcceptanceFilterBypassCommand() { return acceptanceFilterBypassCommand_; } - /** - * optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; - */ public com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder getAcceptanceFilterBypassCommandOrBuilder() { return acceptanceFilterBypassCommand_; } - + // optional .openxc.PayloadFormatCommand payload_format_command = 5; public static final int PAYLOAD_FORMAT_COMMAND_FIELD_NUMBER = 5; private com.openxc.BinaryMessages.PayloadFormatCommand payloadFormatCommand_; - /** - * optional .openxc.PayloadFormatCommand payload_format_command = 5; - */ public boolean hasPayloadFormatCommand() { return ((bitField0_ & 0x00000010) == 0x00000010); } - /** - * optional .openxc.PayloadFormatCommand payload_format_command = 5; - */ public com.openxc.BinaryMessages.PayloadFormatCommand getPayloadFormatCommand() { return payloadFormatCommand_; } - /** - * optional .openxc.PayloadFormatCommand payload_format_command = 5; - */ public com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder getPayloadFormatCommandOrBuilder() { return payloadFormatCommand_; } - + // optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; public static final int PREDEFINED_OBD2_REQUESTS_COMMAND_FIELD_NUMBER = 6; private com.openxc.BinaryMessages.PredefinedObd2RequestsCommand predefinedObd2RequestsCommand_; - /** - * optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; - */ public boolean hasPredefinedObd2RequestsCommand() { return ((bitField0_ & 0x00000020) == 0x00000020); } - /** - * optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; - */ public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand getPredefinedObd2RequestsCommand() { return predefinedObd2RequestsCommand_; } - /** - * optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; - */ public com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder getPredefinedObd2RequestsCommandOrBuilder() { return predefinedObd2RequestsCommand_; } - + // optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; public static final int MODEM_CONFIGURATION_COMMAND_FIELD_NUMBER = 7; private com.openxc.BinaryMessages.ModemConfigurationCommand modemConfigurationCommand_; - /** - * optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; - */ public boolean hasModemConfigurationCommand() { return ((bitField0_ & 0x00000040) == 0x00000040); } - /** - * optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; - */ public com.openxc.BinaryMessages.ModemConfigurationCommand getModemConfigurationCommand() { return modemConfigurationCommand_; } - /** - * optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; - */ public com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder getModemConfigurationCommandOrBuilder() { return modemConfigurationCommand_; } - + // optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; public static final int RTC_CONFIGURATION_COMMAND_FIELD_NUMBER = 8; private com.openxc.BinaryMessages.RTCConfigurationCommand rtcConfigurationCommand_; - /** - * optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; - */ public boolean hasRtcConfigurationCommand() { return ((bitField0_ & 0x00000080) == 0x00000080); } - /** - * optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; - */ public com.openxc.BinaryMessages.RTCConfigurationCommand getRtcConfigurationCommand() { return rtcConfigurationCommand_; } - /** - * optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; - */ public com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder getRtcConfigurationCommandOrBuilder() { return rtcConfigurationCommand_; } - + private void initFields() { type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION; diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance(); @@ -2938,11 +2074,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -2972,12 +2108,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -3015,83 +2151,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.ControlCommand parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.ControlCommand parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.ControlCommand parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.ControlCommand parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.ControlCommand parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.ControlCommand parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.ControlCommand parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.ControlCommand parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.ControlCommand parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.ControlCommand parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.ControlCommand prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.ControlCommand} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.ControlCommandOrBuilder { @@ -3099,21 +2246,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.ControlCommand.class, com.openxc.BinaryMessages.ControlCommand.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.ControlCommand.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -3131,7 +2275,7 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION; @@ -3180,20 +2324,20 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000080); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_descriptor; + return com.openxc.BinaryMessages.ControlCommand.getDescriptor(); } - + public com.openxc.BinaryMessages.ControlCommand getDefaultInstanceForType() { return com.openxc.BinaryMessages.ControlCommand.getDefaultInstance(); } - + public com.openxc.BinaryMessages.ControlCommand build() { com.openxc.BinaryMessages.ControlCommand result = buildPartial(); if (!result.isInitialized()) { @@ -3201,7 +2345,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.ControlCommand buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.ControlCommand result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.ControlCommand buildPartial() { com.openxc.BinaryMessages.ControlCommand result = new com.openxc.BinaryMessages.ControlCommand(this); int from_bitField0_ = bitField0_; @@ -3270,7 +2424,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.ControlCommand) { return mergeFrom((com.openxc.BinaryMessages.ControlCommand)other); @@ -3279,7 +2433,7 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.ControlCommand other) { if (other == com.openxc.BinaryMessages.ControlCommand.getDefaultInstance()) return this; if (other.hasType()) { @@ -3309,47 +2463,122 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.ControlCommand parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.ControlCommand) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // optional .openxc.ControlCommand.Type type = 1; - private com.openxc.BinaryMessages.ControlCommand.Type type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION; - /** - * optional .openxc.ControlCommand.Type type = 1; - */ - public boolean hasType() { + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 8: { + int rawValue = input.readEnum(); + com.openxc.BinaryMessages.ControlCommand.Type value = com.openxc.BinaryMessages.ControlCommand.Type.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(1, rawValue); + } else { + bitField0_ |= 0x00000001; + type_ = value; + } + break; + } + case 18: { + com.openxc.BinaryMessages.DiagnosticControlCommand.Builder subBuilder = com.openxc.BinaryMessages.DiagnosticControlCommand.newBuilder(); + if (hasDiagnosticRequest()) { + subBuilder.mergeFrom(getDiagnosticRequest()); + } + input.readMessage(subBuilder, extensionRegistry); + setDiagnosticRequest(subBuilder.buildPartial()); + break; + } + case 26: { + com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder subBuilder = com.openxc.BinaryMessages.PassthroughModeControlCommand.newBuilder(); + if (hasPassthroughModeRequest()) { + subBuilder.mergeFrom(getPassthroughModeRequest()); + } + input.readMessage(subBuilder, extensionRegistry); + setPassthroughModeRequest(subBuilder.buildPartial()); + break; + } + case 34: { + com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder subBuilder = com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.newBuilder(); + if (hasAcceptanceFilterBypassCommand()) { + subBuilder.mergeFrom(getAcceptanceFilterBypassCommand()); + } + input.readMessage(subBuilder, extensionRegistry); + setAcceptanceFilterBypassCommand(subBuilder.buildPartial()); + break; + } + case 42: { + com.openxc.BinaryMessages.PayloadFormatCommand.Builder subBuilder = com.openxc.BinaryMessages.PayloadFormatCommand.newBuilder(); + if (hasPayloadFormatCommand()) { + subBuilder.mergeFrom(getPayloadFormatCommand()); + } + input.readMessage(subBuilder, extensionRegistry); + setPayloadFormatCommand(subBuilder.buildPartial()); + break; + } + case 50: { + com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder subBuilder = com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.newBuilder(); + if (hasPredefinedObd2RequestsCommand()) { + subBuilder.mergeFrom(getPredefinedObd2RequestsCommand()); + } + input.readMessage(subBuilder, extensionRegistry); + setPredefinedObd2RequestsCommand(subBuilder.buildPartial()); + break; + } + case 58: { + com.openxc.BinaryMessages.ModemConfigurationCommand.Builder subBuilder = com.openxc.BinaryMessages.ModemConfigurationCommand.newBuilder(); + if (hasModemConfigurationCommand()) { + subBuilder.mergeFrom(getModemConfigurationCommand()); + } + input.readMessage(subBuilder, extensionRegistry); + setModemConfigurationCommand(subBuilder.buildPartial()); + break; + } + case 66: { + com.openxc.BinaryMessages.RTCConfigurationCommand.Builder subBuilder = com.openxc.BinaryMessages.RTCConfigurationCommand.newBuilder(); + if (hasRtcConfigurationCommand()) { + subBuilder.mergeFrom(getRtcConfigurationCommand()); + } + input.readMessage(subBuilder, extensionRegistry); + setRtcConfigurationCommand(subBuilder.buildPartial()); + break; + } + } + } + } + + private int bitField0_; + + // optional .openxc.ControlCommand.Type type = 1; + private com.openxc.BinaryMessages.ControlCommand.Type type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION; + public boolean hasType() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional .openxc.ControlCommand.Type type = 1; - */ public com.openxc.BinaryMessages.ControlCommand.Type getType() { return type_; } - /** - * optional .openxc.ControlCommand.Type type = 1; - */ public Builder setType(com.openxc.BinaryMessages.ControlCommand.Type value) { if (value == null) { throw new NullPointerException(); @@ -3359,29 +2588,20 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional .openxc.ControlCommand.Type type = 1; - */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION; onChanged(); return this; } - + // optional .openxc.DiagnosticControlCommand diagnostic_request = 2; private com.openxc.BinaryMessages.DiagnosticControlCommand diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.DiagnosticControlCommand, com.openxc.BinaryMessages.DiagnosticControlCommand.Builder, com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder> diagnosticRequestBuilder_; - /** - * optional .openxc.DiagnosticControlCommand diagnostic_request = 2; - */ public boolean hasDiagnosticRequest() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional .openxc.DiagnosticControlCommand diagnostic_request = 2; - */ public com.openxc.BinaryMessages.DiagnosticControlCommand getDiagnosticRequest() { if (diagnosticRequestBuilder_ == null) { return diagnosticRequest_; @@ -3389,9 +2609,6 @@ public final class BinaryMessages { return diagnosticRequestBuilder_.getMessage(); } } - /** - * optional .openxc.DiagnosticControlCommand diagnostic_request = 2; - */ public Builder setDiagnosticRequest(com.openxc.BinaryMessages.DiagnosticControlCommand value) { if (diagnosticRequestBuilder_ == null) { if (value == null) { @@ -3405,9 +2622,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000002; return this; } - /** - * optional .openxc.DiagnosticControlCommand diagnostic_request = 2; - */ public Builder setDiagnosticRequest( com.openxc.BinaryMessages.DiagnosticControlCommand.Builder builderForValue) { if (diagnosticRequestBuilder_ == null) { @@ -3419,9 +2633,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000002; return this; } - /** - * optional .openxc.DiagnosticControlCommand diagnostic_request = 2; - */ public Builder mergeDiagnosticRequest(com.openxc.BinaryMessages.DiagnosticControlCommand value) { if (diagnosticRequestBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && @@ -3438,9 +2649,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000002; return this; } - /** - * optional .openxc.DiagnosticControlCommand diagnostic_request = 2; - */ public Builder clearDiagnosticRequest() { if (diagnosticRequestBuilder_ == null) { diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance(); @@ -3451,17 +2659,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000002); return this; } - /** - * optional .openxc.DiagnosticControlCommand diagnostic_request = 2; - */ public com.openxc.BinaryMessages.DiagnosticControlCommand.Builder getDiagnosticRequestBuilder() { bitField0_ |= 0x00000002; onChanged(); return getDiagnosticRequestFieldBuilder().getBuilder(); } - /** - * optional .openxc.DiagnosticControlCommand diagnostic_request = 2; - */ public com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder getDiagnosticRequestOrBuilder() { if (diagnosticRequestBuilder_ != null) { return diagnosticRequestBuilder_.getMessageOrBuilder(); @@ -3469,9 +2671,6 @@ public final class BinaryMessages { return diagnosticRequest_; } } - /** - * optional .openxc.DiagnosticControlCommand diagnostic_request = 2; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.DiagnosticControlCommand, com.openxc.BinaryMessages.DiagnosticControlCommand.Builder, com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder> getDiagnosticRequestFieldBuilder() { @@ -3485,20 +2684,14 @@ public final class BinaryMessages { } return diagnosticRequestBuilder_; } - + // optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; private com.openxc.BinaryMessages.PassthroughModeControlCommand passthroughModeRequest_ = com.openxc.BinaryMessages.PassthroughModeControlCommand.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.PassthroughModeControlCommand, com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder, com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder> passthroughModeRequestBuilder_; - /** - * optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; - */ public boolean hasPassthroughModeRequest() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; - */ public com.openxc.BinaryMessages.PassthroughModeControlCommand getPassthroughModeRequest() { if (passthroughModeRequestBuilder_ == null) { return passthroughModeRequest_; @@ -3506,9 +2699,6 @@ public final class BinaryMessages { return passthroughModeRequestBuilder_.getMessage(); } } - /** - * optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; - */ public Builder setPassthroughModeRequest(com.openxc.BinaryMessages.PassthroughModeControlCommand value) { if (passthroughModeRequestBuilder_ == null) { if (value == null) { @@ -3522,9 +2712,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000004; return this; } - /** - * optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; - */ public Builder setPassthroughModeRequest( com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder builderForValue) { if (passthroughModeRequestBuilder_ == null) { @@ -3536,9 +2723,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000004; return this; } - /** - * optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; - */ public Builder mergePassthroughModeRequest(com.openxc.BinaryMessages.PassthroughModeControlCommand value) { if (passthroughModeRequestBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && @@ -3555,9 +2739,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000004; return this; } - /** - * optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; - */ public Builder clearPassthroughModeRequest() { if (passthroughModeRequestBuilder_ == null) { passthroughModeRequest_ = com.openxc.BinaryMessages.PassthroughModeControlCommand.getDefaultInstance(); @@ -3568,17 +2749,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000004); return this; } - /** - * optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; - */ public com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder getPassthroughModeRequestBuilder() { bitField0_ |= 0x00000004; onChanged(); return getPassthroughModeRequestFieldBuilder().getBuilder(); } - /** - * optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; - */ public com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder getPassthroughModeRequestOrBuilder() { if (passthroughModeRequestBuilder_ != null) { return passthroughModeRequestBuilder_.getMessageOrBuilder(); @@ -3586,9 +2761,6 @@ public final class BinaryMessages { return passthroughModeRequest_; } } - /** - * optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.PassthroughModeControlCommand, com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder, com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder> getPassthroughModeRequestFieldBuilder() { @@ -3602,20 +2774,14 @@ public final class BinaryMessages { } return passthroughModeRequestBuilder_; } - + // optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; private com.openxc.BinaryMessages.AcceptanceFilterBypassCommand acceptanceFilterBypassCommand_ = com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.AcceptanceFilterBypassCommand, com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder, com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder> acceptanceFilterBypassCommandBuilder_; - /** - * optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; - */ public boolean hasAcceptanceFilterBypassCommand() { return ((bitField0_ & 0x00000008) == 0x00000008); } - /** - * optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; - */ public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand getAcceptanceFilterBypassCommand() { if (acceptanceFilterBypassCommandBuilder_ == null) { return acceptanceFilterBypassCommand_; @@ -3623,9 +2789,6 @@ public final class BinaryMessages { return acceptanceFilterBypassCommandBuilder_.getMessage(); } } - /** - * optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; - */ public Builder setAcceptanceFilterBypassCommand(com.openxc.BinaryMessages.AcceptanceFilterBypassCommand value) { if (acceptanceFilterBypassCommandBuilder_ == null) { if (value == null) { @@ -3639,9 +2802,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000008; return this; } - /** - * optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; - */ public Builder setAcceptanceFilterBypassCommand( com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder builderForValue) { if (acceptanceFilterBypassCommandBuilder_ == null) { @@ -3653,9 +2813,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000008; return this; } - /** - * optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; - */ public Builder mergeAcceptanceFilterBypassCommand(com.openxc.BinaryMessages.AcceptanceFilterBypassCommand value) { if (acceptanceFilterBypassCommandBuilder_ == null) { if (((bitField0_ & 0x00000008) == 0x00000008) && @@ -3672,9 +2829,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000008; return this; } - /** - * optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; - */ public Builder clearAcceptanceFilterBypassCommand() { if (acceptanceFilterBypassCommandBuilder_ == null) { acceptanceFilterBypassCommand_ = com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDefaultInstance(); @@ -3685,17 +2839,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000008); return this; } - /** - * optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; - */ public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder getAcceptanceFilterBypassCommandBuilder() { bitField0_ |= 0x00000008; onChanged(); return getAcceptanceFilterBypassCommandFieldBuilder().getBuilder(); } - /** - * optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; - */ public com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder getAcceptanceFilterBypassCommandOrBuilder() { if (acceptanceFilterBypassCommandBuilder_ != null) { return acceptanceFilterBypassCommandBuilder_.getMessageOrBuilder(); @@ -3703,9 +2851,6 @@ public final class BinaryMessages { return acceptanceFilterBypassCommand_; } } - /** - * optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.AcceptanceFilterBypassCommand, com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder, com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder> getAcceptanceFilterBypassCommandFieldBuilder() { @@ -3719,20 +2864,14 @@ public final class BinaryMessages { } return acceptanceFilterBypassCommandBuilder_; } - + // optional .openxc.PayloadFormatCommand payload_format_command = 5; private com.openxc.BinaryMessages.PayloadFormatCommand payloadFormatCommand_ = com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.PayloadFormatCommand, com.openxc.BinaryMessages.PayloadFormatCommand.Builder, com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder> payloadFormatCommandBuilder_; - /** - * optional .openxc.PayloadFormatCommand payload_format_command = 5; - */ public boolean hasPayloadFormatCommand() { return ((bitField0_ & 0x00000010) == 0x00000010); } - /** - * optional .openxc.PayloadFormatCommand payload_format_command = 5; - */ public com.openxc.BinaryMessages.PayloadFormatCommand getPayloadFormatCommand() { if (payloadFormatCommandBuilder_ == null) { return payloadFormatCommand_; @@ -3740,9 +2879,6 @@ public final class BinaryMessages { return payloadFormatCommandBuilder_.getMessage(); } } - /** - * optional .openxc.PayloadFormatCommand payload_format_command = 5; - */ public Builder setPayloadFormatCommand(com.openxc.BinaryMessages.PayloadFormatCommand value) { if (payloadFormatCommandBuilder_ == null) { if (value == null) { @@ -3756,9 +2892,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000010; return this; } - /** - * optional .openxc.PayloadFormatCommand payload_format_command = 5; - */ public Builder setPayloadFormatCommand( com.openxc.BinaryMessages.PayloadFormatCommand.Builder builderForValue) { if (payloadFormatCommandBuilder_ == null) { @@ -3770,9 +2903,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000010; return this; } - /** - * optional .openxc.PayloadFormatCommand payload_format_command = 5; - */ public Builder mergePayloadFormatCommand(com.openxc.BinaryMessages.PayloadFormatCommand value) { if (payloadFormatCommandBuilder_ == null) { if (((bitField0_ & 0x00000010) == 0x00000010) && @@ -3789,9 +2919,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000010; return this; } - /** - * optional .openxc.PayloadFormatCommand payload_format_command = 5; - */ public Builder clearPayloadFormatCommand() { if (payloadFormatCommandBuilder_ == null) { payloadFormatCommand_ = com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance(); @@ -3802,17 +2929,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000010); return this; } - /** - * optional .openxc.PayloadFormatCommand payload_format_command = 5; - */ public com.openxc.BinaryMessages.PayloadFormatCommand.Builder getPayloadFormatCommandBuilder() { bitField0_ |= 0x00000010; onChanged(); return getPayloadFormatCommandFieldBuilder().getBuilder(); } - /** - * optional .openxc.PayloadFormatCommand payload_format_command = 5; - */ public com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder getPayloadFormatCommandOrBuilder() { if (payloadFormatCommandBuilder_ != null) { return payloadFormatCommandBuilder_.getMessageOrBuilder(); @@ -3820,9 +2941,6 @@ public final class BinaryMessages { return payloadFormatCommand_; } } - /** - * optional .openxc.PayloadFormatCommand payload_format_command = 5; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.PayloadFormatCommand, com.openxc.BinaryMessages.PayloadFormatCommand.Builder, com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder> getPayloadFormatCommandFieldBuilder() { @@ -3836,20 +2954,14 @@ public final class BinaryMessages { } return payloadFormatCommandBuilder_; } - + // optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; private com.openxc.BinaryMessages.PredefinedObd2RequestsCommand predefinedObd2RequestsCommand_ = com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.PredefinedObd2RequestsCommand, com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder, com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder> predefinedObd2RequestsCommandBuilder_; - /** - * optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; - */ public boolean hasPredefinedObd2RequestsCommand() { return ((bitField0_ & 0x00000020) == 0x00000020); } - /** - * optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; - */ public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand getPredefinedObd2RequestsCommand() { if (predefinedObd2RequestsCommandBuilder_ == null) { return predefinedObd2RequestsCommand_; @@ -3857,9 +2969,6 @@ public final class BinaryMessages { return predefinedObd2RequestsCommandBuilder_.getMessage(); } } - /** - * optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; - */ public Builder setPredefinedObd2RequestsCommand(com.openxc.BinaryMessages.PredefinedObd2RequestsCommand value) { if (predefinedObd2RequestsCommandBuilder_ == null) { if (value == null) { @@ -3873,9 +2982,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000020; return this; } - /** - * optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; - */ public Builder setPredefinedObd2RequestsCommand( com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder builderForValue) { if (predefinedObd2RequestsCommandBuilder_ == null) { @@ -3887,9 +2993,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000020; return this; } - /** - * optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; - */ public Builder mergePredefinedObd2RequestsCommand(com.openxc.BinaryMessages.PredefinedObd2RequestsCommand value) { if (predefinedObd2RequestsCommandBuilder_ == null) { if (((bitField0_ & 0x00000020) == 0x00000020) && @@ -3906,9 +3009,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000020; return this; } - /** - * optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; - */ public Builder clearPredefinedObd2RequestsCommand() { if (predefinedObd2RequestsCommandBuilder_ == null) { predefinedObd2RequestsCommand_ = com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDefaultInstance(); @@ -3919,17 +3019,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000020); return this; } - /** - * optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; - */ public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder getPredefinedObd2RequestsCommandBuilder() { bitField0_ |= 0x00000020; onChanged(); return getPredefinedObd2RequestsCommandFieldBuilder().getBuilder(); } - /** - * optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; - */ public com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder getPredefinedObd2RequestsCommandOrBuilder() { if (predefinedObd2RequestsCommandBuilder_ != null) { return predefinedObd2RequestsCommandBuilder_.getMessageOrBuilder(); @@ -3937,9 +3031,6 @@ public final class BinaryMessages { return predefinedObd2RequestsCommand_; } } - /** - * optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.PredefinedObd2RequestsCommand, com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder, com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder> getPredefinedObd2RequestsCommandFieldBuilder() { @@ -3953,20 +3044,14 @@ public final class BinaryMessages { } return predefinedObd2RequestsCommandBuilder_; } - + // optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; private com.openxc.BinaryMessages.ModemConfigurationCommand modemConfigurationCommand_ = com.openxc.BinaryMessages.ModemConfigurationCommand.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.ModemConfigurationCommand, com.openxc.BinaryMessages.ModemConfigurationCommand.Builder, com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder> modemConfigurationCommandBuilder_; - /** - * optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; - */ public boolean hasModemConfigurationCommand() { return ((bitField0_ & 0x00000040) == 0x00000040); } - /** - * optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; - */ public com.openxc.BinaryMessages.ModemConfigurationCommand getModemConfigurationCommand() { if (modemConfigurationCommandBuilder_ == null) { return modemConfigurationCommand_; @@ -3974,9 +3059,6 @@ public final class BinaryMessages { return modemConfigurationCommandBuilder_.getMessage(); } } - /** - * optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; - */ public Builder setModemConfigurationCommand(com.openxc.BinaryMessages.ModemConfigurationCommand value) { if (modemConfigurationCommandBuilder_ == null) { if (value == null) { @@ -3990,9 +3072,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000040; return this; } - /** - * optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; - */ public Builder setModemConfigurationCommand( com.openxc.BinaryMessages.ModemConfigurationCommand.Builder builderForValue) { if (modemConfigurationCommandBuilder_ == null) { @@ -4004,9 +3083,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000040; return this; } - /** - * optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; - */ public Builder mergeModemConfigurationCommand(com.openxc.BinaryMessages.ModemConfigurationCommand value) { if (modemConfigurationCommandBuilder_ == null) { if (((bitField0_ & 0x00000040) == 0x00000040) && @@ -4023,9 +3099,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000040; return this; } - /** - * optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; - */ public Builder clearModemConfigurationCommand() { if (modemConfigurationCommandBuilder_ == null) { modemConfigurationCommand_ = com.openxc.BinaryMessages.ModemConfigurationCommand.getDefaultInstance(); @@ -4036,17 +3109,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000040); return this; } - /** - * optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; - */ public com.openxc.BinaryMessages.ModemConfigurationCommand.Builder getModemConfigurationCommandBuilder() { bitField0_ |= 0x00000040; onChanged(); return getModemConfigurationCommandFieldBuilder().getBuilder(); } - /** - * optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; - */ public com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder getModemConfigurationCommandOrBuilder() { if (modemConfigurationCommandBuilder_ != null) { return modemConfigurationCommandBuilder_.getMessageOrBuilder(); @@ -4054,9 +3121,6 @@ public final class BinaryMessages { return modemConfigurationCommand_; } } - /** - * optional .openxc.ModemConfigurationCommand modem_configuration_command = 7; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.ModemConfigurationCommand, com.openxc.BinaryMessages.ModemConfigurationCommand.Builder, com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder> getModemConfigurationCommandFieldBuilder() { @@ -4070,20 +3134,14 @@ public final class BinaryMessages { } return modemConfigurationCommandBuilder_; } - + // optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; private com.openxc.BinaryMessages.RTCConfigurationCommand rtcConfigurationCommand_ = com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.RTCConfigurationCommand, com.openxc.BinaryMessages.RTCConfigurationCommand.Builder, com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder> rtcConfigurationCommandBuilder_; - /** - * optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; - */ public boolean hasRtcConfigurationCommand() { return ((bitField0_ & 0x00000080) == 0x00000080); } - /** - * optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; - */ public com.openxc.BinaryMessages.RTCConfigurationCommand getRtcConfigurationCommand() { if (rtcConfigurationCommandBuilder_ == null) { return rtcConfigurationCommand_; @@ -4091,9 +3149,6 @@ public final class BinaryMessages { return rtcConfigurationCommandBuilder_.getMessage(); } } - /** - * optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; - */ public Builder setRtcConfigurationCommand(com.openxc.BinaryMessages.RTCConfigurationCommand value) { if (rtcConfigurationCommandBuilder_ == null) { if (value == null) { @@ -4107,9 +3162,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000080; return this; } - /** - * optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; - */ public Builder setRtcConfigurationCommand( com.openxc.BinaryMessages.RTCConfigurationCommand.Builder builderForValue) { if (rtcConfigurationCommandBuilder_ == null) { @@ -4121,9 +3173,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000080; return this; } - /** - * optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; - */ public Builder mergeRtcConfigurationCommand(com.openxc.BinaryMessages.RTCConfigurationCommand value) { if (rtcConfigurationCommandBuilder_ == null) { if (((bitField0_ & 0x00000080) == 0x00000080) && @@ -4140,9 +3189,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000080; return this; } - /** - * optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; - */ public Builder clearRtcConfigurationCommand() { if (rtcConfigurationCommandBuilder_ == null) { rtcConfigurationCommand_ = com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance(); @@ -4153,17 +3199,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000080); return this; } - /** - * optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; - */ public com.openxc.BinaryMessages.RTCConfigurationCommand.Builder getRtcConfigurationCommandBuilder() { bitField0_ |= 0x00000080; onChanged(); return getRtcConfigurationCommandFieldBuilder().getBuilder(); } - /** - * optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; - */ public com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder getRtcConfigurationCommandOrBuilder() { if (rtcConfigurationCommandBuilder_ != null) { return rtcConfigurationCommandBuilder_.getMessageOrBuilder(); @@ -4171,9 +3211,6 @@ public final class BinaryMessages { return rtcConfigurationCommand_; } } - /** - * optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.RTCConfigurationCommand, com.openxc.BinaryMessages.RTCConfigurationCommand.Builder, com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder> getRtcConfigurationCommandFieldBuilder() { @@ -4187,186 +3224,70 @@ public final class BinaryMessages { } return rtcConfigurationCommandBuilder_; } - + // @@protoc_insertion_point(builder_scope:openxc.ControlCommand) } - + static { defaultInstance = new ControlCommand(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.ControlCommand) } - + public interface DiagnosticControlCommandOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional .openxc.DiagnosticRequest request = 1; - /** - * optional .openxc.DiagnosticRequest request = 1; - */ boolean hasRequest(); - /** - * optional .openxc.DiagnosticRequest request = 1; - */ com.openxc.BinaryMessages.DiagnosticRequest getRequest(); - /** - * optional .openxc.DiagnosticRequest request = 1; - */ com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getRequestOrBuilder(); - + // optional .openxc.DiagnosticControlCommand.Action action = 2; - /** - * optional .openxc.DiagnosticControlCommand.Action action = 2; - */ boolean hasAction(); - /** - * optional .openxc.DiagnosticControlCommand.Action action = 2; - */ com.openxc.BinaryMessages.DiagnosticControlCommand.Action getAction(); } - /** - * Protobuf type {@code openxc.DiagnosticControlCommand} - */ public static final class DiagnosticControlCommand extends com.google.protobuf.GeneratedMessage implements DiagnosticControlCommandOrBuilder { // Use DiagnosticControlCommand.newBuilder() to construct. - private DiagnosticControlCommand(com.google.protobuf.GeneratedMessage.Builder builder) { + private DiagnosticControlCommand(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private DiagnosticControlCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private DiagnosticControlCommand(boolean noInit) {} + private static final DiagnosticControlCommand defaultInstance; public static DiagnosticControlCommand getDefaultInstance() { return defaultInstance; } - + public DiagnosticControlCommand getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private DiagnosticControlCommand( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - com.openxc.BinaryMessages.DiagnosticRequest.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = request_.toBuilder(); - } - request_ = input.readMessage(com.openxc.BinaryMessages.DiagnosticRequest.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(request_); - request_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 16: { - int rawValue = input.readEnum(); - com.openxc.BinaryMessages.DiagnosticControlCommand.Action value = com.openxc.BinaryMessages.DiagnosticControlCommand.Action.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(2, rawValue); - } else { - bitField0_ |= 0x00000002; - action_ = value; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.DiagnosticControlCommand.class, com.openxc.BinaryMessages.DiagnosticControlCommand.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public DiagnosticControlCommand parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new DiagnosticControlCommand(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_fieldAccessorTable; } - - /** - * Protobuf enum {@code openxc.DiagnosticControlCommand.Action} - */ + public enum Action implements com.google.protobuf.ProtocolMessageEnum { - /** - * ADD = 1; - */ ADD(0, 1), - /** - * CANCEL = 2; - */ CANCEL(1, 2), ; - - /** - * ADD = 1; - */ + public static final int ADD_VALUE = 1; - /** - * CANCEL = 2; - */ public static final int CANCEL_VALUE = 2; - - + + public final int getNumber() { return value; } - + public static Action valueOf(int value) { switch (value) { case 1: return ADD; @@ -4374,7 +3295,7 @@ public final class BinaryMessages { default: return null; } } - + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; @@ -4386,7 +3307,7 @@ public final class BinaryMessages { return Action.valueOf(number); } }; - + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { return getDescriptor().getValues().get(index); @@ -4399,9 +3320,11 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.DiagnosticControlCommand.getDescriptor().getEnumTypes().get(0); } - - private static final Action[] VALUES = values(); - + + private static final Action[] VALUES = { + ADD, CANCEL, + }; + public static Action valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { @@ -4410,57 +3333,42 @@ public final class BinaryMessages { } return VALUES[desc.getIndex()]; } - + private final int index; private final int value; - + private Action(int index, int value) { this.index = index; this.value = value; } - + // @@protoc_insertion_point(enum_scope:openxc.DiagnosticControlCommand.Action) } - + private int bitField0_; // optional .openxc.DiagnosticRequest request = 1; public static final int REQUEST_FIELD_NUMBER = 1; private com.openxc.BinaryMessages.DiagnosticRequest request_; - /** - * optional .openxc.DiagnosticRequest request = 1; - */ public boolean hasRequest() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional .openxc.DiagnosticRequest request = 1; - */ public com.openxc.BinaryMessages.DiagnosticRequest getRequest() { return request_; } - /** - * optional .openxc.DiagnosticRequest request = 1; - */ public com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getRequestOrBuilder() { return request_; } - + // optional .openxc.DiagnosticControlCommand.Action action = 2; public static final int ACTION_FIELD_NUMBER = 2; private com.openxc.BinaryMessages.DiagnosticControlCommand.Action action_; - /** - * optional .openxc.DiagnosticControlCommand.Action action = 2; - */ public boolean hasAction() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional .openxc.DiagnosticControlCommand.Action action = 2; - */ public com.openxc.BinaryMessages.DiagnosticControlCommand.Action getAction() { return action_; } - + private void initFields() { request_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance(); action_ = com.openxc.BinaryMessages.DiagnosticControlCommand.Action.ADD; @@ -4469,11 +3377,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -4485,12 +3393,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -4504,83 +3412,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticControlCommand parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.DiagnosticControlCommand parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.DiagnosticControlCommand prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.DiagnosticControlCommand} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder { @@ -4588,21 +3507,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.DiagnosticControlCommand.class, com.openxc.BinaryMessages.DiagnosticControlCommand.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.DiagnosticControlCommand.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -4614,7 +3530,7 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); if (requestBuilder_ == null) { @@ -4627,20 +3543,20 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000002); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_descriptor; + return com.openxc.BinaryMessages.DiagnosticControlCommand.getDescriptor(); } - + public com.openxc.BinaryMessages.DiagnosticControlCommand getDefaultInstanceForType() { return com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance(); } - + public com.openxc.BinaryMessages.DiagnosticControlCommand build() { com.openxc.BinaryMessages.DiagnosticControlCommand result = buildPartial(); if (!result.isInitialized()) { @@ -4648,7 +3564,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.DiagnosticControlCommand buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.DiagnosticControlCommand result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.DiagnosticControlCommand buildPartial() { com.openxc.BinaryMessages.DiagnosticControlCommand result = new com.openxc.BinaryMessages.DiagnosticControlCommand(this); int from_bitField0_ = bitField0_; @@ -4669,7 +3595,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.DiagnosticControlCommand) { return mergeFrom((com.openxc.BinaryMessages.DiagnosticControlCommand)other); @@ -4678,7 +3604,7 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.DiagnosticControlCommand other) { if (other == com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance()) return this; if (other.hasRequest()) { @@ -4690,43 +3616,67 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.DiagnosticControlCommand parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.DiagnosticControlCommand) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 10: { + com.openxc.BinaryMessages.DiagnosticRequest.Builder subBuilder = com.openxc.BinaryMessages.DiagnosticRequest.newBuilder(); + if (hasRequest()) { + subBuilder.mergeFrom(getRequest()); + } + input.readMessage(subBuilder, extensionRegistry); + setRequest(subBuilder.buildPartial()); + break; + } + case 16: { + int rawValue = input.readEnum(); + com.openxc.BinaryMessages.DiagnosticControlCommand.Action value = com.openxc.BinaryMessages.DiagnosticControlCommand.Action.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(2, rawValue); + } else { + bitField0_ |= 0x00000002; + action_ = value; + } + break; + } } } - return this; } + private int bitField0_; - + // optional .openxc.DiagnosticRequest request = 1; private com.openxc.BinaryMessages.DiagnosticRequest request_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.DiagnosticRequest, com.openxc.BinaryMessages.DiagnosticRequest.Builder, com.openxc.BinaryMessages.DiagnosticRequestOrBuilder> requestBuilder_; - /** - * optional .openxc.DiagnosticRequest request = 1; - */ public boolean hasRequest() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional .openxc.DiagnosticRequest request = 1; - */ public com.openxc.BinaryMessages.DiagnosticRequest getRequest() { if (requestBuilder_ == null) { return request_; @@ -4734,9 +3684,6 @@ public final class BinaryMessages { return requestBuilder_.getMessage(); } } - /** - * optional .openxc.DiagnosticRequest request = 1; - */ public Builder setRequest(com.openxc.BinaryMessages.DiagnosticRequest value) { if (requestBuilder_ == null) { if (value == null) { @@ -4750,9 +3697,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000001; return this; } - /** - * optional .openxc.DiagnosticRequest request = 1; - */ public Builder setRequest( com.openxc.BinaryMessages.DiagnosticRequest.Builder builderForValue) { if (requestBuilder_ == null) { @@ -4764,9 +3708,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000001; return this; } - /** - * optional .openxc.DiagnosticRequest request = 1; - */ public Builder mergeRequest(com.openxc.BinaryMessages.DiagnosticRequest value) { if (requestBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && @@ -4783,9 +3724,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000001; return this; } - /** - * optional .openxc.DiagnosticRequest request = 1; - */ public Builder clearRequest() { if (requestBuilder_ == null) { request_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance(); @@ -4796,17 +3734,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000001); return this; } - /** - * optional .openxc.DiagnosticRequest request = 1; - */ public com.openxc.BinaryMessages.DiagnosticRequest.Builder getRequestBuilder() { bitField0_ |= 0x00000001; onChanged(); return getRequestFieldBuilder().getBuilder(); } - /** - * optional .openxc.DiagnosticRequest request = 1; - */ public com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getRequestOrBuilder() { if (requestBuilder_ != null) { return requestBuilder_.getMessageOrBuilder(); @@ -4814,9 +3746,6 @@ public final class BinaryMessages { return request_; } } - /** - * optional .openxc.DiagnosticRequest request = 1; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.DiagnosticRequest, com.openxc.BinaryMessages.DiagnosticRequest.Builder, com.openxc.BinaryMessages.DiagnosticRequestOrBuilder> getRequestFieldBuilder() { @@ -4830,24 +3759,15 @@ public final class BinaryMessages { } return requestBuilder_; } - + // optional .openxc.DiagnosticControlCommand.Action action = 2; private com.openxc.BinaryMessages.DiagnosticControlCommand.Action action_ = com.openxc.BinaryMessages.DiagnosticControlCommand.Action.ADD; - /** - * optional .openxc.DiagnosticControlCommand.Action action = 2; - */ public boolean hasAction() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional .openxc.DiagnosticControlCommand.Action action = 2; - */ public com.openxc.BinaryMessages.DiagnosticControlCommand.Action getAction() { return action_; } - /** - * optional .openxc.DiagnosticControlCommand.Action action = 2; - */ public Builder setAction(com.openxc.BinaryMessages.DiagnosticControlCommand.Action value) { if (value == null) { throw new NullPointerException(); @@ -4857,183 +3777,84 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional .openxc.DiagnosticControlCommand.Action action = 2; - */ public Builder clearAction() { bitField0_ = (bitField0_ & ~0x00000002); action_ = com.openxc.BinaryMessages.DiagnosticControlCommand.Action.ADD; onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:openxc.DiagnosticControlCommand) } - + static { defaultInstance = new DiagnosticControlCommand(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.DiagnosticControlCommand) } - + public interface PassthroughModeControlCommandOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional int32 bus = 1; - /** - * optional int32 bus = 1; - */ boolean hasBus(); - /** - * optional int32 bus = 1; - */ int getBus(); - + // optional bool enabled = 2; - /** - * optional bool enabled = 2; - */ boolean hasEnabled(); - /** - * optional bool enabled = 2; - */ boolean getEnabled(); } - /** - * Protobuf type {@code openxc.PassthroughModeControlCommand} - */ public static final class PassthroughModeControlCommand extends com.google.protobuf.GeneratedMessage implements PassthroughModeControlCommandOrBuilder { // Use PassthroughModeControlCommand.newBuilder() to construct. - private PassthroughModeControlCommand(com.google.protobuf.GeneratedMessage.Builder builder) { + private PassthroughModeControlCommand(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private PassthroughModeControlCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private PassthroughModeControlCommand(boolean noInit) {} + private static final PassthroughModeControlCommand defaultInstance; public static PassthroughModeControlCommand getDefaultInstance() { return defaultInstance; } - + public PassthroughModeControlCommand getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private PassthroughModeControlCommand( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - bus_ = input.readInt32(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - enabled_ = input.readBool(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.PassthroughModeControlCommand.class, com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public PassthroughModeControlCommand parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new PassthroughModeControlCommand(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_fieldAccessorTable; } - + private int bitField0_; // optional int32 bus = 1; public static final int BUS_FIELD_NUMBER = 1; private int bus_; - /** - * optional int32 bus = 1; - */ public boolean hasBus() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional int32 bus = 1; - */ public int getBus() { return bus_; } - + // optional bool enabled = 2; public static final int ENABLED_FIELD_NUMBER = 2; private boolean enabled_; - /** - * optional bool enabled = 2; - */ public boolean hasEnabled() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional bool enabled = 2; - */ public boolean getEnabled() { return enabled_; } - + private void initFields() { bus_ = 0; enabled_ = false; @@ -5042,11 +3863,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -5058,12 +3879,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -5077,83 +3898,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.PassthroughModeControlCommand prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.PassthroughModeControlCommand} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder { @@ -5161,21 +3993,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.PassthroughModeControlCommand.class, com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.PassthroughModeControlCommand.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -5186,7 +4015,7 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); bus_ = 0; @@ -5195,20 +4024,20 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000002); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_descriptor; + return com.openxc.BinaryMessages.PassthroughModeControlCommand.getDescriptor(); } - + public com.openxc.BinaryMessages.PassthroughModeControlCommand getDefaultInstanceForType() { return com.openxc.BinaryMessages.PassthroughModeControlCommand.getDefaultInstance(); } - + public com.openxc.BinaryMessages.PassthroughModeControlCommand build() { com.openxc.BinaryMessages.PassthroughModeControlCommand result = buildPartial(); if (!result.isInitialized()) { @@ -5216,7 +4045,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.PassthroughModeControlCommand buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.PassthroughModeControlCommand result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.PassthroughModeControlCommand buildPartial() { com.openxc.BinaryMessages.PassthroughModeControlCommand result = new com.openxc.BinaryMessages.PassthroughModeControlCommand(this); int from_bitField0_ = bitField0_; @@ -5233,7 +4072,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.PassthroughModeControlCommand) { return mergeFrom((com.openxc.BinaryMessages.PassthroughModeControlCommand)other); @@ -5242,7 +4081,7 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.PassthroughModeControlCommand other) { if (other == com.openxc.BinaryMessages.PassthroughModeControlCommand.getDefaultInstance()) return this; if (other.hasBus()) { @@ -5254,263 +4093,163 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.PassthroughModeControlCommand parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.PassthroughModeControlCommand) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + bus_ = input.readInt32(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + enabled_ = input.readBool(); + break; + } } } - return this; } + private int bitField0_; - + // optional int32 bus = 1; private int bus_ ; - /** - * optional int32 bus = 1; - */ public boolean hasBus() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional int32 bus = 1; - */ public int getBus() { return bus_; } - /** - * optional int32 bus = 1; - */ public Builder setBus(int value) { bitField0_ |= 0x00000001; bus_ = value; onChanged(); return this; } - /** - * optional int32 bus = 1; - */ public Builder clearBus() { bitField0_ = (bitField0_ & ~0x00000001); bus_ = 0; onChanged(); return this; } - + // optional bool enabled = 2; private boolean enabled_ ; - /** - * optional bool enabled = 2; - */ public boolean hasEnabled() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional bool enabled = 2; - */ public boolean getEnabled() { return enabled_; } - /** - * optional bool enabled = 2; - */ public Builder setEnabled(boolean value) { bitField0_ |= 0x00000002; enabled_ = value; onChanged(); return this; } - /** - * optional bool enabled = 2; - */ public Builder clearEnabled() { bitField0_ = (bitField0_ & ~0x00000002); enabled_ = false; onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:openxc.PassthroughModeControlCommand) } - + static { defaultInstance = new PassthroughModeControlCommand(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.PassthroughModeControlCommand) } - + public interface AcceptanceFilterBypassCommandOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional int32 bus = 1; - /** - * optional int32 bus = 1; - */ boolean hasBus(); - /** - * optional int32 bus = 1; - */ int getBus(); - + // optional bool bypass = 2; - /** - * optional bool bypass = 2; - */ boolean hasBypass(); - /** - * optional bool bypass = 2; - */ boolean getBypass(); } - /** - * Protobuf type {@code openxc.AcceptanceFilterBypassCommand} - */ public static final class AcceptanceFilterBypassCommand extends com.google.protobuf.GeneratedMessage implements AcceptanceFilterBypassCommandOrBuilder { // Use AcceptanceFilterBypassCommand.newBuilder() to construct. - private AcceptanceFilterBypassCommand(com.google.protobuf.GeneratedMessage.Builder builder) { + private AcceptanceFilterBypassCommand(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private AcceptanceFilterBypassCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private AcceptanceFilterBypassCommand(boolean noInit) {} + private static final AcceptanceFilterBypassCommand defaultInstance; public static AcceptanceFilterBypassCommand getDefaultInstance() { return defaultInstance; } - + public AcceptanceFilterBypassCommand getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private AcceptanceFilterBypassCommand( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - bus_ = input.readInt32(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - bypass_ = input.readBool(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.class, com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public AcceptanceFilterBypassCommand parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new AcceptanceFilterBypassCommand(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_fieldAccessorTable; } - + private int bitField0_; // optional int32 bus = 1; public static final int BUS_FIELD_NUMBER = 1; private int bus_; - /** - * optional int32 bus = 1; - */ public boolean hasBus() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional int32 bus = 1; - */ public int getBus() { return bus_; } - + // optional bool bypass = 2; public static final int BYPASS_FIELD_NUMBER = 2; private boolean bypass_; - /** - * optional bool bypass = 2; - */ public boolean hasBypass() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional bool bypass = 2; - */ public boolean getBypass() { return bypass_; } - + private void initFields() { bus_ = 0; bypass_ = false; @@ -5519,11 +4258,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -5535,12 +4274,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -5554,83 +4293,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.AcceptanceFilterBypassCommand prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.AcceptanceFilterBypassCommand} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder { @@ -5638,21 +4388,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.class, com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -5663,7 +4410,7 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); bus_ = 0; @@ -5672,20 +4419,20 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000002); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_descriptor; + return com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDescriptor(); } - + public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand getDefaultInstanceForType() { return com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDefaultInstance(); } - + public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand build() { com.openxc.BinaryMessages.AcceptanceFilterBypassCommand result = buildPartial(); if (!result.isInitialized()) { @@ -5693,7 +4440,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.AcceptanceFilterBypassCommand buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.AcceptanceFilterBypassCommand result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand buildPartial() { com.openxc.BinaryMessages.AcceptanceFilterBypassCommand result = new com.openxc.BinaryMessages.AcceptanceFilterBypassCommand(this); int from_bitField0_ = bitField0_; @@ -5710,7 +4467,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.AcceptanceFilterBypassCommand) { return mergeFrom((com.openxc.BinaryMessages.AcceptanceFilterBypassCommand)other); @@ -5719,7 +4476,7 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.AcceptanceFilterBypassCommand other) { if (other == com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDefaultInstance()) return this; if (other.hasBus()) { @@ -5731,256 +4488,152 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.AcceptanceFilterBypassCommand) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + bus_ = input.readInt32(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + bypass_ = input.readBool(); + break; + } } } - return this; } + private int bitField0_; - + // optional int32 bus = 1; private int bus_ ; - /** - * optional int32 bus = 1; - */ public boolean hasBus() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional int32 bus = 1; - */ public int getBus() { return bus_; } - /** - * optional int32 bus = 1; - */ public Builder setBus(int value) { bitField0_ |= 0x00000001; bus_ = value; onChanged(); return this; } - /** - * optional int32 bus = 1; - */ public Builder clearBus() { bitField0_ = (bitField0_ & ~0x00000001); bus_ = 0; onChanged(); return this; } - + // optional bool bypass = 2; private boolean bypass_ ; - /** - * optional bool bypass = 2; - */ public boolean hasBypass() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional bool bypass = 2; - */ public boolean getBypass() { return bypass_; } - /** - * optional bool bypass = 2; - */ public Builder setBypass(boolean value) { bitField0_ |= 0x00000002; bypass_ = value; onChanged(); return this; } - /** - * optional bool bypass = 2; - */ public Builder clearBypass() { bitField0_ = (bitField0_ & ~0x00000002); bypass_ = false; onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:openxc.AcceptanceFilterBypassCommand) } - + static { defaultInstance = new AcceptanceFilterBypassCommand(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.AcceptanceFilterBypassCommand) } - + public interface PayloadFormatCommandOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional .openxc.PayloadFormatCommand.PayloadFormat format = 1; - /** - * optional .openxc.PayloadFormatCommand.PayloadFormat format = 1; - */ boolean hasFormat(); - /** - * optional .openxc.PayloadFormatCommand.PayloadFormat format = 1; - */ com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat getFormat(); } - /** - * Protobuf type {@code openxc.PayloadFormatCommand} - */ public static final class PayloadFormatCommand extends com.google.protobuf.GeneratedMessage implements PayloadFormatCommandOrBuilder { // Use PayloadFormatCommand.newBuilder() to construct. - private PayloadFormatCommand(com.google.protobuf.GeneratedMessage.Builder builder) { + private PayloadFormatCommand(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private PayloadFormatCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private PayloadFormatCommand(boolean noInit) {} + private static final PayloadFormatCommand defaultInstance; public static PayloadFormatCommand getDefaultInstance() { return defaultInstance; } - + public PayloadFormatCommand getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private PayloadFormatCommand( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - int rawValue = input.readEnum(); - com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat value = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(1, rawValue); - } else { - bitField0_ |= 0x00000001; - format_ = value; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.PayloadFormatCommand.class, com.openxc.BinaryMessages.PayloadFormatCommand.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_fieldAccessorTable; } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public PayloadFormatCommand parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new PayloadFormatCommand(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - /** - * Protobuf enum {@code openxc.PayloadFormatCommand.PayloadFormat} - */ + public enum PayloadFormat implements com.google.protobuf.ProtocolMessageEnum { - /** - * JSON = 1; - */ JSON(0, 1), - /** - * PROTOBUF = 2; - */ PROTOBUF(1, 2), - /** - * MESSAGEPACK = 3; - */ MESSAGEPACK(2, 3), ; - - /** - * JSON = 1; - */ + public static final int JSON_VALUE = 1; - /** - * PROTOBUF = 2; - */ public static final int PROTOBUF_VALUE = 2; - /** - * MESSAGEPACK = 3; - */ public static final int MESSAGEPACK_VALUE = 3; - - + + public final int getNumber() { return value; } - + public static PayloadFormat valueOf(int value) { switch (value) { case 1: return JSON; @@ -5989,7 +4642,7 @@ public final class BinaryMessages { default: return null; } } - + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; @@ -6001,7 +4654,7 @@ public final class BinaryMessages { return PayloadFormat.valueOf(number); } }; - + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { return getDescriptor().getValues().get(index); @@ -6014,9 +4667,11 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.PayloadFormatCommand.getDescriptor().getEnumTypes().get(0); } - - private static final PayloadFormat[] VALUES = values(); - + + private static final PayloadFormat[] VALUES = { + JSON, PROTOBUF, MESSAGEPACK, + }; + public static PayloadFormat valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { @@ -6025,35 +4680,29 @@ public final class BinaryMessages { } return VALUES[desc.getIndex()]; } - + private final int index; private final int value; - + private PayloadFormat(int index, int value) { this.index = index; this.value = value; } - + // @@protoc_insertion_point(enum_scope:openxc.PayloadFormatCommand.PayloadFormat) } - + private int bitField0_; // optional .openxc.PayloadFormatCommand.PayloadFormat format = 1; public static final int FORMAT_FIELD_NUMBER = 1; private com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat format_; - /** - * optional .openxc.PayloadFormatCommand.PayloadFormat format = 1; - */ public boolean hasFormat() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional .openxc.PayloadFormatCommand.PayloadFormat format = 1; - */ public com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat getFormat() { return format_; } - + private void initFields() { format_ = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.JSON; } @@ -6061,11 +4710,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -6074,12 +4723,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -6089,83 +4738,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.PayloadFormatCommand parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.PayloadFormatCommand parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.PayloadFormatCommand prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.PayloadFormatCommand} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder { @@ -6173,21 +4833,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.PayloadFormatCommand.class, com.openxc.BinaryMessages.PayloadFormatCommand.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.PayloadFormatCommand.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -6198,27 +4855,27 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); format_ = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.JSON; bitField0_ = (bitField0_ & ~0x00000001); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_descriptor; + return com.openxc.BinaryMessages.PayloadFormatCommand.getDescriptor(); } - + public com.openxc.BinaryMessages.PayloadFormatCommand getDefaultInstanceForType() { return com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance(); } - + public com.openxc.BinaryMessages.PayloadFormatCommand build() { com.openxc.BinaryMessages.PayloadFormatCommand result = buildPartial(); if (!result.isInitialized()) { @@ -6226,7 +4883,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.PayloadFormatCommand buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.PayloadFormatCommand result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.PayloadFormatCommand buildPartial() { com.openxc.BinaryMessages.PayloadFormatCommand result = new com.openxc.BinaryMessages.PayloadFormatCommand(this); int from_bitField0_ = bitField0_; @@ -6239,7 +4906,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.PayloadFormatCommand) { return mergeFrom((com.openxc.BinaryMessages.PayloadFormatCommand)other); @@ -6248,7 +4915,7 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.PayloadFormatCommand other) { if (other == com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance()) return this; if (other.hasFormat()) { @@ -6257,47 +4924,59 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.PayloadFormatCommand parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.PayloadFormatCommand) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // optional .openxc.PayloadFormatCommand.PayloadFormat format = 1; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 8: { + int rawValue = input.readEnum(); + com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat value = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(1, rawValue); + } else { + bitField0_ |= 0x00000001; + format_ = value; + } + break; + } + } + } + } + + private int bitField0_; + + // optional .openxc.PayloadFormatCommand.PayloadFormat format = 1; private com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat format_ = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.JSON; - /** - * optional .openxc.PayloadFormatCommand.PayloadFormat format = 1; - */ public boolean hasFormat() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional .openxc.PayloadFormatCommand.PayloadFormat format = 1; - */ public com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat getFormat() { return format_; } - /** - * optional .openxc.PayloadFormatCommand.PayloadFormat format = 1; - */ public Builder setFormat(com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat value) { if (value == null) { throw new NullPointerException(); @@ -6307,152 +4986,70 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional .openxc.PayloadFormatCommand.PayloadFormat format = 1; - */ public Builder clearFormat() { bitField0_ = (bitField0_ & ~0x00000001); format_ = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.JSON; onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:openxc.PayloadFormatCommand) } - + static { defaultInstance = new PayloadFormatCommand(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.PayloadFormatCommand) } - + public interface PredefinedObd2RequestsCommandOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional bool enabled = 1; - /** - * optional bool enabled = 1; - */ boolean hasEnabled(); - /** - * optional bool enabled = 1; - */ boolean getEnabled(); } - /** - * Protobuf type {@code openxc.PredefinedObd2RequestsCommand} - */ public static final class PredefinedObd2RequestsCommand extends com.google.protobuf.GeneratedMessage implements PredefinedObd2RequestsCommandOrBuilder { // Use PredefinedObd2RequestsCommand.newBuilder() to construct. - private PredefinedObd2RequestsCommand(com.google.protobuf.GeneratedMessage.Builder builder) { + private PredefinedObd2RequestsCommand(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private PredefinedObd2RequestsCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private PredefinedObd2RequestsCommand(boolean noInit) {} + private static final PredefinedObd2RequestsCommand defaultInstance; public static PredefinedObd2RequestsCommand getDefaultInstance() { return defaultInstance; } - + public PredefinedObd2RequestsCommand getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private PredefinedObd2RequestsCommand( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - enabled_ = input.readBool(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.class, com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public PredefinedObd2RequestsCommand parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new PredefinedObd2RequestsCommand(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_fieldAccessorTable; } - + private int bitField0_; // optional bool enabled = 1; public static final int ENABLED_FIELD_NUMBER = 1; private boolean enabled_; - /** - * optional bool enabled = 1; - */ public boolean hasEnabled() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional bool enabled = 1; - */ public boolean getEnabled() { return enabled_; } - + private void initFields() { enabled_ = false; } @@ -6460,11 +5057,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -6473,12 +5070,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -6488,83 +5085,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.PredefinedObd2RequestsCommand prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.PredefinedObd2RequestsCommand} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder { @@ -6572,21 +5180,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.class, com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -6597,27 +5202,27 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); enabled_ = false; bitField0_ = (bitField0_ & ~0x00000001); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_descriptor; + return com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDescriptor(); } - + public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand getDefaultInstanceForType() { return com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDefaultInstance(); } - + public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand build() { com.openxc.BinaryMessages.PredefinedObd2RequestsCommand result = buildPartial(); if (!result.isInitialized()) { @@ -6625,7 +5230,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.PredefinedObd2RequestsCommand buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.PredefinedObd2RequestsCommand result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand buildPartial() { com.openxc.BinaryMessages.PredefinedObd2RequestsCommand result = new com.openxc.BinaryMessages.PredefinedObd2RequestsCommand(this); int from_bitField0_ = bitField0_; @@ -6638,7 +5253,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.PredefinedObd2RequestsCommand) { return mergeFrom((com.openxc.BinaryMessages.PredefinedObd2RequestsCommand)other); @@ -6647,7 +5262,7 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.PredefinedObd2RequestsCommand other) { if (other == com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDefaultInstance()) return this; if (other.hasEnabled()) { @@ -6656,281 +5271,139 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.PredefinedObd2RequestsCommand) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + enabled_ = input.readBool(); + break; + } } } - return this; } + private int bitField0_; - + // optional bool enabled = 1; private boolean enabled_ ; - /** - * optional bool enabled = 1; - */ public boolean hasEnabled() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional bool enabled = 1; - */ public boolean getEnabled() { return enabled_; } - /** - * optional bool enabled = 1; - */ public Builder setEnabled(boolean value) { bitField0_ |= 0x00000001; enabled_ = value; onChanged(); return this; } - /** - * optional bool enabled = 1; - */ public Builder clearEnabled() { bitField0_ = (bitField0_ & ~0x00000001); enabled_ = false; onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:openxc.PredefinedObd2RequestsCommand) } - + static { defaultInstance = new PredefinedObd2RequestsCommand(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.PredefinedObd2RequestsCommand) } - + public interface NetworkOperatorSettingsOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional bool allowDataRoaming = 1; - /** - * optional bool allowDataRoaming = 1; - */ boolean hasAllowDataRoaming(); - /** - * optional bool allowDataRoaming = 1; - */ boolean getAllowDataRoaming(); - + // optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2; - /** - * optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2; - */ boolean hasOperatorSelectMode(); - /** - * optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2; - */ com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode getOperatorSelectMode(); - + // optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; - */ boolean hasNetworkDescriptor(); - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; - */ com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor getNetworkDescriptor(); - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; - */ com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder getNetworkDescriptorOrBuilder(); } - /** - * Protobuf type {@code openxc.NetworkOperatorSettings} - */ public static final class NetworkOperatorSettings extends com.google.protobuf.GeneratedMessage implements NetworkOperatorSettingsOrBuilder { // Use NetworkOperatorSettings.newBuilder() to construct. - private NetworkOperatorSettings(com.google.protobuf.GeneratedMessage.Builder builder) { + private NetworkOperatorSettings(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private NetworkOperatorSettings(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private NetworkOperatorSettings(boolean noInit) {} + private static final NetworkOperatorSettings defaultInstance; public static NetworkOperatorSettings getDefaultInstance() { return defaultInstance; } - + public NetworkOperatorSettings getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private NetworkOperatorSettings( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - allowDataRoaming_ = input.readBool(); - break; - } - case 16: { - int rawValue = input.readEnum(); - com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode value = com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(2, rawValue); - } else { - bitField0_ |= 0x00000002; - operatorSelectMode_ = value; - } - break; - } - case 26: { - com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - subBuilder = networkDescriptor_.toBuilder(); - } - networkDescriptor_ = input.readMessage(com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(networkDescriptor_); - networkDescriptor_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000004; - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.NetworkOperatorSettings.class, com.openxc.BinaryMessages.NetworkOperatorSettings.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public NetworkOperatorSettings parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new NetworkOperatorSettings(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_fieldAccessorTable; } - - /** - * Protobuf enum {@code openxc.NetworkOperatorSettings.OperatorSelectMode} - */ + public enum OperatorSelectMode implements com.google.protobuf.ProtocolMessageEnum { - /** - * AUTOMATIC = 0; - */ AUTOMATIC(0, 0), - /** - * MANUAL = 1; - */ MANUAL(1, 1), - /** - * DEREGISTER = 2; - */ DEREGISTER(2, 2), - /** - * SET_ONLY = 3; - */ SET_ONLY(3, 3), - /** - * MANUAL_AUTOMATIC = 4; - */ MANUAL_AUTOMATIC(4, 4), ; - - /** - * AUTOMATIC = 0; - */ + public static final int AUTOMATIC_VALUE = 0; - /** - * MANUAL = 1; - */ public static final int MANUAL_VALUE = 1; - /** - * DEREGISTER = 2; - */ public static final int DEREGISTER_VALUE = 2; - /** - * SET_ONLY = 3; - */ public static final int SET_ONLY_VALUE = 3; - /** - * MANUAL_AUTOMATIC = 4; - */ public static final int MANUAL_AUTOMATIC_VALUE = 4; - - + + public final int getNumber() { return value; } - + public static OperatorSelectMode valueOf(int value) { switch (value) { case 0: return AUTOMATIC; @@ -6941,7 +5414,7 @@ public final class BinaryMessages { default: return null; } } - + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; @@ -6953,7 +5426,7 @@ public final class BinaryMessages { return OperatorSelectMode.valueOf(number); } }; - + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { return getDescriptor().getValues().get(index); @@ -6966,9 +5439,11 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.NetworkOperatorSettings.getDescriptor().getEnumTypes().get(0); } - - private static final OperatorSelectMode[] VALUES = values(); - + + private static final OperatorSelectMode[] VALUES = { + AUTOMATIC, MANUAL, DEREGISTER, SET_ONLY, MANUAL_AUTOMATIC, + }; + public static OperatorSelectMode valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { @@ -6977,174 +5452,69 @@ public final class BinaryMessages { } return VALUES[desc.getIndex()]; } - + private final int index; private final int value; - + private OperatorSelectMode(int index, int value) { this.index = index; this.value = value; } - + // @@protoc_insertion_point(enum_scope:openxc.NetworkOperatorSettings.OperatorSelectMode) } - + public interface NetworkDescriptorOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional uint32 PLMN = 1; - /** - * optional uint32 PLMN = 1; - */ boolean hasPLMN(); - /** - * optional uint32 PLMN = 1; - */ int getPLMN(); - + // optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2; - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2; - */ boolean hasNetworkType(); - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2; - */ com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType getNetworkType(); } - /** - * Protobuf type {@code openxc.NetworkOperatorSettings.NetworkDescriptor} - */ public static final class NetworkDescriptor extends com.google.protobuf.GeneratedMessage implements NetworkDescriptorOrBuilder { // Use NetworkDescriptor.newBuilder() to construct. - private NetworkDescriptor(com.google.protobuf.GeneratedMessage.Builder builder) { + private NetworkDescriptor(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private NetworkDescriptor(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private NetworkDescriptor(boolean noInit) {} + private static final NetworkDescriptor defaultInstance; public static NetworkDescriptor getDefaultInstance() { return defaultInstance; } - + public NetworkDescriptor getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private NetworkDescriptor( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - pLMN_ = input.readUInt32(); - break; - } - case 16: { - int rawValue = input.readEnum(); - com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType value = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(2, rawValue); - } else { - bitField0_ |= 0x00000002; - networkType_ = value; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.class, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public NetworkDescriptor parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new NetworkDescriptor(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_fieldAccessorTable; } - - /** - * Protobuf enum {@code openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType} - */ + public enum NetworkType implements com.google.protobuf.ProtocolMessageEnum { - /** - * GSM = 0; - */ GSM(0, 0), - /** - * UTRAN = 2; - */ UTRAN(1, 2), ; - - /** - * GSM = 0; - */ + public static final int GSM_VALUE = 0; - /** - * UTRAN = 2; - */ public static final int UTRAN_VALUE = 2; - - + + public final int getNumber() { return value; } - + public static NetworkType valueOf(int value) { switch (value) { case 0: return GSM; @@ -7152,7 +5522,7 @@ public final class BinaryMessages { default: return null; } } - + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; @@ -7164,7 +5534,7 @@ public final class BinaryMessages { return NetworkType.valueOf(number); } }; - + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { return getDescriptor().getValues().get(index); @@ -7177,9 +5547,11 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDescriptor().getEnumTypes().get(0); } - - private static final NetworkType[] VALUES = values(); - + + private static final NetworkType[] VALUES = { + GSM, UTRAN, + }; + public static NetworkType valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { @@ -7188,51 +5560,39 @@ public final class BinaryMessages { } return VALUES[desc.getIndex()]; } - + private final int index; private final int value; - + private NetworkType(int index, int value) { this.index = index; this.value = value; } - + // @@protoc_insertion_point(enum_scope:openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType) } - + private int bitField0_; // optional uint32 PLMN = 1; public static final int PLMN_FIELD_NUMBER = 1; private int pLMN_; - /** - * optional uint32 PLMN = 1; - */ public boolean hasPLMN() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional uint32 PLMN = 1; - */ public int getPLMN() { return pLMN_; } - + // optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2; public static final int NETWORKTYPE_FIELD_NUMBER = 2; private com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType_; - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2; - */ public boolean hasNetworkType() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2; - */ public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType getNetworkType() { return networkType_; } - + private void initFields() { pLMN_ = 0; networkType_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType.GSM; @@ -7241,11 +5601,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -7257,12 +5617,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -7276,83 +5636,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.NetworkOperatorSettings.NetworkDescriptor} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder { @@ -7360,21 +5731,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.class, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -7385,7 +5753,7 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); pLMN_ = 0; @@ -7394,20 +5762,20 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000002); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_descriptor; + return com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDescriptor(); } - + public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor getDefaultInstanceForType() { return com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDefaultInstance(); } - + public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor build() { com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor result = buildPartial(); if (!result.isInitialized()) { @@ -7415,7 +5783,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor buildPartial() { com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor result = new com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor(this); int from_bitField0_ = bitField0_; @@ -7432,7 +5810,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor) { return mergeFrom((com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor)other); @@ -7441,7 +5819,7 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor other) { if (other == com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDefaultInstance()) return this; if (other.hasPLMN()) { @@ -7453,80 +5831,85 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + pLMN_ = input.readUInt32(); + break; + } + case 16: { + int rawValue = input.readEnum(); + com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType value = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(2, rawValue); + } else { + bitField0_ |= 0x00000002; + networkType_ = value; + } + break; + } } } - return this; } + private int bitField0_; - + // optional uint32 PLMN = 1; private int pLMN_ ; - /** - * optional uint32 PLMN = 1; - */ public boolean hasPLMN() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional uint32 PLMN = 1; - */ public int getPLMN() { return pLMN_; } - /** - * optional uint32 PLMN = 1; - */ public Builder setPLMN(int value) { bitField0_ |= 0x00000001; pLMN_ = value; onChanged(); return this; } - /** - * optional uint32 PLMN = 1; - */ public Builder clearPLMN() { bitField0_ = (bitField0_ & ~0x00000001); pLMN_ = 0; onChanged(); return this; } - + // optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2; private com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType.GSM; - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2; - */ public boolean hasNetworkType() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2; - */ public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType getNetworkType() { return networkType_; } - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2; - */ public Builder setNetworkType(com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType value) { if (value == null) { throw new NullPointerException(); @@ -7536,82 +5919,58 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2; - */ public Builder clearNetworkType() { bitField0_ = (bitField0_ & ~0x00000002); networkType_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType.GSM; onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:openxc.NetworkOperatorSettings.NetworkDescriptor) } - + static { defaultInstance = new NetworkDescriptor(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.NetworkOperatorSettings.NetworkDescriptor) } - + private int bitField0_; // optional bool allowDataRoaming = 1; public static final int ALLOWDATAROAMING_FIELD_NUMBER = 1; private boolean allowDataRoaming_; - /** - * optional bool allowDataRoaming = 1; - */ public boolean hasAllowDataRoaming() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional bool allowDataRoaming = 1; - */ public boolean getAllowDataRoaming() { return allowDataRoaming_; } - + // optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2; public static final int OPERATORSELECTMODE_FIELD_NUMBER = 2; private com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode_; - /** - * optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2; - */ public boolean hasOperatorSelectMode() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2; - */ public com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode getOperatorSelectMode() { return operatorSelectMode_; } - + // optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; public static final int NETWORKDESCRIPTOR_FIELD_NUMBER = 3; private com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor networkDescriptor_; - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; - */ public boolean hasNetworkDescriptor() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; - */ public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor getNetworkDescriptor() { return networkDescriptor_; } - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; - */ public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder getNetworkDescriptorOrBuilder() { return networkDescriptor_; } - + private void initFields() { allowDataRoaming_ = false; operatorSelectMode_ = com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode.AUTOMATIC; @@ -7621,11 +5980,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -7640,12 +5999,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -7663,83 +6022,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.NetworkOperatorSettings parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.NetworkOperatorSettings parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.NetworkOperatorSettings prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.NetworkOperatorSettings} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder { @@ -7747,21 +6117,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.NetworkOperatorSettings.class, com.openxc.BinaryMessages.NetworkOperatorSettings.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.NetworkOperatorSettings.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -7773,7 +6140,7 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); allowDataRoaming_ = false; @@ -7788,20 +6155,20 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000004); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_descriptor; + return com.openxc.BinaryMessages.NetworkOperatorSettings.getDescriptor(); } - + public com.openxc.BinaryMessages.NetworkOperatorSettings getDefaultInstanceForType() { return com.openxc.BinaryMessages.NetworkOperatorSettings.getDefaultInstance(); } - + public com.openxc.BinaryMessages.NetworkOperatorSettings build() { com.openxc.BinaryMessages.NetworkOperatorSettings result = buildPartial(); if (!result.isInitialized()) { @@ -7809,7 +6176,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.NetworkOperatorSettings buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.NetworkOperatorSettings result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.NetworkOperatorSettings buildPartial() { com.openxc.BinaryMessages.NetworkOperatorSettings result = new com.openxc.BinaryMessages.NetworkOperatorSettings(this); int from_bitField0_ = bitField0_; @@ -7834,7 +6211,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.NetworkOperatorSettings) { return mergeFrom((com.openxc.BinaryMessages.NetworkOperatorSettings)other); @@ -7843,7 +6220,7 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.NetworkOperatorSettings other) { if (other == com.openxc.BinaryMessages.NetworkOperatorSettings.getDefaultInstance()) return this; if (other.hasAllowDataRoaming()) { @@ -7858,80 +6235,94 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.NetworkOperatorSettings parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.NetworkOperatorSettings) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + allowDataRoaming_ = input.readBool(); + break; + } + case 16: { + int rawValue = input.readEnum(); + com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode value = com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(2, rawValue); + } else { + bitField0_ |= 0x00000002; + operatorSelectMode_ = value; + } + break; + } + case 26: { + com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder subBuilder = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.newBuilder(); + if (hasNetworkDescriptor()) { + subBuilder.mergeFrom(getNetworkDescriptor()); + } + input.readMessage(subBuilder, extensionRegistry); + setNetworkDescriptor(subBuilder.buildPartial()); + break; + } } } - return this; } + private int bitField0_; - + // optional bool allowDataRoaming = 1; private boolean allowDataRoaming_ ; - /** - * optional bool allowDataRoaming = 1; - */ public boolean hasAllowDataRoaming() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional bool allowDataRoaming = 1; - */ public boolean getAllowDataRoaming() { return allowDataRoaming_; } - /** - * optional bool allowDataRoaming = 1; - */ public Builder setAllowDataRoaming(boolean value) { bitField0_ |= 0x00000001; allowDataRoaming_ = value; onChanged(); return this; } - /** - * optional bool allowDataRoaming = 1; - */ public Builder clearAllowDataRoaming() { bitField0_ = (bitField0_ & ~0x00000001); allowDataRoaming_ = false; onChanged(); return this; } - + // optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2; private com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode_ = com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode.AUTOMATIC; - /** - * optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2; - */ public boolean hasOperatorSelectMode() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2; - */ public com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode getOperatorSelectMode() { return operatorSelectMode_; } - /** - * optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2; - */ public Builder setOperatorSelectMode(com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode value) { if (value == null) { throw new NullPointerException(); @@ -7941,29 +6332,20 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2; - */ public Builder clearOperatorSelectMode() { bitField0_ = (bitField0_ & ~0x00000002); operatorSelectMode_ = com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode.AUTOMATIC; onChanged(); return this; } - + // optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; private com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor networkDescriptor_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder> networkDescriptorBuilder_; - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; - */ public boolean hasNetworkDescriptor() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; - */ public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor getNetworkDescriptor() { if (networkDescriptorBuilder_ == null) { return networkDescriptor_; @@ -7971,9 +6353,6 @@ public final class BinaryMessages { return networkDescriptorBuilder_.getMessage(); } } - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; - */ public Builder setNetworkDescriptor(com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor value) { if (networkDescriptorBuilder_ == null) { if (value == null) { @@ -7987,9 +6366,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000004; return this; } - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; - */ public Builder setNetworkDescriptor( com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder builderForValue) { if (networkDescriptorBuilder_ == null) { @@ -8001,9 +6377,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000004; return this; } - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; - */ public Builder mergeNetworkDescriptor(com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor value) { if (networkDescriptorBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && @@ -8020,9 +6393,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000004; return this; } - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; - */ public Builder clearNetworkDescriptor() { if (networkDescriptorBuilder_ == null) { networkDescriptor_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDefaultInstance(); @@ -8033,17 +6403,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000004); return this; } - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; - */ public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder getNetworkDescriptorBuilder() { bitField0_ |= 0x00000004; onChanged(); return getNetworkDescriptorFieldBuilder().getBuilder(); } - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; - */ public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder getNetworkDescriptorOrBuilder() { if (networkDescriptorBuilder_ != null) { return networkDescriptorBuilder_.getMessageOrBuilder(); @@ -8051,9 +6415,6 @@ public final class BinaryMessages { return networkDescriptor_; } } - /** - * optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder> getNetworkDescriptorFieldBuilder() { @@ -8067,175 +6428,86 @@ public final class BinaryMessages { } return networkDescriptorBuilder_; } - + // @@protoc_insertion_point(builder_scope:openxc.NetworkOperatorSettings) } - + static { defaultInstance = new NetworkOperatorSettings(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.NetworkOperatorSettings) } - + public interface NetworkDataSettingsOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional string APN = 1; - /** - * optional string APN = 1; - */ boolean hasAPN(); - /** - * optional string APN = 1; - */ - java.lang.String getAPN(); - /** - * optional string APN = 1; - */ - com.google.protobuf.ByteString - getAPNBytes(); + String getAPN(); } - /** - * Protobuf type {@code openxc.NetworkDataSettings} - */ public static final class NetworkDataSettings extends com.google.protobuf.GeneratedMessage implements NetworkDataSettingsOrBuilder { // Use NetworkDataSettings.newBuilder() to construct. - private NetworkDataSettings(com.google.protobuf.GeneratedMessage.Builder builder) { + private NetworkDataSettings(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private NetworkDataSettings(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private NetworkDataSettings(boolean noInit) {} + private static final NetworkDataSettings defaultInstance; public static NetworkDataSettings getDefaultInstance() { return defaultInstance; } - + public NetworkDataSettings getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private NetworkDataSettings( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - bitField0_ |= 0x00000001; - aPN_ = input.readBytes(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.NetworkDataSettings.class, com.openxc.BinaryMessages.NetworkDataSettings.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public NetworkDataSettings parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new NetworkDataSettings(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_descriptor; } - + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_fieldAccessorTable; + } + private int bitField0_; // optional string APN = 1; public static final int APN_FIELD_NUMBER = 1; private java.lang.Object aPN_; - /** - * optional string APN = 1; - */ public boolean hasAPN() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional string APN = 1; - */ - public java.lang.String getAPN() { + public String getAPN() { java.lang.Object ref = aPN_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { + String s = bs.toStringUtf8(); + if (com.google.protobuf.Internal.isValidUtf8(bs)) { aPN_ = s; } return s; } } - /** - * optional string APN = 1; - */ - public com.google.protobuf.ByteString - getAPNBytes() { + private com.google.protobuf.ByteString getAPNBytes() { java.lang.Object ref = aPN_; - if (ref instanceof java.lang.String) { + if (ref instanceof String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8((String) ref); aPN_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - + private void initFields() { aPN_ = ""; } @@ -8243,11 +6515,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -8256,12 +6528,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -8271,83 +6543,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.NetworkDataSettings parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.NetworkDataSettings parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.NetworkDataSettings prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.NetworkDataSettings} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder { @@ -8355,21 +6638,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.NetworkDataSettings.class, com.openxc.BinaryMessages.NetworkDataSettings.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.NetworkDataSettings.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -8380,27 +6660,27 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); aPN_ = ""; bitField0_ = (bitField0_ & ~0x00000001); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_descriptor; + return com.openxc.BinaryMessages.NetworkDataSettings.getDescriptor(); } - + public com.openxc.BinaryMessages.NetworkDataSettings getDefaultInstanceForType() { return com.openxc.BinaryMessages.NetworkDataSettings.getDefaultInstance(); } - + public com.openxc.BinaryMessages.NetworkDataSettings build() { com.openxc.BinaryMessages.NetworkDataSettings result = buildPartial(); if (!result.isInitialized()) { @@ -8408,7 +6688,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.NetworkDataSettings buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.NetworkDataSettings result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.NetworkDataSettings buildPartial() { com.openxc.BinaryMessages.NetworkDataSettings result = new com.openxc.BinaryMessages.NetworkDataSettings(this); int from_bitField0_ = bitField0_; @@ -8421,7 +6711,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.NetworkDataSettings) { return mergeFrom((com.openxc.BinaryMessages.NetworkDataSettings)other); @@ -8430,84 +6720,70 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.NetworkDataSettings other) { if (other == com.openxc.BinaryMessages.NetworkDataSettings.getDefaultInstance()) return this; if (other.hasAPN()) { - bitField0_ |= 0x00000001; - aPN_ = other.aPN_; - onChanged(); + setAPN(other.getAPN()); } this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.NetworkDataSettings parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.NetworkDataSettings) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 10: { + bitField0_ |= 0x00000001; + aPN_ = input.readBytes(); + break; + } } } - return this; } + private int bitField0_; - + // optional string APN = 1; private java.lang.Object aPN_ = ""; - /** - * optional string APN = 1; - */ public boolean hasAPN() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional string APN = 1; - */ - public java.lang.String getAPN() { + public String getAPN() { java.lang.Object ref = aPN_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); + if (!(ref instanceof String)) { + String s = ((com.google.protobuf.ByteString) ref).toStringUtf8(); aPN_ = s; return s; } else { - return (java.lang.String) ref; - } - } - /** - * optional string APN = 1; - */ - public com.google.protobuf.ByteString - getAPNBytes() { - java.lang.Object ref = aPN_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - aPN_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; + return (String) ref; } } - /** - * optional string APN = 1; - */ - public Builder setAPN( - java.lang.String value) { + public Builder setAPN(String value) { if (value == null) { throw new NullPointerException(); } @@ -8516,228 +6792,111 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional string APN = 1; - */ public Builder clearAPN() { bitField0_ = (bitField0_ & ~0x00000001); aPN_ = getDefaultInstance().getAPN(); onChanged(); return this; } - /** - * optional string APN = 1; - */ - public Builder setAPNBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + void setAPN(com.google.protobuf.ByteString value) { + bitField0_ |= 0x00000001; aPN_ = value; onChanged(); - return this; } - + // @@protoc_insertion_point(builder_scope:openxc.NetworkDataSettings) } - + static { defaultInstance = new NetworkDataSettings(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.NetworkDataSettings) } - + public interface ServerConnectSettingsOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional string host = 1; - /** - * optional string host = 1; - */ boolean hasHost(); - /** - * optional string host = 1; - */ - java.lang.String getHost(); - /** - * optional string host = 1; - */ - com.google.protobuf.ByteString - getHostBytes(); - + String getHost(); + // optional uint32 port = 2; - /** - * optional uint32 port = 2; - */ boolean hasPort(); - /** - * optional uint32 port = 2; - */ int getPort(); } - /** - * Protobuf type {@code openxc.ServerConnectSettings} - */ public static final class ServerConnectSettings extends com.google.protobuf.GeneratedMessage implements ServerConnectSettingsOrBuilder { // Use ServerConnectSettings.newBuilder() to construct. - private ServerConnectSettings(com.google.protobuf.GeneratedMessage.Builder builder) { + private ServerConnectSettings(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private ServerConnectSettings(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private ServerConnectSettings(boolean noInit) {} + private static final ServerConnectSettings defaultInstance; public static ServerConnectSettings getDefaultInstance() { return defaultInstance; } - + public ServerConnectSettings getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private ServerConnectSettings( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - bitField0_ |= 0x00000001; - host_ = input.readBytes(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - port_ = input.readUInt32(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.ServerConnectSettings.class, com.openxc.BinaryMessages.ServerConnectSettings.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public ServerConnectSettings parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new ServerConnectSettings(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_fieldAccessorTable; } - + private int bitField0_; // optional string host = 1; public static final int HOST_FIELD_NUMBER = 1; private java.lang.Object host_; - /** - * optional string host = 1; - */ public boolean hasHost() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional string host = 1; - */ - public java.lang.String getHost() { + public String getHost() { java.lang.Object ref = host_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { + String s = bs.toStringUtf8(); + if (com.google.protobuf.Internal.isValidUtf8(bs)) { host_ = s; } return s; } } - /** - * optional string host = 1; - */ - public com.google.protobuf.ByteString - getHostBytes() { + private com.google.protobuf.ByteString getHostBytes() { java.lang.Object ref = host_; - if (ref instanceof java.lang.String) { + if (ref instanceof String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8((String) ref); host_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - + // optional uint32 port = 2; public static final int PORT_FIELD_NUMBER = 2; private int port_; - /** - * optional uint32 port = 2; - */ public boolean hasPort() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional uint32 port = 2; - */ public int getPort() { return port_; } - + private void initFields() { host_ = ""; port_ = 0; @@ -8746,11 +6905,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -8762,12 +6921,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -8781,83 +6940,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.ServerConnectSettings parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.ServerConnectSettings parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.ServerConnectSettings prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.ServerConnectSettings} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder { @@ -8865,21 +7035,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.ServerConnectSettings.class, com.openxc.BinaryMessages.ServerConnectSettings.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.ServerConnectSettings.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -8890,7 +7057,7 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); host_ = ""; @@ -8899,20 +7066,20 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000002); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_descriptor; + return com.openxc.BinaryMessages.ServerConnectSettings.getDescriptor(); } - + public com.openxc.BinaryMessages.ServerConnectSettings getDefaultInstanceForType() { return com.openxc.BinaryMessages.ServerConnectSettings.getDefaultInstance(); } - + public com.openxc.BinaryMessages.ServerConnectSettings build() { com.openxc.BinaryMessages.ServerConnectSettings result = buildPartial(); if (!result.isInitialized()) { @@ -8920,7 +7087,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.ServerConnectSettings buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.ServerConnectSettings result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.ServerConnectSettings buildPartial() { com.openxc.BinaryMessages.ServerConnectSettings result = new com.openxc.BinaryMessages.ServerConnectSettings(this); int from_bitField0_ = bitField0_; @@ -8937,7 +7114,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.ServerConnectSettings) { return mergeFrom((com.openxc.BinaryMessages.ServerConnectSettings)other); @@ -8946,13 +7123,11 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.ServerConnectSettings other) { if (other == com.openxc.BinaryMessages.ServerConnectSettings.getDefaultInstance()) return this; if (other.hasHost()) { - bitField0_ |= 0x00000001; - host_ = other.host_; - onChanged(); + setHost(other.getHost()); } if (other.hasPort()) { setPort(other.getPort()); @@ -8960,73 +7135,66 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.ServerConnectSettings parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.ServerConnectSettings) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 10: { + bitField0_ |= 0x00000001; + host_ = input.readBytes(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + port_ = input.readUInt32(); + break; + } } } - return this; } + private int bitField0_; - + // optional string host = 1; private java.lang.Object host_ = ""; - /** - * optional string host = 1; - */ public boolean hasHost() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional string host = 1; - */ - public java.lang.String getHost() { + public String getHost() { java.lang.Object ref = host_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); + if (!(ref instanceof String)) { + String s = ((com.google.protobuf.ByteString) ref).toStringUtf8(); host_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } - /** - * optional string host = 1; - */ - public com.google.protobuf.ByteString - getHostBytes() { - java.lang.Object ref = host_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - host_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string host = 1; - */ - public Builder setHost( - java.lang.String value) { + public Builder setHost(String value) { if (value == null) { throw new NullPointerException(); } @@ -9035,314 +7203,136 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional string host = 1; - */ public Builder clearHost() { bitField0_ = (bitField0_ & ~0x00000001); host_ = getDefaultInstance().getHost(); onChanged(); return this; } - /** - * optional string host = 1; - */ - public Builder setHostBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + void setHost(com.google.protobuf.ByteString value) { + bitField0_ |= 0x00000001; host_ = value; onChanged(); - return this; } - + // optional uint32 port = 2; private int port_ ; - /** - * optional uint32 port = 2; - */ public boolean hasPort() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional uint32 port = 2; - */ public int getPort() { return port_; } - /** - * optional uint32 port = 2; - */ public Builder setPort(int value) { bitField0_ |= 0x00000002; port_ = value; onChanged(); return this; } - /** - * optional uint32 port = 2; - */ public Builder clearPort() { bitField0_ = (bitField0_ & ~0x00000002); port_ = 0; onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:openxc.ServerConnectSettings) } - + static { defaultInstance = new ServerConnectSettings(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.ServerConnectSettings) } - + public interface ModemConfigurationCommandOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; - /** - * optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; - */ boolean hasNetworkOperatorSettings(); - /** - * optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; - */ com.openxc.BinaryMessages.NetworkOperatorSettings getNetworkOperatorSettings(); - /** - * optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; - */ com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder getNetworkOperatorSettingsOrBuilder(); - + // optional .openxc.NetworkDataSettings networkDataSettings = 2; - /** - * optional .openxc.NetworkDataSettings networkDataSettings = 2; - */ boolean hasNetworkDataSettings(); - /** - * optional .openxc.NetworkDataSettings networkDataSettings = 2; - */ com.openxc.BinaryMessages.NetworkDataSettings getNetworkDataSettings(); - /** - * optional .openxc.NetworkDataSettings networkDataSettings = 2; - */ com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder getNetworkDataSettingsOrBuilder(); - + // optional .openxc.ServerConnectSettings serverConnectSettings = 3; - /** - * optional .openxc.ServerConnectSettings serverConnectSettings = 3; - */ boolean hasServerConnectSettings(); - /** - * optional .openxc.ServerConnectSettings serverConnectSettings = 3; - */ com.openxc.BinaryMessages.ServerConnectSettings getServerConnectSettings(); - /** - * optional .openxc.ServerConnectSettings serverConnectSettings = 3; - */ com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder getServerConnectSettingsOrBuilder(); } - /** - * Protobuf type {@code openxc.ModemConfigurationCommand} - */ public static final class ModemConfigurationCommand extends com.google.protobuf.GeneratedMessage implements ModemConfigurationCommandOrBuilder { // Use ModemConfigurationCommand.newBuilder() to construct. - private ModemConfigurationCommand(com.google.protobuf.GeneratedMessage.Builder builder) { + private ModemConfigurationCommand(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private ModemConfigurationCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private ModemConfigurationCommand(boolean noInit) {} + private static final ModemConfigurationCommand defaultInstance; public static ModemConfigurationCommand getDefaultInstance() { return defaultInstance; } - + public ModemConfigurationCommand getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private ModemConfigurationCommand( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - com.openxc.BinaryMessages.NetworkOperatorSettings.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = networkOperatorSettings_.toBuilder(); - } - networkOperatorSettings_ = input.readMessage(com.openxc.BinaryMessages.NetworkOperatorSettings.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(networkOperatorSettings_); - networkOperatorSettings_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 18: { - com.openxc.BinaryMessages.NetworkDataSettings.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - subBuilder = networkDataSettings_.toBuilder(); - } - networkDataSettings_ = input.readMessage(com.openxc.BinaryMessages.NetworkDataSettings.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(networkDataSettings_); - networkDataSettings_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - case 26: { - com.openxc.BinaryMessages.ServerConnectSettings.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - subBuilder = serverConnectSettings_.toBuilder(); - } - serverConnectSettings_ = input.readMessage(com.openxc.BinaryMessages.ServerConnectSettings.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(serverConnectSettings_); - serverConnectSettings_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000004; - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.ModemConfigurationCommand.class, com.openxc.BinaryMessages.ModemConfigurationCommand.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public ModemConfigurationCommand parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new ModemConfigurationCommand(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_fieldAccessorTable; } - + private int bitField0_; // optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; public static final int NETWORKOPERATORSETTINGS_FIELD_NUMBER = 1; private com.openxc.BinaryMessages.NetworkOperatorSettings networkOperatorSettings_; - /** - * optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; - */ public boolean hasNetworkOperatorSettings() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; - */ public com.openxc.BinaryMessages.NetworkOperatorSettings getNetworkOperatorSettings() { return networkOperatorSettings_; } - /** - * optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; - */ public com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder getNetworkOperatorSettingsOrBuilder() { return networkOperatorSettings_; } - + // optional .openxc.NetworkDataSettings networkDataSettings = 2; public static final int NETWORKDATASETTINGS_FIELD_NUMBER = 2; private com.openxc.BinaryMessages.NetworkDataSettings networkDataSettings_; - /** - * optional .openxc.NetworkDataSettings networkDataSettings = 2; - */ public boolean hasNetworkDataSettings() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional .openxc.NetworkDataSettings networkDataSettings = 2; - */ public com.openxc.BinaryMessages.NetworkDataSettings getNetworkDataSettings() { return networkDataSettings_; } - /** - * optional .openxc.NetworkDataSettings networkDataSettings = 2; - */ public com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder getNetworkDataSettingsOrBuilder() { return networkDataSettings_; } - + // optional .openxc.ServerConnectSettings serverConnectSettings = 3; public static final int SERVERCONNECTSETTINGS_FIELD_NUMBER = 3; private com.openxc.BinaryMessages.ServerConnectSettings serverConnectSettings_; - /** - * optional .openxc.ServerConnectSettings serverConnectSettings = 3; - */ public boolean hasServerConnectSettings() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional .openxc.ServerConnectSettings serverConnectSettings = 3; - */ public com.openxc.BinaryMessages.ServerConnectSettings getServerConnectSettings() { return serverConnectSettings_; } - /** - * optional .openxc.ServerConnectSettings serverConnectSettings = 3; - */ public com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder getServerConnectSettingsOrBuilder() { return serverConnectSettings_; } - + private void initFields() { networkOperatorSettings_ = com.openxc.BinaryMessages.NetworkOperatorSettings.getDefaultInstance(); networkDataSettings_ = com.openxc.BinaryMessages.NetworkDataSettings.getDefaultInstance(); @@ -9352,11 +7342,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -9371,12 +7361,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -9394,83 +7384,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.ModemConfigurationCommand parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.ModemConfigurationCommand parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.ModemConfigurationCommand prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.ModemConfigurationCommand} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder { @@ -9478,21 +7479,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.ModemConfigurationCommand.class, com.openxc.BinaryMessages.ModemConfigurationCommand.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.ModemConfigurationCommand.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -9506,7 +7504,7 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); if (networkOperatorSettingsBuilder_ == null) { @@ -9529,20 +7527,20 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000004); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_descriptor; + return com.openxc.BinaryMessages.ModemConfigurationCommand.getDescriptor(); } - + public com.openxc.BinaryMessages.ModemConfigurationCommand getDefaultInstanceForType() { return com.openxc.BinaryMessages.ModemConfigurationCommand.getDefaultInstance(); } - + public com.openxc.BinaryMessages.ModemConfigurationCommand build() { com.openxc.BinaryMessages.ModemConfigurationCommand result = buildPartial(); if (!result.isInitialized()) { @@ -9550,7 +7548,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.ModemConfigurationCommand buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.ModemConfigurationCommand result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.ModemConfigurationCommand buildPartial() { com.openxc.BinaryMessages.ModemConfigurationCommand result = new com.openxc.BinaryMessages.ModemConfigurationCommand(this); int from_bitField0_ = bitField0_; @@ -9583,7 +7591,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.ModemConfigurationCommand) { return mergeFrom((com.openxc.BinaryMessages.ModemConfigurationCommand)other); @@ -9592,7 +7600,7 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.ModemConfigurationCommand other) { if (other == com.openxc.BinaryMessages.ModemConfigurationCommand.getDefaultInstance()) return this; if (other.hasNetworkOperatorSettings()) { @@ -9607,43 +7615,74 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.ModemConfigurationCommand parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.ModemConfigurationCommand) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 10: { + com.openxc.BinaryMessages.NetworkOperatorSettings.Builder subBuilder = com.openxc.BinaryMessages.NetworkOperatorSettings.newBuilder(); + if (hasNetworkOperatorSettings()) { + subBuilder.mergeFrom(getNetworkOperatorSettings()); + } + input.readMessage(subBuilder, extensionRegistry); + setNetworkOperatorSettings(subBuilder.buildPartial()); + break; + } + case 18: { + com.openxc.BinaryMessages.NetworkDataSettings.Builder subBuilder = com.openxc.BinaryMessages.NetworkDataSettings.newBuilder(); + if (hasNetworkDataSettings()) { + subBuilder.mergeFrom(getNetworkDataSettings()); + } + input.readMessage(subBuilder, extensionRegistry); + setNetworkDataSettings(subBuilder.buildPartial()); + break; + } + case 26: { + com.openxc.BinaryMessages.ServerConnectSettings.Builder subBuilder = com.openxc.BinaryMessages.ServerConnectSettings.newBuilder(); + if (hasServerConnectSettings()) { + subBuilder.mergeFrom(getServerConnectSettings()); + } + input.readMessage(subBuilder, extensionRegistry); + setServerConnectSettings(subBuilder.buildPartial()); + break; + } } } - return this; } + private int bitField0_; - + // optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; private com.openxc.BinaryMessages.NetworkOperatorSettings networkOperatorSettings_ = com.openxc.BinaryMessages.NetworkOperatorSettings.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.NetworkOperatorSettings, com.openxc.BinaryMessages.NetworkOperatorSettings.Builder, com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder> networkOperatorSettingsBuilder_; - /** - * optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; - */ public boolean hasNetworkOperatorSettings() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; - */ public com.openxc.BinaryMessages.NetworkOperatorSettings getNetworkOperatorSettings() { if (networkOperatorSettingsBuilder_ == null) { return networkOperatorSettings_; @@ -9651,9 +7690,6 @@ public final class BinaryMessages { return networkOperatorSettingsBuilder_.getMessage(); } } - /** - * optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; - */ public Builder setNetworkOperatorSettings(com.openxc.BinaryMessages.NetworkOperatorSettings value) { if (networkOperatorSettingsBuilder_ == null) { if (value == null) { @@ -9667,9 +7703,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000001; return this; } - /** - * optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; - */ public Builder setNetworkOperatorSettings( com.openxc.BinaryMessages.NetworkOperatorSettings.Builder builderForValue) { if (networkOperatorSettingsBuilder_ == null) { @@ -9681,9 +7714,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000001; return this; } - /** - * optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; - */ public Builder mergeNetworkOperatorSettings(com.openxc.BinaryMessages.NetworkOperatorSettings value) { if (networkOperatorSettingsBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && @@ -9700,9 +7730,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000001; return this; } - /** - * optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; - */ public Builder clearNetworkOperatorSettings() { if (networkOperatorSettingsBuilder_ == null) { networkOperatorSettings_ = com.openxc.BinaryMessages.NetworkOperatorSettings.getDefaultInstance(); @@ -9713,17 +7740,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000001); return this; } - /** - * optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; - */ public com.openxc.BinaryMessages.NetworkOperatorSettings.Builder getNetworkOperatorSettingsBuilder() { bitField0_ |= 0x00000001; onChanged(); return getNetworkOperatorSettingsFieldBuilder().getBuilder(); } - /** - * optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; - */ public com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder getNetworkOperatorSettingsOrBuilder() { if (networkOperatorSettingsBuilder_ != null) { return networkOperatorSettingsBuilder_.getMessageOrBuilder(); @@ -9731,9 +7752,6 @@ public final class BinaryMessages { return networkOperatorSettings_; } } - /** - * optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.NetworkOperatorSettings, com.openxc.BinaryMessages.NetworkOperatorSettings.Builder, com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder> getNetworkOperatorSettingsFieldBuilder() { @@ -9747,20 +7765,14 @@ public final class BinaryMessages { } return networkOperatorSettingsBuilder_; } - + // optional .openxc.NetworkDataSettings networkDataSettings = 2; private com.openxc.BinaryMessages.NetworkDataSettings networkDataSettings_ = com.openxc.BinaryMessages.NetworkDataSettings.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.NetworkDataSettings, com.openxc.BinaryMessages.NetworkDataSettings.Builder, com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder> networkDataSettingsBuilder_; - /** - * optional .openxc.NetworkDataSettings networkDataSettings = 2; - */ public boolean hasNetworkDataSettings() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional .openxc.NetworkDataSettings networkDataSettings = 2; - */ public com.openxc.BinaryMessages.NetworkDataSettings getNetworkDataSettings() { if (networkDataSettingsBuilder_ == null) { return networkDataSettings_; @@ -9768,9 +7780,6 @@ public final class BinaryMessages { return networkDataSettingsBuilder_.getMessage(); } } - /** - * optional .openxc.NetworkDataSettings networkDataSettings = 2; - */ public Builder setNetworkDataSettings(com.openxc.BinaryMessages.NetworkDataSettings value) { if (networkDataSettingsBuilder_ == null) { if (value == null) { @@ -9784,9 +7793,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000002; return this; } - /** - * optional .openxc.NetworkDataSettings networkDataSettings = 2; - */ public Builder setNetworkDataSettings( com.openxc.BinaryMessages.NetworkDataSettings.Builder builderForValue) { if (networkDataSettingsBuilder_ == null) { @@ -9798,9 +7804,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000002; return this; } - /** - * optional .openxc.NetworkDataSettings networkDataSettings = 2; - */ public Builder mergeNetworkDataSettings(com.openxc.BinaryMessages.NetworkDataSettings value) { if (networkDataSettingsBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && @@ -9817,9 +7820,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000002; return this; } - /** - * optional .openxc.NetworkDataSettings networkDataSettings = 2; - */ public Builder clearNetworkDataSettings() { if (networkDataSettingsBuilder_ == null) { networkDataSettings_ = com.openxc.BinaryMessages.NetworkDataSettings.getDefaultInstance(); @@ -9830,17 +7830,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000002); return this; } - /** - * optional .openxc.NetworkDataSettings networkDataSettings = 2; - */ public com.openxc.BinaryMessages.NetworkDataSettings.Builder getNetworkDataSettingsBuilder() { bitField0_ |= 0x00000002; onChanged(); return getNetworkDataSettingsFieldBuilder().getBuilder(); } - /** - * optional .openxc.NetworkDataSettings networkDataSettings = 2; - */ public com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder getNetworkDataSettingsOrBuilder() { if (networkDataSettingsBuilder_ != null) { return networkDataSettingsBuilder_.getMessageOrBuilder(); @@ -9848,9 +7842,6 @@ public final class BinaryMessages { return networkDataSettings_; } } - /** - * optional .openxc.NetworkDataSettings networkDataSettings = 2; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.NetworkDataSettings, com.openxc.BinaryMessages.NetworkDataSettings.Builder, com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder> getNetworkDataSettingsFieldBuilder() { @@ -9864,20 +7855,14 @@ public final class BinaryMessages { } return networkDataSettingsBuilder_; } - + // optional .openxc.ServerConnectSettings serverConnectSettings = 3; private com.openxc.BinaryMessages.ServerConnectSettings serverConnectSettings_ = com.openxc.BinaryMessages.ServerConnectSettings.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.ServerConnectSettings, com.openxc.BinaryMessages.ServerConnectSettings.Builder, com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder> serverConnectSettingsBuilder_; - /** - * optional .openxc.ServerConnectSettings serverConnectSettings = 3; - */ public boolean hasServerConnectSettings() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional .openxc.ServerConnectSettings serverConnectSettings = 3; - */ public com.openxc.BinaryMessages.ServerConnectSettings getServerConnectSettings() { if (serverConnectSettingsBuilder_ == null) { return serverConnectSettings_; @@ -9885,9 +7870,6 @@ public final class BinaryMessages { return serverConnectSettingsBuilder_.getMessage(); } } - /** - * optional .openxc.ServerConnectSettings serverConnectSettings = 3; - */ public Builder setServerConnectSettings(com.openxc.BinaryMessages.ServerConnectSettings value) { if (serverConnectSettingsBuilder_ == null) { if (value == null) { @@ -9901,9 +7883,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000004; return this; } - /** - * optional .openxc.ServerConnectSettings serverConnectSettings = 3; - */ public Builder setServerConnectSettings( com.openxc.BinaryMessages.ServerConnectSettings.Builder builderForValue) { if (serverConnectSettingsBuilder_ == null) { @@ -9915,9 +7894,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000004; return this; } - /** - * optional .openxc.ServerConnectSettings serverConnectSettings = 3; - */ public Builder mergeServerConnectSettings(com.openxc.BinaryMessages.ServerConnectSettings value) { if (serverConnectSettingsBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && @@ -9934,9 +7910,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000004; return this; } - /** - * optional .openxc.ServerConnectSettings serverConnectSettings = 3; - */ public Builder clearServerConnectSettings() { if (serverConnectSettingsBuilder_ == null) { serverConnectSettings_ = com.openxc.BinaryMessages.ServerConnectSettings.getDefaultInstance(); @@ -9947,17 +7920,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000004); return this; } - /** - * optional .openxc.ServerConnectSettings serverConnectSettings = 3; - */ public com.openxc.BinaryMessages.ServerConnectSettings.Builder getServerConnectSettingsBuilder() { bitField0_ |= 0x00000004; onChanged(); return getServerConnectSettingsFieldBuilder().getBuilder(); } - /** - * optional .openxc.ServerConnectSettings serverConnectSettings = 3; - */ public com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder getServerConnectSettingsOrBuilder() { if (serverConnectSettingsBuilder_ != null) { return serverConnectSettingsBuilder_.getMessageOrBuilder(); @@ -9965,9 +7932,6 @@ public final class BinaryMessages { return serverConnectSettings_; } } - /** - * optional .openxc.ServerConnectSettings serverConnectSettings = 3; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.ServerConnectSettings, com.openxc.BinaryMessages.ServerConnectSettings.Builder, com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder> getServerConnectSettingsFieldBuilder() { @@ -9981,143 +7945,64 @@ public final class BinaryMessages { } return serverConnectSettingsBuilder_; } - + // @@protoc_insertion_point(builder_scope:openxc.ModemConfigurationCommand) } - + static { defaultInstance = new ModemConfigurationCommand(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.ModemConfigurationCommand) } - + public interface RTCConfigurationCommandOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional uint32 unix_time = 1; - /** - * optional uint32 unix_time = 1; - */ boolean hasUnixTime(); - /** - * optional uint32 unix_time = 1; - */ int getUnixTime(); } - /** - * Protobuf type {@code openxc.RTCConfigurationCommand} - */ public static final class RTCConfigurationCommand extends com.google.protobuf.GeneratedMessage implements RTCConfigurationCommandOrBuilder { // Use RTCConfigurationCommand.newBuilder() to construct. - private RTCConfigurationCommand(com.google.protobuf.GeneratedMessage.Builder builder) { + private RTCConfigurationCommand(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private RTCConfigurationCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private RTCConfigurationCommand(boolean noInit) {} + private static final RTCConfigurationCommand defaultInstance; public static RTCConfigurationCommand getDefaultInstance() { return defaultInstance; } - + public RTCConfigurationCommand getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private RTCConfigurationCommand( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - unixTime_ = input.readUInt32(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_RTCConfigurationCommand_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_RTCConfigurationCommand_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.RTCConfigurationCommand.class, com.openxc.BinaryMessages.RTCConfigurationCommand.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public RTCConfigurationCommand parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new RTCConfigurationCommand(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + return com.openxc.BinaryMessages.internal_static_openxc_RTCConfigurationCommand_fieldAccessorTable; } - + private int bitField0_; // optional uint32 unix_time = 1; public static final int UNIX_TIME_FIELD_NUMBER = 1; private int unixTime_; - /** - * optional uint32 unix_time = 1; - */ public boolean hasUnixTime() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional uint32 unix_time = 1; - */ public int getUnixTime() { return unixTime_; } - + private void initFields() { unixTime_ = 0; } @@ -10125,11 +8010,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -10138,12 +8023,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -10153,83 +8038,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.RTCConfigurationCommand parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.RTCConfigurationCommand parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.RTCConfigurationCommand prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.RTCConfigurationCommand} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder { @@ -10237,21 +8133,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_RTCConfigurationCommand_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_RTCConfigurationCommand_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.RTCConfigurationCommand.class, com.openxc.BinaryMessages.RTCConfigurationCommand.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_RTCConfigurationCommand_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.RTCConfigurationCommand.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -10262,27 +8155,27 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); unixTime_ = 0; bitField0_ = (bitField0_ & ~0x00000001); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_RTCConfigurationCommand_descriptor; + return com.openxc.BinaryMessages.RTCConfigurationCommand.getDescriptor(); } - + public com.openxc.BinaryMessages.RTCConfigurationCommand getDefaultInstanceForType() { return com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance(); } - + public com.openxc.BinaryMessages.RTCConfigurationCommand build() { com.openxc.BinaryMessages.RTCConfigurationCommand result = buildPartial(); if (!result.isInitialized()) { @@ -10290,7 +8183,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.RTCConfigurationCommand buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.RTCConfigurationCommand result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.RTCConfigurationCommand buildPartial() { com.openxc.BinaryMessages.RTCConfigurationCommand result = new com.openxc.BinaryMessages.RTCConfigurationCommand(this); int from_bitField0_ = bitField0_; @@ -10303,7 +8206,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.RTCConfigurationCommand) { return mergeFrom((com.openxc.BinaryMessages.RTCConfigurationCommand)other); @@ -10312,7 +8215,7 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.RTCConfigurationCommand other) { if (other == com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance()) return this; if (other.hasUnixTime()) { @@ -10321,299 +8224,173 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.RTCConfigurationCommand parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.RTCConfigurationCommand) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + unixTime_ = input.readUInt32(); + break; + } } } - return this; } + private int bitField0_; - + // optional uint32 unix_time = 1; private int unixTime_ ; - /** - * optional uint32 unix_time = 1; - */ public boolean hasUnixTime() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional uint32 unix_time = 1; - */ public int getUnixTime() { return unixTime_; } - /** - * optional uint32 unix_time = 1; - */ public Builder setUnixTime(int value) { bitField0_ |= 0x00000001; unixTime_ = value; onChanged(); return this; } - /** - * optional uint32 unix_time = 1; - */ public Builder clearUnixTime() { bitField0_ = (bitField0_ & ~0x00000001); unixTime_ = 0; onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:openxc.RTCConfigurationCommand) } - + static { defaultInstance = new RTCConfigurationCommand(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.RTCConfigurationCommand) } - + public interface CommandResponseOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional .openxc.ControlCommand.Type type = 1; - /** - * optional .openxc.ControlCommand.Type type = 1; - */ boolean hasType(); - /** - * optional .openxc.ControlCommand.Type type = 1; - */ com.openxc.BinaryMessages.ControlCommand.Type getType(); - + // optional string message = 2; - /** - * optional string message = 2; - */ boolean hasMessage(); - /** - * optional string message = 2; - */ - java.lang.String getMessage(); - /** - * optional string message = 2; - */ - com.google.protobuf.ByteString - getMessageBytes(); - + String getMessage(); + // optional bool status = 3; - /** - * optional bool status = 3; - */ boolean hasStatus(); - /** - * optional bool status = 3; - */ boolean getStatus(); } - /** - * Protobuf type {@code openxc.CommandResponse} - */ public static final class CommandResponse extends com.google.protobuf.GeneratedMessage implements CommandResponseOrBuilder { // Use CommandResponse.newBuilder() to construct. - private CommandResponse(com.google.protobuf.GeneratedMessage.Builder builder) { + private CommandResponse(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private CommandResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private CommandResponse(boolean noInit) {} + private static final CommandResponse defaultInstance; public static CommandResponse getDefaultInstance() { return defaultInstance; } - + public CommandResponse getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private CommandResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - int rawValue = input.readEnum(); - com.openxc.BinaryMessages.ControlCommand.Type value = com.openxc.BinaryMessages.ControlCommand.Type.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(1, rawValue); - } else { - bitField0_ |= 0x00000001; - type_ = value; - } - break; - } - case 18: { - bitField0_ |= 0x00000002; - message_ = input.readBytes(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - status_ = input.readBool(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.CommandResponse.class, com.openxc.BinaryMessages.CommandResponse.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public CommandResponse parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new CommandResponse(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_fieldAccessorTable; } - + private int bitField0_; // optional .openxc.ControlCommand.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; private com.openxc.BinaryMessages.ControlCommand.Type type_; - /** - * optional .openxc.ControlCommand.Type type = 1; - */ public boolean hasType() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional .openxc.ControlCommand.Type type = 1; - */ public com.openxc.BinaryMessages.ControlCommand.Type getType() { return type_; } - + // optional string message = 2; public static final int MESSAGE_FIELD_NUMBER = 2; private java.lang.Object message_; - /** - * optional string message = 2; - */ public boolean hasMessage() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional string message = 2; - */ - public java.lang.String getMessage() { + public String getMessage() { java.lang.Object ref = message_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { + String s = bs.toStringUtf8(); + if (com.google.protobuf.Internal.isValidUtf8(bs)) { message_ = s; } return s; } } - /** - * optional string message = 2; - */ - public com.google.protobuf.ByteString - getMessageBytes() { + private com.google.protobuf.ByteString getMessageBytes() { java.lang.Object ref = message_; - if (ref instanceof java.lang.String) { + if (ref instanceof String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8((String) ref); message_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - + // optional bool status = 3; public static final int STATUS_FIELD_NUMBER = 3; private boolean status_; - /** - * optional bool status = 3; - */ public boolean hasStatus() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional bool status = 3; - */ public boolean getStatus() { return status_; } - + private void initFields() { type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION; message_ = ""; @@ -10623,11 +8400,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -10642,12 +8419,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -10665,83 +8442,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.CommandResponse parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.CommandResponse parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.CommandResponse parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.CommandResponse parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.CommandResponse parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.CommandResponse parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.CommandResponse parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.CommandResponse parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.CommandResponse parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.CommandResponse parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.CommandResponse prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.CommandResponse} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.CommandResponseOrBuilder { @@ -10749,21 +8537,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.CommandResponse.class, com.openxc.BinaryMessages.CommandResponse.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.CommandResponse.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -10774,7 +8559,7 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION; @@ -10785,20 +8570,20 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000004); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_descriptor; + return com.openxc.BinaryMessages.CommandResponse.getDescriptor(); } - + public com.openxc.BinaryMessages.CommandResponse getDefaultInstanceForType() { return com.openxc.BinaryMessages.CommandResponse.getDefaultInstance(); } - + public com.openxc.BinaryMessages.CommandResponse build() { com.openxc.BinaryMessages.CommandResponse result = buildPartial(); if (!result.isInitialized()) { @@ -10806,7 +8591,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.CommandResponse buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.CommandResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.CommandResponse buildPartial() { com.openxc.BinaryMessages.CommandResponse result = new com.openxc.BinaryMessages.CommandResponse(this); int from_bitField0_ = bitField0_; @@ -10827,7 +8622,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.CommandResponse) { return mergeFrom((com.openxc.BinaryMessages.CommandResponse)other); @@ -10836,16 +8631,14 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.CommandResponse other) { if (other == com.openxc.BinaryMessages.CommandResponse.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } if (other.hasMessage()) { - bitField0_ |= 0x00000002; - message_ = other.message_; - onChanged(); + setMessage(other.getMessage()); } if (other.hasStatus()) { setStatus(other.getStatus()); @@ -10853,47 +8646,69 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.CommandResponse parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.CommandResponse) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 8: { + int rawValue = input.readEnum(); + com.openxc.BinaryMessages.ControlCommand.Type value = com.openxc.BinaryMessages.ControlCommand.Type.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(1, rawValue); + } else { + bitField0_ |= 0x00000001; + type_ = value; + } + break; + } + case 18: { + bitField0_ |= 0x00000002; + message_ = input.readBytes(); + break; + } + case 24: { + bitField0_ |= 0x00000004; + status_ = input.readBool(); + break; + } } } - return this; } + private int bitField0_; - + // optional .openxc.ControlCommand.Type type = 1; private com.openxc.BinaryMessages.ControlCommand.Type type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION; - /** - * optional .openxc.ControlCommand.Type type = 1; - */ public boolean hasType() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional .openxc.ControlCommand.Type type = 1; - */ public com.openxc.BinaryMessages.ControlCommand.Type getType() { return type_; } - /** - * optional .openxc.ControlCommand.Type type = 1; - */ public Builder setType(com.openxc.BinaryMessages.ControlCommand.Type value) { if (value == null) { throw new NullPointerException(); @@ -10903,59 +8718,29 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional .openxc.ControlCommand.Type type = 1; - */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION; onChanged(); return this; } - + // optional string message = 2; private java.lang.Object message_ = ""; - /** - * optional string message = 2; - */ public boolean hasMessage() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional string message = 2; - */ - public java.lang.String getMessage() { + public String getMessage() { java.lang.Object ref = message_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); + if (!(ref instanceof String)) { + String s = ((com.google.protobuf.ByteString) ref).toStringUtf8(); message_ = s; return s; } else { - return (java.lang.String) ref; - } - } - /** - * optional string message = 2; - */ - public com.google.protobuf.ByteString - getMessageBytes() { - java.lang.Object ref = message_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - message_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; + return (String) ref; } } - /** - * optional string message = 2; - */ - public Builder setMessage( - java.lang.String value) { + public Builder setMessage(String value) { if (value == null) { throw new NullPointerException(); } @@ -10964,349 +8749,129 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional string message = 2; - */ public Builder clearMessage() { bitField0_ = (bitField0_ & ~0x00000002); message_ = getDefaultInstance().getMessage(); onChanged(); return this; } - /** - * optional string message = 2; - */ - public Builder setMessageBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; + void setMessage(com.google.protobuf.ByteString value) { + bitField0_ |= 0x00000002; message_ = value; onChanged(); - return this; } - + // optional bool status = 3; private boolean status_ ; - /** - * optional bool status = 3; - */ public boolean hasStatus() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional bool status = 3; - */ public boolean getStatus() { return status_; } - /** - * optional bool status = 3; - */ public Builder setStatus(boolean value) { bitField0_ |= 0x00000004; status_ = value; onChanged(); return this; } - /** - * optional bool status = 3; - */ public Builder clearStatus() { bitField0_ = (bitField0_ & ~0x00000004); status_ = false; onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:openxc.CommandResponse) } - + static { defaultInstance = new CommandResponse(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.CommandResponse) } - + public interface DiagnosticRequestOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional int32 bus = 1; - /** - * optional int32 bus = 1; - */ boolean hasBus(); - /** - * optional int32 bus = 1; - */ int getBus(); - + // optional uint32 message_id = 2; - /** - * optional uint32 message_id = 2; - */ boolean hasMessageId(); - /** - * optional uint32 message_id = 2; - */ int getMessageId(); - + // optional uint32 mode = 3; - /** - * optional uint32 mode = 3; - */ boolean hasMode(); - /** - * optional uint32 mode = 3; - */ int getMode(); - + // optional uint32 pid = 4; - /** - * optional uint32 pid = 4; - */ boolean hasPid(); - /** - * optional uint32 pid = 4; - */ int getPid(); - + // optional bytes payload = 5; - /** - * optional bytes payload = 5; - * - * 
-     * TODO we are capping this at 8 bytes for now - need to change when we
-     * support multi-frame responses
-     *
- */ boolean hasPayload(); - /** - * optional bytes payload = 5; - * - * 
-     * TODO we are capping this at 8 bytes for now - need to change when we
-     * support multi-frame responses
-     *
- */ com.google.protobuf.ByteString getPayload(); - + // optional bool multiple_responses = 6; - /** - * optional bool multiple_responses = 6; - */ boolean hasMultipleResponses(); - /** - * optional bool multiple_responses = 6; - */ boolean getMultipleResponses(); - + // optional double frequency = 7; - /** - * optional double frequency = 7; - */ boolean hasFrequency(); - /** - * optional double frequency = 7; - */ double getFrequency(); - + // optional string name = 8; - /** - * optional string name = 8; - */ boolean hasName(); - /** - * optional string name = 8; - */ - java.lang.String getName(); - /** - * optional string name = 8; - */ - com.google.protobuf.ByteString - getNameBytes(); - + String getName(); + // optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; - /** - * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; - */ boolean hasDecodedType(); - /** - * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; - */ com.openxc.BinaryMessages.DiagnosticRequest.DecodedType getDecodedType(); } - /** - * Protobuf type {@code openxc.DiagnosticRequest} - */ public static final class DiagnosticRequest extends com.google.protobuf.GeneratedMessage implements DiagnosticRequestOrBuilder { // Use DiagnosticRequest.newBuilder() to construct. - private DiagnosticRequest(com.google.protobuf.GeneratedMessage.Builder builder) { + private DiagnosticRequest(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private DiagnosticRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private DiagnosticRequest(boolean noInit) {} + private static final DiagnosticRequest defaultInstance; public static DiagnosticRequest getDefaultInstance() { return defaultInstance; } - + public DiagnosticRequest getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private DiagnosticRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - bus_ = input.readInt32(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - messageId_ = input.readUInt32(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - mode_ = input.readUInt32(); - break; - } - case 32: { - bitField0_ |= 0x00000008; - pid_ = input.readUInt32(); - break; - } - case 42: { - bitField0_ |= 0x00000010; - payload_ = input.readBytes(); - break; - } - case 48: { - bitField0_ |= 0x00000020; - multipleResponses_ = input.readBool(); - break; - } - case 57: { - bitField0_ |= 0x00000040; - frequency_ = input.readDouble(); - break; - } - case 66: { - bitField0_ |= 0x00000080; - name_ = input.readBytes(); - break; - } - case 72: { - int rawValue = input.readEnum(); - com.openxc.BinaryMessages.DiagnosticRequest.DecodedType value = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(9, rawValue); - } else { - bitField0_ |= 0x00000100; - decodedType_ = value; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.DiagnosticRequest.class, com.openxc.BinaryMessages.DiagnosticRequest.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public DiagnosticRequest parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new DiagnosticRequest(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_fieldAccessorTable; } - - /** - * Protobuf enum {@code openxc.DiagnosticRequest.DecodedType} - */ + public enum DecodedType implements com.google.protobuf.ProtocolMessageEnum { - /** - * NONE = 1; - */ NONE(0, 1), - /** - * OBD2 = 2; - */ OBD2(1, 2), ; - - /** - * NONE = 1; - */ + public static final int NONE_VALUE = 1; - /** - * OBD2 = 2; - */ public static final int OBD2_VALUE = 2; - - + + public final int getNumber() { return value; } - + public static DecodedType valueOf(int value) { switch (value) { case 1: return NONE; @@ -11314,7 +8879,7 @@ public final class BinaryMessages { default: return null; } } - + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; @@ -11326,7 +8891,7 @@ public final class BinaryMessages { return DecodedType.valueOf(number); } }; - + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { return getDescriptor().getValues().get(index); @@ -11339,9 +8904,11 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.DiagnosticRequest.getDescriptor().getEnumTypes().get(0); } - - private static final DecodedType[] VALUES = values(); - + + private static final DecodedType[] VALUES = { + NONE, OBD2, + }; + public static DecodedType valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { @@ -11350,200 +8917,131 @@ public final class BinaryMessages { } return VALUES[desc.getIndex()]; } - + private final int index; private final int value; - + private DecodedType(int index, int value) { this.index = index; this.value = value; } - + // @@protoc_insertion_point(enum_scope:openxc.DiagnosticRequest.DecodedType) } - + private int bitField0_; // optional int32 bus = 1; public static final int BUS_FIELD_NUMBER = 1; private int bus_; - /** - * optional int32 bus = 1; - */ public boolean hasBus() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional int32 bus = 1; - */ public int getBus() { return bus_; } - + // optional uint32 message_id = 2; public static final int MESSAGE_ID_FIELD_NUMBER = 2; private int messageId_; - /** - * optional uint32 message_id = 2; - */ public boolean hasMessageId() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional uint32 message_id = 2; - */ public int getMessageId() { return messageId_; } - + // optional uint32 mode = 3; public static final int MODE_FIELD_NUMBER = 3; private int mode_; - /** - * optional uint32 mode = 3; - */ public boolean hasMode() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional uint32 mode = 3; - */ public int getMode() { return mode_; } - + // optional uint32 pid = 4; public static final int PID_FIELD_NUMBER = 4; private int pid_; - /** - * optional uint32 pid = 4; - */ public boolean hasPid() { return ((bitField0_ & 0x00000008) == 0x00000008); } - /** - * optional uint32 pid = 4; - */ public int getPid() { return pid_; } - + // optional bytes payload = 5; public static final int PAYLOAD_FIELD_NUMBER = 5; private com.google.protobuf.ByteString payload_; - /** - * optional bytes payload = 5; - * - * 
-     * TODO we are capping this at 8 bytes for now - need to change when we
-     * support multi-frame responses
-     *
- */ public boolean hasPayload() { return ((bitField0_ & 0x00000010) == 0x00000010); } - /** - * optional bytes payload = 5; - * - * 
-     * TODO we are capping this at 8 bytes for now - need to change when we
-     * support multi-frame responses
-     *
- */ public com.google.protobuf.ByteString getPayload() { return payload_; } - + // optional bool multiple_responses = 6; public static final int MULTIPLE_RESPONSES_FIELD_NUMBER = 6; private boolean multipleResponses_; - /** - * optional bool multiple_responses = 6; - */ public boolean hasMultipleResponses() { return ((bitField0_ & 0x00000020) == 0x00000020); } - /** - * optional bool multiple_responses = 6; - */ public boolean getMultipleResponses() { return multipleResponses_; } - + // optional double frequency = 7; public static final int FREQUENCY_FIELD_NUMBER = 7; private double frequency_; - /** - * optional double frequency = 7; - */ public boolean hasFrequency() { return ((bitField0_ & 0x00000040) == 0x00000040); } - /** - * optional double frequency = 7; - */ public double getFrequency() { return frequency_; } - + // optional string name = 8; public static final int NAME_FIELD_NUMBER = 8; private java.lang.Object name_; - /** - * optional string name = 8; - */ public boolean hasName() { return ((bitField0_ & 0x00000080) == 0x00000080); } - /** - * optional string name = 8; - */ - public java.lang.String getName() { + public String getName() { java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { + String s = bs.toStringUtf8(); + if (com.google.protobuf.Internal.isValidUtf8(bs)) { name_ = s; } return s; } } - /** - * optional string name = 8; - */ - public com.google.protobuf.ByteString - getNameBytes() { + private com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { + if (ref instanceof String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8((String) ref); name_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - + // optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; public static final int DECODED_TYPE_FIELD_NUMBER = 9; private com.openxc.BinaryMessages.DiagnosticRequest.DecodedType decodedType_; - /** - * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; - */ public boolean hasDecodedType() { return ((bitField0_ & 0x00000100) == 0x00000100); } - /** - * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; - */ public com.openxc.BinaryMessages.DiagnosticRequest.DecodedType getDecodedType() { return decodedType_; } - + private void initFields() { bus_ = 0; messageId_ = 0; @@ -11559,11 +9057,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -11596,12 +9094,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -11643,83 +9141,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.DiagnosticRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.DiagnosticRequest prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.DiagnosticRequest} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.DiagnosticRequestOrBuilder { @@ -11727,21 +9236,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.DiagnosticRequest.class, com.openxc.BinaryMessages.DiagnosticRequest.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.DiagnosticRequest.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -11752,7 +9258,7 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); bus_ = 0; @@ -11775,20 +9281,20 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000100); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_descriptor; + return com.openxc.BinaryMessages.DiagnosticRequest.getDescriptor(); } - + public com.openxc.BinaryMessages.DiagnosticRequest getDefaultInstanceForType() { return com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance(); } - + public com.openxc.BinaryMessages.DiagnosticRequest build() { com.openxc.BinaryMessages.DiagnosticRequest result = buildPartial(); if (!result.isInitialized()) { @@ -11796,7 +9302,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.DiagnosticRequest buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.DiagnosticRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.DiagnosticRequest buildPartial() { com.openxc.BinaryMessages.DiagnosticRequest result = new com.openxc.BinaryMessages.DiagnosticRequest(this); int from_bitField0_ = bitField0_; @@ -11841,7 +9357,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.DiagnosticRequest) { return mergeFrom((com.openxc.BinaryMessages.DiagnosticRequest)other); @@ -11850,7 +9366,7 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.DiagnosticRequest other) { if (other == com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance()) return this; if (other.hasBus()) { @@ -11875,9 +9391,7 @@ public final class BinaryMessages { setFrequency(other.getFrequency()); } if (other.hasName()) { - bitField0_ |= 0x00000080; - name_ = other.name_; - onChanged(); + setName(other.getName()); } if (other.hasDecodedType()) { setDecodedType(other.getDecodedType()); @@ -11885,194 +9399,183 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.DiagnosticRequest parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.DiagnosticRequest) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + bus_ = input.readInt32(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + messageId_ = input.readUInt32(); + break; + } + case 24: { + bitField0_ |= 0x00000004; + mode_ = input.readUInt32(); + break; + } + case 32: { + bitField0_ |= 0x00000008; + pid_ = input.readUInt32(); + break; + } + case 42: { + bitField0_ |= 0x00000010; + payload_ = input.readBytes(); + break; + } + case 48: { + bitField0_ |= 0x00000020; + multipleResponses_ = input.readBool(); + break; + } + case 57: { + bitField0_ |= 0x00000040; + frequency_ = input.readDouble(); + break; + } + case 66: { + bitField0_ |= 0x00000080; + name_ = input.readBytes(); + break; + } + case 72: { + int rawValue = input.readEnum(); + com.openxc.BinaryMessages.DiagnosticRequest.DecodedType value = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(9, rawValue); + } else { + bitField0_ |= 0x00000100; + decodedType_ = value; + } + break; + } } } - return this; } + private int bitField0_; - + // optional int32 bus = 1; private int bus_ ; - /** - * optional int32 bus = 1; - */ public boolean hasBus() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional int32 bus = 1; - */ public int getBus() { return bus_; } - /** - * optional int32 bus = 1; - */ public Builder setBus(int value) { bitField0_ |= 0x00000001; bus_ = value; onChanged(); return this; } - /** - * optional int32 bus = 1; - */ public Builder clearBus() { bitField0_ = (bitField0_ & ~0x00000001); bus_ = 0; onChanged(); return this; } - + // optional uint32 message_id = 2; private int messageId_ ; - /** - * optional uint32 message_id = 2; - */ public boolean hasMessageId() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional uint32 message_id = 2; - */ public int getMessageId() { return messageId_; } - /** - * optional uint32 message_id = 2; - */ public Builder setMessageId(int value) { bitField0_ |= 0x00000002; messageId_ = value; onChanged(); return this; } - /** - * optional uint32 message_id = 2; - */ public Builder clearMessageId() { bitField0_ = (bitField0_ & ~0x00000002); messageId_ = 0; onChanged(); return this; } - + // optional uint32 mode = 3; private int mode_ ; - /** - * optional uint32 mode = 3; - */ public boolean hasMode() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional uint32 mode = 3; - */ public int getMode() { return mode_; } - /** - * optional uint32 mode = 3; - */ public Builder setMode(int value) { bitField0_ |= 0x00000004; mode_ = value; onChanged(); return this; } - /** - * optional uint32 mode = 3; - */ public Builder clearMode() { bitField0_ = (bitField0_ & ~0x00000004); mode_ = 0; onChanged(); return this; } - + // optional uint32 pid = 4; private int pid_ ; - /** - * optional uint32 pid = 4; - */ public boolean hasPid() { return ((bitField0_ & 0x00000008) == 0x00000008); } - /** - * optional uint32 pid = 4; - */ public int getPid() { return pid_; } - /** - * optional uint32 pid = 4; - */ public Builder setPid(int value) { bitField0_ |= 0x00000008; pid_ = value; onChanged(); return this; } - /** - * optional uint32 pid = 4; - */ public Builder clearPid() { bitField0_ = (bitField0_ & ~0x00000008); pid_ = 0; onChanged(); return this; } - + // optional bytes payload = 5; private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY; - /** - * optional bytes payload = 5; - * - * 
-       * TODO we are capping this at 8 bytes for now - need to change when we
-       * support multi-frame responses
-       *
- */ public boolean hasPayload() { return ((bitField0_ & 0x00000010) == 0x00000010); } - /** - * optional bytes payload = 5; - * - * 
-       * TODO we are capping this at 8 bytes for now - need to change when we
-       * support multi-frame responses
-       *
- */ public com.google.protobuf.ByteString getPayload() { return payload_; } - /** - * optional bytes payload = 5; - * - * 
-       * TODO we are capping this at 8 bytes for now - need to change when we
-       * support multi-frame responses
-       *
- */ public Builder setPayload(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); @@ -12082,130 +9585,71 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional bytes payload = 5; - * - * 
-       * TODO we are capping this at 8 bytes for now - need to change when we
-       * support multi-frame responses
-       *
- */ public Builder clearPayload() { bitField0_ = (bitField0_ & ~0x00000010); payload_ = getDefaultInstance().getPayload(); onChanged(); return this; } - + // optional bool multiple_responses = 6; private boolean multipleResponses_ ; - /** - * optional bool multiple_responses = 6; - */ public boolean hasMultipleResponses() { return ((bitField0_ & 0x00000020) == 0x00000020); } - /** - * optional bool multiple_responses = 6; - */ public boolean getMultipleResponses() { return multipleResponses_; } - /** - * optional bool multiple_responses = 6; - */ public Builder setMultipleResponses(boolean value) { bitField0_ |= 0x00000020; multipleResponses_ = value; onChanged(); return this; } - /** - * optional bool multiple_responses = 6; - */ public Builder clearMultipleResponses() { bitField0_ = (bitField0_ & ~0x00000020); multipleResponses_ = false; onChanged(); return this; } - + // optional double frequency = 7; private double frequency_ ; - /** - * optional double frequency = 7; - */ public boolean hasFrequency() { return ((bitField0_ & 0x00000040) == 0x00000040); } - /** - * optional double frequency = 7; - */ public double getFrequency() { return frequency_; } - /** - * optional double frequency = 7; - */ public Builder setFrequency(double value) { bitField0_ |= 0x00000040; frequency_ = value; onChanged(); return this; } - /** - * optional double frequency = 7; - */ public Builder clearFrequency() { bitField0_ = (bitField0_ & ~0x00000040); frequency_ = 0D; onChanged(); return this; } - + // optional string name = 8; private java.lang.Object name_ = ""; - /** - * optional string name = 8; - */ public boolean hasName() { return ((bitField0_ & 0x00000080) == 0x00000080); } - /** - * optional string name = 8; - */ - public java.lang.String getName() { + public String getName() { java.lang.Object ref = name_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); + if (!(ref instanceof String)) { + String s = ((com.google.protobuf.ByteString) ref).toStringUtf8(); name_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } - /** - * optional string name = 8; - */ - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string name = 8; - */ - public Builder setName( - java.lang.String value) { + public Builder setName(String value) { if (value == null) { throw new NullPointerException(); } @@ -12214,46 +9658,26 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional string name = 8; - */ public Builder clearName() { bitField0_ = (bitField0_ & ~0x00000080); name_ = getDefaultInstance().getName(); onChanged(); return this; } - /** - * optional string name = 8; - */ - public Builder setNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000080; + void setName(com.google.protobuf.ByteString value) { + bitField0_ |= 0x00000080; name_ = value; onChanged(); - return this; } - + // optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; private com.openxc.BinaryMessages.DiagnosticRequest.DecodedType decodedType_ = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.NONE; - /** - * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; - */ public boolean hasDecodedType() { return ((bitField0_ & 0x00000100) == 0x00000100); } - /** - * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; - */ public com.openxc.BinaryMessages.DiagnosticRequest.DecodedType getDecodedType() { return decodedType_; } - /** - * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; - */ public Builder setDecodedType(com.openxc.BinaryMessages.DiagnosticRequest.DecodedType value) { if (value == null) { throw new NullPointerException(); @@ -12263,389 +9687,168 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; - */ public Builder clearDecodedType() { bitField0_ = (bitField0_ & ~0x00000100); decodedType_ = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.NONE; onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:openxc.DiagnosticRequest) } - + static { defaultInstance = new DiagnosticRequest(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.DiagnosticRequest) } - + public interface DiagnosticResponseOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional int32 bus = 1; - /** - * optional int32 bus = 1; - */ boolean hasBus(); - /** - * optional int32 bus = 1; - */ int getBus(); - + // optional uint32 message_id = 2; - /** - * optional uint32 message_id = 2; - */ boolean hasMessageId(); - /** - * optional uint32 message_id = 2; - */ int getMessageId(); - + // optional uint32 mode = 3; - /** - * optional uint32 mode = 3; - */ boolean hasMode(); - /** - * optional uint32 mode = 3; - */ int getMode(); - + // optional uint32 pid = 4; - /** - * optional uint32 pid = 4; - */ boolean hasPid(); - /** - * optional uint32 pid = 4; - */ int getPid(); - + // optional bool success = 5; - /** - * optional bool success = 5; - */ boolean hasSuccess(); - /** - * optional bool success = 5; - */ boolean getSuccess(); - + // optional uint32 negative_response_code = 6; - /** - * optional uint32 negative_response_code = 6; - */ boolean hasNegativeResponseCode(); - /** - * optional uint32 negative_response_code = 6; - */ int getNegativeResponseCode(); - + // optional bytes payload = 7; - /** - * optional bytes payload = 7; - * - * 
-     * TODO we are capping this at 8 bytes for now - need to change when we
-     * support multi-frame responses
-     *
- */ boolean hasPayload(); - /** - * optional bytes payload = 7; - * - * 
-     * TODO we are capping this at 8 bytes for now - need to change when we
-     * support multi-frame responses
-     *
- */ com.google.protobuf.ByteString getPayload(); - + // optional double value = 8; - /** - * optional double value = 8; - */ boolean hasValue(); - /** - * optional double value = 8; - */ double getValue(); } - /** - * Protobuf type {@code openxc.DiagnosticResponse} - */ public static final class DiagnosticResponse extends com.google.protobuf.GeneratedMessage implements DiagnosticResponseOrBuilder { // Use DiagnosticResponse.newBuilder() to construct. - private DiagnosticResponse(com.google.protobuf.GeneratedMessage.Builder builder) { + private DiagnosticResponse(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private DiagnosticResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private DiagnosticResponse(boolean noInit) {} + private static final DiagnosticResponse defaultInstance; public static DiagnosticResponse getDefaultInstance() { return defaultInstance; } - + public DiagnosticResponse getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private DiagnosticResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - bus_ = input.readInt32(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - messageId_ = input.readUInt32(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - mode_ = input.readUInt32(); - break; - } - case 32: { - bitField0_ |= 0x00000008; - pid_ = input.readUInt32(); - break; - } - case 40: { - bitField0_ |= 0x00000010; - success_ = input.readBool(); - break; - } - case 48: { - bitField0_ |= 0x00000020; - negativeResponseCode_ = input.readUInt32(); - break; - } - case 58: { - bitField0_ |= 0x00000040; - payload_ = input.readBytes(); - break; - } - case 65: { - bitField0_ |= 0x00000080; - value_ = input.readDouble(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.DiagnosticResponse.class, com.openxc.BinaryMessages.DiagnosticResponse.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public DiagnosticResponse parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new DiagnosticResponse(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_fieldAccessorTable; } - + private int bitField0_; // optional int32 bus = 1; public static final int BUS_FIELD_NUMBER = 1; private int bus_; - /** - * optional int32 bus = 1; - */ public boolean hasBus() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional int32 bus = 1; - */ public int getBus() { return bus_; } - + // optional uint32 message_id = 2; public static final int MESSAGE_ID_FIELD_NUMBER = 2; private int messageId_; - /** - * optional uint32 message_id = 2; - */ public boolean hasMessageId() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional uint32 message_id = 2; - */ public int getMessageId() { return messageId_; } - + // optional uint32 mode = 3; public static final int MODE_FIELD_NUMBER = 3; private int mode_; - /** - * optional uint32 mode = 3; - */ public boolean hasMode() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional uint32 mode = 3; - */ public int getMode() { return mode_; } - + // optional uint32 pid = 4; public static final int PID_FIELD_NUMBER = 4; private int pid_; - /** - * optional uint32 pid = 4; - */ public boolean hasPid() { return ((bitField0_ & 0x00000008) == 0x00000008); } - /** - * optional uint32 pid = 4; - */ public int getPid() { return pid_; } - + // optional bool success = 5; public static final int SUCCESS_FIELD_NUMBER = 5; private boolean success_; - /** - * optional bool success = 5; - */ public boolean hasSuccess() { return ((bitField0_ & 0x00000010) == 0x00000010); } - /** - * optional bool success = 5; - */ public boolean getSuccess() { return success_; } - + // optional uint32 negative_response_code = 6; public static final int NEGATIVE_RESPONSE_CODE_FIELD_NUMBER = 6; private int negativeResponseCode_; - /** - * optional uint32 negative_response_code = 6; - */ public boolean hasNegativeResponseCode() { return ((bitField0_ & 0x00000020) == 0x00000020); } - /** - * optional uint32 negative_response_code = 6; - */ public int getNegativeResponseCode() { return negativeResponseCode_; } - + // optional bytes payload = 7; public static final int PAYLOAD_FIELD_NUMBER = 7; private com.google.protobuf.ByteString payload_; - /** - * optional bytes payload = 7; - * - * 
-     * TODO we are capping this at 8 bytes for now - need to change when we
-     * support multi-frame responses
-     *
- */ public boolean hasPayload() { return ((bitField0_ & 0x00000040) == 0x00000040); } - /** - * optional bytes payload = 7; - * - * 
-     * TODO we are capping this at 8 bytes for now - need to change when we
-     * support multi-frame responses
-     *
- */ public com.google.protobuf.ByteString getPayload() { return payload_; } - + // optional double value = 8; public static final int VALUE_FIELD_NUMBER = 8; private double value_; - /** - * optional double value = 8; - */ public boolean hasValue() { return ((bitField0_ & 0x00000080) == 0x00000080); } - /** - * optional double value = 8; - */ public double getValue() { return value_; } - + private void initFields() { bus_ = 0; messageId_ = 0; @@ -12660,11 +9863,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -12694,12 +9897,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -12737,83 +9940,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticResponse parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.DiagnosticResponse parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.DiagnosticResponse prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.DiagnosticResponse} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.DiagnosticResponseOrBuilder { @@ -12821,21 +10035,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.DiagnosticResponse.class, com.openxc.BinaryMessages.DiagnosticResponse.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.DiagnosticResponse.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -12846,7 +10057,7 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); bus_ = 0; @@ -12867,20 +10078,20 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000080); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_descriptor; + return com.openxc.BinaryMessages.DiagnosticResponse.getDescriptor(); } - + public com.openxc.BinaryMessages.DiagnosticResponse getDefaultInstanceForType() { return com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance(); } - + public com.openxc.BinaryMessages.DiagnosticResponse build() { com.openxc.BinaryMessages.DiagnosticResponse result = buildPartial(); if (!result.isInitialized()) { @@ -12888,7 +10099,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.DiagnosticResponse buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.DiagnosticResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.DiagnosticResponse buildPartial() { com.openxc.BinaryMessages.DiagnosticResponse result = new com.openxc.BinaryMessages.DiagnosticResponse(this); int from_bitField0_ = bitField0_; @@ -12929,7 +10150,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.DiagnosticResponse) { return mergeFrom((com.openxc.BinaryMessages.DiagnosticResponse)other); @@ -12938,7 +10159,7 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.DiagnosticResponse other) { if (other == com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance()) return this; if (other.hasBus()) { @@ -12968,260 +10189,214 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.DiagnosticResponse parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.DiagnosticResponse) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + bus_ = input.readInt32(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + messageId_ = input.readUInt32(); + break; + } + case 24: { + bitField0_ |= 0x00000004; + mode_ = input.readUInt32(); + break; + } + case 32: { + bitField0_ |= 0x00000008; + pid_ = input.readUInt32(); + break; + } + case 40: { + bitField0_ |= 0x00000010; + success_ = input.readBool(); + break; + } + case 48: { + bitField0_ |= 0x00000020; + negativeResponseCode_ = input.readUInt32(); + break; + } + case 58: { + bitField0_ |= 0x00000040; + payload_ = input.readBytes(); + break; + } + case 65: { + bitField0_ |= 0x00000080; + value_ = input.readDouble(); + break; + } } } - return this; } + private int bitField0_; - + // optional int32 bus = 1; private int bus_ ; - /** - * optional int32 bus = 1; - */ public boolean hasBus() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional int32 bus = 1; - */ public int getBus() { return bus_; } - /** - * optional int32 bus = 1; - */ public Builder setBus(int value) { bitField0_ |= 0x00000001; bus_ = value; onChanged(); return this; } - /** - * optional int32 bus = 1; - */ public Builder clearBus() { bitField0_ = (bitField0_ & ~0x00000001); bus_ = 0; onChanged(); return this; } - + // optional uint32 message_id = 2; private int messageId_ ; - /** - * optional uint32 message_id = 2; - */ public boolean hasMessageId() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional uint32 message_id = 2; - */ public int getMessageId() { return messageId_; } - /** - * optional uint32 message_id = 2; - */ public Builder setMessageId(int value) { bitField0_ |= 0x00000002; messageId_ = value; onChanged(); return this; } - /** - * optional uint32 message_id = 2; - */ public Builder clearMessageId() { bitField0_ = (bitField0_ & ~0x00000002); messageId_ = 0; onChanged(); return this; } - + // optional uint32 mode = 3; private int mode_ ; - /** - * optional uint32 mode = 3; - */ public boolean hasMode() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional uint32 mode = 3; - */ public int getMode() { return mode_; } - /** - * optional uint32 mode = 3; - */ public Builder setMode(int value) { bitField0_ |= 0x00000004; mode_ = value; onChanged(); return this; } - /** - * optional uint32 mode = 3; - */ public Builder clearMode() { bitField0_ = (bitField0_ & ~0x00000004); mode_ = 0; onChanged(); return this; } - + // optional uint32 pid = 4; private int pid_ ; - /** - * optional uint32 pid = 4; - */ public boolean hasPid() { return ((bitField0_ & 0x00000008) == 0x00000008); } - /** - * optional uint32 pid = 4; - */ public int getPid() { return pid_; } - /** - * optional uint32 pid = 4; - */ public Builder setPid(int value) { bitField0_ |= 0x00000008; pid_ = value; onChanged(); return this; } - /** - * optional uint32 pid = 4; - */ public Builder clearPid() { bitField0_ = (bitField0_ & ~0x00000008); pid_ = 0; onChanged(); return this; } - + // optional bool success = 5; private boolean success_ ; - /** - * optional bool success = 5; - */ public boolean hasSuccess() { return ((bitField0_ & 0x00000010) == 0x00000010); } - /** - * optional bool success = 5; - */ public boolean getSuccess() { return success_; } - /** - * optional bool success = 5; - */ public Builder setSuccess(boolean value) { bitField0_ |= 0x00000010; success_ = value; onChanged(); return this; } - /** - * optional bool success = 5; - */ public Builder clearSuccess() { bitField0_ = (bitField0_ & ~0x00000010); success_ = false; onChanged(); return this; } - + // optional uint32 negative_response_code = 6; private int negativeResponseCode_ ; - /** - * optional uint32 negative_response_code = 6; - */ public boolean hasNegativeResponseCode() { return ((bitField0_ & 0x00000020) == 0x00000020); } - /** - * optional uint32 negative_response_code = 6; - */ public int getNegativeResponseCode() { return negativeResponseCode_; } - /** - * optional uint32 negative_response_code = 6; - */ public Builder setNegativeResponseCode(int value) { bitField0_ |= 0x00000020; negativeResponseCode_ = value; onChanged(); return this; } - /** - * optional uint32 negative_response_code = 6; - */ public Builder clearNegativeResponseCode() { bitField0_ = (bitField0_ & ~0x00000020); negativeResponseCode_ = 0; onChanged(); return this; } - + // optional bytes payload = 7; private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY; - /** - * optional bytes payload = 7; - * - * 
-       * TODO we are capping this at 8 bytes for now - need to change when we
-       * support multi-frame responses
-       *
- */ public boolean hasPayload() { return ((bitField0_ & 0x00000040) == 0x00000040); } - /** - * optional bytes payload = 7; - * - * 
-       * TODO we are capping this at 8 bytes for now - need to change when we
-       * support multi-frame responses
-       *
- */ public com.google.protobuf.ByteString getPayload() { return payload_; } - /** - * optional bytes payload = 7; - * - * 
-       * TODO we are capping this at 8 bytes for now - need to change when we
-       * support multi-frame responses
-       *
- */ public Builder setPayload(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); @@ -13231,264 +10406,106 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional bytes payload = 7; - * - * 
-       * TODO we are capping this at 8 bytes for now - need to change when we
-       * support multi-frame responses
-       *
- */ public Builder clearPayload() { bitField0_ = (bitField0_ & ~0x00000040); payload_ = getDefaultInstance().getPayload(); onChanged(); return this; } - + // optional double value = 8; private double value_ ; - /** - * optional double value = 8; - */ public boolean hasValue() { return ((bitField0_ & 0x00000080) == 0x00000080); } - /** - * optional double value = 8; - */ public double getValue() { return value_; } - /** - * optional double value = 8; - */ public Builder setValue(double value) { bitField0_ |= 0x00000080; value_ = value; onChanged(); return this; } - /** - * optional double value = 8; - */ public Builder clearValue() { bitField0_ = (bitField0_ & ~0x00000080); value_ = 0D; onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:openxc.DiagnosticResponse) } - + static { defaultInstance = new DiagnosticResponse(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.DiagnosticResponse) } - + public interface DynamicFieldOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional .openxc.DynamicField.Type type = 1; - /** - * optional .openxc.DynamicField.Type type = 1; - */ boolean hasType(); - /** - * optional .openxc.DynamicField.Type type = 1; - */ com.openxc.BinaryMessages.DynamicField.Type getType(); - + // optional string string_value = 2; - /** - * optional string string_value = 2; - */ boolean hasStringValue(); - /** - * optional string string_value = 2; - */ - java.lang.String getStringValue(); - /** - * optional string string_value = 2; - */ - com.google.protobuf.ByteString - getStringValueBytes(); - + String getStringValue(); + // optional double numeric_value = 3; - /** - * optional double numeric_value = 3; - */ boolean hasNumericValue(); - /** - * optional double numeric_value = 3; - */ double getNumericValue(); - + // optional bool boolean_value = 4; - /** - * optional bool boolean_value = 4; - */ boolean hasBooleanValue(); - /** - * optional bool boolean_value = 4; - */ boolean getBooleanValue(); } - /** - * Protobuf type {@code openxc.DynamicField} - */ public static final class DynamicField extends com.google.protobuf.GeneratedMessage implements DynamicFieldOrBuilder { // Use DynamicField.newBuilder() to construct. - private DynamicField(com.google.protobuf.GeneratedMessage.Builder builder) { + private DynamicField(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private DynamicField(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private DynamicField(boolean noInit) {} + private static final DynamicField defaultInstance; public static DynamicField getDefaultInstance() { - return defaultInstance; - } - - public DynamicField getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private DynamicField( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - int rawValue = input.readEnum(); - com.openxc.BinaryMessages.DynamicField.Type value = com.openxc.BinaryMessages.DynamicField.Type.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(1, rawValue); - } else { - bitField0_ |= 0x00000001; - type_ = value; - } - break; - } - case 18: { - bitField0_ |= 0x00000002; - stringValue_ = input.readBytes(); - break; - } - case 25: { - bitField0_ |= 0x00000004; - numericValue_ = input.readDouble(); - break; - } - case 32: { - bitField0_ |= 0x00000008; - booleanValue_ = input.readBool(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } + return defaultInstance; + } + + public DynamicField getDefaultInstanceForType() { + return defaultInstance; } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.DynamicField.class, com.openxc.BinaryMessages.DynamicField.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public DynamicField parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new DynamicField(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_fieldAccessorTable; } - - /** - * Protobuf enum {@code openxc.DynamicField.Type} - */ + public enum Type implements com.google.protobuf.ProtocolMessageEnum { - /** - * STRING = 1; - */ STRING(0, 1), - /** - * NUM = 2; - */ NUM(1, 2), - /** - * BOOL = 3; - */ BOOL(2, 3), ; - - /** - * STRING = 1; - */ + public static final int STRING_VALUE = 1; - /** - * NUM = 2; - */ public static final int NUM_VALUE = 2; - /** - * BOOL = 3; - */ public static final int BOOL_VALUE = 3; - - + + public final int getNumber() { return value; } - + public static Type valueOf(int value) { switch (value) { case 1: return STRING; @@ -13497,7 +10514,7 @@ public final class BinaryMessages { default: return null; } } - + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; @@ -13509,7 +10526,7 @@ public final class BinaryMessages { return Type.valueOf(number); } }; - + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { return getDescriptor().getValues().get(index); @@ -13522,9 +10539,11 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.DynamicField.getDescriptor().getEnumTypes().get(0); } - - private static final Type[] VALUES = values(); - + + private static final Type[] VALUES = { + STRING, NUM, BOOL, + }; + public static Type valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { @@ -13533,110 +10552,81 @@ public final class BinaryMessages { } return VALUES[desc.getIndex()]; } - + private final int index; private final int value; - + private Type(int index, int value) { this.index = index; this.value = value; } - + // @@protoc_insertion_point(enum_scope:openxc.DynamicField.Type) } - + private int bitField0_; // optional .openxc.DynamicField.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; private com.openxc.BinaryMessages.DynamicField.Type type_; - /** - * optional .openxc.DynamicField.Type type = 1; - */ public boolean hasType() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional .openxc.DynamicField.Type type = 1; - */ public com.openxc.BinaryMessages.DynamicField.Type getType() { return type_; } - + // optional string string_value = 2; public static final int STRING_VALUE_FIELD_NUMBER = 2; private java.lang.Object stringValue_; - /** - * optional string string_value = 2; - */ public boolean hasStringValue() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional string string_value = 2; - */ - public java.lang.String getStringValue() { + public String getStringValue() { java.lang.Object ref = stringValue_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { + String s = bs.toStringUtf8(); + if (com.google.protobuf.Internal.isValidUtf8(bs)) { stringValue_ = s; } return s; } } - /** - * optional string string_value = 2; - */ - public com.google.protobuf.ByteString - getStringValueBytes() { + private com.google.protobuf.ByteString getStringValueBytes() { java.lang.Object ref = stringValue_; - if (ref instanceof java.lang.String) { + if (ref instanceof String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8((String) ref); stringValue_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - + // optional double numeric_value = 3; public static final int NUMERIC_VALUE_FIELD_NUMBER = 3; private double numericValue_; - /** - * optional double numeric_value = 3; - */ public boolean hasNumericValue() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional double numeric_value = 3; - */ public double getNumericValue() { return numericValue_; } - + // optional bool boolean_value = 4; public static final int BOOLEAN_VALUE_FIELD_NUMBER = 4; private boolean booleanValue_; - /** - * optional bool boolean_value = 4; - */ public boolean hasBooleanValue() { return ((bitField0_ & 0x00000008) == 0x00000008); } - /** - * optional bool boolean_value = 4; - */ public boolean getBooleanValue() { return booleanValue_; } - + private void initFields() { type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING; stringValue_ = ""; @@ -13647,11 +10637,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -13669,12 +10659,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -13696,83 +10686,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.DynamicField parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.DynamicField parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.DynamicField parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.DynamicField parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.DynamicField parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.DynamicField parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.DynamicField parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.DynamicField parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.DynamicField parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.DynamicField parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.DynamicField prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.DynamicField} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.DynamicFieldOrBuilder { @@ -13780,21 +10781,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.DynamicField.class, com.openxc.BinaryMessages.DynamicField.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.DynamicField.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -13805,7 +10803,7 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING; @@ -13818,20 +10816,20 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000008); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_descriptor; + return com.openxc.BinaryMessages.DynamicField.getDescriptor(); } - + public com.openxc.BinaryMessages.DynamicField getDefaultInstanceForType() { return com.openxc.BinaryMessages.DynamicField.getDefaultInstance(); } - + public com.openxc.BinaryMessages.DynamicField build() { com.openxc.BinaryMessages.DynamicField result = buildPartial(); if (!result.isInitialized()) { @@ -13839,7 +10837,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.DynamicField buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.DynamicField result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.DynamicField buildPartial() { com.openxc.BinaryMessages.DynamicField result = new com.openxc.BinaryMessages.DynamicField(this); int from_bitField0_ = bitField0_; @@ -13864,7 +10872,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.DynamicField) { return mergeFrom((com.openxc.BinaryMessages.DynamicField)other); @@ -13873,16 +10881,14 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.DynamicField other) { if (other == com.openxc.BinaryMessages.DynamicField.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } if (other.hasStringValue()) { - bitField0_ |= 0x00000002; - stringValue_ = other.stringValue_; - onChanged(); + setStringValue(other.getStringValue()); } if (other.hasNumericValue()) { setNumericValue(other.getNumericValue()); @@ -13893,47 +10899,74 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.DynamicField parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.DynamicField) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 8: { + int rawValue = input.readEnum(); + com.openxc.BinaryMessages.DynamicField.Type value = com.openxc.BinaryMessages.DynamicField.Type.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(1, rawValue); + } else { + bitField0_ |= 0x00000001; + type_ = value; + } + break; + } + case 18: { + bitField0_ |= 0x00000002; + stringValue_ = input.readBytes(); + break; + } + case 25: { + bitField0_ |= 0x00000004; + numericValue_ = input.readDouble(); + break; + } + case 32: { + bitField0_ |= 0x00000008; + booleanValue_ = input.readBool(); + break; + } } } - return this; } + private int bitField0_; - + // optional .openxc.DynamicField.Type type = 1; private com.openxc.BinaryMessages.DynamicField.Type type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING; - /** - * optional .openxc.DynamicField.Type type = 1; - */ public boolean hasType() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional .openxc.DynamicField.Type type = 1; - */ public com.openxc.BinaryMessages.DynamicField.Type getType() { return type_; } - /** - * optional .openxc.DynamicField.Type type = 1; - */ public Builder setType(com.openxc.BinaryMessages.DynamicField.Type value) { if (value == null) { throw new NullPointerException(); @@ -13943,59 +10976,29 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional .openxc.DynamicField.Type type = 1; - */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING; onChanged(); return this; } - + // optional string string_value = 2; private java.lang.Object stringValue_ = ""; - /** - * optional string string_value = 2; - */ public boolean hasStringValue() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional string string_value = 2; - */ - public java.lang.String getStringValue() { + public String getStringValue() { java.lang.Object ref = stringValue_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); + if (!(ref instanceof String)) { + String s = ((com.google.protobuf.ByteString) ref).toStringUtf8(); stringValue_ = s; return s; } else { - return (java.lang.String) ref; - } - } - /** - * optional string string_value = 2; - */ - public com.google.protobuf.ByteString - getStringValueBytes() { - java.lang.Object ref = stringValue_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - stringValue_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; + return (String) ref; } } - /** - * optional string string_value = 2; - */ - public Builder setStringValue( - java.lang.String value) { + public Builder setStringValue(String value) { if (value == null) { throw new NullPointerException(); } @@ -14004,361 +11007,175 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional string string_value = 2; - */ public Builder clearStringValue() { bitField0_ = (bitField0_ & ~0x00000002); stringValue_ = getDefaultInstance().getStringValue(); onChanged(); return this; } - /** - * optional string string_value = 2; - */ - public Builder setStringValueBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; + void setStringValue(com.google.protobuf.ByteString value) { + bitField0_ |= 0x00000002; stringValue_ = value; onChanged(); - return this; } - + // optional double numeric_value = 3; private double numericValue_ ; - /** - * optional double numeric_value = 3; - */ public boolean hasNumericValue() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional double numeric_value = 3; - */ public double getNumericValue() { return numericValue_; } - /** - * optional double numeric_value = 3; - */ public Builder setNumericValue(double value) { bitField0_ |= 0x00000004; numericValue_ = value; onChanged(); return this; } - /** - * optional double numeric_value = 3; - */ public Builder clearNumericValue() { bitField0_ = (bitField0_ & ~0x00000004); numericValue_ = 0D; onChanged(); return this; } - + // optional bool boolean_value = 4; private boolean booleanValue_ ; - /** - * optional bool boolean_value = 4; - */ public boolean hasBooleanValue() { return ((bitField0_ & 0x00000008) == 0x00000008); } - /** - * optional bool boolean_value = 4; - */ public boolean getBooleanValue() { return booleanValue_; } - /** - * optional bool boolean_value = 4; - */ public Builder setBooleanValue(boolean value) { bitField0_ |= 0x00000008; booleanValue_ = value; onChanged(); return this; } - /** - * optional bool boolean_value = 4; - */ public Builder clearBooleanValue() { bitField0_ = (bitField0_ & ~0x00000008); booleanValue_ = false; onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:openxc.DynamicField) } - + static { defaultInstance = new DynamicField(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.DynamicField) } - + public interface SimpleMessageOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional string name = 1; - /** - * optional string name = 1; - */ boolean hasName(); - /** - * optional string name = 1; - */ - java.lang.String getName(); - /** - * optional string name = 1; - */ - com.google.protobuf.ByteString - getNameBytes(); - + String getName(); + // optional .openxc.DynamicField value = 2; - /** - * optional .openxc.DynamicField value = 2; - */ boolean hasValue(); - /** - * optional .openxc.DynamicField value = 2; - */ com.openxc.BinaryMessages.DynamicField getValue(); - /** - * optional .openxc.DynamicField value = 2; - */ com.openxc.BinaryMessages.DynamicFieldOrBuilder getValueOrBuilder(); - + // optional .openxc.DynamicField event = 3; - /** - * optional .openxc.DynamicField event = 3; - */ boolean hasEvent(); - /** - * optional .openxc.DynamicField event = 3; - */ com.openxc.BinaryMessages.DynamicField getEvent(); - /** - * optional .openxc.DynamicField event = 3; - */ com.openxc.BinaryMessages.DynamicFieldOrBuilder getEventOrBuilder(); } - /** - * Protobuf type {@code openxc.SimpleMessage} - */ public static final class SimpleMessage extends com.google.protobuf.GeneratedMessage implements SimpleMessageOrBuilder { // Use SimpleMessage.newBuilder() to construct. - private SimpleMessage(com.google.protobuf.GeneratedMessage.Builder builder) { + private SimpleMessage(Builder builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); } - private SimpleMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - + private SimpleMessage(boolean noInit) {} + private static final SimpleMessage defaultInstance; public static SimpleMessage getDefaultInstance() { return defaultInstance; } - + public SimpleMessage getDefaultInstanceForType() { return defaultInstance; } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private SimpleMessage( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - bitField0_ |= 0x00000001; - name_ = input.readBytes(); - break; - } - case 18: { - com.openxc.BinaryMessages.DynamicField.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - subBuilder = value_.toBuilder(); - } - value_ = input.readMessage(com.openxc.BinaryMessages.DynamicField.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(value_); - value_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - case 26: { - com.openxc.BinaryMessages.DynamicField.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - subBuilder = event_.toBuilder(); - } - event_ = input.readMessage(com.openxc.BinaryMessages.DynamicField.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(event_); - event_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000004; - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.SimpleMessage.class, com.openxc.BinaryMessages.SimpleMessage.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public SimpleMessage parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new SimpleMessage(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_fieldAccessorTable; } - + private int bitField0_; // optional string name = 1; public static final int NAME_FIELD_NUMBER = 1; private java.lang.Object name_; - /** - * optional string name = 1; - */ public boolean hasName() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional string name = 1; - */ - public java.lang.String getName() { + public String getName() { java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { + String s = bs.toStringUtf8(); + if (com.google.protobuf.Internal.isValidUtf8(bs)) { name_ = s; } return s; } } - /** - * optional string name = 1; - */ - public com.google.protobuf.ByteString - getNameBytes() { + private com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { + if (ref instanceof String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8((String) ref); name_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - + // optional .openxc.DynamicField value = 2; public static final int VALUE_FIELD_NUMBER = 2; private com.openxc.BinaryMessages.DynamicField value_; - /** - * optional .openxc.DynamicField value = 2; - */ public boolean hasValue() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional .openxc.DynamicField value = 2; - */ public com.openxc.BinaryMessages.DynamicField getValue() { return value_; } - /** - * optional .openxc.DynamicField value = 2; - */ public com.openxc.BinaryMessages.DynamicFieldOrBuilder getValueOrBuilder() { return value_; } - + // optional .openxc.DynamicField event = 3; public static final int EVENT_FIELD_NUMBER = 3; private com.openxc.BinaryMessages.DynamicField event_; - /** - * optional .openxc.DynamicField event = 3; - */ public boolean hasEvent() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional .openxc.DynamicField event = 3; - */ public com.openxc.BinaryMessages.DynamicField getEvent() { return event_; } - /** - * optional .openxc.DynamicField event = 3; - */ public com.openxc.BinaryMessages.DynamicFieldOrBuilder getEventOrBuilder() { return event_; } - + private void initFields() { name_ = ""; value_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance(); @@ -14368,11 +11185,11 @@ public final class BinaryMessages { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -14387,12 +11204,12 @@ public final class BinaryMessages { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -14410,83 +11227,94 @@ public final class BinaryMessages { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static com.openxc.BinaryMessages.SimpleMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.SimpleMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.SimpleMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return newBuilder().mergeFrom(data).buildParsed(); } public static com.openxc.BinaryMessages.SimpleMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return newBuilder().mergeFrom(data, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.SimpleMessage parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.SimpleMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } public static com.openxc.BinaryMessages.SimpleMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.SimpleMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + Builder builder = newBuilder(); + if (builder.mergeDelimitedFrom(input, extensionRegistry)) { + return builder.buildParsed(); + } else { + return null; + } } public static com.openxc.BinaryMessages.SimpleMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return newBuilder().mergeFrom(input).buildParsed(); } public static com.openxc.BinaryMessages.SimpleMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return newBuilder().mergeFrom(input, extensionRegistry) + .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(com.openxc.BinaryMessages.SimpleMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code openxc.SimpleMessage} - */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements com.openxc.BinaryMessages.SimpleMessageOrBuilder { @@ -14494,21 +11322,18 @@ public final class BinaryMessages { getDescriptor() { return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.SimpleMessage.class, com.openxc.BinaryMessages.SimpleMessage.Builder.class); + return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_fieldAccessorTable; } - + // Construct using com.openxc.BinaryMessages.SimpleMessage.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -14521,7 +11346,7 @@ public final class BinaryMessages { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); name_ = ""; @@ -14540,20 +11365,20 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000004); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_descriptor; + return com.openxc.BinaryMessages.SimpleMessage.getDescriptor(); } - + public com.openxc.BinaryMessages.SimpleMessage getDefaultInstanceForType() { return com.openxc.BinaryMessages.SimpleMessage.getDefaultInstance(); } - + public com.openxc.BinaryMessages.SimpleMessage build() { com.openxc.BinaryMessages.SimpleMessage result = buildPartial(); if (!result.isInitialized()) { @@ -14561,7 +11386,17 @@ public final class BinaryMessages { } return result; } - + + private com.openxc.BinaryMessages.SimpleMessage buildParsed() + throws com.google.protobuf.InvalidProtocolBufferException { + com.openxc.BinaryMessages.SimpleMessage result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException( + result).asInvalidProtocolBufferException(); + } + return result; + } + public com.openxc.BinaryMessages.SimpleMessage buildPartial() { com.openxc.BinaryMessages.SimpleMessage result = new com.openxc.BinaryMessages.SimpleMessage(this); int from_bitField0_ = bitField0_; @@ -14590,7 +11425,7 @@ public final class BinaryMessages { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.openxc.BinaryMessages.SimpleMessage) { return mergeFrom((com.openxc.BinaryMessages.SimpleMessage)other); @@ -14599,13 +11434,11 @@ public final class BinaryMessages { return this; } } - + public Builder mergeFrom(com.openxc.BinaryMessages.SimpleMessage other) { if (other == com.openxc.BinaryMessages.SimpleMessage.getDefaultInstance()) return this; if (other.hasName()) { - bitField0_ |= 0x00000001; - name_ = other.name_; - onChanged(); + setName(other.getName()); } if (other.hasValue()) { mergeValue(other.getValue()); @@ -14616,73 +11449,79 @@ public final class BinaryMessages { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.SimpleMessage parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.SimpleMessage) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder( + this.getUnknownFields()); + while (true) { + int tag = input.readTag(); + switch (tag) { + case 0: + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + this.setUnknownFields(unknownFields.build()); + onChanged(); + return this; + } + break; + } + case 10: { + bitField0_ |= 0x00000001; + name_ = input.readBytes(); + break; + } + case 18: { + com.openxc.BinaryMessages.DynamicField.Builder subBuilder = com.openxc.BinaryMessages.DynamicField.newBuilder(); + if (hasValue()) { + subBuilder.mergeFrom(getValue()); + } + input.readMessage(subBuilder, extensionRegistry); + setValue(subBuilder.buildPartial()); + break; + } + case 26: { + com.openxc.BinaryMessages.DynamicField.Builder subBuilder = com.openxc.BinaryMessages.DynamicField.newBuilder(); + if (hasEvent()) { + subBuilder.mergeFrom(getEvent()); + } + input.readMessage(subBuilder, extensionRegistry); + setEvent(subBuilder.buildPartial()); + break; + } } } - return this; } + private int bitField0_; - + // optional string name = 1; private java.lang.Object name_ = ""; - /** - * optional string name = 1; - */ public boolean hasName() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** - * optional string name = 1; - */ - public java.lang.String getName() { + public String getName() { java.lang.Object ref = name_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); + if (!(ref instanceof String)) { + String s = ((com.google.protobuf.ByteString) ref).toStringUtf8(); name_ = s; return s; } else { - return (java.lang.String) ref; - } - } - /** - * optional string name = 1; - */ - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; + return (String) ref; } } - /** - * optional string name = 1; - */ - public Builder setName( - java.lang.String value) { + public Builder setName(String value) { if (value == null) { throw new NullPointerException(); } @@ -14691,42 +11530,25 @@ public final class BinaryMessages { onChanged(); return this; } - /** - * optional string name = 1; - */ public Builder clearName() { bitField0_ = (bitField0_ & ~0x00000001); name_ = getDefaultInstance().getName(); onChanged(); return this; } - /** - * optional string name = 1; - */ - public Builder setNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + void setName(com.google.protobuf.ByteString value) { + bitField0_ |= 0x00000001; name_ = value; onChanged(); - return this; } - + // optional .openxc.DynamicField value = 2; private com.openxc.BinaryMessages.DynamicField value_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder> valueBuilder_; - /** - * optional .openxc.DynamicField value = 2; - */ public boolean hasValue() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** - * optional .openxc.DynamicField value = 2; - */ public com.openxc.BinaryMessages.DynamicField getValue() { if (valueBuilder_ == null) { return value_; @@ -14734,9 +11556,6 @@ public final class BinaryMessages { return valueBuilder_.getMessage(); } } - /** - * optional .openxc.DynamicField value = 2; - */ public Builder setValue(com.openxc.BinaryMessages.DynamicField value) { if (valueBuilder_ == null) { if (value == null) { @@ -14750,9 +11569,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000002; return this; } - /** - * optional .openxc.DynamicField value = 2; - */ public Builder setValue( com.openxc.BinaryMessages.DynamicField.Builder builderForValue) { if (valueBuilder_ == null) { @@ -14764,9 +11580,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000002; return this; } - /** - * optional .openxc.DynamicField value = 2; - */ public Builder mergeValue(com.openxc.BinaryMessages.DynamicField value) { if (valueBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && @@ -14783,9 +11596,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000002; return this; } - /** - * optional .openxc.DynamicField value = 2; - */ public Builder clearValue() { if (valueBuilder_ == null) { value_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance(); @@ -14796,17 +11606,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000002); return this; } - /** - * optional .openxc.DynamicField value = 2; - */ public com.openxc.BinaryMessages.DynamicField.Builder getValueBuilder() { bitField0_ |= 0x00000002; onChanged(); return getValueFieldBuilder().getBuilder(); } - /** - * optional .openxc.DynamicField value = 2; - */ public com.openxc.BinaryMessages.DynamicFieldOrBuilder getValueOrBuilder() { if (valueBuilder_ != null) { return valueBuilder_.getMessageOrBuilder(); @@ -14814,9 +11618,6 @@ public final class BinaryMessages { return value_; } } - /** - * optional .openxc.DynamicField value = 2; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder> getValueFieldBuilder() { @@ -14830,20 +11631,14 @@ public final class BinaryMessages { } return valueBuilder_; } - + // optional .openxc.DynamicField event = 3; private com.openxc.BinaryMessages.DynamicField event_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder> eventBuilder_; - /** - * optional .openxc.DynamicField event = 3; - */ public boolean hasEvent() { return ((bitField0_ & 0x00000004) == 0x00000004); } - /** - * optional .openxc.DynamicField event = 3; - */ public com.openxc.BinaryMessages.DynamicField getEvent() { if (eventBuilder_ == null) { return event_; @@ -14851,9 +11646,6 @@ public final class BinaryMessages { return eventBuilder_.getMessage(); } } - /** - * optional .openxc.DynamicField event = 3; - */ public Builder setEvent(com.openxc.BinaryMessages.DynamicField value) { if (eventBuilder_ == null) { if (value == null) { @@ -14867,9 +11659,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000004; return this; } - /** - * optional .openxc.DynamicField event = 3; - */ public Builder setEvent( com.openxc.BinaryMessages.DynamicField.Builder builderForValue) { if (eventBuilder_ == null) { @@ -14881,9 +11670,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000004; return this; } - /** - * optional .openxc.DynamicField event = 3; - */ public Builder mergeEvent(com.openxc.BinaryMessages.DynamicField value) { if (eventBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && @@ -14900,9 +11686,6 @@ public final class BinaryMessages { bitField0_ |= 0x00000004; return this; } - /** - * optional .openxc.DynamicField event = 3; - */ public Builder clearEvent() { if (eventBuilder_ == null) { event_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance(); @@ -14913,17 +11696,11 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000004); return this; } - /** - * optional .openxc.DynamicField event = 3; - */ public com.openxc.BinaryMessages.DynamicField.Builder getEventBuilder() { bitField0_ |= 0x00000004; onChanged(); return getEventFieldBuilder().getBuilder(); } - /** - * optional .openxc.DynamicField event = 3; - */ public com.openxc.BinaryMessages.DynamicFieldOrBuilder getEventOrBuilder() { if (eventBuilder_ != null) { return eventBuilder_.getMessageOrBuilder(); @@ -14931,9 +11708,6 @@ public final class BinaryMessages { return event_; } } - /** - * optional .openxc.DynamicField event = 3; - */ private com.google.protobuf.SingleFieldBuilder< com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder> getEventFieldBuilder() { @@ -14947,18 +11721,18 @@ public final class BinaryMessages { } return eventBuilder_; } - + // @@protoc_insertion_point(builder_scope:openxc.SimpleMessage) } - + static { defaultInstance = new SimpleMessage(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:openxc.SimpleMessage) } - + private static com.google.protobuf.Descriptors.Descriptor internal_static_openxc_VehicleMessage_descriptor; private static @@ -15054,7 +11828,7 @@ public final class BinaryMessages { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_openxc_SimpleMessage_fieldAccessorTable; - + public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { return descriptor; @@ -15161,115 +11935,153 @@ public final class BinaryMessages { internal_static_openxc_VehicleMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_VehicleMessage_descriptor, - new java.lang.String[] { "Type", "CanMessage", "SimpleMessage", "DiagnosticResponse", "ControlCommand", "CommandResponse", "Timestamp", }); + new java.lang.String[] { "Type", "CanMessage", "SimpleMessage", "DiagnosticResponse", "ControlCommand", "CommandResponse", "Timestamp", }, + com.openxc.BinaryMessages.VehicleMessage.class, + com.openxc.BinaryMessages.VehicleMessage.Builder.class); internal_static_openxc_CanMessage_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_openxc_CanMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_CanMessage_descriptor, - new java.lang.String[] { "Bus", "Id", "Data", "FrameFormat", }); + new java.lang.String[] { "Bus", "Id", "Data", "FrameFormat", }, + com.openxc.BinaryMessages.CanMessage.class, + com.openxc.BinaryMessages.CanMessage.Builder.class); internal_static_openxc_ControlCommand_descriptor = getDescriptor().getMessageTypes().get(2); internal_static_openxc_ControlCommand_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_ControlCommand_descriptor, - new java.lang.String[] { "Type", "DiagnosticRequest", "PassthroughModeRequest", "AcceptanceFilterBypassCommand", "PayloadFormatCommand", "PredefinedObd2RequestsCommand", "ModemConfigurationCommand", "RtcConfigurationCommand", }); + new java.lang.String[] { "Type", "DiagnosticRequest", "PassthroughModeRequest", "AcceptanceFilterBypassCommand", "PayloadFormatCommand", "PredefinedObd2RequestsCommand", "ModemConfigurationCommand", "RtcConfigurationCommand", }, + com.openxc.BinaryMessages.ControlCommand.class, + com.openxc.BinaryMessages.ControlCommand.Builder.class); internal_static_openxc_DiagnosticControlCommand_descriptor = getDescriptor().getMessageTypes().get(3); internal_static_openxc_DiagnosticControlCommand_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_DiagnosticControlCommand_descriptor, - new java.lang.String[] { "Request", "Action", }); + new java.lang.String[] { "Request", "Action", }, + com.openxc.BinaryMessages.DiagnosticControlCommand.class, + com.openxc.BinaryMessages.DiagnosticControlCommand.Builder.class); internal_static_openxc_PassthroughModeControlCommand_descriptor = getDescriptor().getMessageTypes().get(4); internal_static_openxc_PassthroughModeControlCommand_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_PassthroughModeControlCommand_descriptor, - new java.lang.String[] { "Bus", "Enabled", }); + new java.lang.String[] { "Bus", "Enabled", }, + com.openxc.BinaryMessages.PassthroughModeControlCommand.class, + com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder.class); internal_static_openxc_AcceptanceFilterBypassCommand_descriptor = getDescriptor().getMessageTypes().get(5); internal_static_openxc_AcceptanceFilterBypassCommand_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_AcceptanceFilterBypassCommand_descriptor, - new java.lang.String[] { "Bus", "Bypass", }); + new java.lang.String[] { "Bus", "Bypass", }, + com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.class, + com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder.class); internal_static_openxc_PayloadFormatCommand_descriptor = getDescriptor().getMessageTypes().get(6); internal_static_openxc_PayloadFormatCommand_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_PayloadFormatCommand_descriptor, - new java.lang.String[] { "Format", }); + new java.lang.String[] { "Format", }, + com.openxc.BinaryMessages.PayloadFormatCommand.class, + com.openxc.BinaryMessages.PayloadFormatCommand.Builder.class); internal_static_openxc_PredefinedObd2RequestsCommand_descriptor = getDescriptor().getMessageTypes().get(7); internal_static_openxc_PredefinedObd2RequestsCommand_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_PredefinedObd2RequestsCommand_descriptor, - new java.lang.String[] { "Enabled", }); + new java.lang.String[] { "Enabled", }, + com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.class, + com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder.class); internal_static_openxc_NetworkOperatorSettings_descriptor = getDescriptor().getMessageTypes().get(8); internal_static_openxc_NetworkOperatorSettings_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_NetworkOperatorSettings_descriptor, - new java.lang.String[] { "AllowDataRoaming", "OperatorSelectMode", "NetworkDescriptor", }); + new java.lang.String[] { "AllowDataRoaming", "OperatorSelectMode", "NetworkDescriptor", }, + com.openxc.BinaryMessages.NetworkOperatorSettings.class, + com.openxc.BinaryMessages.NetworkOperatorSettings.Builder.class); internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_descriptor = internal_static_openxc_NetworkOperatorSettings_descriptor.getNestedTypes().get(0); internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_descriptor, - new java.lang.String[] { "PLMN", "NetworkType", }); + new java.lang.String[] { "PLMN", "NetworkType", }, + com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.class, + com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder.class); internal_static_openxc_NetworkDataSettings_descriptor = getDescriptor().getMessageTypes().get(9); internal_static_openxc_NetworkDataSettings_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_NetworkDataSettings_descriptor, - new java.lang.String[] { "APN", }); + new java.lang.String[] { "APN", }, + com.openxc.BinaryMessages.NetworkDataSettings.class, + com.openxc.BinaryMessages.NetworkDataSettings.Builder.class); internal_static_openxc_ServerConnectSettings_descriptor = getDescriptor().getMessageTypes().get(10); internal_static_openxc_ServerConnectSettings_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_ServerConnectSettings_descriptor, - new java.lang.String[] { "Host", "Port", }); + new java.lang.String[] { "Host", "Port", }, + com.openxc.BinaryMessages.ServerConnectSettings.class, + com.openxc.BinaryMessages.ServerConnectSettings.Builder.class); internal_static_openxc_ModemConfigurationCommand_descriptor = getDescriptor().getMessageTypes().get(11); internal_static_openxc_ModemConfigurationCommand_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_ModemConfigurationCommand_descriptor, - new java.lang.String[] { "NetworkOperatorSettings", "NetworkDataSettings", "ServerConnectSettings", }); + new java.lang.String[] { "NetworkOperatorSettings", "NetworkDataSettings", "ServerConnectSettings", }, + com.openxc.BinaryMessages.ModemConfigurationCommand.class, + com.openxc.BinaryMessages.ModemConfigurationCommand.Builder.class); internal_static_openxc_RTCConfigurationCommand_descriptor = getDescriptor().getMessageTypes().get(12); internal_static_openxc_RTCConfigurationCommand_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_RTCConfigurationCommand_descriptor, - new java.lang.String[] { "UnixTime", }); + new java.lang.String[] { "UnixTime", }, + com.openxc.BinaryMessages.RTCConfigurationCommand.class, + com.openxc.BinaryMessages.RTCConfigurationCommand.Builder.class); internal_static_openxc_CommandResponse_descriptor = getDescriptor().getMessageTypes().get(13); internal_static_openxc_CommandResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_CommandResponse_descriptor, - new java.lang.String[] { "Type", "Message", "Status", }); + new java.lang.String[] { "Type", "Message", "Status", }, + com.openxc.BinaryMessages.CommandResponse.class, + com.openxc.BinaryMessages.CommandResponse.Builder.class); internal_static_openxc_DiagnosticRequest_descriptor = getDescriptor().getMessageTypes().get(14); internal_static_openxc_DiagnosticRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_DiagnosticRequest_descriptor, - new java.lang.String[] { "Bus", "MessageId", "Mode", "Pid", "Payload", "MultipleResponses", "Frequency", "Name", "DecodedType", }); + new java.lang.String[] { "Bus", "MessageId", "Mode", "Pid", "Payload", "MultipleResponses", "Frequency", "Name", "DecodedType", }, + com.openxc.BinaryMessages.DiagnosticRequest.class, + com.openxc.BinaryMessages.DiagnosticRequest.Builder.class); internal_static_openxc_DiagnosticResponse_descriptor = getDescriptor().getMessageTypes().get(15); internal_static_openxc_DiagnosticResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_DiagnosticResponse_descriptor, - new java.lang.String[] { "Bus", "MessageId", "Mode", "Pid", "Success", "NegativeResponseCode", "Payload", "Value", }); + new java.lang.String[] { "Bus", "MessageId", "Mode", "Pid", "Success", "NegativeResponseCode", "Payload", "Value", }, + com.openxc.BinaryMessages.DiagnosticResponse.class, + com.openxc.BinaryMessages.DiagnosticResponse.Builder.class); internal_static_openxc_DynamicField_descriptor = getDescriptor().getMessageTypes().get(16); internal_static_openxc_DynamicField_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_DynamicField_descriptor, - new java.lang.String[] { "Type", "StringValue", "NumericValue", "BooleanValue", }); + new java.lang.String[] { "Type", "StringValue", "NumericValue", "BooleanValue", }, + com.openxc.BinaryMessages.DynamicField.class, + com.openxc.BinaryMessages.DynamicField.Builder.class); internal_static_openxc_SimpleMessage_descriptor = getDescriptor().getMessageTypes().get(17); internal_static_openxc_SimpleMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_SimpleMessage_descriptor, - new java.lang.String[] { "Name", "Value", "Event", }); + new java.lang.String[] { "Name", "Value", "Event", }, + com.openxc.BinaryMessages.SimpleMessage.class, + com.openxc.BinaryMessages.SimpleMessage.Builder.class); return null; } }; @@ -15278,6 +12090,6 @@ public final class BinaryMessages { new com.google.protobuf.Descriptors.FileDescriptor[] { }, assigner); } - + // @@protoc_insertion_point(outer_class_scope) } diff --git a/gen/python/openxc_pb2.py b/gen/python/openxc_pb2.py index 023379de..718231b8 100644 --- a/gen/python/openxc_pb2.py +++ b/gen/python/openxc_pb2.py @@ -1,45 +1,43 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: openxc.proto -from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection +from google.protobuf import descriptor +from google.protobuf import message +from google.protobuf import reflection from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) - -DESCRIPTOR = _descriptor.FileDescriptor( +DESCRIPTOR = descriptor.FileDescriptor( name='openxc.proto', package='openxc', serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\x9b\x03\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0b\x63\x61n_message\x18\x02 \x01(\x0b\x32\x12.openxc.CanMessage\x12-\n\x0esimple_message\x18\x03 \x01(\x0b\x32\x15.openxc.SimpleMessage\x12\x37\n\x13\x64iagnostic_response\x18\x04 \x01(\x0b\x32\x1a.openxc.DiagnosticResponse\x12/\n\x0f\x63ontrol_command\x18\x05 \x01(\x0b\x32\x16.openxc.ControlCommand\x12\x31\n\x10\x63ommand_response\x18\x06 \x01(\x0b\x32\x17.openxc.CommandResponse\x12\x11\n\ttimestamp\x18\x07 \x01(\x04\"V\n\x04Type\x12\x07\n\x03\x43\x41N\x10\x01\x12\n\n\x06SIMPLE\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x13\n\x0f\x43ONTROL_COMMAND\x10\x04\x12\x14\n\x10\x43OMMAND_RESPONSE\x10\x05\"\x94\x01\n\nCanMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\n\n\x02id\x18\x02 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\x12\x34\n\x0c\x66rame_format\x18\x04 \x01(\x0e\x32\x1e.openxc.CanMessage.FrameFormat\")\n\x0b\x46rameFormat\x12\x0c\n\x08STANDARD\x10\x01\x12\x0c\n\x08\x45XTENDED\x10\x02\"\x89\x06\n\x0e\x43ontrolCommand\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12<\n\x12\x64iagnostic_request\x18\x02 \x01(\x0b\x32 .openxc.DiagnosticControlCommand\x12G\n\x18passthrough_mode_request\x18\x03 \x01(\x0b\x32%.openxc.PassthroughModeControlCommand\x12O\n acceptance_filter_bypass_command\x18\x04 \x01(\x0b\x32%.openxc.AcceptanceFilterBypassCommand\x12<\n\x16payload_format_command\x18\x05 \x01(\x0b\x32\x1c.openxc.PayloadFormatCommand\x12O\n predefined_obd2_requests_command\x18\x06 \x01(\x0b\x32%.openxc.PredefinedObd2RequestsCommand\x12\x46\n\x1bmodem_configuration_command\x18\x07 \x01(\x0b\x32!.openxc.ModemConfigurationCommand\x12\x42\n\x19rtc_configuration_command\x18\x08 \x01(\x0b\x32\x1f.openxc.RTCConfigurationCommand\"\xd8\x01\n\x04Type\x12\x0b\n\x07VERSION\x10\x01\x12\r\n\tDEVICE_ID\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x0f\n\x0bPASSTHROUGH\x10\x04\x12\x1c\n\x18\x41\x43\x43\x45PTANCE_FILTER_BYPASS\x10\x05\x12\x12\n\x0ePAYLOAD_FORMAT\x10\x06\x12\x1c\n\x18PREDEFINED_OBD2_REQUESTS\x10\x07\x12\x17\n\x13MODEM_CONFIGURATION\x10\x08\x12\x15\n\x11RTC_CONFIGURATION\x10\t\x12\x13\n\x0fSD_MOUNT_STATUS\x10\n\"\x9e\x01\n\x18\x44iagnosticControlCommand\x12*\n\x07request\x18\x01 \x01(\x0b\x32\x19.openxc.DiagnosticRequest\x12\x37\n\x06\x61\x63tion\x18\x02 \x01(\x0e\x32\'.openxc.DiagnosticControlCommand.Action\"\x1d\n\x06\x41\x63tion\x12\x07\n\x03\x41\x44\x44\x10\x01\x12\n\n\x06\x43\x41NCEL\x10\x02\"=\n\x1dPassthroughModeControlCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0f\n\x07\x65nabled\x18\x02 \x01(\x08\"<\n\x1d\x41\x63\x63\x65ptanceFilterBypassCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0e\n\x06\x62ypass\x18\x02 \x01(\x08\"\x8c\x01\n\x14PayloadFormatCommand\x12:\n\x06\x66ormat\x18\x01 \x01(\x0e\x32*.openxc.PayloadFormatCommand.PayloadFormat\"8\n\rPayloadFormat\x12\x08\n\x04JSON\x10\x01\x12\x0c\n\x08PROTOBUF\x10\x02\x12\x0f\n\x0bMESSAGEPACK\x10\x03\"0\n\x1dPredefinedObd2RequestsCommand\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\"\xd1\x03\n\x17NetworkOperatorSettings\x12\x18\n\x10\x61llowDataRoaming\x18\x01 \x01(\x08\x12N\n\x12operatorSelectMode\x18\x02 \x01(\x0e\x32\x32.openxc.NetworkOperatorSettings.OperatorSelectMode\x12L\n\x11networkDescriptor\x18\x03 \x01(\x0b\x32\x31.openxc.NetworkOperatorSettings.NetworkDescriptor\x1a\x98\x01\n\x11NetworkDescriptor\x12\x0c\n\x04PLMN\x18\x01 \x01(\r\x12R\n\x0bnetworkType\x18\x02 \x01(\x0e\x32=.openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType\"!\n\x0bNetworkType\x12\x07\n\x03GSM\x10\x00\x12\t\n\x05UTRAN\x10\x02\"c\n\x12OperatorSelectMode\x12\r\n\tAUTOMATIC\x10\x00\x12\n\n\x06MANUAL\x10\x01\x12\x0e\n\nDEREGISTER\x10\x02\x12\x0c\n\x08SET_ONLY\x10\x03\x12\x14\n\x10MANUAL_AUTOMATIC\x10\x04\"\"\n\x13NetworkDataSettings\x12\x0b\n\x03\x41PN\x18\x01 \x01(\t\"3\n\x15ServerConnectSettings\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0c\n\x04port\x18\x02 \x01(\r\"\xd5\x01\n\x19ModemConfigurationCommand\x12@\n\x17networkOperatorSettings\x18\x01 \x01(\x0b\x32\x1f.openxc.NetworkOperatorSettings\x12\x38\n\x13networkDataSettings\x18\x02 \x01(\x0b\x32\x1b.openxc.NetworkDataSettings\x12<\n\x15serverConnectSettings\x18\x03 \x01(\x0b\x32\x1d.openxc.ServerConnectSettings\",\n\x17RTCConfigurationCommand\x12\x11\n\tunix_time\x18\x01 \x01(\r\"]\n\x0f\x43ommandResponse\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\x08\"\xfd\x01\n\x11\x44iagnosticRequest\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07payload\x18\x05 \x01(\x0c\x12\x1a\n\x12multiple_responses\x18\x06 \x01(\x08\x12\x11\n\tfrequency\x18\x07 \x01(\x01\x12\x0c\n\x04name\x18\x08 \x01(\t\x12;\n\x0c\x64\x65\x63oded_type\x18\t \x01(\x0e\x32%.openxc.DiagnosticRequest.DecodedType\"!\n\x0b\x44\x65\x63odedType\x12\x08\n\x04NONE\x10\x01\x12\x08\n\x04OBD2\x10\x02\"\xa1\x01\n\x12\x44iagnosticResponse\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07success\x18\x05 \x01(\x08\x12\x1e\n\x16negative_response_code\x18\x06 \x01(\r\x12\x0f\n\x07payload\x18\x07 \x01(\x0c\x12\r\n\x05value\x18\x08 \x01(\x01\"\xa2\x01\n\x0c\x44ynamicField\x12\'\n\x04type\x18\x01 \x01(\x0e\x32\x19.openxc.DynamicField.Type\x12\x14\n\x0cstring_value\x18\x02 \x01(\t\x12\x15\n\rnumeric_value\x18\x03 \x01(\x01\x12\x15\n\rboolean_value\x18\x04 \x01(\x08\"%\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\"g\n\rSimpleMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.openxc.DynamicField\x12#\n\x05\x65vent\x18\x03 \x01(\x0b\x32\x14.openxc.DynamicFieldB\x1c\n\ncom.openxcB\x0e\x42inaryMessages') -_VEHICLEMESSAGE_TYPE = _descriptor.EnumDescriptor( +_VEHICLEMESSAGE_TYPE = descriptor.EnumDescriptor( name='Type', full_name='openxc.VehicleMessage.Type', filename=None, file=DESCRIPTOR, values=[ - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='CAN', index=0, number=1, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='SIMPLE', index=1, number=2, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='DIAGNOSTIC', index=2, number=3, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='CONTROL_COMMAND', index=3, number=4, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='COMMAND_RESPONSE', index=4, number=5, options=None, type=None), @@ -50,17 +48,17 @@ _VEHICLEMESSAGE_TYPE = _descriptor.EnumDescriptor( serialized_end=436, ) -_CANMESSAGE_FRAMEFORMAT = _descriptor.EnumDescriptor( +_CANMESSAGE_FRAMEFORMAT = descriptor.EnumDescriptor( name='FrameFormat', full_name='openxc.CanMessage.FrameFormat', filename=None, file=DESCRIPTOR, values=[ - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='STANDARD', index=0, number=1, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='EXTENDED', index=1, number=2, options=None, type=None), @@ -71,49 +69,49 @@ _CANMESSAGE_FRAMEFORMAT = _descriptor.EnumDescriptor( serialized_end=587, ) -_CONTROLCOMMAND_TYPE = _descriptor.EnumDescriptor( +_CONTROLCOMMAND_TYPE = descriptor.EnumDescriptor( name='Type', full_name='openxc.ControlCommand.Type', filename=None, file=DESCRIPTOR, values=[ - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='VERSION', index=0, number=1, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='DEVICE_ID', index=1, number=2, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='DIAGNOSTIC', index=2, number=3, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='PASSTHROUGH', index=3, number=4, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='ACCEPTANCE_FILTER_BYPASS', index=4, number=5, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='PAYLOAD_FORMAT', index=5, number=6, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='PREDEFINED_OBD2_REQUESTS', index=6, number=7, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='MODEM_CONFIGURATION', index=7, number=8, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='RTC_CONFIGURATION', index=8, number=9, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='SD_MOUNT_STATUS', index=9, number=10, options=None, type=None), @@ -124,17 +122,17 @@ _CONTROLCOMMAND_TYPE = _descriptor.EnumDescriptor( serialized_end=1367, ) -_DIAGNOSTICCONTROLCOMMAND_ACTION = _descriptor.EnumDescriptor( +_DIAGNOSTICCONTROLCOMMAND_ACTION = descriptor.EnumDescriptor( name='Action', full_name='openxc.DiagnosticControlCommand.Action', filename=None, file=DESCRIPTOR, values=[ - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='ADD', index=0, number=1, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='CANCEL', index=1, number=2, options=None, type=None), @@ -145,21 +143,21 @@ _DIAGNOSTICCONTROLCOMMAND_ACTION = _descriptor.EnumDescriptor( serialized_end=1528, ) -_PAYLOADFORMATCOMMAND_PAYLOADFORMAT = _descriptor.EnumDescriptor( +_PAYLOADFORMATCOMMAND_PAYLOADFORMAT = descriptor.EnumDescriptor( name='PayloadFormat', full_name='openxc.PayloadFormatCommand.PayloadFormat', filename=None, file=DESCRIPTOR, values=[ - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='JSON', index=0, number=1, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='PROTOBUF', index=1, number=2, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='MESSAGEPACK', index=2, number=3, options=None, type=None), @@ -170,17 +168,17 @@ _PAYLOADFORMATCOMMAND_PAYLOADFORMAT = _descriptor.EnumDescriptor( serialized_end=1796, ) -_NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR_NETWORKTYPE = _descriptor.EnumDescriptor( +_NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR_NETWORKTYPE = descriptor.EnumDescriptor( name='NetworkType', full_name='openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType', filename=None, file=DESCRIPTOR, values=[ - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='GSM', index=0, number=0, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='UTRAN', index=1, number=2, options=None, type=None), @@ -191,29 +189,29 @@ _NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR_NETWORKTYPE = _descriptor.EnumDescrip serialized_end=2213, ) -_NETWORKOPERATORSETTINGS_OPERATORSELECTMODE = _descriptor.EnumDescriptor( +_NETWORKOPERATORSETTINGS_OPERATORSELECTMODE = descriptor.EnumDescriptor( name='OperatorSelectMode', full_name='openxc.NetworkOperatorSettings.OperatorSelectMode', filename=None, file=DESCRIPTOR, values=[ - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='AUTOMATIC', index=0, number=0, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='MANUAL', index=1, number=1, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='DEREGISTER', index=2, number=2, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='SET_ONLY', index=3, number=3, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='MANUAL_AUTOMATIC', index=4, number=4, options=None, type=None), @@ -224,17 +222,17 @@ _NETWORKOPERATORSETTINGS_OPERATORSELECTMODE = _descriptor.EnumDescriptor( serialized_end=2314, ) -_DIAGNOSTICREQUEST_DECODEDTYPE = _descriptor.EnumDescriptor( +_DIAGNOSTICREQUEST_DECODEDTYPE = descriptor.EnumDescriptor( name='DecodedType', full_name='openxc.DiagnosticRequest.DecodedType', filename=None, file=DESCRIPTOR, values=[ - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='NONE', index=0, number=1, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='OBD2', index=1, number=2, options=None, type=None), @@ -245,21 +243,21 @@ _DIAGNOSTICREQUEST_DECODEDTYPE = _descriptor.EnumDescriptor( serialized_end=3016, ) -_DYNAMICFIELD_TYPE = _descriptor.EnumDescriptor( +_DYNAMICFIELD_TYPE = descriptor.EnumDescriptor( name='Type', full_name='openxc.DynamicField.Type', filename=None, file=DESCRIPTOR, values=[ - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='STRING', index=0, number=1, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='NUM', index=1, number=2, options=None, type=None), - _descriptor.EnumValueDescriptor( + descriptor.EnumValueDescriptor( name='BOOL', index=2, number=3, options=None, type=None), @@ -271,56 +269,56 @@ _DYNAMICFIELD_TYPE = _descriptor.EnumDescriptor( ) -_VEHICLEMESSAGE = _descriptor.Descriptor( +_VEHICLEMESSAGE = descriptor.Descriptor( name='VehicleMessage', full_name='openxc.VehicleMessage', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='type', full_name='openxc.VehicleMessage.type', index=0, number=1, type=14, cpp_type=8, label=1, has_default_value=False, default_value=1, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='can_message', full_name='openxc.VehicleMessage.can_message', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='simple_message', full_name='openxc.VehicleMessage.simple_message', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='diagnostic_response', full_name='openxc.VehicleMessage.diagnostic_response', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='control_command', full_name='openxc.VehicleMessage.control_command', index=4, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='command_response', full_name='openxc.VehicleMessage.command_response', index=5, number=6, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='timestamp', full_name='openxc.VehicleMessage.timestamp', index=6, number=7, type=4, cpp_type=4, label=1, has_default_value=False, default_value=0, @@ -342,35 +340,35 @@ _VEHICLEMESSAGE = _descriptor.Descriptor( ) -_CANMESSAGE = _descriptor.Descriptor( +_CANMESSAGE = descriptor.Descriptor( name='CanMessage', full_name='openxc.CanMessage', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='bus', full_name='openxc.CanMessage.bus', index=0, number=1, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='id', full_name='openxc.CanMessage.id', index=1, number=2, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='data', full_name='openxc.CanMessage.data', index=2, number=3, type=12, cpp_type=9, label=1, has_default_value=False, default_value="", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='frame_format', full_name='openxc.CanMessage.frame_format', index=3, number=4, type=14, cpp_type=8, label=1, has_default_value=False, default_value=1, @@ -392,63 +390,63 @@ _CANMESSAGE = _descriptor.Descriptor( ) -_CONTROLCOMMAND = _descriptor.Descriptor( +_CONTROLCOMMAND = descriptor.Descriptor( name='ControlCommand', full_name='openxc.ControlCommand', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='type', full_name='openxc.ControlCommand.type', index=0, number=1, type=14, cpp_type=8, label=1, has_default_value=False, default_value=1, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='diagnostic_request', full_name='openxc.ControlCommand.diagnostic_request', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='passthrough_mode_request', full_name='openxc.ControlCommand.passthrough_mode_request', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='acceptance_filter_bypass_command', full_name='openxc.ControlCommand.acceptance_filter_bypass_command', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='payload_format_command', full_name='openxc.ControlCommand.payload_format_command', index=4, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='predefined_obd2_requests_command', full_name='openxc.ControlCommand.predefined_obd2_requests_command', index=5, number=6, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='modem_configuration_command', full_name='openxc.ControlCommand.modem_configuration_command', index=6, number=7, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='rtc_configuration_command', full_name='openxc.ControlCommand.rtc_configuration_command', index=7, number=8, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, @@ -470,21 +468,21 @@ _CONTROLCOMMAND = _descriptor.Descriptor( ) -_DIAGNOSTICCONTROLCOMMAND = _descriptor.Descriptor( +_DIAGNOSTICCONTROLCOMMAND = descriptor.Descriptor( name='DiagnosticControlCommand', full_name='openxc.DiagnosticControlCommand', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='request', full_name='openxc.DiagnosticControlCommand.request', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='action', full_name='openxc.DiagnosticControlCommand.action', index=1, number=2, type=14, cpp_type=8, label=1, has_default_value=False, default_value=1, @@ -506,21 +504,21 @@ _DIAGNOSTICCONTROLCOMMAND = _descriptor.Descriptor( ) -_PASSTHROUGHMODECONTROLCOMMAND = _descriptor.Descriptor( +_PASSTHROUGHMODECONTROLCOMMAND = descriptor.Descriptor( name='PassthroughModeControlCommand', full_name='openxc.PassthroughModeControlCommand', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='bus', full_name='openxc.PassthroughModeControlCommand.bus', index=0, number=1, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='enabled', full_name='openxc.PassthroughModeControlCommand.enabled', index=1, number=2, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, @@ -541,21 +539,21 @@ _PASSTHROUGHMODECONTROLCOMMAND = _descriptor.Descriptor( ) -_ACCEPTANCEFILTERBYPASSCOMMAND = _descriptor.Descriptor( +_ACCEPTANCEFILTERBYPASSCOMMAND = descriptor.Descriptor( name='AcceptanceFilterBypassCommand', full_name='openxc.AcceptanceFilterBypassCommand', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='bus', full_name='openxc.AcceptanceFilterBypassCommand.bus', index=0, number=1, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='bypass', full_name='openxc.AcceptanceFilterBypassCommand.bypass', index=1, number=2, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, @@ -576,14 +574,14 @@ _ACCEPTANCEFILTERBYPASSCOMMAND = _descriptor.Descriptor( ) -_PAYLOADFORMATCOMMAND = _descriptor.Descriptor( +_PAYLOADFORMATCOMMAND = descriptor.Descriptor( name='PayloadFormatCommand', full_name='openxc.PayloadFormatCommand', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='format', full_name='openxc.PayloadFormatCommand.format', index=0, number=1, type=14, cpp_type=8, label=1, has_default_value=False, default_value=1, @@ -605,14 +603,14 @@ _PAYLOADFORMATCOMMAND = _descriptor.Descriptor( ) -_PREDEFINEDOBD2REQUESTSCOMMAND = _descriptor.Descriptor( +_PREDEFINEDOBD2REQUESTSCOMMAND = descriptor.Descriptor( name='PredefinedObd2RequestsCommand', full_name='openxc.PredefinedObd2RequestsCommand', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='enabled', full_name='openxc.PredefinedObd2RequestsCommand.enabled', index=0, number=1, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, @@ -633,21 +631,21 @@ _PREDEFINEDOBD2REQUESTSCOMMAND = _descriptor.Descriptor( ) -_NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR = _descriptor.Descriptor( +_NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR = descriptor.Descriptor( name='NetworkDescriptor', full_name='openxc.NetworkOperatorSettings.NetworkDescriptor', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='PLMN', full_name='openxc.NetworkOperatorSettings.NetworkDescriptor.PLMN', index=0, number=1, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='networkType', full_name='openxc.NetworkOperatorSettings.NetworkDescriptor.networkType', index=1, number=2, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, @@ -668,28 +666,28 @@ _NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR = _descriptor.Descriptor( serialized_end=2213, ) -_NETWORKOPERATORSETTINGS = _descriptor.Descriptor( +_NETWORKOPERATORSETTINGS = descriptor.Descriptor( name='NetworkOperatorSettings', full_name='openxc.NetworkOperatorSettings', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='allowDataRoaming', full_name='openxc.NetworkOperatorSettings.allowDataRoaming', index=0, number=1, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='operatorSelectMode', full_name='openxc.NetworkOperatorSettings.operatorSelectMode', index=1, number=2, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='networkDescriptor', full_name='openxc.NetworkOperatorSettings.networkDescriptor', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, @@ -711,14 +709,14 @@ _NETWORKOPERATORSETTINGS = _descriptor.Descriptor( ) -_NETWORKDATASETTINGS = _descriptor.Descriptor( +_NETWORKDATASETTINGS = descriptor.Descriptor( name='NetworkDataSettings', full_name='openxc.NetworkDataSettings', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='APN', full_name='openxc.NetworkDataSettings.APN', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=unicode("", "utf-8"), @@ -739,21 +737,21 @@ _NETWORKDATASETTINGS = _descriptor.Descriptor( ) -_SERVERCONNECTSETTINGS = _descriptor.Descriptor( +_SERVERCONNECTSETTINGS = descriptor.Descriptor( name='ServerConnectSettings', full_name='openxc.ServerConnectSettings', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='host', full_name='openxc.ServerConnectSettings.host', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='port', full_name='openxc.ServerConnectSettings.port', index=1, number=2, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, @@ -774,28 +772,28 @@ _SERVERCONNECTSETTINGS = _descriptor.Descriptor( ) -_MODEMCONFIGURATIONCOMMAND = _descriptor.Descriptor( +_MODEMCONFIGURATIONCOMMAND = descriptor.Descriptor( name='ModemConfigurationCommand', full_name='openxc.ModemConfigurationCommand', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='networkOperatorSettings', full_name='openxc.ModemConfigurationCommand.networkOperatorSettings', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='networkDataSettings', full_name='openxc.ModemConfigurationCommand.networkDataSettings', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='serverConnectSettings', full_name='openxc.ModemConfigurationCommand.serverConnectSettings', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, @@ -816,14 +814,14 @@ _MODEMCONFIGURATIONCOMMAND = _descriptor.Descriptor( ) -_RTCCONFIGURATIONCOMMAND = _descriptor.Descriptor( +_RTCCONFIGURATIONCOMMAND = descriptor.Descriptor( name='RTCConfigurationCommand', full_name='openxc.RTCConfigurationCommand', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='unix_time', full_name='openxc.RTCConfigurationCommand.unix_time', index=0, number=1, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, @@ -844,28 +842,28 @@ _RTCCONFIGURATIONCOMMAND = _descriptor.Descriptor( ) -_COMMANDRESPONSE = _descriptor.Descriptor( +_COMMANDRESPONSE = descriptor.Descriptor( name='CommandResponse', full_name='openxc.CommandResponse', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='type', full_name='openxc.CommandResponse.type', index=0, number=1, type=14, cpp_type=8, label=1, has_default_value=False, default_value=1, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='message', full_name='openxc.CommandResponse.message', index=1, number=2, type=9, cpp_type=9, label=1, has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='status', full_name='openxc.CommandResponse.status', index=2, number=3, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, @@ -886,70 +884,70 @@ _COMMANDRESPONSE = _descriptor.Descriptor( ) -_DIAGNOSTICREQUEST = _descriptor.Descriptor( +_DIAGNOSTICREQUEST = descriptor.Descriptor( name='DiagnosticRequest', full_name='openxc.DiagnosticRequest', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='bus', full_name='openxc.DiagnosticRequest.bus', index=0, number=1, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='message_id', full_name='openxc.DiagnosticRequest.message_id', index=1, number=2, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='mode', full_name='openxc.DiagnosticRequest.mode', index=2, number=3, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='pid', full_name='openxc.DiagnosticRequest.pid', index=3, number=4, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='payload', full_name='openxc.DiagnosticRequest.payload', index=4, number=5, type=12, cpp_type=9, label=1, has_default_value=False, default_value="", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='multiple_responses', full_name='openxc.DiagnosticRequest.multiple_responses', index=5, number=6, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='frequency', full_name='openxc.DiagnosticRequest.frequency', index=6, number=7, type=1, cpp_type=5, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='name', full_name='openxc.DiagnosticRequest.name', index=7, number=8, type=9, cpp_type=9, label=1, has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='decoded_type', full_name='openxc.DiagnosticRequest.decoded_type', index=8, number=9, type=14, cpp_type=8, label=1, has_default_value=False, default_value=1, @@ -971,63 +969,63 @@ _DIAGNOSTICREQUEST = _descriptor.Descriptor( ) -_DIAGNOSTICRESPONSE = _descriptor.Descriptor( +_DIAGNOSTICRESPONSE = descriptor.Descriptor( name='DiagnosticResponse', full_name='openxc.DiagnosticResponse', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='bus', full_name='openxc.DiagnosticResponse.bus', index=0, number=1, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='message_id', full_name='openxc.DiagnosticResponse.message_id', index=1, number=2, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='mode', full_name='openxc.DiagnosticResponse.mode', index=2, number=3, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='pid', full_name='openxc.DiagnosticResponse.pid', index=3, number=4, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='success', full_name='openxc.DiagnosticResponse.success', index=4, number=5, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='negative_response_code', full_name='openxc.DiagnosticResponse.negative_response_code', index=5, number=6, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='payload', full_name='openxc.DiagnosticResponse.payload', index=6, number=7, type=12, cpp_type=9, label=1, has_default_value=False, default_value="", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='value', full_name='openxc.DiagnosticResponse.value', index=7, number=8, type=1, cpp_type=5, label=1, has_default_value=False, default_value=0, @@ -1048,35 +1046,35 @@ _DIAGNOSTICRESPONSE = _descriptor.Descriptor( ) -_DYNAMICFIELD = _descriptor.Descriptor( +_DYNAMICFIELD = descriptor.Descriptor( name='DynamicField', full_name='openxc.DynamicField', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='type', full_name='openxc.DynamicField.type', index=0, number=1, type=14, cpp_type=8, label=1, has_default_value=False, default_value=1, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='string_value', full_name='openxc.DynamicField.string_value', index=1, number=2, type=9, cpp_type=9, label=1, has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='numeric_value', full_name='openxc.DynamicField.numeric_value', index=2, number=3, type=1, cpp_type=5, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='boolean_value', full_name='openxc.DynamicField.boolean_value', index=3, number=4, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, @@ -1098,28 +1096,28 @@ _DYNAMICFIELD = _descriptor.Descriptor( ) -_SIMPLEMESSAGE = _descriptor.Descriptor( +_SIMPLEMESSAGE = descriptor.Descriptor( name='SimpleMessage', full_name='openxc.SimpleMessage', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='name', full_name='openxc.SimpleMessage.name', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='value', full_name='openxc.SimpleMessage.value', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( + descriptor.FieldDescriptor( name='event', full_name='openxc.SimpleMessage.event', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, @@ -1197,121 +1195,118 @@ DESCRIPTOR.message_types_by_name['DiagnosticResponse'] = _DIAGNOSTICRESPONSE DESCRIPTOR.message_types_by_name['DynamicField'] = _DYNAMICFIELD DESCRIPTOR.message_types_by_name['SimpleMessage'] = _SIMPLEMESSAGE -class VehicleMessage(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class VehicleMessage(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _VEHICLEMESSAGE - + # @@protoc_insertion_point(class_scope:openxc.VehicleMessage) -class CanMessage(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class CanMessage(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _CANMESSAGE - + # @@protoc_insertion_point(class_scope:openxc.CanMessage) -class ControlCommand(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class ControlCommand(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _CONTROLCOMMAND - + # @@protoc_insertion_point(class_scope:openxc.ControlCommand) -class DiagnosticControlCommand(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class DiagnosticControlCommand(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _DIAGNOSTICCONTROLCOMMAND - + # @@protoc_insertion_point(class_scope:openxc.DiagnosticControlCommand) -class PassthroughModeControlCommand(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class PassthroughModeControlCommand(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _PASSTHROUGHMODECONTROLCOMMAND - + # @@protoc_insertion_point(class_scope:openxc.PassthroughModeControlCommand) -class AcceptanceFilterBypassCommand(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class AcceptanceFilterBypassCommand(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _ACCEPTANCEFILTERBYPASSCOMMAND - + # @@protoc_insertion_point(class_scope:openxc.AcceptanceFilterBypassCommand) -class PayloadFormatCommand(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class PayloadFormatCommand(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _PAYLOADFORMATCOMMAND - + # @@protoc_insertion_point(class_scope:openxc.PayloadFormatCommand) -class PredefinedObd2RequestsCommand(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class PredefinedObd2RequestsCommand(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _PREDEFINEDOBD2REQUESTSCOMMAND - + # @@protoc_insertion_point(class_scope:openxc.PredefinedObd2RequestsCommand) -class NetworkOperatorSettings(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - - class NetworkDescriptor(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class NetworkOperatorSettings(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType + + class NetworkDescriptor(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR - + # @@protoc_insertion_point(class_scope:openxc.NetworkOperatorSettings.NetworkDescriptor) DESCRIPTOR = _NETWORKOPERATORSETTINGS - + # @@protoc_insertion_point(class_scope:openxc.NetworkOperatorSettings) -class NetworkDataSettings(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class NetworkDataSettings(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _NETWORKDATASETTINGS - + # @@protoc_insertion_point(class_scope:openxc.NetworkDataSettings) -class ServerConnectSettings(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class ServerConnectSettings(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _SERVERCONNECTSETTINGS - + # @@protoc_insertion_point(class_scope:openxc.ServerConnectSettings) -class ModemConfigurationCommand(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class ModemConfigurationCommand(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _MODEMCONFIGURATIONCOMMAND - + # @@protoc_insertion_point(class_scope:openxc.ModemConfigurationCommand) -class RTCConfigurationCommand(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class RTCConfigurationCommand(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _RTCCONFIGURATIONCOMMAND - + # @@protoc_insertion_point(class_scope:openxc.RTCConfigurationCommand) -class CommandResponse(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class CommandResponse(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _COMMANDRESPONSE - + # @@protoc_insertion_point(class_scope:openxc.CommandResponse) -class DiagnosticRequest(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class DiagnosticRequest(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _DIAGNOSTICREQUEST - + # @@protoc_insertion_point(class_scope:openxc.DiagnosticRequest) -class DiagnosticResponse(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class DiagnosticResponse(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _DIAGNOSTICRESPONSE - + # @@protoc_insertion_point(class_scope:openxc.DiagnosticResponse) -class DynamicField(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class DynamicField(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _DYNAMICFIELD - + # @@protoc_insertion_point(class_scope:openxc.DynamicField) -class SimpleMessage(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType +class SimpleMessage(message.Message): + __metaclass__ = reflection.GeneratedProtocolMessageType DESCRIPTOR = _SIMPLEMESSAGE - + # @@protoc_insertion_point(class_scope:openxc.SimpleMessage) - -DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), '\n\ncom.openxcB\016BinaryMessages') # @@protoc_insertion_point(module_scope) -- 2.16.6