optional .openxc.TranslatedMessage translated_message = 3;
*/
com.openxc.BinaryMessages.TranslatedMessageOrBuilder getTranslatedMessageOrBuilder();
+
+ // optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ /**
+ * optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ */
+ boolean hasDiagnosticResponse();
+ /**
+ * optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ */
+ com.openxc.BinaryMessages.DiagnosticResponse getDiagnosticResponse();
+ /**
+ * optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ */
+ com.openxc.BinaryMessages.DiagnosticResponseOrBuilder getDiagnosticResponseOrBuilder();
}
/**
* Protobuf type {@code openxc.VehicleMessage}
@@ -137,6 +151,19 @@ public final class BinaryMessages {
bitField0_ |= 0x00000004;
break;
}
+ case 34: {
+ com.openxc.BinaryMessages.DiagnosticResponse.Builder subBuilder = null;
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ subBuilder = diagnosticResponse_.toBuilder();
+ }
+ diagnosticResponse_ = input.readMessage(com.openxc.BinaryMessages.DiagnosticResponse.PARSER, extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(diagnosticResponse_);
+ diagnosticResponse_ = subBuilder.buildPartial();
+ }
+ bitField0_ |= 0x00000008;
+ break;
+ }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -189,6 +216,10 @@ public final class BinaryMessages {
* TRANSLATED = 2;
*/
TRANSLATED(1, 2),
+ /**
+ * DIAGNOSTIC = 3;
+ */
+ DIAGNOSTIC(2, 3),
;
/**
@@ -199,6 +230,10 @@ public final class BinaryMessages {
* TRANSLATED = 2;
*/
public static final int TRANSLATED_VALUE = 2;
+ /**
+ * DIAGNOSTIC = 3;
+ */
+ public static final int DIAGNOSTIC_VALUE = 3;
public final int getNumber() { return value; }
@@ -207,6 +242,7 @@ public final class BinaryMessages {
switch (value) {
case 1: return RAW;
case 2: return TRANSLATED;
+ case 3: return DIAGNOSTIC;
default: return null;
}
}
@@ -319,10 +355,33 @@ public final class BinaryMessages {
return translatedMessage_;
}
+ // optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ public static final int DIAGNOSTIC_RESPONSE_FIELD_NUMBER = 4;
+ private com.openxc.BinaryMessages.DiagnosticResponse diagnosticResponse_;
+ /**
+ * optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ */
+ public boolean hasDiagnosticResponse() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ */
+ public com.openxc.BinaryMessages.DiagnosticResponse getDiagnosticResponse() {
+ return diagnosticResponse_;
+ }
+ /**
+ * optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ */
+ public com.openxc.BinaryMessages.DiagnosticResponseOrBuilder getDiagnosticResponseOrBuilder() {
+ return diagnosticResponse_;
+ }
+
private void initFields() {
type_ = com.openxc.BinaryMessages.VehicleMessage.Type.RAW;
rawMessage_ = com.openxc.BinaryMessages.RawMessage.getDefaultInstance();
translatedMessage_ = com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance();
+ diagnosticResponse_ = com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -345,6 +404,9 @@ public final class BinaryMessages {
if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, translatedMessage_);
}
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeMessage(4, diagnosticResponse_);
+ }
getUnknownFields().writeTo(output);
}
@@ -366,6 +428,10 @@ public final class BinaryMessages {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(3, translatedMessage_);
}
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(4, diagnosticResponse_);
+ }
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -476,6 +542,7 @@ public final class BinaryMessages {
if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getRawMessageFieldBuilder();
getTranslatedMessageFieldBuilder();
+ getDiagnosticResponseFieldBuilder();
}
}
private static Builder create() {
@@ -498,6 +565,12 @@ public final class BinaryMessages {
translatedMessageBuilder_.clear();
}
bitField0_ = (bitField0_ & ~0x00000004);
+ if (diagnosticResponseBuilder_ == null) {
+ diagnosticResponse_ = com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance();
+ } else {
+ diagnosticResponseBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000008);
return this;
}
@@ -546,6 +619,14 @@ public final class BinaryMessages {
} else {
result.translatedMessage_ = translatedMessageBuilder_.build();
}
+ if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+ to_bitField0_ |= 0x00000008;
+ }
+ if (diagnosticResponseBuilder_ == null) {
+ result.diagnosticResponse_ = diagnosticResponse_;
+ } else {
+ result.diagnosticResponse_ = diagnosticResponseBuilder_.build();
+ }
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -571,6 +652,9 @@ public final class BinaryMessages {
if (other.hasTranslatedMessage()) {
mergeTranslatedMessage(other.getTranslatedMessage());
}
+ if (other.hasDiagnosticResponse()) {
+ mergeDiagnosticResponse(other.getDiagnosticResponse());
+ }
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@@ -868,6 +952,123 @@ public final class BinaryMessages {
return translatedMessageBuilder_;
}
+ // optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ private com.openxc.BinaryMessages.DiagnosticResponse diagnosticResponse_ = com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ com.openxc.BinaryMessages.DiagnosticResponse, com.openxc.BinaryMessages.DiagnosticResponse.Builder, com.openxc.BinaryMessages.DiagnosticResponseOrBuilder> diagnosticResponseBuilder_;
+ /**
+ * optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ */
+ public boolean hasDiagnosticResponse() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ */
+ public com.openxc.BinaryMessages.DiagnosticResponse getDiagnosticResponse() {
+ if (diagnosticResponseBuilder_ == null) {
+ return diagnosticResponse_;
+ } else {
+ return diagnosticResponseBuilder_.getMessage();
+ }
+ }
+ /**
+ * optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ */
+ public Builder setDiagnosticResponse(com.openxc.BinaryMessages.DiagnosticResponse value) {
+ if (diagnosticResponseBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ diagnosticResponse_ = value;
+ onChanged();
+ } else {
+ diagnosticResponseBuilder_.setMessage(value);
+ }
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ */
+ public Builder setDiagnosticResponse(
+ com.openxc.BinaryMessages.DiagnosticResponse.Builder builderForValue) {
+ if (diagnosticResponseBuilder_ == null) {
+ diagnosticResponse_ = builderForValue.build();
+ onChanged();
+ } else {
+ diagnosticResponseBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ */
+ public Builder mergeDiagnosticResponse(com.openxc.BinaryMessages.DiagnosticResponse value) {
+ if (diagnosticResponseBuilder_ == null) {
+ if (((bitField0_ & 0x00000008) == 0x00000008) &&
+ diagnosticResponse_ != com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance()) {
+ diagnosticResponse_ =
+ com.openxc.BinaryMessages.DiagnosticResponse.newBuilder(diagnosticResponse_).mergeFrom(value).buildPartial();
+ } else {
+ diagnosticResponse_ = value;
+ }
+ onChanged();
+ } else {
+ diagnosticResponseBuilder_.mergeFrom(value);
+ }
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ */
+ public Builder clearDiagnosticResponse() {
+ if (diagnosticResponseBuilder_ == null) {
+ diagnosticResponse_ = com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance();
+ onChanged();
+ } else {
+ diagnosticResponseBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000008);
+ return this;
+ }
+ /**
+ * optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ */
+ public com.openxc.BinaryMessages.DiagnosticResponse.Builder getDiagnosticResponseBuilder() {
+ bitField0_ |= 0x00000008;
+ onChanged();
+ return getDiagnosticResponseFieldBuilder().getBuilder();
+ }
+ /**
+ * optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ */
+ public com.openxc.BinaryMessages.DiagnosticResponseOrBuilder getDiagnosticResponseOrBuilder() {
+ if (diagnosticResponseBuilder_ != null) {
+ return diagnosticResponseBuilder_.getMessageOrBuilder();
+ } else {
+ return diagnosticResponse_;
+ }
+ }
+ /**
+ * optional .openxc.DiagnosticResponse diagnostic_response = 4;
+ */
+ private com.google.protobuf.SingleFieldBuilder<
+ com.openxc.BinaryMessages.DiagnosticResponse, com.openxc.BinaryMessages.DiagnosticResponse.Builder, com.openxc.BinaryMessages.DiagnosticResponseOrBuilder>
+ getDiagnosticResponseFieldBuilder() {
+ if (diagnosticResponseBuilder_ == null) {
+ diagnosticResponseBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ com.openxc.BinaryMessages.DiagnosticResponse, com.openxc.BinaryMessages.DiagnosticResponse.Builder, com.openxc.BinaryMessages.DiagnosticResponseOrBuilder>(
+ diagnosticResponse_,
+ getParentForChildren(),
+ isClean());
+ diagnosticResponse_ = null;
+ }
+ return diagnosticResponseBuilder_;
+ }
+
// @@protoc_insertion_point(builder_scope:openxc.VehicleMessage)
}
@@ -902,15 +1103,15 @@ public final class BinaryMessages {
*/
int getMessageId();
- // optional uint64 data = 3;
+ // optional bytes data = 3;
/**
- * optional uint64 data = 3;
+ * optional bytes data = 3;
*/
boolean hasData();
/**
- * optional uint64 data = 3;
+ * optional bytes data = 3;
*/
- long getData();
+ com.google.protobuf.ByteString getData();
}
/**
* Protobuf type {@code openxc.RawMessage}
@@ -973,9 +1174,9 @@ public final class BinaryMessages {
messageId_ = input.readUInt32();
break;
}
- case 24: {
+ case 26: {
bitField0_ |= 0x00000004;
- data_ = input.readUInt64();
+ data_ = input.readBytes();
break;
}
}
@@ -1050,26 +1251,26 @@ public final class BinaryMessages {
return messageId_;
}
- // optional uint64 data = 3;
+ // optional bytes data = 3;
public static final int DATA_FIELD_NUMBER = 3;
- private long data_;
+ private com.google.protobuf.ByteString data_;
/**
- * optional uint64 data = 3;
+ * optional bytes data = 3;
*/
public boolean hasData() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * optional uint64 data = 3;
+ * optional bytes data = 3;
*/
- public long getData() {
+ public com.google.protobuf.ByteString getData() {
return data_;
}
private void initFields() {
bus_ = 0;
messageId_ = 0;
- data_ = 0L;
+ data_ = com.google.protobuf.ByteString.EMPTY;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -1090,7 +1291,7 @@ public final class BinaryMessages {
output.writeUInt32(2, messageId_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- output.writeUInt64(3, data_);
+ output.writeBytes(3, data_);
}
getUnknownFields().writeTo(output);
}
@@ -1111,7 +1312,7 @@ public final class BinaryMessages {
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt64Size(3, data_);
+ .computeBytesSize(3, data_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
@@ -1233,7 +1434,7 @@ public final class BinaryMessages {
bitField0_ = (bitField0_ & ~0x00000001);
messageId_ = 0;
bitField0_ = (bitField0_ & ~0x00000002);
- data_ = 0L;
+ data_ = com.google.protobuf.ByteString.EMPTY;
bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
@@ -1274,31 +1475,1588 @@ public final class BinaryMessages {
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000004;
}
- result.data_ = data_;
+ result.data_ = data_;
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
+ }
+
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof com.openxc.BinaryMessages.RawMessage) {
+ return mergeFrom((com.openxc.BinaryMessages.RawMessage)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(com.openxc.BinaryMessages.RawMessage other) {
+ if (other == com.openxc.BinaryMessages.RawMessage.getDefaultInstance()) return this;
+ if (other.hasBus()) {
+ setBus(other.getBus());
+ }
+ if (other.hasMessageId()) {
+ setMessageId(other.getMessageId());
+ }
+ if (other.hasData()) {
+ setData(other.getData());
+ }
+ 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.RawMessage parsedMessage = null;
+ try {
+ parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ parsedMessage = (com.openxc.BinaryMessages.RawMessage) 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 bytes data = 3;
+ private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY;
+ /**
+ * optional bytes data = 3;
+ */
+ public boolean hasData() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * optional bytes data = 3;
+ */
+ public com.google.protobuf.ByteString getData() {
+ return data_;
+ }
+ /**
+ * optional bytes data = 3;
+ */
+ public Builder setData(com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00000004;
+ data_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * optional bytes data = 3;
+ */
+ public Builder clearData() {
+ bitField0_ = (bitField0_ & ~0x00000004);
+ data_ = getDefaultInstance().getData();
+ onChanged();
+ return this;
+ }
+
+ // @@protoc_insertion_point(builder_scope:openxc.RawMessage)
+ }
+
+ static {
+ defaultInstance = new RawMessage(true);
+ defaultInstance.initFields();
+ }
+
+ // @@protoc_insertion_point(class_scope:openxc.RawMessage)
+ }
+
+ public interface ControlCommandOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // optional .openxc.ControlCommand.Type type = 1;
+ /**
+ * optional .openxc.ControlCommand.Type type = 1;
+ */
+ boolean hasType();
+ /**
+ * optional .openxc.ControlCommand.Type type = 1;
+ */
+ com.openxc.BinaryMessages.ControlCommand.Type getType();
+
+ // optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ /**
+ * optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ */
+ boolean hasDiagnosticRequest();
+ /**
+ * optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ */
+ com.openxc.BinaryMessages.DiagnosticRequest getDiagnosticRequest();
+ /**
+ * optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ */
+ com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getDiagnosticRequestOrBuilder();
+ }
+ /**
+ * Protobuf type {@code openxc.ControlCommand}
+ */
+ public static final class ControlCommand extends
+ com.google.protobuf.GeneratedMessage
+ implements ControlCommandOrBuilder {
+ // Use ControlCommand.newBuilder() to construct.
+ private ControlCommand(com.google.protobuf.GeneratedMessage.Builder builder) {
+ super(builder);
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private ControlCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+ private static final ControlCommand defaultInstance;
+ public static ControlCommand getDefaultInstance() {
+ return defaultInstance;
+ }
+
+ public ControlCommand getDefaultInstanceForType() {
+ return defaultInstance;
+ }
+
+ private final com.google.protobuf.UnknownFieldSet unknownFields;
+ @java.lang.Override
+ public final com.google.protobuf.UnknownFieldSet
+ getUnknownFields() {
+ return this.unknownFields;
+ }
+ private ControlCommand(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ initFields();
+ int mutable_bitField0_ = 0;
+ com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.protobuf.UnknownFieldSet.newBuilder();
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ default: {
+ if (!parseUnknownField(input, unknownFields,
+ extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ case 8: {
+ int rawValue = input.readEnum();
+ com.openxc.BinaryMessages.ControlCommand.Type value = com.openxc.BinaryMessages.ControlCommand.Type.valueOf(rawValue);
+ if (value == null) {
+ unknownFields.mergeVarintField(1, rawValue);
+ } else {
+ bitField0_ |= 0x00000001;
+ type_ = value;
+ }
+ break;
+ }
+ case 18: {
+ com.openxc.BinaryMessages.DiagnosticRequest.Builder subBuilder = null;
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ subBuilder = diagnosticRequest_.toBuilder();
+ }
+ diagnosticRequest_ = input.readMessage(com.openxc.BinaryMessages.DiagnosticRequest.PARSER, extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(diagnosticRequest_);
+ diagnosticRequest_ = subBuilder.buildPartial();
+ }
+ bitField0_ |= 0x00000002;
+ break;
+ }
+ }
+ }
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(this);
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(
+ e.getMessage()).setUnfinishedMessage(this);
+ } finally {
+ this.unknownFields = unknownFields.build();
+ makeExtensionsImmutable();
+ }
+ }
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_descriptor;
+ }
+
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ com.openxc.BinaryMessages.ControlCommand.class, com.openxc.BinaryMessages.ControlCommand.Builder.class);
+ }
+
+ public static com.google.protobuf.ParserVERSION = 1;
+ */
+ VERSION(0, 1),
+ /**
+ * DEVICE_ID = 2;
+ */
+ DEVICE_ID(1, 2),
+ /**
+ * DIAGNOSTIC = 3;
+ */
+ DIAGNOSTIC(2, 3),
+ ;
+
+ /**
+ * VERSION = 1;
+ */
+ public static final int VERSION_VALUE = 1;
+ /**
+ * DEVICE_ID = 2;
+ */
+ public static final int DEVICE_ID_VALUE = 2;
+ /**
+ * DIAGNOSTIC = 3;
+ */
+ public static final int DIAGNOSTIC_VALUE = 3;
+
+
+ public final int getNumber() { return value; }
+
+ public static Type valueOf(int value) {
+ switch (value) {
+ case 1: return VERSION;
+ case 2: return DEVICE_ID;
+ case 3: return DIAGNOSTIC;
+ default: return null;
+ }
+ }
+
+ public static com.google.protobuf.Internal.EnumLiteMapoptional .openxc.ControlCommand.Type type = 1;
+ */
+ public boolean hasType() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * optional .openxc.ControlCommand.Type type = 1;
+ */
+ public com.openxc.BinaryMessages.ControlCommand.Type getType() {
+ return type_;
+ }
+
+ // optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ public static final int DIAGNOSTIC_REQUEST_FIELD_NUMBER = 2;
+ private com.openxc.BinaryMessages.DiagnosticRequest diagnosticRequest_;
+ /**
+ * optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ */
+ public boolean hasDiagnosticRequest() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ */
+ public com.openxc.BinaryMessages.DiagnosticRequest getDiagnosticRequest() {
+ return diagnosticRequest_;
+ }
+ /**
+ * optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ */
+ public com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getDiagnosticRequestOrBuilder() {
+ return diagnosticRequest_;
+ }
+
+ private void initFields() {
+ type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
+ diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance();
+ }
+ 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.writeEnum(1, type_.getNumber());
+ }
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeMessage(2, diagnosticRequest_);
+ }
+ 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
+ .computeEnumSize(1, type_.getNumber());
+ }
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(2, diagnosticRequest_);
+ }
+ 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.ControlCommand parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static com.openxc.BinaryMessages.ControlCommand parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static com.openxc.BinaryMessages.ControlCommand parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static com.openxc.BinaryMessages.ControlCommand parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static com.openxc.BinaryMessages.ControlCommand parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input);
+ }
+ public static com.openxc.BinaryMessages.ControlCommand parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input, extensionRegistry);
+ }
+ public static com.openxc.BinaryMessages.ControlCommand parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return PARSER.parseDelimitedFrom(input);
+ }
+ public static com.openxc.BinaryMessages.ControlCommand parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseDelimitedFrom(input, extensionRegistry);
+ }
+ public static com.openxc.BinaryMessages.ControlCommand parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input);
+ }
+ public static com.openxc.BinaryMessages.ControlCommand parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input, extensionRegistry);
+ }
+
+ public static Builder newBuilder() { return Builder.create(); }
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder(com.openxc.BinaryMessages.ControlCommand prototype) {
+ return newBuilder().mergeFrom(prototype);
+ }
+ public Builder toBuilder() { return newBuilder(this); }
+
+ @java.lang.Override
+ protected Builder newBuilderForType(
+ com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ * Protobuf type {@code openxc.ControlCommand}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessage.Builderoptional .openxc.ControlCommand.Type type = 1;
+ */
+ public boolean hasType() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * optional .openxc.ControlCommand.Type type = 1;
+ */
+ public com.openxc.BinaryMessages.ControlCommand.Type getType() {
+ return type_;
+ }
+ /**
+ * optional .openxc.ControlCommand.Type type = 1;
+ */
+ public Builder setType(com.openxc.BinaryMessages.ControlCommand.Type value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00000001;
+ type_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * optional .openxc.ControlCommand.Type type = 1;
+ */
+ public Builder clearType() {
+ bitField0_ = (bitField0_ & ~0x00000001);
+ type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
+ onChanged();
+ return this;
+ }
+
+ // optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ private com.openxc.BinaryMessages.DiagnosticRequest diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ com.openxc.BinaryMessages.DiagnosticRequest, com.openxc.BinaryMessages.DiagnosticRequest.Builder, com.openxc.BinaryMessages.DiagnosticRequestOrBuilder> diagnosticRequestBuilder_;
+ /**
+ * optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ */
+ public boolean hasDiagnosticRequest() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ */
+ public com.openxc.BinaryMessages.DiagnosticRequest getDiagnosticRequest() {
+ if (diagnosticRequestBuilder_ == null) {
+ return diagnosticRequest_;
+ } else {
+ return diagnosticRequestBuilder_.getMessage();
+ }
+ }
+ /**
+ * optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ */
+ public Builder setDiagnosticRequest(com.openxc.BinaryMessages.DiagnosticRequest value) {
+ if (diagnosticRequestBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ diagnosticRequest_ = value;
+ onChanged();
+ } else {
+ diagnosticRequestBuilder_.setMessage(value);
+ }
+ bitField0_ |= 0x00000002;
+ return this;
+ }
+ /**
+ * optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ */
+ public Builder setDiagnosticRequest(
+ com.openxc.BinaryMessages.DiagnosticRequest.Builder builderForValue) {
+ if (diagnosticRequestBuilder_ == null) {
+ diagnosticRequest_ = builderForValue.build();
+ onChanged();
+ } else {
+ diagnosticRequestBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000002;
+ return this;
+ }
+ /**
+ * optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ */
+ public Builder mergeDiagnosticRequest(com.openxc.BinaryMessages.DiagnosticRequest value) {
+ if (diagnosticRequestBuilder_ == null) {
+ if (((bitField0_ & 0x00000002) == 0x00000002) &&
+ diagnosticRequest_ != com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance()) {
+ diagnosticRequest_ =
+ com.openxc.BinaryMessages.DiagnosticRequest.newBuilder(diagnosticRequest_).mergeFrom(value).buildPartial();
+ } else {
+ diagnosticRequest_ = value;
+ }
+ onChanged();
+ } else {
+ diagnosticRequestBuilder_.mergeFrom(value);
+ }
+ bitField0_ |= 0x00000002;
+ return this;
+ }
+ /**
+ * optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ */
+ public Builder clearDiagnosticRequest() {
+ if (diagnosticRequestBuilder_ == null) {
+ diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance();
+ onChanged();
+ } else {
+ diagnosticRequestBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000002);
+ return this;
+ }
+ /**
+ * optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ */
+ public com.openxc.BinaryMessages.DiagnosticRequest.Builder getDiagnosticRequestBuilder() {
+ bitField0_ |= 0x00000002;
+ onChanged();
+ return getDiagnosticRequestFieldBuilder().getBuilder();
+ }
+ /**
+ * optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ */
+ public com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getDiagnosticRequestOrBuilder() {
+ if (diagnosticRequestBuilder_ != null) {
+ return diagnosticRequestBuilder_.getMessageOrBuilder();
+ } else {
+ return diagnosticRequest_;
+ }
+ }
+ /**
+ * optional .openxc.DiagnosticRequest diagnostic_request = 2;
+ */
+ private com.google.protobuf.SingleFieldBuilder<
+ com.openxc.BinaryMessages.DiagnosticRequest, com.openxc.BinaryMessages.DiagnosticRequest.Builder, com.openxc.BinaryMessages.DiagnosticRequestOrBuilder>
+ getDiagnosticRequestFieldBuilder() {
+ if (diagnosticRequestBuilder_ == null) {
+ diagnosticRequestBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ com.openxc.BinaryMessages.DiagnosticRequest, com.openxc.BinaryMessages.DiagnosticRequest.Builder, com.openxc.BinaryMessages.DiagnosticRequestOrBuilder>(
+ diagnosticRequest_,
+ getParentForChildren(),
+ isClean());
+ diagnosticRequest_ = null;
+ }
+ return diagnosticRequestBuilder_;
+ }
+
+ // @@protoc_insertion_point(builder_scope:openxc.ControlCommand)
+ }
+
+ static {
+ defaultInstance = new ControlCommand(true);
+ defaultInstance.initFields();
+ }
+
+ // @@protoc_insertion_point(class_scope:openxc.ControlCommand)
+ }
+
+ public interface DiagnosticRequestOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // optional int32 bus = 1;
+ /**
+ * optional int32 bus = 1;
+ */
+ boolean hasBus();
+ /**
+ * optional int32 bus = 1;
+ */
+ int getBus();
+
+ // optional uint32 message_id = 2;
+ /**
+ * optional uint32 message_id = 2;
+ */
+ boolean hasMessageId();
+ /**
+ * optional uint32 message_id = 2;
+ */
+ int getMessageId();
+
+ // optional uint32 mode = 3;
+ /**
+ * optional uint32 mode = 3;
+ */
+ boolean hasMode();
+ /**
+ * optional uint32 mode = 3;
+ */
+ int getMode();
+
+ // optional uint32 pid = 4;
+ /**
+ * optional uint32 pid = 4;
+ */
+ boolean hasPid();
+ /**
+ * optional uint32 pid = 4;
+ */
+ int getPid();
+
+ // optional bytes payload = 5;
+ /**
+ * optional bytes payload = 5;
+ *
+ * + * TODO we are capping this at 8 bytes for now - need to change when we + * support multi-frame responses + *+ */ + boolean hasPayload(); + /** + *
optional bytes payload = 5;
+ *
+ * + * TODO we are capping this at 8 bytes for now - need to change when we + * support multi-frame responses + *+ */ + com.google.protobuf.ByteString getPayload(); + + // optional bool parse_payload = 6; + /** + *
optional bool parse_payload = 6;
+ */
+ boolean hasParsePayload();
+ /**
+ * optional bool parse_payload = 6;
+ */
+ boolean getParsePayload();
+
+ // optional double factor = 7;
+ /**
+ * optional double factor = 7;
+ */
+ boolean hasFactor();
+ /**
+ * optional double factor = 7;
+ */
+ double getFactor();
+
+ // optional double offset = 8;
+ /**
+ * optional double offset = 8;
+ */
+ boolean hasOffset();
+ /**
+ * optional double offset = 8;
+ */
+ double getOffset();
+
+ // optional double frequency = 9;
+ /**
+ * optional double frequency = 9;
+ */
+ boolean hasFrequency();
+ /**
+ * optional double frequency = 9;
+ */
+ double getFrequency();
+ }
+ /**
+ * Protobuf type {@code openxc.DiagnosticRequest}
+ */
+ public static final class DiagnosticRequest extends
+ com.google.protobuf.GeneratedMessage
+ implements DiagnosticRequestOrBuilder {
+ // Use DiagnosticRequest.newBuilder() to construct.
+ private DiagnosticRequest(com.google.protobuf.GeneratedMessage.Builder builder) {
+ super(builder);
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private DiagnosticRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+ private static final DiagnosticRequest defaultInstance;
+ public static DiagnosticRequest getDefaultInstance() {
+ return defaultInstance;
+ }
+
+ public DiagnosticRequest getDefaultInstanceForType() {
+ return defaultInstance;
+ }
+
+ private final com.google.protobuf.UnknownFieldSet unknownFields;
+ @java.lang.Override
+ public final com.google.protobuf.UnknownFieldSet
+ getUnknownFields() {
+ return this.unknownFields;
+ }
+ private DiagnosticRequest(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ initFields();
+ int mutable_bitField0_ = 0;
+ com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.protobuf.UnknownFieldSet.newBuilder();
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ default: {
+ if (!parseUnknownField(input, unknownFields,
+ extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ case 8: {
+ bitField0_ |= 0x00000001;
+ bus_ = input.readInt32();
+ break;
+ }
+ case 16: {
+ bitField0_ |= 0x00000002;
+ messageId_ = input.readUInt32();
+ break;
+ }
+ case 24: {
+ bitField0_ |= 0x00000004;
+ mode_ = input.readUInt32();
+ break;
+ }
+ case 32: {
+ bitField0_ |= 0x00000008;
+ pid_ = input.readUInt32();
+ break;
+ }
+ case 42: {
+ bitField0_ |= 0x00000010;
+ payload_ = input.readBytes();
+ break;
+ }
+ case 48: {
+ bitField0_ |= 0x00000020;
+ parsePayload_ = input.readBool();
+ break;
+ }
+ case 57: {
+ bitField0_ |= 0x00000040;
+ factor_ = input.readDouble();
+ break;
+ }
+ case 65: {
+ bitField0_ |= 0x00000080;
+ offset_ = input.readDouble();
+ break;
+ }
+ case 73: {
+ bitField0_ |= 0x00000100;
+ frequency_ = 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_DiagnosticRequest_descriptor;
+ }
+
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ com.openxc.BinaryMessages.DiagnosticRequest.class, com.openxc.BinaryMessages.DiagnosticRequest.Builder.class);
+ }
+
+ public static com.google.protobuf.Parseroptional int32 bus = 1;
+ */
+ public boolean hasBus() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * optional int32 bus = 1;
+ */
+ public int getBus() {
+ return bus_;
+ }
+
+ // optional uint32 message_id = 2;
+ public static final int MESSAGE_ID_FIELD_NUMBER = 2;
+ private int messageId_;
+ /**
+ * optional uint32 message_id = 2;
+ */
+ public boolean hasMessageId() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * optional uint32 message_id = 2;
+ */
+ public int getMessageId() {
+ return messageId_;
+ }
+
+ // optional uint32 mode = 3;
+ public static final int MODE_FIELD_NUMBER = 3;
+ private int mode_;
+ /**
+ * optional uint32 mode = 3;
+ */
+ public boolean hasMode() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * optional uint32 mode = 3;
+ */
+ public int getMode() {
+ return mode_;
+ }
+
+ // optional uint32 pid = 4;
+ public static final int PID_FIELD_NUMBER = 4;
+ private int pid_;
+ /**
+ * optional uint32 pid = 4;
+ */
+ public boolean hasPid() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional uint32 pid = 4;
+ */
+ public int getPid() {
+ return pid_;
+ }
+
+ // optional bytes payload = 5;
+ public static final int PAYLOAD_FIELD_NUMBER = 5;
+ private com.google.protobuf.ByteString payload_;
+ /**
+ * optional bytes payload = 5;
+ *
+ * + * TODO we are capping this at 8 bytes for now - need to change when we + * support multi-frame responses + *+ */ + public boolean hasPayload() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + *
optional bytes payload = 5;
+ *
+ * + * TODO we are capping this at 8 bytes for now - need to change when we + * support multi-frame responses + *+ */ + public com.google.protobuf.ByteString getPayload() { + return payload_; + } + + // optional bool parse_payload = 6; + public static final int PARSE_PAYLOAD_FIELD_NUMBER = 6; + private boolean parsePayload_; + /** + *
optional bool parse_payload = 6;
+ */
+ public boolean hasParsePayload() {
+ return ((bitField0_ & 0x00000020) == 0x00000020);
+ }
+ /**
+ * optional bool parse_payload = 6;
+ */
+ public boolean getParsePayload() {
+ return parsePayload_;
+ }
+
+ // optional double factor = 7;
+ public static final int FACTOR_FIELD_NUMBER = 7;
+ private double factor_;
+ /**
+ * optional double factor = 7;
+ */
+ public boolean hasFactor() {
+ return ((bitField0_ & 0x00000040) == 0x00000040);
+ }
+ /**
+ * optional double factor = 7;
+ */
+ public double getFactor() {
+ return factor_;
+ }
+
+ // optional double offset = 8;
+ public static final int OFFSET_FIELD_NUMBER = 8;
+ private double offset_;
+ /**
+ * optional double offset = 8;
+ */
+ public boolean hasOffset() {
+ return ((bitField0_ & 0x00000080) == 0x00000080);
+ }
+ /**
+ * optional double offset = 8;
+ */
+ public double getOffset() {
+ return offset_;
+ }
+
+ // optional double frequency = 9;
+ public static final int FREQUENCY_FIELD_NUMBER = 9;
+ private double frequency_;
+ /**
+ * optional double frequency = 9;
+ */
+ public boolean hasFrequency() {
+ return ((bitField0_ & 0x00000100) == 0x00000100);
+ }
+ /**
+ * optional double frequency = 9;
+ */
+ public double getFrequency() {
+ return frequency_;
+ }
+
+ private void initFields() {
+ bus_ = 0;
+ messageId_ = 0;
+ mode_ = 0;
+ pid_ = 0;
+ payload_ = com.google.protobuf.ByteString.EMPTY;
+ parsePayload_ = false;
+ factor_ = 0D;
+ offset_ = 0D;
+ frequency_ = 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.writeBytes(5, payload_);
+ }
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ output.writeBool(6, parsePayload_);
+ }
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ output.writeDouble(7, factor_);
+ }
+ if (((bitField0_ & 0x00000080) == 0x00000080)) {
+ output.writeDouble(8, offset_);
+ }
+ if (((bitField0_ & 0x00000100) == 0x00000100)) {
+ output.writeDouble(9, frequency_);
+ }
+ 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
+ .computeBytesSize(5, payload_);
+ }
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBoolSize(6, parsePayload_);
+ }
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeDoubleSize(7, factor_);
+ }
+ if (((bitField0_ & 0x00000080) == 0x00000080)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeDoubleSize(8, offset_);
+ }
+ if (((bitField0_ & 0x00000100) == 0x00000100)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeDoubleSize(9, frequency_);
+ }
+ 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.DiagnosticRequest parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input);
+ }
+ public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input, extensionRegistry);
+ }
+ public static com.openxc.BinaryMessages.DiagnosticRequest parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return PARSER.parseDelimitedFrom(input);
+ }
+ public static com.openxc.BinaryMessages.DiagnosticRequest parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseDelimitedFrom(input, extensionRegistry);
+ }
+ public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input);
+ }
+ public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input, extensionRegistry);
+ }
+
+ public static Builder newBuilder() { return Builder.create(); }
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder(com.openxc.BinaryMessages.DiagnosticRequest prototype) {
+ return newBuilder().mergeFrom(prototype);
+ }
+ public Builder toBuilder() { return newBuilder(this); }
+
+ @java.lang.Override
+ protected Builder newBuilderForType(
+ com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ * Protobuf type {@code openxc.DiagnosticRequest}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessage.Builderoptional uint64 data = 3;
+ * optional uint32 mode = 3;
*/
- public boolean hasData() {
+ public boolean hasMode() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * optional uint64 data = 3;
+ * optional uint32 mode = 3;
*/
- public long getData() {
- return data_;
+ public int getMode() {
+ return mode_;
}
/**
- * optional uint64 data = 3;
+ * optional uint32 mode = 3;
*/
- public Builder setData(long value) {
+ public Builder setMode(int value) {
bitField0_ |= 0x00000004;
- data_ = value;
+ mode_ = value;
onChanged();
return this;
}
/**
- * optional uint64 data = 3;
+ * optional uint32 mode = 3;
*/
- public Builder clearData() {
+ public Builder clearMode() {
bitField0_ = (bitField0_ & ~0x00000004);
- data_ = 0L;
+ mode_ = 0;
onChanged();
return this;
}
- // @@protoc_insertion_point(builder_scope:openxc.RawMessage)
+ // 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 parse_payload = 6; + private boolean parsePayload_ ; + /** + *
optional bool parse_payload = 6;
+ */
+ public boolean hasParsePayload() {
+ return ((bitField0_ & 0x00000020) == 0x00000020);
+ }
+ /**
+ * optional bool parse_payload = 6;
+ */
+ public boolean getParsePayload() {
+ return parsePayload_;
+ }
+ /**
+ * optional bool parse_payload = 6;
+ */
+ public Builder setParsePayload(boolean value) {
+ bitField0_ |= 0x00000020;
+ parsePayload_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * optional bool parse_payload = 6;
+ */
+ public Builder clearParsePayload() {
+ bitField0_ = (bitField0_ & ~0x00000020);
+ parsePayload_ = false;
+ onChanged();
+ return this;
+ }
+
+ // optional double factor = 7;
+ private double factor_ ;
+ /**
+ * optional double factor = 7;
+ */
+ public boolean hasFactor() {
+ return ((bitField0_ & 0x00000040) == 0x00000040);
+ }
+ /**
+ * optional double factor = 7;
+ */
+ public double getFactor() {
+ return factor_;
+ }
+ /**
+ * optional double factor = 7;
+ */
+ public Builder setFactor(double value) {
+ bitField0_ |= 0x00000040;
+ factor_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * optional double factor = 7;
+ */
+ public Builder clearFactor() {
+ bitField0_ = (bitField0_ & ~0x00000040);
+ factor_ = 0D;
+ onChanged();
+ return this;
+ }
+
+ // optional double offset = 8;
+ private double offset_ ;
+ /**
+ * optional double offset = 8;
+ */
+ public boolean hasOffset() {
+ return ((bitField0_ & 0x00000080) == 0x00000080);
+ }
+ /**
+ * optional double offset = 8;
+ */
+ public double getOffset() {
+ return offset_;
+ }
+ /**
+ * optional double offset = 8;
+ */
+ public Builder setOffset(double value) {
+ bitField0_ |= 0x00000080;
+ offset_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * optional double offset = 8;
+ */
+ public Builder clearOffset() {
+ bitField0_ = (bitField0_ & ~0x00000080);
+ offset_ = 0D;
+ onChanged();
+ return this;
+ }
+
+ // optional double frequency = 9;
+ private double frequency_ ;
+ /**
+ * optional double frequency = 9;
+ */
+ public boolean hasFrequency() {
+ return ((bitField0_ & 0x00000100) == 0x00000100);
+ }
+ /**
+ * optional double frequency = 9;
+ */
+ public double getFrequency() {
+ return frequency_;
+ }
+ /**
+ * optional double frequency = 9;
+ */
+ public Builder setFrequency(double value) {
+ bitField0_ |= 0x00000100;
+ frequency_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * optional double frequency = 9;
+ */
+ public Builder clearFrequency() {
+ bitField0_ = (bitField0_ & ~0x00000100);
+ frequency_ = 0D;
+ onChanged();
+ return this;
+ }
+
+ // @@protoc_insertion_point(builder_scope:openxc.DiagnosticRequest)
}
static {
- defaultInstance = new RawMessage(true);
+ defaultInstance = new DiagnosticRequest(true);
defaultInstance.initFields();
}
- // @@protoc_insertion_point(class_scope:openxc.RawMessage)
+ // @@protoc_insertion_point(class_scope:openxc.DiagnosticRequest)
}
- public interface DiagnosticMessageOrBuilder
+ public interface DiagnosticResponseOrBuilder
extends com.google.protobuf.MessageOrBuilder {
// optional int32 bus = 1;
@@ -1500,35 +3479,55 @@ public final class BinaryMessages {
*/
int getNegativeResponseCode();
- // optional uint64 payload = 7;
+ // optional bytes payload = 7;
/**
- * optional uint64 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 uint64 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 + *+ */ + com.google.protobuf.ByteString getPayload(); + + // optional double value = 8; + /** + *
optional double value = 8;
+ */
+ boolean hasValue();
+ /**
+ * optional double value = 8;
*/
- long getPayload();
+ double getValue();
}
/**
- * Protobuf type {@code openxc.DiagnosticMessage}
+ * Protobuf type {@code openxc.DiagnosticResponse}
*/
- public static final class DiagnosticMessage extends
+ public static final class DiagnosticResponse extends
com.google.protobuf.GeneratedMessage
- implements DiagnosticMessageOrBuilder {
- // Use DiagnosticMessage.newBuilder() to construct.
- private DiagnosticMessage(com.google.protobuf.GeneratedMessage.Builder builder) {
+ implements DiagnosticResponseOrBuilder {
+ // Use DiagnosticResponse.newBuilder() to construct.
+ private DiagnosticResponse(com.google.protobuf.GeneratedMessage.Builder builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private DiagnosticMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private DiagnosticResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
- private static final DiagnosticMessage defaultInstance;
- public static DiagnosticMessage getDefaultInstance() {
+ private static final DiagnosticResponse defaultInstance;
+ public static DiagnosticResponse getDefaultInstance() {
return defaultInstance;
}
- public DiagnosticMessage getDefaultInstanceForType() {
+ public DiagnosticResponse getDefaultInstanceForType() {
return defaultInstance;
}
@@ -1538,7 +3537,7 @@ public final class BinaryMessages {
getUnknownFields() {
return this.unknownFields;
}
- private DiagnosticMessage(
+ private DiagnosticResponse(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1591,9 +3590,14 @@ public final class BinaryMessages {
negativeResponseCode_ = input.readUInt32();
break;
}
- case 56: {
+ case 58: {
bitField0_ |= 0x00000040;
- payload_ = input.readUInt64();
+ payload_ = input.readBytes();
+ break;
+ }
+ case 65: {
+ bitField0_ |= 0x00000080;
+ value_ = input.readDouble();
break;
}
}
@@ -1610,28 +3614,28 @@ 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_DiagnosticResponse_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticMessage_fieldAccessorTable
+ return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- com.openxc.BinaryMessages.DiagnosticMessage.class, com.openxc.BinaryMessages.DiagnosticMessage.Builder.class);
+ com.openxc.BinaryMessages.DiagnosticResponse.class, com.openxc.BinaryMessages.DiagnosticResponse.Builder.class);
}
- public static com.google.protobuf.Parseroptional uint64 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 + **/ public boolean hasPayload() { return ((bitField0_ & 0x00000040) == 0x00000040); } /** - *
optional uint64 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 + **/ - public long getPayload() { + 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;
@@ -1755,7 +3785,8 @@ public final class BinaryMessages {
pid_ = 0;
success_ = false;
negativeResponseCode_ = 0;
- payload_ = 0L;
+ payload_ = com.google.protobuf.ByteString.EMPTY;
+ value_ = 0D;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -1788,7 +3819,10 @@ public final class BinaryMessages {
output.writeUInt32(6, negativeResponseCode_);
}
if (((bitField0_ & 0x00000040) == 0x00000040)) {
- output.writeUInt64(7, payload_);
+ output.writeBytes(7, payload_);
+ }
+ if (((bitField0_ & 0x00000080) == 0x00000080)) {
+ output.writeDouble(8, value_);
}
getUnknownFields().writeTo(output);
}
@@ -1825,7 +3859,11 @@ public final class BinaryMessages {
}
if (((bitField0_ & 0x00000040) == 0x00000040)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt64Size(7, payload_);
+ .computeBytesSize(7, payload_);
+ }
+ if (((bitField0_ & 0x00000080) == 0x00000080)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeDoubleSize(8, value_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
@@ -1839,53 +3877,53 @@ public final class BinaryMessages {
return super.writeReplace();
}
- public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(
+ 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.DiagnosticMessage parseFrom(
+ 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.DiagnosticMessage parseFrom(byte[] data)
+ public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(
+ 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.DiagnosticMessage parseFrom(java.io.InputStream input)
+ public static com.openxc.BinaryMessages.DiagnosticResponse 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.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.DiagnosticMessage parseDelimitedFrom(java.io.InputStream input)
+ public static com.openxc.BinaryMessages.DiagnosticResponse 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.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.DiagnosticMessage parseFrom(
+ 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.DiagnosticMessage parseFrom(
+ public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -1894,7 +3932,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.DiagnosticResponse prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
@@ -1906,24 +3944,24 @@ public final class BinaryMessages {
return builder;
}
/**
- * Protobuf type {@code openxc.DiagnosticMessage}
+ * Protobuf type {@code openxc.DiagnosticResponse}
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builderoptional uint64 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 + **/ public boolean hasPayload() { return ((bitField0_ & 0x00000040) == 0x00000040); } /** - *
optional uint64 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 + **/ - public long getPayload() { + public com.google.protobuf.ByteString getPayload() { return payload_; } /** - *
optional uint64 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 + **/ - public Builder setPayload(long value) { - bitField0_ |= 0x00000040; + public Builder setPayload(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000040; payload_ = value; onChanged(); return this; } /** - *
optional uint64 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 + **/ public Builder clearPayload() { bitField0_ = (bitField0_ & ~0x00000040); - payload_ = 0L; + 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.DiagnosticMessage)
+ // @@protoc_insertion_point(builder_scope:openxc.DiagnosticResponse)
}
static {
- defaultInstance = new DiagnosticMessage(true);
+ defaultInstance = new DiagnosticResponse(true);
defaultInstance.initFields();
}
- // @@protoc_insertion_point(class_scope:openxc.DiagnosticMessage)
+ // @@protoc_insertion_point(class_scope:openxc.DiagnosticResponse)
}
public interface TranslatedMessageOrBuilder
@@ -3645,10 +5748,20 @@ 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_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_DiagnosticMessage_fieldAccessorTable;
+ internal_static_openxc_DiagnosticResponse_fieldAccessorTable;
private static com.google.protobuf.Descriptors.Descriptor
internal_static_openxc_TranslatedMessage_descriptor;
private static
@@ -3663,26 +5776,36 @@ public final class BinaryMessages {
descriptor;
static {
java.lang.String[] descriptorData = {
- "\n\014openxc.proto\022\006openxc\"\274\001\n\016VehicleMessag" +
+ "\n\014openxc.proto\022\006openxc\"\205\002\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\"\037\n\004Type\022\007\n\003RAW\020\001\022\016\n" +
- "\nTRANSLATED\020\002\";\n\nRawMessage\022\013\n\003bus\030\001 \001(\005" +
- "\022\022\n\nmessage_id\030\002 \001(\r\022\014\n\004data\030\003 \001(\004\"\221\001\n\021D" +
- "iagnosticMessage\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\007" +
- "success\030\005 \001(\010\022\036\n\026negative_response_code\030",
- "\006 \001(\r\022\017\n\007payload\030\007 \001(\004\"\265\002\n\021TranslatedMes" +
- "sage\022,\n\004type\030\001 \001(\0162\036.openxc.TranslatedMe" +
- "ssage.Type\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\rnu" +
- "meric_event\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\016EVENTED_STRING\020\004\022\017\n\013EVENTED_NUM\020\005\022\020\n\014" +
- "EVENTED_BOOL\020\006B\034\n\ncom.openxcB\016BinaryMess" +
- "ages"
+ "xc.TranslatedMessage\0227\n\023diagnostic_respo" +
+ "nse\030\004 \001(\0132\032.openxc.DiagnosticResponse\"/\n" +
+ "\004Type\022\007\n\003RAW\020\001\022\016\n\nTRANSLATED\020\002\022\016\n\nDIAGNO" +
+ "STIC\020\003\";\n\nRawMessage\022\013\n\003bus\030\001 \001(\005\022\022\n\nmes" +
+ "sage_id\030\002 \001(\r\022\014\n\004data\030\003 \001(\014\"\246\001\n\016ControlC" +
+ "ommand\022)\n\004type\030\001 \001(\0162\033.openxc.ControlCom",
+ "mand.Type\0225\n\022diagnostic_request\030\002 \001(\0132\031." +
+ "openxc.DiagnosticRequest\"2\n\004Type\022\013\n\007VERS" +
+ "ION\020\001\022\r\n\tDEVICE_ID\020\002\022\016\n\nDIAGNOSTIC\020\003\"\252\001\n" +
+ "\021DiagnosticRequest\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessa" +
+ "ge_id\030\002 \001(\r\022\014\n\004mode\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022\017" +
+ "\n\007payload\030\005 \001(\014\022\025\n\rparse_payload\030\006 \001(\010\022\016" +
+ "\n\006factor\030\007 \001(\001\022\016\n\006offset\030\010 \001(\001\022\021\n\tfreque" +
+ "ncy\030\t \001(\001\"\241\001\n\022DiagnosticResponse\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\026negativ",
+ "e_response_code\030\006 \001(\r\022\017\n\007payload\030\007 \001(\014\022\r" +
+ "\n\005value\030\010 \001(\001\"\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"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -3694,21 +5817,33 @@ 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", });
+ new java.lang.String[] { "Type", "RawMessage", "TranslatedMessage", "DiagnosticResponse", });
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_DiagnosticRequest_descriptor =
getDescriptor().getMessageTypes().get(3);
+ 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", "ParsePayload", "Factor", "Offset", "Frequency", });
+ internal_static_openxc_DiagnosticResponse_descriptor =
+ getDescriptor().getMessageTypes().get(4);
+ 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_TranslatedMessage_descriptor =
+ getDescriptor().getMessageTypes().get(5);
internal_static_openxc_TranslatedMessage_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_openxc_TranslatedMessage_descriptor,