X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=gen%2Fjava%2Fcom%2Fopenxc%2FBinaryMessages.java;h=a30e70f4b49a9cfa450ac23d8cc93b0340edd0ae;hb=3cd516b8f2925e82cff666a5c98ff30de507ca39;hp=dc44febcebb4fb87d326679e524a0c85b810df0b;hpb=5347f07163d737f6c6cfde9ad943c110b47e0963;p=apps%2Fagl-service-can-low-level.git
diff --git a/gen/java/com/openxc/BinaryMessages.java b/gen/java/com/openxc/BinaryMessages.java
index dc44febc..a30e70f4 100644
--- a/gen/java/com/openxc/BinaryMessages.java
+++ b/gen/java/com/openxc/BinaryMessages.java
@@ -76,6 +76,20 @@ public final class BinaryMessages {
* optional .openxc.ControlCommand control_command = 5;
*/
com.openxc.BinaryMessages.ControlCommandOrBuilder getControlCommandOrBuilder();
+
+ // optional .openxc.CommandResponse command_response = 6;
+ /**
+ * optional .openxc.CommandResponse command_response = 6;
+ */
+ boolean hasCommandResponse();
+ /**
+ * optional .openxc.CommandResponse command_response = 6;
+ */
+ com.openxc.BinaryMessages.CommandResponse getCommandResponse();
+ /**
+ * optional .openxc.CommandResponse command_response = 6;
+ */
+ com.openxc.BinaryMessages.CommandResponseOrBuilder getCommandResponseOrBuilder();
}
/**
* Protobuf type {@code openxc.VehicleMessage}
@@ -191,6 +205,19 @@ public final class BinaryMessages {
bitField0_ |= 0x00000010;
break;
}
+ case 50: {
+ com.openxc.BinaryMessages.CommandResponse.Builder subBuilder = null;
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ subBuilder = commandResponse_.toBuilder();
+ }
+ commandResponse_ = input.readMessage(com.openxc.BinaryMessages.CommandResponse.PARSER, extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(commandResponse_);
+ commandResponse_ = subBuilder.buildPartial();
+ }
+ bitField0_ |= 0x00000020;
+ break;
+ }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -251,6 +278,10 @@ public final class BinaryMessages {
* CONTROL_COMMAND = 4;
*/
CONTROL_COMMAND(3, 4),
+ /**
+ * COMMAND_RESPONSE = 5;
+ */
+ COMMAND_RESPONSE(4, 5),
;
/**
@@ -269,6 +300,10 @@ public final class BinaryMessages {
* CONTROL_COMMAND = 4;
*/
public static final int CONTROL_COMMAND_VALUE = 4;
+ /**
+ * COMMAND_RESPONSE = 5;
+ */
+ public static final int COMMAND_RESPONSE_VALUE = 5;
public final int getNumber() { return value; }
@@ -279,6 +314,7 @@ public final class BinaryMessages {
case 2: return TRANSLATED;
case 3: return DIAGNOSTIC;
case 4: return CONTROL_COMMAND;
+ case 5: return COMMAND_RESPONSE;
default: return null;
}
}
@@ -435,12 +471,35 @@ public final class BinaryMessages {
return controlCommand_;
}
+ // optional .openxc.CommandResponse command_response = 6;
+ public static final int COMMAND_RESPONSE_FIELD_NUMBER = 6;
+ private com.openxc.BinaryMessages.CommandResponse commandResponse_;
+ /**
+ * optional .openxc.CommandResponse command_response = 6;
+ */
+ public boolean hasCommandResponse() {
+ return ((bitField0_ & 0x00000020) == 0x00000020);
+ }
+ /**
+ * optional .openxc.CommandResponse command_response = 6;
+ */
+ public com.openxc.BinaryMessages.CommandResponse getCommandResponse() {
+ return commandResponse_;
+ }
+ /**
+ * optional .openxc.CommandResponse command_response = 6;
+ */
+ public com.openxc.BinaryMessages.CommandResponseOrBuilder getCommandResponseOrBuilder() {
+ return commandResponse_;
+ }
+
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();
controlCommand_ = com.openxc.BinaryMessages.ControlCommand.getDefaultInstance();
+ commandResponse_ = com.openxc.BinaryMessages.CommandResponse.getDefaultInstance();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -469,6 +528,9 @@ public final class BinaryMessages {
if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeMessage(5, controlCommand_);
}
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ output.writeMessage(6, commandResponse_);
+ }
getUnknownFields().writeTo(output);
}
@@ -498,6 +560,10 @@ public final class BinaryMessages {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, controlCommand_);
}
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(6, commandResponse_);
+ }
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -610,6 +676,7 @@ public final class BinaryMessages {
getTranslatedMessageFieldBuilder();
getDiagnosticResponseFieldBuilder();
getControlCommandFieldBuilder();
+ getCommandResponseFieldBuilder();
}
}
private static Builder create() {
@@ -644,6 +711,12 @@ public final class BinaryMessages {
controlCommandBuilder_.clear();
}
bitField0_ = (bitField0_ & ~0x00000010);
+ if (commandResponseBuilder_ == null) {
+ commandResponse_ = com.openxc.BinaryMessages.CommandResponse.getDefaultInstance();
+ } else {
+ commandResponseBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000020);
return this;
}
@@ -708,6 +781,14 @@ public final class BinaryMessages {
} else {
result.controlCommand_ = controlCommandBuilder_.build();
}
+ if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
+ to_bitField0_ |= 0x00000020;
+ }
+ if (commandResponseBuilder_ == null) {
+ result.commandResponse_ = commandResponse_;
+ } else {
+ result.commandResponse_ = commandResponseBuilder_.build();
+ }
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -739,6 +820,9 @@ public final class BinaryMessages {
if (other.hasControlCommand()) {
mergeControlCommand(other.getControlCommand());
}
+ if (other.hasCommandResponse()) {
+ mergeCommandResponse(other.getCommandResponse());
+ }
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@@ -1270,6 +1354,123 @@ public final class BinaryMessages {
return controlCommandBuilder_;
}
+ // optional .openxc.CommandResponse command_response = 6;
+ private com.openxc.BinaryMessages.CommandResponse commandResponse_ = com.openxc.BinaryMessages.CommandResponse.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ com.openxc.BinaryMessages.CommandResponse, com.openxc.BinaryMessages.CommandResponse.Builder, com.openxc.BinaryMessages.CommandResponseOrBuilder> commandResponseBuilder_;
+ /**
+ * optional .openxc.CommandResponse command_response = 6;
+ */
+ public boolean hasCommandResponse() {
+ return ((bitField0_ & 0x00000020) == 0x00000020);
+ }
+ /**
+ * optional .openxc.CommandResponse command_response = 6;
+ */
+ public com.openxc.BinaryMessages.CommandResponse getCommandResponse() {
+ if (commandResponseBuilder_ == null) {
+ return commandResponse_;
+ } else {
+ return commandResponseBuilder_.getMessage();
+ }
+ }
+ /**
+ * optional .openxc.CommandResponse command_response = 6;
+ */
+ public Builder setCommandResponse(com.openxc.BinaryMessages.CommandResponse value) {
+ if (commandResponseBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ commandResponse_ = value;
+ onChanged();
+ } else {
+ commandResponseBuilder_.setMessage(value);
+ }
+ bitField0_ |= 0x00000020;
+ return this;
+ }
+ /**
+ * optional .openxc.CommandResponse command_response = 6;
+ */
+ public Builder setCommandResponse(
+ com.openxc.BinaryMessages.CommandResponse.Builder builderForValue) {
+ if (commandResponseBuilder_ == null) {
+ commandResponse_ = builderForValue.build();
+ onChanged();
+ } else {
+ commandResponseBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000020;
+ return this;
+ }
+ /**
+ * optional .openxc.CommandResponse command_response = 6;
+ */
+ public Builder mergeCommandResponse(com.openxc.BinaryMessages.CommandResponse value) {
+ if (commandResponseBuilder_ == null) {
+ if (((bitField0_ & 0x00000020) == 0x00000020) &&
+ commandResponse_ != com.openxc.BinaryMessages.CommandResponse.getDefaultInstance()) {
+ commandResponse_ =
+ com.openxc.BinaryMessages.CommandResponse.newBuilder(commandResponse_).mergeFrom(value).buildPartial();
+ } else {
+ commandResponse_ = value;
+ }
+ onChanged();
+ } else {
+ commandResponseBuilder_.mergeFrom(value);
+ }
+ bitField0_ |= 0x00000020;
+ return this;
+ }
+ /**
+ * optional .openxc.CommandResponse command_response = 6;
+ */
+ public Builder clearCommandResponse() {
+ if (commandResponseBuilder_ == null) {
+ commandResponse_ = com.openxc.BinaryMessages.CommandResponse.getDefaultInstance();
+ onChanged();
+ } else {
+ commandResponseBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000020);
+ return this;
+ }
+ /**
+ * optional .openxc.CommandResponse command_response = 6;
+ */
+ public com.openxc.BinaryMessages.CommandResponse.Builder getCommandResponseBuilder() {
+ bitField0_ |= 0x00000020;
+ onChanged();
+ return getCommandResponseFieldBuilder().getBuilder();
+ }
+ /**
+ * optional .openxc.CommandResponse command_response = 6;
+ */
+ public com.openxc.BinaryMessages.CommandResponseOrBuilder getCommandResponseOrBuilder() {
+ if (commandResponseBuilder_ != null) {
+ return commandResponseBuilder_.getMessageOrBuilder();
+ } else {
+ return commandResponse_;
+ }
+ }
+ /**
+ * optional .openxc.CommandResponse command_response = 6;
+ */
+ private com.google.protobuf.SingleFieldBuilder<
+ com.openxc.BinaryMessages.CommandResponse, com.openxc.BinaryMessages.CommandResponse.Builder, com.openxc.BinaryMessages.CommandResponseOrBuilder>
+ getCommandResponseFieldBuilder() {
+ if (commandResponseBuilder_ == null) {
+ commandResponseBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ com.openxc.BinaryMessages.CommandResponse, com.openxc.BinaryMessages.CommandResponse.Builder, com.openxc.BinaryMessages.CommandResponseOrBuilder>(
+ commandResponse_,
+ getParentForChildren(),
+ isClean());
+ commandResponse_ = null;
+ }
+ return commandResponseBuilder_;
+ }
+
// @@protoc_insertion_point(builder_scope:openxc.VehicleMessage)
}
@@ -2530,128 +2731,53 @@ public final class BinaryMessages {
// @@protoc_insertion_point(class_scope:openxc.ControlCommand)
}
- public interface DiagnosticRequestOrBuilder
+ public interface CommandResponseOrBuilder
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 .openxc.ControlCommand.Type type = 1;
/**
- * optional double factor = 7;
+ * optional .openxc.ControlCommand.Type type = 1;
*/
- boolean hasFactor();
+ boolean hasType();
/**
- * optional double factor = 7;
+ * optional .openxc.ControlCommand.Type type = 1;
*/
- double getFactor();
+ com.openxc.BinaryMessages.ControlCommand.Type getType();
- // optional double offset = 8;
- /**
- * optional double offset = 8;
- */
- boolean hasOffset();
+ // optional string message = 2;
/**
- * optional double offset = 8;
+ * optional string message = 2;
*/
- double getOffset();
-
- // optional double frequency = 9;
+ boolean hasMessage();
/**
- * optional double frequency = 9;
+ * optional string message = 2;
*/
- boolean hasFrequency();
+ java.lang.String getMessage();
/**
- * optional double frequency = 9;
+ * optional string message = 2;
*/
- double getFrequency();
+ com.google.protobuf.ByteString
+ getMessageBytes();
}
/**
- * Protobuf type {@code openxc.DiagnosticRequest}
+ * Protobuf type {@code openxc.CommandResponse}
*/
- public static final class DiagnosticRequest extends
+ public static final class CommandResponse extends
com.google.protobuf.GeneratedMessage
- implements DiagnosticRequestOrBuilder {
- // Use DiagnosticRequest.newBuilder() to construct.
- private DiagnosticRequest(com.google.protobuf.GeneratedMessage.Builder> builder) {
+ implements CommandResponseOrBuilder {
+ // Use CommandResponse.newBuilder() to construct.
+ private CommandResponse(com.google.protobuf.GeneratedMessage.Builder> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private DiagnosticRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private CommandResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
- private static final DiagnosticRequest defaultInstance;
- public static DiagnosticRequest getDefaultInstance() {
+ private static final CommandResponse defaultInstance;
+ public static CommandResponse getDefaultInstance() {
return defaultInstance;
}
- public DiagnosticRequest getDefaultInstanceForType() {
+ public CommandResponse getDefaultInstanceForType() {
return defaultInstance;
}
@@ -2661,7 +2787,7 @@ public final class BinaryMessages {
getUnknownFields() {
return this.unknownFields;
}
- private DiagnosticRequest(
+ private CommandResponse(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -2685,48 +2811,19 @@ public final class BinaryMessages {
break;
}
case 8: {
- bitField0_ |= 0x00000001;
- bus_ = input.readInt32();
+ 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 16: {
+ case 18: {
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();
+ message_ = input.readBytes();
break;
}
}
@@ -2743,196 +2840,94 @@ public final class BinaryMessages {
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_descriptor;
+ return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_fieldAccessorTable
+ return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- com.openxc.BinaryMessages.DiagnosticRequest.class, com.openxc.BinaryMessages.DiagnosticRequest.Builder.class);
+ com.openxc.BinaryMessages.CommandResponse.class, com.openxc.BinaryMessages.CommandResponse.Builder.class);
}
- public static com.google.protobuf.Parseroptional int32 bus = 1;
+ * optional .openxc.ControlCommand.Type type = 1;
*/
- public boolean hasBus() {
+ public boolean hasType() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
- * optional int32 bus = 1;
+ * optional .openxc.ControlCommand.Type type = 1;
*/
- public int getBus() {
- return bus_;
+ public com.openxc.BinaryMessages.ControlCommand.Type getType() {
+ return type_;
}
- // optional uint32 message_id = 2;
- public static final int MESSAGE_ID_FIELD_NUMBER = 2;
- private int messageId_;
+ // optional string message = 2;
+ public static final int MESSAGE_FIELD_NUMBER = 2;
+ private java.lang.Object message_;
/**
- * optional uint32 message_id = 2;
+ * optional string message = 2;
*/
- public boolean hasMessageId() {
+ public boolean hasMessage() {
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;
+ * optional string message = 2;
*/
- 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);
+ public java.lang.String getMessage() {
+ java.lang.Object ref = message_;
+ 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()) {
+ message_ = s;
+ }
+ return s;
+ }
}
/**
- * optional double frequency = 9;
+ * optional string message = 2;
*/
- public double getFrequency() {
- return frequency_;
+ public com.google.protobuf.ByteString
+ getMessageBytes() {
+ java.lang.Object ref = message_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ message_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
}
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;
+ type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
+ message_ = "";
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -2947,31 +2942,10 @@ 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_);
- }
- 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_);
+ output.writeBytes(2, getMessageBytes());
}
getUnknownFields().writeTo(output);
}
@@ -2984,39 +2958,11 @@ 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_);
- }
- 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_);
+ .computeBytesSize(2, getMessageBytes());
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
@@ -3030,53 +2976,53 @@ public final class BinaryMessages {
return super.writeReplace();
}
- public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
+ public static com.openxc.BinaryMessages.CommandResponse parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
+ public static com.openxc.BinaryMessages.CommandResponse parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(byte[] data)
+ public static com.openxc.BinaryMessages.CommandResponse parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
+ public static com.openxc.BinaryMessages.CommandResponse 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)
+ public static com.openxc.BinaryMessages.CommandResponse parseFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
+ public static com.openxc.BinaryMessages.CommandResponse parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
- public static com.openxc.BinaryMessages.DiagnosticRequest parseDelimitedFrom(java.io.InputStream input)
+ public static com.openxc.BinaryMessages.CommandResponse parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input);
}
- public static com.openxc.BinaryMessages.DiagnosticRequest parseDelimitedFrom(
+ public static com.openxc.BinaryMessages.CommandResponse parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
- public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
+ public static com.openxc.BinaryMessages.CommandResponse parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
+ public static com.openxc.BinaryMessages.CommandResponse parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -3085,7 +3031,7 @@ public final class BinaryMessages {
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
- public static Builder newBuilder(com.openxc.BinaryMessages.DiagnosticRequest prototype) {
+ public static Builder newBuilder(com.openxc.BinaryMessages.CommandResponse prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
@@ -3097,24 +3043,24 @@ public final class BinaryMessages {
return builder;
}
/**
- * Protobuf type {@code openxc.DiagnosticRequest}
+ * Protobuf type {@code openxc.CommandResponse}
*/
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 string message = 2;
+ private java.lang.Object message_ = "";
+ /**
+ * optional string message = 2;
+ */
+ public boolean hasMessage() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * optional string message = 2;
+ */
+ public java.lang.String getMessage() {
+ java.lang.Object ref = message_;
+ if (!(ref instanceof java.lang.String)) {
+ java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ .toStringUtf8();
+ message_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * optional string message = 2;
+ */
+ public com.google.protobuf.ByteString
+ getMessageBytes() {
+ java.lang.Object ref = message_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ message_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * optional string message = 2;
+ */
+ public Builder setMessage(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00000002;
+ message_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * optional string message = 2;
+ */
+ public Builder clearMessage() {
+ bitField0_ = (bitField0_ & ~0x00000002);
+ message_ = getDefaultInstance().getMessage();
+ onChanged();
+ return this;
+ }
+ /**
+ * optional string message = 2;
+ */
+ public Builder setMessageBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00000002;
+ message_ = value;
+ onChanged();
+ return this;
+ }
+
+ // @@protoc_insertion_point(builder_scope:openxc.CommandResponse)
+ }
+
+ static {
+ defaultInstance = new CommandResponse(true);
+ defaultInstance.initFields();
+ }
+
+ // @@protoc_insertion_point(class_scope:openxc.CommandResponse)
+ }
+
+ public interface DiagnosticRequestOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // optional int32 bus = 1;
+ /**
+ * optional int32 bus = 1;
+ */
+ boolean hasBus();
+ /**
+ * optional int32 bus = 1;
+ */
+ int getBus();
+
+ // optional uint32 message_id = 2;
+ /**
+ * optional uint32 message_id = 2;
+ */
+ boolean hasMessageId();
+ /**
+ * optional uint32 message_id = 2;
+ */
+ int getMessageId();
+
+ // optional uint32 mode = 3;
+ /**
+ * optional uint32 mode = 3;
+ */
+ boolean hasMode();
+ /**
+ * optional uint32 mode = 3;
+ */
+ int getMode();
+
+ // optional uint32 pid = 4;
+ /**
+ * optional uint32 pid = 4;
+ */
+ boolean hasPid();
+ /**
+ * optional uint32 pid = 4;
+ */
+ int getPid();
+
+ // optional bytes payload = 5;
+ /**
+ * optional bytes payload = 5;
+ *
+ * + * TODO we are capping this at 8 bytes for now - need to change when we + * support multi-frame responses + *+ */ + boolean hasPayload(); + /** + *
optional bytes payload = 5;
+ *
+ * + * TODO we are capping this at 8 bytes for now - need to change when we + * support multi-frame responses + *+ */ + com.google.protobuf.ByteString getPayload(); + + // optional bool multiple_responses = 6; + /** + *
optional bool multiple_responses = 6;
+ */
+ boolean hasMultipleResponses();
+ /**
+ * optional bool multiple_responses = 6;
+ */
+ boolean getMultipleResponses();
+
+ // optional double frequency = 7;
+ /**
+ * optional double frequency = 7;
+ */
+ boolean hasFrequency();
+ /**
+ * optional double frequency = 7;
+ */
+ double getFrequency();
+
+ // optional string name = 8;
+ /**
+ * optional string name = 8;
+ */
+ boolean hasName();
+ /**
+ * optional string name = 8;
+ */
+ java.lang.String getName();
+ /**
+ * optional string name = 8;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
+
+ // optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;
+ /**
+ * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;
+ */
+ boolean hasDecodedType();
+ /**
+ * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;
+ */
+ com.openxc.BinaryMessages.DiagnosticRequest.DecodedType getDecodedType();
+
+ // optional .openxc.DiagnosticRequest.Action action = 10;
+ /**
+ * optional .openxc.DiagnosticRequest.Action action = 10;
+ */
+ boolean hasAction();
+ /**
+ * optional .openxc.DiagnosticRequest.Action action = 10;
+ */
+ com.openxc.BinaryMessages.DiagnosticRequest.Action getAction();
+ }
+ /**
+ * 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;
+ multipleResponses_ = input.readBool();
+ break;
+ }
+ case 57: {
+ bitField0_ |= 0x00000040;
+ frequency_ = input.readDouble();
+ break;
+ }
+ case 66: {
+ bitField0_ |= 0x00000080;
+ name_ = input.readBytes();
+ break;
+ }
+ case 72: {
+ int rawValue = input.readEnum();
+ com.openxc.BinaryMessages.DiagnosticRequest.DecodedType value = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.valueOf(rawValue);
+ if (value == null) {
+ unknownFields.mergeVarintField(9, rawValue);
+ } else {
+ bitField0_ |= 0x00000100;
+ decodedType_ = value;
+ }
+ break;
+ }
+ case 80: {
+ int rawValue = input.readEnum();
+ com.openxc.BinaryMessages.DiagnosticRequest.Action value = com.openxc.BinaryMessages.DiagnosticRequest.Action.valueOf(rawValue);
+ if (value == null) {
+ unknownFields.mergeVarintField(10, rawValue);
+ } else {
+ bitField0_ |= 0x00000200;
+ action_ = value;
+ }
+ break;
+ }
+ }
+ }
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(this);
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(
+ e.getMessage()).setUnfinishedMessage(this);
+ } finally {
+ this.unknownFields = unknownFields.build();
+ makeExtensionsImmutable();
+ }
+ }
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return com.openxc.BinaryMessages.internal_static_openxc_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.ParserNONE = 1;
+ */
+ NONE(0, 1),
+ /**
+ * OBD2 = 2;
+ */
+ OBD2(1, 2),
+ ;
+
+ /**
+ * NONE = 1;
+ */
+ public static final int NONE_VALUE = 1;
+ /**
+ * OBD2 = 2;
+ */
+ public static final int OBD2_VALUE = 2;
+
+
+ public final int getNumber() { return value; }
+
+ public static DecodedType valueOf(int value) {
+ switch (value) {
+ case 1: return NONE;
+ case 2: return OBD2;
+ default: return null;
+ }
+ }
+
+ public static com.google.protobuf.Internal.EnumLiteMapADD = 1;
+ */
+ ADD(0, 1),
+ /**
+ * CANCEL = 3;
+ */
+ CANCEL(1, 3),
+ ;
+
+ /**
+ * ADD = 1;
+ */
+ public static final int ADD_VALUE = 1;
+ /**
+ * CANCEL = 3;
+ */
+ public static final int CANCEL_VALUE = 3;
+
+
+ public final int getNumber() { return value; }
+
+ public static Action valueOf(int value) {
+ switch (value) {
+ case 1: return ADD;
+ case 3: return CANCEL;
+ default: return null;
+ }
+ }
+
+ public static com.google.protobuf.Internal.EnumLiteMapoptional int32 bus = 1;
+ */
+ public boolean hasBus() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * optional int32 bus = 1;
+ */
+ public int getBus() {
+ return bus_;
+ }
+
+ // optional uint32 message_id = 2;
+ public static final int MESSAGE_ID_FIELD_NUMBER = 2;
+ private int messageId_;
+ /**
+ * optional uint32 message_id = 2;
+ */
+ public boolean hasMessageId() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * optional uint32 message_id = 2;
+ */
+ public int getMessageId() {
+ return messageId_;
+ }
+
+ // optional uint32 mode = 3;
+ public static final int MODE_FIELD_NUMBER = 3;
+ private int mode_;
+ /**
+ * optional uint32 mode = 3;
+ */
+ public boolean hasMode() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * optional uint32 mode = 3;
+ */
+ public int getMode() {
+ return mode_;
+ }
+
+ // optional uint32 pid = 4;
+ public static final int PID_FIELD_NUMBER = 4;
+ private int pid_;
+ /**
+ * optional uint32 pid = 4;
+ */
+ public boolean hasPid() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional uint32 pid = 4;
+ */
+ public int getPid() {
+ return pid_;
+ }
+
+ // optional bytes payload = 5;
+ public static final int PAYLOAD_FIELD_NUMBER = 5;
+ private com.google.protobuf.ByteString payload_;
+ /**
+ * optional bytes payload = 5;
+ *
+ * + * TODO we are capping this at 8 bytes for now - need to change when we + * support multi-frame responses + *+ */ + public boolean hasPayload() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + *
optional bytes payload = 5;
+ *
+ * + * TODO we are capping this at 8 bytes for now - need to change when we + * support multi-frame responses + *+ */ + public com.google.protobuf.ByteString getPayload() { + return payload_; + } + + // optional bool multiple_responses = 6; + public static final int MULTIPLE_RESPONSES_FIELD_NUMBER = 6; + private boolean multipleResponses_; + /** + *
optional bool multiple_responses = 6;
+ */
+ public boolean hasMultipleResponses() {
+ return ((bitField0_ & 0x00000020) == 0x00000020);
+ }
+ /**
+ * optional bool multiple_responses = 6;
+ */
+ public boolean getMultipleResponses() {
+ return multipleResponses_;
+ }
+
+ // optional double frequency = 7;
+ public static final int FREQUENCY_FIELD_NUMBER = 7;
+ private double frequency_;
+ /**
+ * optional double frequency = 7;
+ */
+ public boolean hasFrequency() {
+ return ((bitField0_ & 0x00000040) == 0x00000040);
+ }
+ /**
+ * optional double frequency = 7;
+ */
+ public double getFrequency() {
+ return frequency_;
+ }
+
+ // optional string name = 8;
+ public static final int NAME_FIELD_NUMBER = 8;
+ private java.lang.Object name_;
+ /**
+ * optional string name = 8;
+ */
+ public boolean hasName() {
+ return ((bitField0_ & 0x00000080) == 0x00000080);
+ }
+ /**
+ * optional string name = 8;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ 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()) {
+ name_ = s;
+ }
+ return s;
+ }
+ }
+ /**
+ * optional string name = 8;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.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 .openxc.DiagnosticRequest.DecodedType decoded_type = 9;
+ public static final int DECODED_TYPE_FIELD_NUMBER = 9;
+ private com.openxc.BinaryMessages.DiagnosticRequest.DecodedType decodedType_;
+ /**
+ * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;
+ */
+ public boolean hasDecodedType() {
+ return ((bitField0_ & 0x00000100) == 0x00000100);
+ }
+ /**
+ * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;
+ */
+ public com.openxc.BinaryMessages.DiagnosticRequest.DecodedType getDecodedType() {
+ return decodedType_;
+ }
+
+ // optional .openxc.DiagnosticRequest.Action action = 10;
+ public static final int ACTION_FIELD_NUMBER = 10;
+ private com.openxc.BinaryMessages.DiagnosticRequest.Action action_;
+ /**
+ * optional .openxc.DiagnosticRequest.Action action = 10;
+ */
+ public boolean hasAction() {
+ return ((bitField0_ & 0x00000200) == 0x00000200);
+ }
+ /**
+ * optional .openxc.DiagnosticRequest.Action action = 10;
+ */
+ public com.openxc.BinaryMessages.DiagnosticRequest.Action getAction() {
+ return action_;
+ }
+
+ private void initFields() {
+ bus_ = 0;
+ messageId_ = 0;
+ mode_ = 0;
+ pid_ = 0;
+ payload_ = com.google.protobuf.ByteString.EMPTY;
+ multipleResponses_ = false;
+ frequency_ = 0D;
+ name_ = "";
+ decodedType_ = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.NONE;
+ action_ = com.openxc.BinaryMessages.DiagnosticRequest.Action.ADD;
+ }
+ 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, multipleResponses_);
+ }
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ output.writeDouble(7, frequency_);
+ }
+ if (((bitField0_ & 0x00000080) == 0x00000080)) {
+ output.writeBytes(8, getNameBytes());
+ }
+ if (((bitField0_ & 0x00000100) == 0x00000100)) {
+ output.writeEnum(9, decodedType_.getNumber());
+ }
+ if (((bitField0_ & 0x00000200) == 0x00000200)) {
+ output.writeEnum(10, action_.getNumber());
+ }
+ 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, multipleResponses_);
+ }
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeDoubleSize(7, frequency_);
+ }
+ if (((bitField0_ & 0x00000080) == 0x00000080)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBytesSize(8, getNameBytes());
+ }
+ if (((bitField0_ & 0x00000100) == 0x00000100)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeEnumSize(9, decodedType_.getNumber());
+ }
+ if (((bitField0_ & 0x00000200) == 0x00000200)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeEnumSize(10, action_.getNumber());
+ }
+ 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 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;
+ }
+
+ // optional .openxc.DiagnosticRequest.Action action = 10;
+ private com.openxc.BinaryMessages.DiagnosticRequest.Action action_ = com.openxc.BinaryMessages.DiagnosticRequest.Action.ADD;
+ /**
+ * optional .openxc.DiagnosticRequest.Action action = 10;
+ */
+ public boolean hasAction() {
+ return ((bitField0_ & 0x00000200) == 0x00000200);
+ }
+ /**
+ * optional .openxc.DiagnosticRequest.Action action = 10;
+ */
+ public com.openxc.BinaryMessages.DiagnosticRequest.Action getAction() {
+ return action_;
+ }
+ /**
+ * optional .openxc.DiagnosticRequest.Action action = 10;
+ */
+ public Builder setAction(com.openxc.BinaryMessages.DiagnosticRequest.Action value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00000200;
+ action_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * optional .openxc.DiagnosticRequest.Action action = 10;
+ */
+ public Builder clearAction() {
+ bitField0_ = (bitField0_ & ~0x00000200);
+ action_ = com.openxc.BinaryMessages.DiagnosticRequest.Action.ADD;
+ onChanged();
+ return this;
+ }
+
+ // @@protoc_insertion_point(builder_scope:openxc.DiagnosticRequest)
+ }
+
+ static {
+ defaultInstance = new DiagnosticRequest(true);
+ defaultInstance.initFields();
+ }
+
+ // @@protoc_insertion_point(class_scope:openxc.DiagnosticRequest)
+ }
+
+ public interface DiagnosticResponseOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // optional int32 bus = 1;
+ /**
+ * optional int32 bus = 1;
+ */
+ boolean hasBus();
+ /**
+ * optional int32 bus = 1;
+ */
+ int getBus();
+
+ // optional uint32 message_id = 2;
+ /**
+ * optional uint32 message_id = 2;
+ */
+ boolean hasMessageId();
+ /**
+ * optional uint32 message_id = 2;
+ */
+ int getMessageId();
+
+ // optional uint32 mode = 3;
+ /**
+ * optional uint32 mode = 3;
+ */
+ boolean hasMode();
+ /**
+ * optional uint32 mode = 3;
+ */
+ int getMode();
+
+ // optional uint32 pid = 4;
+ /**
+ * optional uint32 pid = 4;
+ */
+ boolean hasPid();
+ /**
+ * optional uint32 pid = 4;
+ */
+ int getPid();
+
+ // optional bool success = 5;
+ /**
+ * optional bool success = 5;
+ */
+ boolean hasSuccess();
+ /**
+ * optional bool success = 5;
+ */
+ boolean getSuccess();
+
+ // optional uint32 negative_response_code = 6;
+ /**
+ * optional uint32 negative_response_code = 6;
+ */
+ boolean hasNegativeResponseCode();
+ /**
+ * optional uint32 negative_response_code = 6;
+ */
+ int getNegativeResponseCode();
+
+ // optional bytes payload = 7;
+ /**
+ * optional bytes payload = 7;
+ *
+ * + * TODO we are capping this at 8 bytes for now - need to change when we + * support multi-frame responses + *+ */ + boolean hasPayload(); + /** + *
optional bytes payload = 7;
+ *
+ * + * TODO we are capping this at 8 bytes for now - need to change when we + * support multi-frame responses + *+ */ + com.google.protobuf.ByteString getPayload(); + + // optional double value = 8; + /** + *
optional double value = 8;
+ */
+ boolean hasValue();
+ /**
+ * optional double value = 8;
+ */
+ double getValue();
+ }
+ /**
+ * Protobuf type {@code openxc.DiagnosticResponse}
+ */
+ public static final class DiagnosticResponse extends
+ com.google.protobuf.GeneratedMessage
+ implements DiagnosticResponseOrBuilder {
+ // Use DiagnosticResponse.newBuilder() to construct.
+ private DiagnosticResponse(com.google.protobuf.GeneratedMessage.Builder> builder) {
+ 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.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 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.Builderoptional bytes payload = 5;
- *
- * - * TODO we are capping this at 8 bytes for now - need to change when we - * support multi-frame responses - *+ *
optional bool success = 5;
*/
- public boolean hasPayload() {
+ public boolean hasSuccess() {
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 - *+ *
optional bool success = 5;
*/
- public com.google.protobuf.ByteString getPayload() {
- return payload_;
+ public boolean getSuccess() {
+ return success_;
}
/**
- * optional bytes payload = 5;
- *
- * - * TODO we are capping this at 8 bytes for now - need to change when we - * support multi-frame responses - *+ *
optional bool success = 5;
*/
- public Builder setPayload(com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000010;
- payload_ = value;
+ public Builder setSuccess(boolean value) {
+ bitField0_ |= 0x00000010;
+ success_ = 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 - *+ *
optional bool success = 5;
*/
- public Builder clearPayload() {
+ public Builder clearSuccess() {
bitField0_ = (bitField0_ & ~0x00000010);
- payload_ = getDefaultInstance().getPayload();
+ success_ = false;
onChanged();
return this;
}
- // optional bool parse_payload = 6;
- private boolean parsePayload_ ;
+ // optional uint32 negative_response_code = 6;
+ private int negativeResponseCode_ ;
/**
- * optional bool parse_payload = 6;
+ * optional uint32 negative_response_code = 6;
*/
- public boolean hasParsePayload() {
+ public boolean hasNegativeResponseCode() {
return ((bitField0_ & 0x00000020) == 0x00000020);
}
/**
- * optional bool parse_payload = 6;
+ * optional uint32 negative_response_code = 6;
*/
- public boolean getParsePayload() {
- return parsePayload_;
+ public int getNegativeResponseCode() {
+ return negativeResponseCode_;
}
/**
- * optional bool parse_payload = 6;
+ * optional uint32 negative_response_code = 6;
*/
- public Builder setParsePayload(boolean value) {
+ public Builder setNegativeResponseCode(int value) {
bitField0_ |= 0x00000020;
- parsePayload_ = value;
+ negativeResponseCode_ = value;
onChanged();
return this;
}
/**
- * optional bool parse_payload = 6;
+ * optional uint32 negative_response_code = 6;
*/
- public Builder clearParsePayload() {
+ public Builder clearNegativeResponseCode() {
bitField0_ = (bitField0_ & ~0x00000020);
- parsePayload_ = false;
+ negativeResponseCode_ = 0;
onChanged();
return this;
}
- // optional double factor = 7;
- private double factor_ ;
+ // optional bytes payload = 7;
+ private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY;
/**
- * optional double factor = 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 hasFactor() { + public boolean hasPayload() { 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;
+ * optional bytes payload = 7;
+ *
+ * + * TODO we are capping this at 8 bytes for now - need to change when we + * support multi-frame responses + **/ - public double getOffset() { - return offset_; + public com.google.protobuf.ByteString getPayload() { + return payload_; } /** - *
optional double offset = 8;
+ * 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 setOffset(double value) { - bitField0_ |= 0x00000080; - offset_ = value; + public Builder setPayload(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000040; + payload_ = value; onChanged(); return this; } /** - *
optional double offset = 8;
+ * 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 clearOffset() { - bitField0_ = (bitField0_ & ~0x00000080); - offset_ = 0D; + public Builder clearPayload() { + bitField0_ = (bitField0_ & ~0x00000040); + payload_ = getDefaultInstance().getPayload(); onChanged(); return this; } - // optional double frequency = 9; - private double frequency_ ; + // optional double value = 8; + private double value_ ; /** - *
optional double frequency = 9;
+ * optional double value = 8;
*/
- public boolean hasFrequency() {
- return ((bitField0_ & 0x00000100) == 0x00000100);
+ public boolean hasValue() {
+ return ((bitField0_ & 0x00000080) == 0x00000080);
}
/**
- * optional double frequency = 9;
+ * optional double value = 8;
*/
- public double getFrequency() {
- return frequency_;
+ public double getValue() {
+ return value_;
}
/**
- * optional double frequency = 9;
+ * optional double value = 8;
*/
- public Builder setFrequency(double value) {
- bitField0_ |= 0x00000100;
- frequency_ = value;
+ public Builder setValue(double value) {
+ bitField0_ |= 0x00000080;
+ value_ = value;
onChanged();
return this;
}
/**
- * optional double frequency = 9;
+ * optional double value = 8;
*/
- public Builder clearFrequency() {
- bitField0_ = (bitField0_ & ~0x00000100);
- frequency_ = 0D;
+ public Builder clearValue() {
+ bitField0_ = (bitField0_ & ~0x00000080);
+ value_ = 0D;
onChanged();
return this;
}
- // @@protoc_insertion_point(builder_scope:openxc.DiagnosticRequest)
+ // @@protoc_insertion_point(builder_scope:openxc.DiagnosticResponse)
}
static {
- defaultInstance = new DiagnosticRequest(true);
+ defaultInstance = new DiagnosticResponse(true);
defaultInstance.initFields();
}
- // @@protoc_insertion_point(class_scope:openxc.DiagnosticRequest)
+ // @@protoc_insertion_point(class_scope:openxc.DiagnosticResponse)
}
- public interface DiagnosticResponseOrBuilder
+ public interface DynamicFieldOrBuilder
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 .openxc.DynamicField.Type type = 1;
/**
- * optional uint32 pid = 4;
+ * optional .openxc.DynamicField.Type type = 1;
*/
- boolean hasPid();
+ boolean hasType();
/**
- * optional uint32 pid = 4;
+ * optional .openxc.DynamicField.Type type = 1;
*/
- int getPid();
+ com.openxc.BinaryMessages.DynamicField.Type getType();
- // optional bool success = 5;
- /**
- * optional bool success = 5;
- */
- boolean hasSuccess();
+ // optional string string_value = 2;
/**
- * optional bool success = 5;
+ * optional string string_value = 2;
*/
- boolean getSuccess();
-
- // optional uint32 negative_response_code = 6;
+ boolean hasStringValue();
/**
- * optional uint32 negative_response_code = 6;
+ * optional string string_value = 2;
*/
- boolean hasNegativeResponseCode();
+ java.lang.String getStringValue();
/**
- * optional uint32 negative_response_code = 6;
+ * optional string string_value = 2;
*/
- int getNegativeResponseCode();
+ 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 hasPayload();
+ boolean hasNumericValue();
/**
- * 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;
*/
- com.google.protobuf.ByteString getPayload();
+ double getNumericValue();
- // optional double value = 8;
+ // optional bool boolean_value = 4;
/**
- * optional double value = 8;
+ * optional bool boolean_value = 4;
*/
- boolean hasValue();
+ boolean hasBooleanValue();
/**
- * optional double value = 8;
+ * optional bool boolean_value = 4;
*/
- double getValue();
+ boolean getBooleanValue();
}
/**
- * Protobuf type {@code openxc.DiagnosticResponse}
+ * Protobuf type {@code openxc.DynamicField}
*/
- public static final class DiagnosticResponse extends
+ public static final class DynamicField extends
com.google.protobuf.GeneratedMessage
- implements DiagnosticResponseOrBuilder {
- // Use DiagnosticResponse.newBuilder() to construct.
- private DiagnosticResponse(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 DiagnosticResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private DynamicField(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
- private static final DiagnosticResponse defaultInstance;
- public static DiagnosticResponse getDefaultInstance() {
+ private static final DynamicField defaultInstance;
+ public static DynamicField getDefaultInstance() {
return defaultInstance;
}
- public DiagnosticResponse getDefaultInstanceForType() {
+ public DynamicField getDefaultInstanceForType() {
return defaultInstance;
}
@@ -3738,7 +5799,7 @@ public final class BinaryMessages {
getUnknownFields() {
return this.unknownFields;
}
- private DiagnosticResponse(
+ private DynamicField(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -3762,43 +5823,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();
- break;
- }
- case 65: {
- bitField0_ |= 0x00000080;
- value_ = input.readDouble();
+ booleanValue_ = input.readBool();
break;
}
}
@@ -3815,179 +5862,219 @@ public final class BinaryMessages {
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_descriptor;
+ return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_descriptor;
+ }
+
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ com.openxc.BinaryMessages.DynamicField.class, com.openxc.BinaryMessages.DynamicField.Builder.class);
+ }
+
+ public static com.google.protobuf.ParserSTRING = 1;
+ */
+ STRING(0, 1),
+ /**
+ * NUM = 2;
+ */
+ NUM(1, 2),
+ /**
+ * BOOL = 3;
+ */
+ BOOL(2, 3),
+ ;
+
+ /**
+ * STRING = 1;
+ */
+ public static final int STRING_VALUE = 1;
+ /**
+ * NUM = 2;
+ */
+ public static final int NUM_VALUE = 2;
+ /**
+ * BOOL = 3;
+ */
+ public static final int BOOL_VALUE = 3;
+
+
+ public final int getNumber() { return value; }
+
+ public static Type valueOf(int value) {
+ switch (value) {
+ case 1: return STRING;
+ case 2: return NUM;
+ case 3: return BOOL;
+ default: return null;
+ }
+ }
+
+ public static com.google.protobuf.Internal.EnumLiteMapoptional 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 uint32 message_id = 2;
- public static final int MESSAGE_ID_FIELD_NUMBER = 2;
- private int messageId_;
+ // optional string string_value = 2;
+ public static final int STRING_VALUE_FIELD_NUMBER = 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 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;
+ * optional string string_value = 2;
*/
- public boolean hasNegativeResponseCode() {
- return ((bitField0_ & 0x00000020) == 0x00000020);
+ 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 uint32 negative_response_code = 6;
+ * optional string string_value = 2;
*/
- public int getNegativeResponseCode() {
- return negativeResponseCode_;
+ 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 bytes payload = 7;
- public static final int PAYLOAD_FIELD_NUMBER = 7;
- private com.google.protobuf.ByteString payload_;
+ // optional double numeric_value = 3;
+ public static final int NUMERIC_VALUE_FIELD_NUMBER = 3;
+ private double numericValue_;
/**
- * 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;
*/
- public boolean hasPayload() {
- return ((bitField0_ & 0x00000040) == 0x00000040);
+ public boolean hasNumericValue() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * 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;
*/
- public com.google.protobuf.ByteString getPayload() {
- return payload_;
+ public double getNumericValue() {
+ return numericValue_;
}
- // optional double value = 8;
- public static final int VALUE_FIELD_NUMBER = 8;
- private double value_;
+ // optional bool boolean_value = 4;
+ public static final int BOOLEAN_VALUE_FIELD_NUMBER = 4;
+ private boolean booleanValue_;
/**
- * optional double value = 8;
+ * optional bool boolean_value = 4;
*/
- public boolean hasValue() {
- return ((bitField0_ & 0x00000080) == 0x00000080);
+ public boolean hasBooleanValue() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
- * optional double value = 8;
+ * optional bool boolean_value = 4;
*/
- public double getValue() {
- return value_;
+ 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;
- value_ = 0D;
+ type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING;
+ stringValue_ = "";
+ numericValue_ = 0D;
+ booleanValue_ = false;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -4002,28 +6089,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_);
- }
- if (((bitField0_ & 0x00000080) == 0x00000080)) {
- output.writeDouble(8, value_);
+ output.writeBool(4, booleanValue_);
}
getUnknownFields().writeTo(output);
}
@@ -4036,35 +6111,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_);
- }
- if (((bitField0_ & 0x00000080) == 0x00000080)) {
- size += com.google.protobuf.CodedOutputStream
- .computeDoubleSize(8, value_);
+ .computeBoolSize(4, booleanValue_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
@@ -4078,53 +6137,53 @@ public final class BinaryMessages {
return super.writeReplace();
}
- public static com.openxc.BinaryMessages.DiagnosticResponse 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.DiagnosticResponse 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.DiagnosticResponse 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.DiagnosticResponse 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.DiagnosticResponse 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.DiagnosticResponse 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.DiagnosticResponse 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.DiagnosticResponse 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.DiagnosticResponse 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.DiagnosticResponse parseFrom(
+ public static com.openxc.BinaryMessages.DynamicField parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -4133,7 +6192,7 @@ public final class BinaryMessages {
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
- public static Builder newBuilder(com.openxc.BinaryMessages.DiagnosticResponse prototype) {
+ public static Builder newBuilder(com.openxc.BinaryMessages.DynamicField prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
@@ -4145,24 +6204,24 @@ public final class BinaryMessages {
return builder;
}
/**
- * Protobuf type {@code openxc.DiagnosticResponse}
+ * Protobuf type {@code openxc.DynamicField}
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builderoptional 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;
- */
- 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;
+ * optional string string_value = 2;
*/
- public boolean getSuccess() {
- return success_;
+ 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 bool success = 5;
+ * optional string string_value = 2;
*/
- public Builder setSuccess(boolean value) {
- bitField0_ |= 0x00000010;
- success_ = 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 bool success = 5;
+ * optional string string_value = 2;
*/
- public Builder clearSuccess() {
- bitField0_ = (bitField0_ & ~0x00000010);
- success_ = false;
+ public Builder setStringValue(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00000002;
+ stringValue_ = value;
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;
+ * optional string string_value = 2;
*/
- public Builder setNegativeResponseCode(int value) {
- bitField0_ |= 0x00000020;
- negativeResponseCode_ = value;
+ public Builder clearStringValue() {
+ bitField0_ = (bitField0_ & ~0x00000002);
+ stringValue_ = getDefaultInstance().getStringValue();
onChanged();
return this;
}
/**
- * optional uint32 negative_response_code = 6;
+ * optional string string_value = 2;
*/
- public Builder clearNegativeResponseCode() {
- bitField0_ = (bitField0_ & ~0x00000020);
- negativeResponseCode_ = 0;
+ public Builder setStringValueBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00000002;
+ stringValue_ = value;
onChanged();
return this;
}
- // optional bytes payload = 7;
- private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY;
+ // optional double numeric_value = 3;
+ private double numericValue_ ;
/**
- * 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;
*/
- public boolean hasPayload() {
- return ((bitField0_ & 0x00000040) == 0x00000040);
+ public boolean hasNumericValue() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * 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;
*/
- public com.google.protobuf.ByteString getPayload() {
- return payload_;
+ public double getNumericValue() {
+ return numericValue_;
}
/**
- * 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;
*/
- public Builder setPayload(com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000040;
- payload_ = value;
+ public Builder setNumericValue(double value) {
+ bitField0_ |= 0x00000004;
+ numericValue_ = 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 double numeric_value = 3;
*/
- public Builder clearPayload() {
- bitField0_ = (bitField0_ & ~0x00000040);
- payload_ = getDefaultInstance().getPayload();
+ public Builder clearNumericValue() {
+ bitField0_ = (bitField0_ & ~0x00000004);
+ numericValue_ = 0D;
onChanged();
return this;
}
- // optional double value = 8;
- private double value_ ;
+ // optional bool boolean_value = 4;
+ private boolean booleanValue_ ;
/**
- * optional double value = 8;
+ * optional bool boolean_value = 4;
*/
- public boolean hasValue() {
- return ((bitField0_ & 0x00000080) == 0x00000080);
+ public boolean hasBooleanValue() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
- * optional double value = 8;
+ * optional bool boolean_value = 4;
*/
- public double getValue() {
- return value_;
+ public boolean getBooleanValue() {
+ return booleanValue_;
}
/**
- * optional double value = 8;
+ * optional bool boolean_value = 4;
*/
- public Builder setValue(double value) {
- bitField0_ |= 0x00000080;
- value_ = value;
+ public Builder setBooleanValue(boolean value) {
+ bitField0_ |= 0x00000008;
+ booleanValue_ = value;
onChanged();
return this;
}
/**
- * optional double value = 8;
+ * optional bool boolean_value = 4;
*/
- public Builder clearValue() {
- bitField0_ = (bitField0_ & ~0x00000080);
- value_ = 0D;
+ public Builder clearBooleanValue() {
+ bitField0_ = (bitField0_ & ~0x00000008);
+ booleanValue_ = false;
onChanged();
return this;
}
- // @@protoc_insertion_point(builder_scope:openxc.DiagnosticResponse)
+ // @@protoc_insertion_point(builder_scope:openxc.DynamicField)
}
static {
- defaultInstance = new DiagnosticResponse(true);
+ defaultInstance = new DynamicField(true);
defaultInstance.initFields();
}
- // @@protoc_insertion_point(class_scope:openxc.DiagnosticResponse)
+ // @@protoc_insertion_point(class_scope:openxc.DynamicField)
}
public interface TranslatedMessageOrBuilder
@@ -4651,75 +6565,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 .openxc.DynamicField value = 3;
/**
- * optional bool boolean_value = 5;
+ * optional .openxc.DynamicField value = 3;
*/
- boolean hasBooleanValue();
- /**
- * optional bool boolean_value = 5;
- */
- boolean getBooleanValue();
-
- // optional string string_event = 6;
- /**
- * optional string string_event = 6;
- */
- 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}
@@ -4789,33 +6661,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;
}
}
@@ -5035,165 +6903,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() {
@@ -5214,22 +6972,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);
}
@@ -5248,29 +6994,13 @@ public final class BinaryMessages {
size += com.google.protobuf.CodedOutputStream
.computeBytesSize(2, getNameBytes());
}
- 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)) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
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;
@@ -5380,6 +7110,8 @@ public final class BinaryMessages {
}
private void maybeForceBuilderInitialization() {
if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ getValueFieldBuilder();
+ getEventFieldBuilder();
}
}
private static Builder create() {
@@ -5392,18 +7124,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;
}
@@ -5443,27 +7175,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;
@@ -5488,27 +7212,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;
@@ -5647,284 +7355,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;
+ * optional .openxc.DynamicField value = 3;
*/
- public double getNumericValue() {
- return numericValue_;
- }
- /**
- * optional double numeric_value = 4;
- */
- 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)
@@ -5953,6 +7615,11 @@ public final class BinaryMessages {
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
@@ -5963,6 +7630,11 @@ public final class BinaryMessages {
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_DynamicField_fieldAccessorTable;
private static com.google.protobuf.Descriptors.Descriptor
internal_static_openxc_TranslatedMessage_descriptor;
private static
@@ -5977,38 +7649,49 @@ public final class BinaryMessages {
descriptor;
static {
java.lang.String[] descriptorData = {
- "\n\014openxc.proto\022\006openxc\"\313\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\0227\n\023diagnostic_respo" +
"nse\030\004 \001(\0132\032.openxc.DiagnosticResponse\022/\n" +
"\017control_command\030\005 \001(\0132\026.openxc.ControlC" +
- "ommand\"D\n\004Type\022\007\n\003RAW\020\001\022\016\n\nTRANSLATED\020\002\022" +
- "\016\n\nDIAGNOSTIC\020\003\022\023\n\017CONTROL_COMMAND\020\004\";\n\n" +
- "RawMessage\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessage_id\030\002 ",
- "\001(\r\022\014\n\004data\030\003 \001(\014\"\246\001\n\016ControlCommand\022)\n\004" +
- "type\030\001 \001(\0162\033.openxc.ControlCommand.Type\022" +
- "5\n\022diagnostic_request\030\002 \001(\0132\031.openxc.Dia" +
- "gnosticRequest\"2\n\004Type\022\013\n\007VERSION\020\001\022\r\n\tD" +
- "EVICE_ID\020\002\022\016\n\nDIAGNOSTIC\020\003\"\252\001\n\021Diagnosti" +
- "cRequest\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\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\tfrequency\030\t \001(\001\"" +
- "\241\001\n\022DiagnosticResponse\022\013\n\003bus\030\001 \001(\005\022\022\n\nm",
- "essage_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\"\265\002\n\021TranslatedMessage\022,\n\004type\030\001 \001(\0162" +
- "\036.openxc.TranslatedMessage.Type\022\014\n\004name\030" +
- "\002 \001(\t\022\024\n\014string_value\030\003 \001(\t\022\025\n\rnumeric_v" +
- "alue\030\004 \001(\001\022\025\n\rboolean_value\030\005 \001(\010\022\024\n\014str" +
- "ing_event\030\006 \001(\t\022\025\n\rnumeric_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\014EVENTED_BOOL\020\006B\034\n\nc" +
- "om.openxcB\016BinaryMessages"
+ "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\"\316\002\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\022" +
+ "0\n\006action\030\n \001(\0162 .openxc.DiagnosticReque" +
+ "st.Action\"!\n\013DecodedType\022\010\n\004NONE\020\001\022\010\n\004OB" +
+ "D2\020\002\"\035\n\006Action\022\007\n\003ADD\020\001\022\n\n\006CANCEL\020\003\"\241\001\n\022" +
+ "DiagnosticResponse\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\007success\030\005 \001(\010\022\036\n\026negative_response_cod",
+ "e\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." +
+ "DynamicField.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\004BO" +
+ "OL\020\003\"\367\001\n\021TranslatedMessage\022,\n\004type\030\001 \001(\016" +
+ "2\036.openxc.TranslatedMessage.Type\022\014\n\004name" +
+ "\030\002 \001(\t\022#\n\005value\030\003 \001(\0132\024.openxc.DynamicFi" +
+ "eld\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\014" +
+ "EVENTED_BOOL\020\006B\034\n\ncom.openxcB\016BinaryMess" +
+ "ages"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -6020,7 +7703,7 @@ 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", "DiagnosticResponse", "ControlCommand", });
+ 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
@@ -6033,24 +7716,36 @@ public final class BinaryMessages {
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_openxc_ControlCommand_descriptor,
new java.lang.String[] { "Type", "DiagnosticRequest", });
- internal_static_openxc_DiagnosticRequest_descriptor =
+ 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", "ParsePayload", "Factor", "Offset", "Frequency", });
+ new java.lang.String[] { "Bus", "MessageId", "Mode", "Pid", "Payload", "MultipleResponses", "Frequency", "Name", "DecodedType", "Action", });
internal_static_openxc_DiagnosticResponse_descriptor =
- getDescriptor().getMessageTypes().get(4);
+ 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(5);
+ 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;
}
};