+ implements com.openxc.BinaryMessages.DiagnosticRequestOrBuilder {
+ 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);
+ }
+
+ // Construct using com.openxc.BinaryMessages.DiagnosticRequest.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(
+ com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ }
+ }
+ private static Builder create() {
+ return new Builder();
+ }
+
+ public Builder clear() {
+ super.clear();
+ bus_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ messageId_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ mode_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000004);
+ pid_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000008);
+ payload_ = com.google.protobuf.ByteString.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000010);
+ multipleResponses_ = false;
+ bitField0_ = (bitField0_ & ~0x00000020);
+ frequency_ = 0D;
+ bitField0_ = (bitField0_ & ~0x00000040);
+ name_ = "";
+ bitField0_ = (bitField0_ & ~0x00000080);
+ decodedType_ = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.NONE;
+ 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;
+ }
+
+ 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()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ public com.openxc.BinaryMessages.DiagnosticRequest buildPartial() {
+ com.openxc.BinaryMessages.DiagnosticRequest result = new com.openxc.BinaryMessages.DiagnosticRequest(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
+ }
+ result.bus_ = bus_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.messageId_ = messageId_;
+ if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+ to_bitField0_ |= 0x00000004;
+ }
+ result.mode_ = mode_;
+ if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+ to_bitField0_ |= 0x00000008;
+ }
+ result.pid_ = pid_;
+ if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+ to_bitField0_ |= 0x00000010;
+ }
+ result.payload_ = payload_;
+ if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
+ to_bitField0_ |= 0x00000020;
+ }
+ result.multipleResponses_ = multipleResponses_;
+ if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
+ to_bitField0_ |= 0x00000040;
+ }
+ result.frequency_ = frequency_;
+ if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
+ to_bitField0_ |= 0x00000080;
+ }
+ result.name_ = name_;
+ if (((from_bitField0_ & 0x00000100) == 0x00000100)) {
+ to_bitField0_ |= 0x00000100;
+ }
+ result.decodedType_ = decodedType_;
+ result.bitField0_ = to_bitField0_;
+ 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);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(com.openxc.BinaryMessages.DiagnosticRequest other) {
+ if (other == com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance()) return this;
+ if (other.hasBus()) {
+ setBus(other.getBus());
+ }
+ if (other.hasMessageId()) {
+ setMessageId(other.getMessageId());
+ }
+ if (other.hasMode()) {
+ setMode(other.getMode());
+ }
+ if (other.hasPid()) {
+ setPid(other.getPid());
+ }
+ if (other.hasPayload()) {
+ setPayload(other.getPayload());
+ }
+ if (other.hasMultipleResponses()) {
+ setMultipleResponses(other.getMultipleResponses());
+ }
+ if (other.hasFrequency()) {
+ setFrequency(other.getFrequency());
+ }
+ if (other.hasName()) {
+ bitField0_ |= 0x00000080;
+ name_ = other.name_;
+ onChanged();
+ }
+ if (other.hasDecodedType()) {
+ setDecodedType(other.getDecodedType());
+ }
+ 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);
+ }
+ }
+ 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();
+ }
+ bitField0_ |= 0x00000010;
+ payload_ = value;
+ 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() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ .toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.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) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00000080;
+ name_ = value;
+ 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;
+ 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();
+ }
+ bitField0_ |= 0x00000100;
+ decodedType_ = value;
+ 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;
+ /**
+ * 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) {
+ super(builder);
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private DiagnosticResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+ 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;
+ }
+
+ 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;
+ mode_ = 0;
+ pid_ = 0;
+ success_ = false;
+ negativeResponseCode_ = 0;
+ payload_ = com.google.protobuf.ByteString.EMPTY;
+ value_ = 0D;
+ }
+ private byte memoizedIsInitialized = -1;
+ 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();
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeInt32(1, bus_);
+ }
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeUInt32(2, messageId_);
+ }
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeUInt32(3, mode_);
+ }
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeUInt32(4, pid_);
+ }
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ output.writeBool(5, success_);
+ }
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ output.writeUInt32(6, negativeResponseCode_);
+ }
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ output.writeBytes(7, payload_);
+ }
+ if (((bitField0_ & 0x00000080) == 0x00000080)) {
+ output.writeDouble(8, value_);
+ }
+ 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
+ .computeInt32Size(1, bus_);
+ }
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeUInt32Size(2, messageId_);
+ }
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeUInt32Size(3, mode_);
+ }
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeUInt32Size(4, pid_);
+ }
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBoolSize(5, success_);
+ }
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeUInt32Size(6, negativeResponseCode_);
+ }
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBytesSize(7, payload_);
+ }
+ if (((bitField0_ & 0x00000080) == 0x00000080)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeDoubleSize(8, value_);
+ }
+ size += getUnknownFields().getSerializedSize();
+ 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);
+ }
+ 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);
+ }
+ public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input);
+ }
+ 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);
+ }
+ public static com.openxc.BinaryMessages.DiagnosticResponse parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return PARSER.parseDelimitedFrom(input);
+ }
+ 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);
+ }
+ public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input);
+ }
+ 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);
+ }
+
+ 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 {
+ 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);
+ }
+
+ // Construct using com.openxc.BinaryMessages.DiagnosticResponse.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(
+ com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ }
+ }
+ private static Builder create() {
+ return new Builder();
+ }
+
+ public Builder clear() {
+ super.clear();
+ bus_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ messageId_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ mode_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000004);
+ pid_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000008);
+ success_ = false;
+ bitField0_ = (bitField0_ & ~0x00000010);
+ negativeResponseCode_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000020);
+ payload_ = com.google.protobuf.ByteString.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000040);
+ value_ = 0D;
+ 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;
+ }
+
+ 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()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ public com.openxc.BinaryMessages.DiagnosticResponse buildPartial() {
+ com.openxc.BinaryMessages.DiagnosticResponse result = new com.openxc.BinaryMessages.DiagnosticResponse(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
+ }
+ result.bus_ = bus_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.messageId_ = messageId_;
+ if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+ to_bitField0_ |= 0x00000004;
+ }
+ result.mode_ = mode_;
+ if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+ to_bitField0_ |= 0x00000008;
+ }
+ result.pid_ = pid_;
+ if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+ to_bitField0_ |= 0x00000010;
+ }
+ result.success_ = success_;
+ if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
+ to_bitField0_ |= 0x00000020;
+ }
+ result.negativeResponseCode_ = negativeResponseCode_;
+ if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
+ to_bitField0_ |= 0x00000040;
+ }
+ result.payload_ = payload_;
+ if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
+ to_bitField0_ |= 0x00000080;
+ }
+ result.value_ = value_;
+ result.bitField0_ = to_bitField0_;
+ 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);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(com.openxc.BinaryMessages.DiagnosticResponse other) {
+ if (other == com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance()) return this;
+ if (other.hasBus()) {
+ setBus(other.getBus());
+ }
+ if (other.hasMessageId()) {
+ setMessageId(other.getMessageId());
+ }
+ if (other.hasMode()) {
+ setMode(other.getMode());
+ }
+ if (other.hasPid()) {
+ setPid(other.getPid());
+ }
+ if (other.hasSuccess()) {
+ setSuccess(other.getSuccess());
+ }
+ if (other.hasNegativeResponseCode()) {
+ setNegativeResponseCode(other.getNegativeResponseCode());
+ }
+ if (other.hasPayload()) {
+ setPayload(other.getPayload());
+ }
+ if (other.hasValue()) {
+ setValue(other.getValue());
+ }
+ 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);
+ }
+ }
+ 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();
+ }
+ bitField0_ |= 0x00000040;
+ payload_ = value;
+ 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 bool success = 5;
+ * optional .openxc.DynamicField.Type type = 1;
*/
- boolean hasSuccess();
+ boolean hasType();
/**
- * optional bool success = 5;
+ * optional .openxc.DynamicField.Type type = 1;
*/
- boolean getSuccess();
+ com.openxc.BinaryMessages.DynamicField.Type getType();
- // optional uint32 negative_response_code = 6;
+ // optional string string_value = 2;
/**
- * optional uint32 negative_response_code = 6;
+ * optional string string_value = 2;
*/
- boolean hasNegativeResponseCode();
+ boolean hasStringValue();
/**
- * optional uint32 negative_response_code = 6;
+ * optional string string_value = 2;
*/
- int getNegativeResponseCode();
+ java.lang.String getStringValue();
+ /**
+ * optional string string_value = 2;
+ */
+ com.google.protobuf.ByteString
+ getStringValueBytes();
- // optional bytes payload = 7;
+ // optional double numeric_value = 3;
/**
- * optional bytes payload = 7;
- *
- *
- * TODO we are capping this at 8 bytes for now - need to change when we
- * support multi-frame responses
- *
+ * 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 hasPayload();
+ boolean hasBooleanValue();
/**
- * optional bytes payload = 7;
- *
- *
- * TODO we are capping this at 8 bytes for now - need to change when we
- * support multi-frame responses
- *
+ * optional bool boolean_value = 4;
*/
- com.google.protobuf.ByteString getPayload();
+ boolean getBooleanValue();
}
/**
- * Protobuf type {@code openxc.DiagnosticMessage}
+ * Protobuf type {@code openxc.DynamicField}
*/
- public static final class DiagnosticMessage extends
+ public static final class DynamicField extends
com.google.protobuf.GeneratedMessage
- implements DiagnosticMessageOrBuilder {
- // Use DiagnosticMessage.newBuilder() to construct.
- private DiagnosticMessage(com.google.protobuf.GeneratedMessage.Builder builder) {
+ implements DynamicFieldOrBuilder {
+ // Use DynamicField.newBuilder() to construct.
+ private DynamicField(com.google.protobuf.GeneratedMessage.Builder builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private DiagnosticMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private DynamicField(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
- private static final DiagnosticMessage defaultInstance;
- public static DiagnosticMessage getDefaultInstance() {
+ private static final DynamicField defaultInstance;
+ public static DynamicField getDefaultInstance() {
return defaultInstance;
}
- public DiagnosticMessage getDefaultInstanceForType() {
+ public DynamicField getDefaultInstanceForType() {
return defaultInstance;
}
@@ -1749,7 +5627,7 @@ public final class BinaryMessages {
getUnknownFields() {
return this.unknownFields;
}
- private DiagnosticMessage(
+ private DynamicField(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1773,38 +5651,29 @@ public final class BinaryMessages {
break;
}
case 8: {
- bitField0_ |= 0x00000001;
- bus_ = input.readInt32();
+ 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 16: {
+ case 18: {
bitField0_ |= 0x00000002;
- messageId_ = input.readUInt32();
+ stringValue_ = input.readBytes();
break;
}
- case 24: {
+ case 25: {
bitField0_ |= 0x00000004;
- mode_ = input.readUInt32();
+ numericValue_ = input.readDouble();
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();
+ booleanValue_ = input.readBool();
break;
}
}
@@ -1821,162 +5690,219 @@ public final class BinaryMessages {
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticMessage_descriptor;
+ return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticMessage_fieldAccessorTable
+ return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- com.openxc.BinaryMessages.DiagnosticMessage.class, com.openxc.BinaryMessages.DiagnosticMessage.Builder.class);
+ com.openxc.BinaryMessages.DynamicField.class, com.openxc.BinaryMessages.DynamicField.Builder.class);
}
- public static com.google.protobuf.Parser PARSER =
- new com.google.protobuf.AbstractParser() {
- public DiagnosticMessage parsePartialFrom(
+ 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 DiagnosticMessage(input, extensionRegistry);
+ return new DynamicField(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser getParserForType() {
+ public com.google.protobuf.Parser getParserForType() {
return PARSER;
}
- 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;
+ * Protobuf enum {@code openxc.DynamicField.Type}
*/
- public int getBus() {
- return bus_;
- }
+ public enum Type
+ implements com.google.protobuf.ProtocolMessageEnum {
+ /**
+ * STRING = 1;
+ */
+ STRING(0, 1),
+ /**
+ * NUM = 2;
+ */
+ NUM(1, 2),
+ /**
+ * BOOL = 3;
+ */
+ BOOL(2, 3),
+ ;
- // 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_;
+ /**
+ * 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;
+ case 2: return NUM;
+ case 3: return BOOL;
+ default: return null;
+ }
+ }
+
+ public static com.google.protobuf.Internal.EnumLiteMap
+ internalGetValueMap() {
+ return internalValueMap;
+ }
+ private static com.google.protobuf.Internal.EnumLiteMap
+ internalValueMap =
+ new com.google.protobuf.Internal.EnumLiteMap() {
+ public Type findValueByNumber(int number) {
+ return Type.valueOf(number);
+ }
+ };
+
+ public final com.google.protobuf.Descriptors.EnumValueDescriptor
+ getValueDescriptor() {
+ return getDescriptor().getValues().get(index);
+ }
+ public final com.google.protobuf.Descriptors.EnumDescriptor
+ getDescriptorForType() {
+ return getDescriptor();
+ }
+ public static final com.google.protobuf.Descriptors.EnumDescriptor
+ getDescriptor() {
+ return com.openxc.BinaryMessages.DynamicField.getDescriptor().getEnumTypes().get(0);
+ }
+
+ private static final Type[] VALUES = values();
+
+ public static Type valueOf(
+ com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+ if (desc.getType() != getDescriptor()) {
+ throw new java.lang.IllegalArgumentException(
+ "EnumValueDescriptor is not for this type.");
+ }
+ 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)
}
- // optional uint32 mode = 3;
- public static final int MODE_FIELD_NUMBER = 3;
- private int mode_;
+ 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 uint32 mode = 3;
+ * optional .openxc.DynamicField.Type type = 1;
*/
- public boolean hasMode() {
- return ((bitField0_ & 0x00000004) == 0x00000004);
+ public boolean hasType() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
- * optional uint32 mode = 3;
+ * optional .openxc.DynamicField.Type type = 1;
*/
- public int getMode() {
- return mode_;
+ public com.openxc.BinaryMessages.DynamicField.Type getType() {
+ return type_;
}
- // 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 string string_value = 2;
+ public static final int STRING_VALUE_FIELD_NUMBER = 2;
+ private java.lang.Object stringValue_;
/**
- * optional uint32 pid = 4;
+ * optional string string_value = 2;
*/
- public int getPid() {
- return pid_;
+ public boolean hasStringValue() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
-
- // optional bool success = 5;
- public static final int SUCCESS_FIELD_NUMBER = 5;
- private boolean success_;
/**
- * optional bool success = 5;
+ * optional string string_value = 2;
*/
- public boolean hasSuccess() {
- return ((bitField0_ & 0x00000010) == 0x00000010);
+ public java.lang.String getStringValue() {
+ java.lang.Object ref = stringValue_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ stringValue_ = s;
+ }
+ return s;
+ }
}
/**
- * optional bool success = 5;
+ * optional string string_value = 2;
*/
- public boolean getSuccess() {
- return success_;
+ public com.google.protobuf.ByteString
+ getStringValueBytes() {
+ java.lang.Object ref = stringValue_;
+ if (ref instanceof java.lang.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;
+ }
}
- // optional uint32 negative_response_code = 6;
- public static final int NEGATIVE_RESPONSE_CODE_FIELD_NUMBER = 6;
- private int negativeResponseCode_;
+ // optional double numeric_value = 3;
+ public static final int NUMERIC_VALUE_FIELD_NUMBER = 3;
+ private double numericValue_;
/**
- * optional uint32 negative_response_code = 6;
+ * optional double numeric_value = 3;
*/
- public boolean hasNegativeResponseCode() {
- return ((bitField0_ & 0x00000020) == 0x00000020);
+ public boolean hasNumericValue() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * optional uint32 negative_response_code = 6;
+ * optional double numeric_value = 3;
*/
- public int getNegativeResponseCode() {
- return negativeResponseCode_;
+ public double getNumericValue() {
+ return numericValue_;
}
- // optional bytes payload = 7;
- public static final int PAYLOAD_FIELD_NUMBER = 7;
- private com.google.protobuf.ByteString payload_;
+ // optional bool boolean_value = 4;
+ public static final int BOOLEAN_VALUE_FIELD_NUMBER = 4;
+ private boolean booleanValue_;
/**
- * optional bytes payload = 7;
- *
- *
- * TODO we are capping this at 8 bytes for now - need to change when we
- * support multi-frame responses
- *
+ * optional bool boolean_value = 4;
*/
- public boolean hasPayload() {
- return ((bitField0_ & 0x00000040) == 0x00000040);
+ public boolean hasBooleanValue() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
- * optional bytes payload = 7;
- *
- *
- * TODO we are capping this at 8 bytes for now - need to change when we
- * support multi-frame responses
- *
+ * optional bool boolean_value = 4;
*/
- public com.google.protobuf.ByteString getPayload() {
- return payload_;
+ public boolean getBooleanValue() {
+ return booleanValue_;
}
private void initFields() {
- bus_ = 0;
- messageId_ = 0;
- mode_ = 0;
- pid_ = 0;
- success_ = false;
- negativeResponseCode_ = 0;
- payload_ = com.google.protobuf.ByteString.EMPTY;
+ type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING;
+ stringValue_ = "";
+ numericValue_ = 0D;
+ booleanValue_ = false;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -1991,25 +5917,16 @@ public final class BinaryMessages {
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- output.writeInt32(1, bus_);
+ output.writeEnum(1, type_.getNumber());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- output.writeUInt32(2, messageId_);
+ output.writeBytes(2, getStringValueBytes());
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- output.writeUInt32(3, mode_);
+ output.writeDouble(3, numericValue_);
}
if (((bitField0_ & 0x00000008) == 0x00000008)) {
- output.writeUInt32(4, pid_);
- }
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
- output.writeBool(5, success_);
- }
- if (((bitField0_ & 0x00000020) == 0x00000020)) {
- output.writeUInt32(6, negativeResponseCode_);
- }
- if (((bitField0_ & 0x00000040) == 0x00000040)) {
- output.writeBytes(7, payload_);
+ output.writeBool(4, booleanValue_);
}
getUnknownFields().writeTo(output);
}
@@ -2022,31 +5939,19 @@ public final class BinaryMessages {
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeInt32Size(1, bus_);
+ .computeEnumSize(1, type_.getNumber());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(2, messageId_);
+ .computeBytesSize(2, getStringValueBytes());
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(3, mode_);
+ .computeDoubleSize(3, numericValue_);
}
if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(4, pid_);
- }
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
- size += com.google.protobuf.CodedOutputStream
- .computeBoolSize(5, success_);
- }
- if (((bitField0_ & 0x00000020) == 0x00000020)) {
- size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(6, negativeResponseCode_);
- }
- if (((bitField0_ & 0x00000040) == 0x00000040)) {
- size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(7, payload_);
+ .computeBoolSize(4, booleanValue_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
@@ -2060,53 +5965,53 @@ public final class BinaryMessages {
return super.writeReplace();
}
- public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(
+ public static com.openxc.BinaryMessages.DynamicField parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(
+ 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);
}
- public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(byte[] data)
+ public static com.openxc.BinaryMessages.DynamicField parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(
+ public static com.openxc.BinaryMessages.DynamicField parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(java.io.InputStream input)
+ public static com.openxc.BinaryMessages.DynamicField parseFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(
+ 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);
}
- public static com.openxc.BinaryMessages.DiagnosticMessage parseDelimitedFrom(java.io.InputStream input)
+ public static com.openxc.BinaryMessages.DynamicField parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input);
}
- public static com.openxc.BinaryMessages.DiagnosticMessage parseDelimitedFrom(
+ 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);
}
- public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(
+ public static com.openxc.BinaryMessages.DynamicField parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(
+ public static com.openxc.BinaryMessages.DynamicField parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -2115,7 +6020,7 @@ public final class BinaryMessages {
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
- public static Builder newBuilder(com.openxc.BinaryMessages.DiagnosticMessage prototype) {
+ public static Builder newBuilder(com.openxc.BinaryMessages.DynamicField prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
@@ -2127,24 +6032,24 @@ public final class BinaryMessages {
return builder;
}
/**
- * Protobuf type {@code openxc.DiagnosticMessage}
+ * Protobuf type {@code openxc.DynamicField}
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builder
- implements com.openxc.BinaryMessages.DiagnosticMessageOrBuilder {
+ implements com.openxc.BinaryMessages.DynamicFieldOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticMessage_descriptor;
+ return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticMessage_fieldAccessorTable
+ return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- com.openxc.BinaryMessages.DiagnosticMessage.class, com.openxc.BinaryMessages.DiagnosticMessage.Builder.class);
+ com.openxc.BinaryMessages.DynamicField.class, com.openxc.BinaryMessages.DynamicField.Builder.class);
}
- // Construct using com.openxc.BinaryMessages.DiagnosticMessage.newBuilder()
+ // Construct using com.openxc.BinaryMessages.DynamicField.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
@@ -2164,20 +6069,14 @@ public final class BinaryMessages {
public Builder clear() {
super.clear();
- bus_ = 0;
+ type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING;
bitField0_ = (bitField0_ & ~0x00000001);
- messageId_ = 0;
+ stringValue_ = "";
bitField0_ = (bitField0_ & ~0x00000002);
- mode_ = 0;
+ numericValue_ = 0D;
bitField0_ = (bitField0_ & ~0x00000004);
- pid_ = 0;
+ booleanValue_ = false;
bitField0_ = (bitField0_ & ~0x00000008);
- success_ = false;
- bitField0_ = (bitField0_ & ~0x00000010);
- negativeResponseCode_ = 0;
- bitField0_ = (bitField0_ & ~0x00000020);
- payload_ = com.google.protobuf.ByteString.EMPTY;
- bitField0_ = (bitField0_ & ~0x00000040);
return this;
}
@@ -2187,89 +6086,70 @@ public final class BinaryMessages {
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
- return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticMessage_descriptor;
+ return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_descriptor;
}
- public com.openxc.BinaryMessages.DiagnosticMessage getDefaultInstanceForType() {
- return com.openxc.BinaryMessages.DiagnosticMessage.getDefaultInstance();
+ public com.openxc.BinaryMessages.DynamicField getDefaultInstanceForType() {
+ return com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
}
- public com.openxc.BinaryMessages.DiagnosticMessage build() {
- com.openxc.BinaryMessages.DiagnosticMessage result = buildPartial();
+ public com.openxc.BinaryMessages.DynamicField build() {
+ com.openxc.BinaryMessages.DynamicField result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
- public com.openxc.BinaryMessages.DiagnosticMessage buildPartial() {
- com.openxc.BinaryMessages.DiagnosticMessage result = new com.openxc.BinaryMessages.DiagnosticMessage(this);
+ public com.openxc.BinaryMessages.DynamicField buildPartial() {
+ com.openxc.BinaryMessages.DynamicField result = new com.openxc.BinaryMessages.DynamicField(this);
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
to_bitField0_ |= 0x00000001;
}
- result.bus_ = bus_;
+ result.type_ = type_;
if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
to_bitField0_ |= 0x00000002;
}
- result.messageId_ = messageId_;
+ result.stringValue_ = stringValue_;
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000004;
}
- result.mode_ = mode_;
+ result.numericValue_ = numericValue_;
if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
to_bitField0_ |= 0x00000008;
}
- result.pid_ = pid_;
- if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
- to_bitField0_ |= 0x00000010;
- }
- result.success_ = success_;
- if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
- to_bitField0_ |= 0x00000020;
- }
- result.negativeResponseCode_ = negativeResponseCode_;
- if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
- to_bitField0_ |= 0x00000040;
- }
- result.payload_ = payload_;
+ result.booleanValue_ = booleanValue_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof com.openxc.BinaryMessages.DiagnosticMessage) {
- return mergeFrom((com.openxc.BinaryMessages.DiagnosticMessage)other);
+ if (other instanceof com.openxc.BinaryMessages.DynamicField) {
+ return mergeFrom((com.openxc.BinaryMessages.DynamicField)other);
} else {
super.mergeFrom(other);
return this;
}
}
- public Builder mergeFrom(com.openxc.BinaryMessages.DiagnosticMessage other) {
- if (other == com.openxc.BinaryMessages.DiagnosticMessage.getDefaultInstance()) return this;
- if (other.hasBus()) {
- setBus(other.getBus());
- }
- if (other.hasMessageId()) {
- setMessageId(other.getMessageId());
- }
- if (other.hasMode()) {
- setMode(other.getMode());
- }
- if (other.hasPid()) {
- setPid(other.getPid());
+ 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.hasSuccess()) {
- setSuccess(other.getSuccess());
+ if (other.hasStringValue()) {
+ bitField0_ |= 0x00000002;
+ stringValue_ = other.stringValue_;
+ onChanged();
}
- if (other.hasNegativeResponseCode()) {
- setNegativeResponseCode(other.getNegativeResponseCode());
+ if (other.hasNumericValue()) {
+ setNumericValue(other.getNumericValue());
}
- if (other.hasPayload()) {
- setPayload(other.getPayload());
+ if (other.hasBooleanValue()) {
+ setBooleanValue(other.getBooleanValue());
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
@@ -2283,11 +6163,11 @@ public final class BinaryMessages {
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
- com.openxc.BinaryMessages.DiagnosticMessage parsedMessage = null;
+ com.openxc.BinaryMessages.DynamicField parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (com.openxc.BinaryMessages.DiagnosticMessage) e.getUnfinishedMessage();
+ parsedMessage = (com.openxc.BinaryMessages.DynamicField) e.getUnfinishedMessage();
throw e;
} finally {
if (parsedMessage != null) {
@@ -2298,269 +6178,191 @@ public final class BinaryMessages {
}
private int bitField0_;
- // optional int32 bus = 1;
- private int bus_ ;
+ // optional .openxc.DynamicField.Type type = 1;
+ private com.openxc.BinaryMessages.DynamicField.Type type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING;
/**
- * optional int32 bus = 1;
+ * optional .openxc.DynamicField.Type type = 1;
*/
- public boolean hasBus() {
+ public boolean hasType() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
- * optional int32 bus = 1;
+ * optional .openxc.DynamicField.Type type = 1;
*/
- public int getBus() {
- return bus_;
+ public com.openxc.BinaryMessages.DynamicField.Type getType() {
+ return type_;
}
/**
- * optional int32 bus = 1;
+ * optional .openxc.DynamicField.Type type = 1;
*/
- public Builder setBus(int value) {
+ public Builder setType(com.openxc.BinaryMessages.DynamicField.Type value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
bitField0_ |= 0x00000001;
- bus_ = value;
+ type_ = value;
onChanged();
return this;
}
/**
- * optional int32 bus = 1;
+ * optional .openxc.DynamicField.Type type = 1;
*/
- public Builder clearBus() {
+ public Builder clearType() {
bitField0_ = (bitField0_ & ~0x00000001);
- bus_ = 0;
+ type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING;
onChanged();
return this;
}
- // optional uint32 message_id = 2;
- private int messageId_ ;
+ // optional string string_value = 2;
+ private java.lang.Object stringValue_ = "";
/**
- * optional uint32 message_id = 2;
+ * optional string string_value = 2;
*/
- public boolean hasMessageId() {
+ public boolean hasStringValue() {
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;
+ * optional string string_value = 2;
*/
- public int getPid() {
- return pid_;
+ public java.lang.String getStringValue() {
+ java.lang.Object ref = stringValue_;
+ if (!(ref instanceof java.lang.String)) {
+ java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ .toStringUtf8();
+ stringValue_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
}
/**
- * optional uint32 pid = 4;
+ * optional string string_value = 2;
*/
- public Builder setPid(int value) {
- bitField0_ |= 0x00000008;
- pid_ = value;
- onChanged();
- return this;
+ 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;
+ }
}
/**
- * optional uint32 pid = 4;
+ * optional string string_value = 2;
*/
- public Builder clearPid() {
- bitField0_ = (bitField0_ & ~0x00000008);
- pid_ = 0;
+ public Builder setStringValue(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00000002;
+ stringValue_ = value;
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;
+ * optional string string_value = 2;
*/
- public Builder setSuccess(boolean value) {
- bitField0_ |= 0x00000010;
- success_ = value;
+ public Builder clearStringValue() {
+ bitField0_ = (bitField0_ & ~0x00000002);
+ stringValue_ = getDefaultInstance().getStringValue();
onChanged();
return this;
}
/**
- * optional bool success = 5;
+ * optional string string_value = 2;
*/
- public Builder clearSuccess() {
- bitField0_ = (bitField0_ & ~0x00000010);
- success_ = false;
+ public Builder setStringValueBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00000002;
+ stringValue_ = value;
onChanged();
return this;
}
- // optional uint32 negative_response_code = 6;
- private int negativeResponseCode_ ;
+ // optional double numeric_value = 3;
+ private double numericValue_ ;
/**
- * optional uint32 negative_response_code = 6;
+ * optional double numeric_value = 3;
*/
- public boolean hasNegativeResponseCode() {
- return ((bitField0_ & 0x00000020) == 0x00000020);
+ public boolean hasNumericValue() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * optional uint32 negative_response_code = 6;
+ * optional double numeric_value = 3;
*/
- public int getNegativeResponseCode() {
- return negativeResponseCode_;
+ public double getNumericValue() {
+ return numericValue_;
}
/**
- * optional uint32 negative_response_code = 6;
+ * optional double numeric_value = 3;
*/
- public Builder setNegativeResponseCode(int value) {
- bitField0_ |= 0x00000020;
- negativeResponseCode_ = value;
+ public Builder setNumericValue(double value) {
+ bitField0_ |= 0x00000004;
+ numericValue_ = value;
onChanged();
return this;
}
/**
- * optional uint32 negative_response_code = 6;
+ * optional double numeric_value = 3;
*/
- public Builder clearNegativeResponseCode() {
- bitField0_ = (bitField0_ & ~0x00000020);
- negativeResponseCode_ = 0;
+ public Builder clearNumericValue() {
+ bitField0_ = (bitField0_ & ~0x00000004);
+ numericValue_ = 0D;
onChanged();
return this;
}
- // optional bytes payload = 7;
- private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY;
+ // optional bool boolean_value = 4;
+ private boolean booleanValue_ ;
/**
- * optional bytes payload = 7;
- *
- *
- * TODO we are capping this at 8 bytes for now - need to change when we
- * support multi-frame responses
- *
+ * optional bool boolean_value = 4;
*/
- public boolean hasPayload() {
- return ((bitField0_ & 0x00000040) == 0x00000040);
+ public boolean hasBooleanValue() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
- * optional bytes payload = 7;
- *
- *
- * TODO we are capping this at 8 bytes for now - need to change when we
- * support multi-frame responses
- *
+ * optional bool boolean_value = 4;
*/
- public com.google.protobuf.ByteString getPayload() {
- return payload_;
+ public boolean getBooleanValue() {
+ return booleanValue_;
}
/**
- * optional bytes payload = 7;
- *
- *
- * TODO we are capping this at 8 bytes for now - need to change when we
- * support multi-frame responses
- *
+ * optional bool boolean_value = 4;
*/
- public Builder setPayload(com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000040;
- payload_ = value;
+ public Builder setBooleanValue(boolean value) {
+ bitField0_ |= 0x00000008;
+ booleanValue_ = value;
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
- *
+ * optional bool boolean_value = 4;
*/
- public Builder clearPayload() {
- bitField0_ = (bitField0_ & ~0x00000040);
- payload_ = getDefaultInstance().getPayload();
+ public Builder clearBooleanValue() {
+ bitField0_ = (bitField0_ & ~0x00000008);
+ booleanValue_ = false;
onChanged();
return this;
}
- // @@protoc_insertion_point(builder_scope:openxc.DiagnosticMessage)
+ // @@protoc_insertion_point(builder_scope:openxc.DynamicField)
}
static {
- defaultInstance = new DiagnosticMessage(true);
+ defaultInstance = new DynamicField(true);
defaultInstance.initFields();
}
- // @@protoc_insertion_point(class_scope:openxc.DiagnosticMessage)
+ // @@protoc_insertion_point(class_scope:openxc.DynamicField)
}
public interface TranslatedMessageOrBuilder
@@ -2591,75 +6393,33 @@ public final class BinaryMessages {
com.google.protobuf.ByteString
getNameBytes();
- // optional string string_value = 3;
- /**
- * optional string string_value = 3;
- */
- boolean hasStringValue();
- /**
- * optional string string_value = 3;
- */
- java.lang.String getStringValue();
- /**
- * optional string string_value = 3;
- */
- com.google.protobuf.ByteString
- getStringValueBytes();
-
- // optional double numeric_value = 4;
- /**
- * optional double numeric_value = 4;
- */
- boolean hasNumericValue();
- /**
- * optional double numeric_value = 4;
- */
- double getNumericValue();
-
- // optional bool boolean_value = 5;
- /**
- * optional bool boolean_value = 5;
- */
- boolean hasBooleanValue();
- /**
- * optional bool boolean_value = 5;
- */
- boolean getBooleanValue();
-
- // optional string string_event = 6;
+ // optional .openxc.DynamicField value = 3;
/**
- * optional string string_event = 6;
+ * optional .openxc.DynamicField value = 3;
*/
- boolean hasStringEvent();
+ boolean hasValue();
/**
- * optional string string_event = 6;
+ * optional .openxc.DynamicField value = 3;
*/
- java.lang.String getStringEvent();
+ com.openxc.BinaryMessages.DynamicField getValue();
/**
- * optional string string_event = 6;
+ * optional .openxc.DynamicField value = 3;
*/
- com.google.protobuf.ByteString
- getStringEventBytes();
+ com.openxc.BinaryMessages.DynamicFieldOrBuilder getValueOrBuilder();
- // optional double numeric_event = 7;
- /**
- * optional double numeric_event = 7;
- */
- boolean hasNumericEvent();
+ // optional .openxc.DynamicField event = 4;
/**
- * optional double numeric_event = 7;
+ * optional .openxc.DynamicField event = 4;
*/
- double getNumericEvent();
-
- // optional bool boolean_event = 8;
+ boolean hasEvent();
/**
- * optional bool boolean_event = 8;
+ * optional .openxc.DynamicField event = 4;
*/
- boolean hasBooleanEvent();
+ com.openxc.BinaryMessages.DynamicField getEvent();
/**
- * optional bool boolean_event = 8;
+ * optional .openxc.DynamicField event = 4;
*/
- boolean getBooleanEvent();
+ com.openxc.BinaryMessages.DynamicFieldOrBuilder getEventOrBuilder();
}
/**
* Protobuf type {@code openxc.TranslatedMessage}
@@ -2729,33 +6489,29 @@ public final class BinaryMessages {
break;
}
case 26: {
+ com.openxc.BinaryMessages.DynamicField.Builder subBuilder = null;
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ subBuilder = value_.toBuilder();
+ }
+ value_ = input.readMessage(com.openxc.BinaryMessages.DynamicField.PARSER, extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(value_);
+ value_ = subBuilder.buildPartial();
+ }
bitField0_ |= 0x00000004;
- stringValue_ = input.readBytes();
break;
}
- case 33: {
+ case 34: {
+ com.openxc.BinaryMessages.DynamicField.Builder subBuilder = null;
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ subBuilder = event_.toBuilder();
+ }
+ event_ = input.readMessage(com.openxc.BinaryMessages.DynamicField.PARSER, extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(event_);
+ event_ = subBuilder.buildPartial();
+ }
bitField0_ |= 0x00000008;
- numericValue_ = input.readDouble();
- break;
- }
- case 40: {
- bitField0_ |= 0x00000010;
- booleanValue_ = input.readBool();
- break;
- }
- case 50: {
- bitField0_ |= 0x00000020;
- stringEvent_ = input.readBytes();
- break;
- }
- case 57: {
- bitField0_ |= 0x00000040;
- numericEvent_ = input.readDouble();
- break;
- }
- case 64: {
- bitField0_ |= 0x00000080;
- booleanEvent_ = input.readBool();
break;
}
}
@@ -2975,165 +6731,55 @@ public final class BinaryMessages {
}
}
- // optional string string_value = 3;
- public static final int STRING_VALUE_FIELD_NUMBER = 3;
- private java.lang.Object stringValue_;
+ // optional .openxc.DynamicField value = 3;
+ public static final int VALUE_FIELD_NUMBER = 3;
+ private com.openxc.BinaryMessages.DynamicField value_;
/**
- * optional string string_value = 3;
+ * optional .openxc.DynamicField value = 3;
*/
- public boolean hasStringValue() {
+ public boolean hasValue() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * optional string string_value = 3;
+ * optional .openxc.DynamicField value = 3;
*/
- public java.lang.String getStringValue() {
- java.lang.Object ref = stringValue_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- if (bs.isValidUtf8()) {
- stringValue_ = s;
- }
- return s;
- }
+ public com.openxc.BinaryMessages.DynamicField getValue() {
+ return value_;
}
/**
- * optional string string_value = 3;
+ * optional .openxc.DynamicField value = 3;
*/
- public com.google.protobuf.ByteString
- getStringValueBytes() {
- java.lang.Object ref = stringValue_;
- if (ref instanceof java.lang.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;
- }
+ public com.openxc.BinaryMessages.DynamicFieldOrBuilder getValueOrBuilder() {
+ return value_;
}
- // optional double numeric_value = 4;
- public static final int NUMERIC_VALUE_FIELD_NUMBER = 4;
- private double numericValue_;
+ // optional .openxc.DynamicField event = 4;
+ public static final int EVENT_FIELD_NUMBER = 4;
+ private com.openxc.BinaryMessages.DynamicField event_;
/**
- * optional double numeric_value = 4;
+ * optional .openxc.DynamicField event = 4;
*/
- public boolean hasNumericValue() {
+ public boolean hasEvent() {
return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
- * optional double numeric_value = 4;
- */
- public double getNumericValue() {
- return numericValue_;
- }
-
- // optional bool boolean_value = 5;
- public static final int BOOLEAN_VALUE_FIELD_NUMBER = 5;
- private boolean booleanValue_;
- /**
- * optional bool boolean_value = 5;
- */
- public boolean hasBooleanValue() {
- return ((bitField0_ & 0x00000010) == 0x00000010);
- }
- /**
- * optional bool boolean_value = 5;
- */
- public boolean getBooleanValue() {
- return booleanValue_;
- }
-
- // optional string string_event = 6;
- public static final int STRING_EVENT_FIELD_NUMBER = 6;
- private java.lang.Object stringEvent_;
- /**
- * optional string string_event = 6;
- */
- public boolean hasStringEvent() {
- return ((bitField0_ & 0x00000020) == 0x00000020);
- }
- /**
- * optional string string_event = 6;
- */
- public java.lang.String getStringEvent() {
- java.lang.Object ref = stringEvent_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- if (bs.isValidUtf8()) {
- stringEvent_ = s;
- }
- return s;
- }
- }
- /**
- * optional string string_event = 6;
- */
- public com.google.protobuf.ByteString
- getStringEventBytes() {
- java.lang.Object ref = stringEvent_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
- stringEvent_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- // optional double numeric_event = 7;
- public static final int NUMERIC_EVENT_FIELD_NUMBER = 7;
- private double numericEvent_;
- /**
- * optional double numeric_event = 7;
- */
- public boolean hasNumericEvent() {
- return ((bitField0_ & 0x00000040) == 0x00000040);
- }
- /**
- * optional double numeric_event = 7;
- */
- public double getNumericEvent() {
- return numericEvent_;
- }
-
- // optional bool boolean_event = 8;
- public static final int BOOLEAN_EVENT_FIELD_NUMBER = 8;
- private boolean booleanEvent_;
- /**
- * optional bool boolean_event = 8;
+ * optional .openxc.DynamicField event = 4;
*/
- public boolean hasBooleanEvent() {
- return ((bitField0_ & 0x00000080) == 0x00000080);
+ public com.openxc.BinaryMessages.DynamicField getEvent() {
+ return event_;
}
/**
- * optional bool boolean_event = 8;
+ * optional .openxc.DynamicField event = 4;
*/
- public boolean getBooleanEvent() {
- return booleanEvent_;
+ public com.openxc.BinaryMessages.DynamicFieldOrBuilder getEventOrBuilder() {
+ return event_;
}
private void initFields() {
type_ = com.openxc.BinaryMessages.TranslatedMessage.Type.STRING;
name_ = "";
- stringValue_ = "";
- numericValue_ = 0D;
- booleanValue_ = false;
- stringEvent_ = "";
- numericEvent_ = 0D;
- booleanEvent_ = false;
+ value_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
+ event_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -3154,22 +6800,10 @@ public final class BinaryMessages {
output.writeBytes(2, getNameBytes());
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- output.writeBytes(3, getStringValueBytes());
+ output.writeMessage(3, value_);
}
if (((bitField0_ & 0x00000008) == 0x00000008)) {
- output.writeDouble(4, numericValue_);
- }
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
- output.writeBool(5, booleanValue_);
- }
- if (((bitField0_ & 0x00000020) == 0x00000020)) {
- output.writeBytes(6, getStringEventBytes());
- }
- if (((bitField0_ & 0x00000040) == 0x00000040)) {
- output.writeDouble(7, numericEvent_);
- }
- if (((bitField0_ & 0x00000080) == 0x00000080)) {
- output.writeBool(8, booleanEvent_);
+ output.writeMessage(4, event_);
}
getUnknownFields().writeTo(output);
}
@@ -3190,27 +6824,11 @@ public final class BinaryMessages {
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(3, getStringValueBytes());
- }
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
- size += com.google.protobuf.CodedOutputStream
- .computeDoubleSize(4, numericValue_);
- }
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
- size += com.google.protobuf.CodedOutputStream
- .computeBoolSize(5, booleanValue_);
- }
- if (((bitField0_ & 0x00000020) == 0x00000020)) {
- size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(6, getStringEventBytes());
- }
- if (((bitField0_ & 0x00000040) == 0x00000040)) {
- size += com.google.protobuf.CodedOutputStream
- .computeDoubleSize(7, numericEvent_);
+ .computeMessageSize(3, value_);
}
- if (((bitField0_ & 0x00000080) == 0x00000080)) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += com.google.protobuf.CodedOutputStream
- .computeBoolSize(8, booleanEvent_);
+ .computeMessageSize(4, event_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
@@ -3320,6 +6938,8 @@ public final class BinaryMessages {
}
private void maybeForceBuilderInitialization() {
if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ getValueFieldBuilder();
+ getEventFieldBuilder();
}
}
private static Builder create() {
@@ -3332,18 +6952,18 @@ public final class BinaryMessages {
bitField0_ = (bitField0_ & ~0x00000001);
name_ = "";
bitField0_ = (bitField0_ & ~0x00000002);
- stringValue_ = "";
+ if (valueBuilder_ == null) {
+ value_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
+ } else {
+ valueBuilder_.clear();
+ }
bitField0_ = (bitField0_ & ~0x00000004);
- numericValue_ = 0D;
+ if (eventBuilder_ == null) {
+ event_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
+ } else {
+ eventBuilder_.clear();
+ }
bitField0_ = (bitField0_ & ~0x00000008);
- booleanValue_ = false;
- bitField0_ = (bitField0_ & ~0x00000010);
- stringEvent_ = "";
- bitField0_ = (bitField0_ & ~0x00000020);
- numericEvent_ = 0D;
- bitField0_ = (bitField0_ & ~0x00000040);
- booleanEvent_ = false;
- bitField0_ = (bitField0_ & ~0x00000080);
return this;
}
@@ -3383,27 +7003,19 @@ public final class BinaryMessages {
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000004;
}
- result.stringValue_ = stringValue_;
+ if (valueBuilder_ == null) {
+ result.value_ = value_;
+ } else {
+ result.value_ = valueBuilder_.build();
+ }
if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
to_bitField0_ |= 0x00000008;
}
- result.numericValue_ = numericValue_;
- if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
- to_bitField0_ |= 0x00000010;
- }
- result.booleanValue_ = booleanValue_;
- if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
- to_bitField0_ |= 0x00000020;
- }
- result.stringEvent_ = stringEvent_;
- if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
- to_bitField0_ |= 0x00000040;
- }
- result.numericEvent_ = numericEvent_;
- if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
- to_bitField0_ |= 0x00000080;
+ if (eventBuilder_ == null) {
+ result.event_ = event_;
+ } else {
+ result.event_ = eventBuilder_.build();
}
- result.booleanEvent_ = booleanEvent_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -3428,27 +7040,11 @@ public final class BinaryMessages {
name_ = other.name_;
onChanged();
}
- if (other.hasStringValue()) {
- bitField0_ |= 0x00000004;
- stringValue_ = other.stringValue_;
- onChanged();
- }
- if (other.hasNumericValue()) {
- setNumericValue(other.getNumericValue());
- }
- if (other.hasBooleanValue()) {
- setBooleanValue(other.getBooleanValue());
- }
- if (other.hasStringEvent()) {
- bitField0_ |= 0x00000020;
- stringEvent_ = other.stringEvent_;
- onChanged();
- }
- if (other.hasNumericEvent()) {
- setNumericEvent(other.getNumericEvent());
+ if (other.hasValue()) {
+ mergeValue(other.getValue());
}
- if (other.hasBooleanEvent()) {
- setBooleanEvent(other.getBooleanEvent());
+ if (other.hasEvent()) {
+ mergeEvent(other.getEvent());
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
@@ -3587,284 +7183,238 @@ public final class BinaryMessages {
return this;
}
- // optional string string_value = 3;
- private java.lang.Object stringValue_ = "";
+ // optional .openxc.DynamicField value = 3;
+ 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 string string_value = 3;
+ * optional .openxc.DynamicField value = 3;
*/
- public boolean hasStringValue() {
+ public boolean hasValue() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * optional string string_value = 3;
+ * optional .openxc.DynamicField value = 3;
*/
- public java.lang.String getStringValue() {
- java.lang.Object ref = stringValue_;
- if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- stringValue_ = s;
- return s;
+ public com.openxc.BinaryMessages.DynamicField getValue() {
+ if (valueBuilder_ == null) {
+ return value_;
} else {
- return (java.lang.String) ref;
+ return valueBuilder_.getMessage();
}
}
/**
- * optional string string_value = 3;
+ * optional .openxc.DynamicField value = 3;
*/
- 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;
+ public Builder setValue(com.openxc.BinaryMessages.DynamicField value) {
+ if (valueBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ value_ = value;
+ onChanged();
} else {
- return (com.google.protobuf.ByteString) ref;
+ valueBuilder_.setMessage(value);
}
- }
- /**
- * optional string string_value = 3;
- */
- public Builder setStringValue(
- java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000004;
- stringValue_ = value;
- onChanged();
+ bitField0_ |= 0x00000004;
return this;
}
/**
- * optional string string_value = 3;
+ * optional .openxc.DynamicField value = 3;
*/
- public Builder clearStringValue() {
- bitField0_ = (bitField0_ & ~0x00000004);
- stringValue_ = getDefaultInstance().getStringValue();
- onChanged();
+ public Builder setValue(
+ com.openxc.BinaryMessages.DynamicField.Builder builderForValue) {
+ if (valueBuilder_ == null) {
+ value_ = builderForValue.build();
+ onChanged();
+ } else {
+ valueBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000004;
return this;
}
/**
- * optional string string_value = 3;
+ * optional .openxc.DynamicField value = 3;
*/
- public Builder setStringValueBytes(
- com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000004;
- stringValue_ = value;
- onChanged();
+ public Builder mergeValue(com.openxc.BinaryMessages.DynamicField value) {
+ if (valueBuilder_ == null) {
+ if (((bitField0_ & 0x00000004) == 0x00000004) &&
+ value_ != com.openxc.BinaryMessages.DynamicField.getDefaultInstance()) {
+ value_ =
+ com.openxc.BinaryMessages.DynamicField.newBuilder(value_).mergeFrom(value).buildPartial();
+ } else {
+ value_ = value;
+ }
+ onChanged();
+ } else {
+ valueBuilder_.mergeFrom(value);
+ }
+ bitField0_ |= 0x00000004;
return this;
}
-
- // optional double numeric_value = 4;
- private double numericValue_ ;
- /**
- * optional double numeric_value = 4;
- */
- public boolean hasNumericValue() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
- }
- /**
- * optional double numeric_value = 4;
- */
- public double getNumericValue() {
- return numericValue_;
- }
/**
- * optional double numeric_value = 4;
+ * optional .openxc.DynamicField value = 3;
*/
- public Builder setNumericValue(double value) {
- bitField0_ |= 0x00000008;
- numericValue_ = value;
- onChanged();
+ public Builder clearValue() {
+ if (valueBuilder_ == null) {
+ value_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
+ onChanged();
+ } else {
+ valueBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
/**
- * optional double numeric_value = 4;
+ * optional .openxc.DynamicField value = 3;
*/
- public Builder clearNumericValue() {
- bitField0_ = (bitField0_ & ~0x00000008);
- numericValue_ = 0D;
+ public com.openxc.BinaryMessages.DynamicField.Builder getValueBuilder() {
+ bitField0_ |= 0x00000004;
onChanged();
- return this;
- }
-
- // optional bool boolean_value = 5;
- private boolean booleanValue_ ;
- /**
- * optional bool boolean_value = 5;
- */
- public boolean hasBooleanValue() {
- return ((bitField0_ & 0x00000010) == 0x00000010);
- }
- /**
- * optional bool boolean_value = 5;
- */
- public boolean getBooleanValue() {
- return booleanValue_;
+ return getValueFieldBuilder().getBuilder();
}
/**
- * optional bool boolean_value = 5;
+ * optional .openxc.DynamicField value = 3;
*/
- public Builder setBooleanValue(boolean value) {
- bitField0_ |= 0x00000010;
- booleanValue_ = value;
- onChanged();
- return this;
+ public com.openxc.BinaryMessages.DynamicFieldOrBuilder getValueOrBuilder() {
+ if (valueBuilder_ != null) {
+ return valueBuilder_.getMessageOrBuilder();
+ } else {
+ return value_;
+ }
}
/**
- * optional bool boolean_value = 5;
+ * optional .openxc.DynamicField value = 3;
*/
- public Builder clearBooleanValue() {
- bitField0_ = (bitField0_ & ~0x00000010);
- booleanValue_ = false;
- onChanged();
- return this;
+ private com.google.protobuf.SingleFieldBuilder<
+ com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder>
+ getValueFieldBuilder() {
+ if (valueBuilder_ == null) {
+ valueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder>(
+ value_,
+ getParentForChildren(),
+ isClean());
+ value_ = null;
+ }
+ return valueBuilder_;
}
- // optional string string_event = 6;
- private java.lang.Object stringEvent_ = "";
+ // optional .openxc.DynamicField event = 4;
+ 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 string string_event = 6;
+ * optional .openxc.DynamicField event = 4;
*/
- public boolean hasStringEvent() {
- return ((bitField0_ & 0x00000020) == 0x00000020);
+ public boolean hasEvent() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
- * optional string string_event = 6;
+ * optional .openxc.DynamicField event = 4;
*/
- public java.lang.String getStringEvent() {
- java.lang.Object ref = stringEvent_;
- if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- stringEvent_ = s;
- return s;
+ public com.openxc.BinaryMessages.DynamicField getEvent() {
+ if (eventBuilder_ == null) {
+ return event_;
} else {
- return (java.lang.String) ref;
+ return eventBuilder_.getMessage();
}
}
/**
- * optional string string_event = 6;
+ * optional .openxc.DynamicField event = 4;
*/
- public com.google.protobuf.ByteString
- getStringEventBytes() {
- java.lang.Object ref = stringEvent_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
- stringEvent_ = b;
- return b;
+ public Builder setEvent(com.openxc.BinaryMessages.DynamicField value) {
+ if (eventBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ event_ = value;
+ onChanged();
} else {
- return (com.google.protobuf.ByteString) ref;
+ eventBuilder_.setMessage(value);
}
- }
- /**
- * optional string string_event = 6;
- */
- public Builder setStringEvent(
- java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000020;
- stringEvent_ = value;
- onChanged();
+ bitField0_ |= 0x00000008;
return this;
}
/**
- * optional string string_event = 6;
+ * optional .openxc.DynamicField event = 4;
*/
- public Builder clearStringEvent() {
- bitField0_ = (bitField0_ & ~0x00000020);
- stringEvent_ = getDefaultInstance().getStringEvent();
- onChanged();
+ public Builder setEvent(
+ com.openxc.BinaryMessages.DynamicField.Builder builderForValue) {
+ if (eventBuilder_ == null) {
+ event_ = builderForValue.build();
+ onChanged();
+ } else {
+ eventBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000008;
return this;
}
/**
- * optional string string_event = 6;
+ * optional .openxc.DynamicField event = 4;
*/
- public Builder setStringEventBytes(
- com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000020;
- stringEvent_ = value;
- onChanged();
+ public Builder mergeEvent(com.openxc.BinaryMessages.DynamicField value) {
+ if (eventBuilder_ == null) {
+ if (((bitField0_ & 0x00000008) == 0x00000008) &&
+ event_ != com.openxc.BinaryMessages.DynamicField.getDefaultInstance()) {
+ event_ =
+ com.openxc.BinaryMessages.DynamicField.newBuilder(event_).mergeFrom(value).buildPartial();
+ } else {
+ event_ = value;
+ }
+ onChanged();
+ } else {
+ eventBuilder_.mergeFrom(value);
+ }
+ bitField0_ |= 0x00000008;
return this;
}
-
- // optional double numeric_event = 7;
- private double numericEvent_ ;
- /**
- * optional double numeric_event = 7;
- */
- public boolean hasNumericEvent() {
- return ((bitField0_ & 0x00000040) == 0x00000040);
- }
- /**
- * optional double numeric_event = 7;
- */
- public double getNumericEvent() {
- return numericEvent_;
- }
/**
- * optional double numeric_event = 7;
+ * optional .openxc.DynamicField event = 4;
*/
- public Builder setNumericEvent(double value) {
- bitField0_ |= 0x00000040;
- numericEvent_ = value;
- onChanged();
+ public Builder clearEvent() {
+ if (eventBuilder_ == null) {
+ event_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
+ onChanged();
+ } else {
+ eventBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000008);
return this;
}
/**
- * optional double numeric_event = 7;
+ * optional .openxc.DynamicField event = 4;
*/
- public Builder clearNumericEvent() {
- bitField0_ = (bitField0_ & ~0x00000040);
- numericEvent_ = 0D;
+ public com.openxc.BinaryMessages.DynamicField.Builder getEventBuilder() {
+ bitField0_ |= 0x00000008;
onChanged();
- return this;
- }
-
- // optional bool boolean_event = 8;
- private boolean booleanEvent_ ;
- /**
- * optional bool boolean_event = 8;
- */
- public boolean hasBooleanEvent() {
- return ((bitField0_ & 0x00000080) == 0x00000080);
- }
- /**
- * optional bool boolean_event = 8;
- */
- public boolean getBooleanEvent() {
- return booleanEvent_;
+ return getEventFieldBuilder().getBuilder();
}
/**
- * optional bool boolean_event = 8;
+ * optional .openxc.DynamicField event = 4;
*/
- public Builder setBooleanEvent(boolean value) {
- bitField0_ |= 0x00000080;
- booleanEvent_ = value;
- onChanged();
- return this;
+ public com.openxc.BinaryMessages.DynamicFieldOrBuilder getEventOrBuilder() {
+ if (eventBuilder_ != null) {
+ return eventBuilder_.getMessageOrBuilder();
+ } else {
+ return event_;
+ }
}
/**
- * optional bool boolean_event = 8;
+ * optional .openxc.DynamicField event = 4;
*/
- public Builder clearBooleanEvent() {
- bitField0_ = (bitField0_ & ~0x00000080);
- booleanEvent_ = false;
- onChanged();
- return this;
+ private com.google.protobuf.SingleFieldBuilder<
+ com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder>
+ getEventFieldBuilder() {
+ if (eventBuilder_ == null) {
+ eventBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder>(
+ event_,
+ getParentForChildren(),
+ isClean());
+ event_ = null;
+ }
+ return eventBuilder_;
}
// @@protoc_insertion_point(builder_scope:openxc.TranslatedMessage)
@@ -3889,10 +7439,30 @@ public final class BinaryMessages {
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_openxc_RawMessage_fieldAccessorTable;
private static com.google.protobuf.Descriptors.Descriptor
- internal_static_openxc_DiagnosticMessage_descriptor;
+ internal_static_openxc_ControlCommand_descriptor;
+ private static
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internal_static_openxc_ControlCommand_fieldAccessorTable;
+ private static com.google.protobuf.Descriptors.Descriptor
+ internal_static_openxc_CommandResponse_descriptor;
+ private static
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internal_static_openxc_CommandResponse_fieldAccessorTable;
+ private static com.google.protobuf.Descriptors.Descriptor
+ internal_static_openxc_DiagnosticRequest_descriptor;
+ private static
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internal_static_openxc_DiagnosticRequest_fieldAccessorTable;
+ private static com.google.protobuf.Descriptors.Descriptor
+ internal_static_openxc_DiagnosticResponse_descriptor;
+ private static
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internal_static_openxc_DiagnosticResponse_fieldAccessorTable;
+ private static com.google.protobuf.Descriptors.Descriptor
+ internal_static_openxc_DynamicField_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
- internal_static_openxc_DiagnosticMessage_fieldAccessorTable;
+ internal_static_openxc_DynamicField_fieldAccessorTable;
private static com.google.protobuf.Descriptors.Descriptor
internal_static_openxc_TranslatedMessage_descriptor;
private static
@@ -3907,27 +7477,47 @@ public final class BinaryMessages {
descriptor;
static {
java.lang.String[] descriptorData = {
- "\n\014openxc.proto\022\006openxc\"\203\002\n\016VehicleMessag" +
+ "\n\014openxc.proto\022\006openxc\"\224\003\n\016VehicleMessag" +
"e\022)\n\004type\030\001 \001(\0162\033.openxc.VehicleMessage." +
"Type\022\'\n\013raw_message\030\002 \001(\0132\022.openxc.RawMe" +
"ssage\0225\n\022translated_message\030\003 \001(\0132\031.open" +
- "xc.TranslatedMessage\0225\n\022diagnostic_messa" +
- "ge\030\004 \001(\0132\031.openxc.DiagnosticMessage\"/\n\004T" +
- "ype\022\007\n\003RAW\020\001\022\016\n\nTRANSLATED\020\002\022\016\n\nDIAGNOST" +
- "IC\020\003\";\n\nRawMessage\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessa" +
- "ge_id\030\002 \001(\r\022\014\n\004data\030\003 \001(\004\"\221\001\n\021Diagnostic" +
- "Message\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessage_id\030\002 \001(\r",
- "\022\014\n\004mode\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022\017\n\007success\030\005" +
- " \001(\010\022\036\n\026negative_response_code\030\006 \001(\r\022\017\n\007" +
- "payload\030\007 \001(\014\"\265\002\n\021TranslatedMessage\022,\n\004t" +
- "ype\030\001 \001(\0162\036.openxc.TranslatedMessage.Typ" +
- "e\022\014\n\004name\030\002 \001(\t\022\024\n\014string_value\030\003 \001(\t\022\025\n" +
- "\rnumeric_value\030\004 \001(\001\022\025\n\rboolean_value\030\005 " +
- "\001(\010\022\024\n\014string_event\030\006 \001(\t\022\025\n\rnumeric_eve" +
- "nt\030\007 \001(\001\022\025\n\rboolean_event\030\010 \001(\010\"\\\n\004Type\022" +
- "\n\n\006STRING\020\001\022\007\n\003NUM\020\002\022\010\n\004BOOL\020\003\022\022\n\016EVENTE" +
- "D_STRING\020\004\022\017\n\013EVENTED_NUM\020\005\022\020\n\014EVENTED_B",
- "OOL\020\006B\034\n\ncom.openxcB\016BinaryMessages"
+ "xc.TranslatedMessage\0227\n\023diagnostic_respo" +
+ "nse\030\004 \001(\0132\032.openxc.DiagnosticResponse\022/\n" +
+ "\017control_command\030\005 \001(\0132\026.openxc.ControlC" +
+ "ommand\0221\n\020command_response\030\006 \001(\0132\027.openx" +
+ "c.CommandResponse\"Z\n\004Type\022\007\n\003RAW\020\001\022\016\n\nTR" +
+ "ANSLATED\020\002\022\016\n\nDIAGNOSTIC\020\003\022\023\n\017CONTROL_CO",
+ "MMAND\020\004\022\024\n\020COMMAND_RESPONSE\020\005\";\n\nRawMess" +
+ "age\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessage_id\030\002 \001(\r\022\014\n\004" +
+ "data\030\003 \001(\014\"\246\001\n\016ControlCommand\022)\n\004type\030\001 " +
+ "\001(\0162\033.openxc.ControlCommand.Type\0225\n\022diag" +
+ "nostic_request\030\002 \001(\0132\031.openxc.Diagnostic" +
+ "Request\"2\n\004Type\022\013\n\007VERSION\020\001\022\r\n\tDEVICE_I" +
+ "D\020\002\022\016\n\nDIAGNOSTIC\020\003\"M\n\017CommandResponse\022)" +
+ "\n\004type\030\001 \001(\0162\033.openxc.ControlCommand.Typ" +
+ "e\022\017\n\007message\030\002 \001(\t\"\375\001\n\021DiagnosticRequest" +
+ "\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessage_id\030\002 \001(\r\022\014\n\004mod",
+ "e\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022\017\n\007payload\030\005 \001(\014\022\032\n" +
+ "\022multiple_responses\030\006 \001(\010\022\021\n\tfrequency\030\007" +
+ " \001(\001\022\014\n\004name\030\010 \001(\t\022;\n\014decoded_type\030\t \001(\016" +
+ "2%.openxc.DiagnosticRequest.DecodedType\"" +
+ "!\n\013DecodedType\022\010\n\004NONE\020\001\022\010\n\004OBD2\020\002\"\241\001\n\022D" +
+ "iagnosticResponse\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessag" +
+ "e_id\030\002 \001(\r\022\014\n\004mode\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022\017\n" +
+ "\007success\030\005 \001(\010\022\036\n\026negative_response_code" +
+ "\030\006 \001(\r\022\017\n\007payload\030\007 \001(\014\022\r\n\005value\030\010 \001(\001\"\242" +
+ "\001\n\014DynamicField\022\'\n\004type\030\001 \001(\0162\031.openxc.D",
+ "ynamicField.Type\022\024\n\014string_value\030\002 \001(\t\022\025" +
+ "\n\rnumeric_value\030\003 \001(\001\022\025\n\rboolean_value\030\004" +
+ " \001(\010\"%\n\004Type\022\n\n\006STRING\020\001\022\007\n\003NUM\020\002\022\010\n\004BOO" +
+ "L\020\003\"\367\001\n\021TranslatedMessage\022,\n\004type\030\001 \001(\0162" +
+ "\036.openxc.TranslatedMessage.Type\022\014\n\004name\030" +
+ "\002 \001(\t\022#\n\005value\030\003 \001(\0132\024.openxc.DynamicFie" +
+ "ld\022#\n\005event\030\004 \001(\0132\024.openxc.DynamicField\"" +
+ "\\\n\004Type\022\n\n\006STRING\020\001\022\007\n\003NUM\020\002\022\010\n\004BOOL\020\003\022\022" +
+ "\n\016EVENTED_STRING\020\004\022\017\n\013EVENTED_NUM\020\005\022\020\n\014E" +
+ "VENTED_BOOL\020\006B\034\n\ncom.openxcB\016BinaryMessa",
+ "ges"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -3939,25 +7529,49 @@ 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", "RawMessage", "TranslatedMessage", "DiagnosticMessage", });
+ new java.lang.String[] { "Type", "RawMessage", "TranslatedMessage", "DiagnosticResponse", "ControlCommand", "CommandResponse", });
internal_static_openxc_RawMessage_descriptor =
getDescriptor().getMessageTypes().get(1);
internal_static_openxc_RawMessage_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_openxc_RawMessage_descriptor,
new java.lang.String[] { "Bus", "MessageId", "Data", });
- internal_static_openxc_DiagnosticMessage_descriptor =
+ internal_static_openxc_ControlCommand_descriptor =
getDescriptor().getMessageTypes().get(2);
- internal_static_openxc_DiagnosticMessage_fieldAccessorTable = new
+ internal_static_openxc_ControlCommand_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_openxc_DiagnosticMessage_descriptor,
- new java.lang.String[] { "Bus", "MessageId", "Mode", "Pid", "Success", "NegativeResponseCode", "Payload", });
- internal_static_openxc_TranslatedMessage_descriptor =
+ internal_static_openxc_ControlCommand_descriptor,
+ new java.lang.String[] { "Type", "DiagnosticRequest", });
+ internal_static_openxc_CommandResponse_descriptor =
getDescriptor().getMessageTypes().get(3);
+ internal_static_openxc_CommandResponse_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_openxc_CommandResponse_descriptor,
+ new java.lang.String[] { "Type", "Message", });
+ internal_static_openxc_DiagnosticRequest_descriptor =
+ getDescriptor().getMessageTypes().get(4);
+ 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", });
+ internal_static_openxc_DiagnosticResponse_descriptor =
+ getDescriptor().getMessageTypes().get(5);
+ 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", });
+ internal_static_openxc_DynamicField_descriptor =
+ getDescriptor().getMessageTypes().get(6);
+ internal_static_openxc_DynamicField_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_openxc_DynamicField_descriptor,
+ new java.lang.String[] { "Type", "StringValue", "NumericValue", "BooleanValue", });
+ internal_static_openxc_TranslatedMessage_descriptor =
+ getDescriptor().getMessageTypes().get(7);
internal_static_openxc_TranslatedMessage_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_openxc_TranslatedMessage_descriptor,
- new java.lang.String[] { "Type", "Name", "StringValue", "NumericValue", "BooleanValue", "StringEvent", "NumericEvent", "BooleanEvent", });
+ new java.lang.String[] { "Type", "Name", "Value", "Event", });
return null;
}
};