X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=gen%2Fjava%2Fcom%2Fopenxc%2FBinaryMessages.java;h=a30e70f4b49a9cfa450ac23d8cc93b0340edd0ae;hb=3cd516b8f2925e82cff666a5c98ff30de507ca39;hp=a2932845846e31ca5545cbbd63a5278cb7adc18b;hpb=da1d41840879bc75a9df06972e1ec191bbfd3691;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 a2932845..a30e70f4 100644 --- a/gen/java/com/openxc/BinaryMessages.java +++ b/gen/java/com/openxc/BinaryMessages.java @@ -35,89 +35,61 @@ public final class BinaryMessages { */ com.openxc.BinaryMessages.RawMessageOrBuilder getRawMessageOrBuilder(); - // optional .openxc.StringMessage string_message = 3; + // optional .openxc.TranslatedMessage translated_message = 3; /** - * optional .openxc.StringMessage string_message = 3; + * optional .openxc.TranslatedMessage translated_message = 3; */ - boolean hasStringMessage(); + boolean hasTranslatedMessage(); /** - * optional .openxc.StringMessage string_message = 3; + * optional .openxc.TranslatedMessage translated_message = 3; */ - com.openxc.BinaryMessages.StringMessage getStringMessage(); + com.openxc.BinaryMessages.TranslatedMessage getTranslatedMessage(); /** - * optional .openxc.StringMessage string_message = 3; + * optional .openxc.TranslatedMessage translated_message = 3; */ - com.openxc.BinaryMessages.StringMessageOrBuilder getStringMessageOrBuilder(); + com.openxc.BinaryMessages.TranslatedMessageOrBuilder getTranslatedMessageOrBuilder(); - // optional .openxc.NumericMessage numeric_message = 4; + // optional .openxc.DiagnosticResponse diagnostic_response = 4; /** - * optional .openxc.NumericMessage numeric_message = 4; + * optional .openxc.DiagnosticResponse diagnostic_response = 4; */ - boolean hasNumericMessage(); + boolean hasDiagnosticResponse(); /** - * optional .openxc.NumericMessage numeric_message = 4; + * optional .openxc.DiagnosticResponse diagnostic_response = 4; */ - com.openxc.BinaryMessages.NumericMessage getNumericMessage(); + com.openxc.BinaryMessages.DiagnosticResponse getDiagnosticResponse(); /** - * optional .openxc.NumericMessage numeric_message = 4; + * optional .openxc.DiagnosticResponse diagnostic_response = 4; */ - com.openxc.BinaryMessages.NumericMessageOrBuilder getNumericMessageOrBuilder(); + com.openxc.BinaryMessages.DiagnosticResponseOrBuilder getDiagnosticResponseOrBuilder(); - // optional .openxc.BooleanMessage boolean_message = 5; + // optional .openxc.ControlCommand control_command = 5; /** - * optional .openxc.BooleanMessage boolean_message = 5; + * optional .openxc.ControlCommand control_command = 5; */ - boolean hasBooleanMessage(); + boolean hasControlCommand(); /** - * optional .openxc.BooleanMessage boolean_message = 5; + * optional .openxc.ControlCommand control_command = 5; */ - com.openxc.BinaryMessages.BooleanMessage getBooleanMessage(); + com.openxc.BinaryMessages.ControlCommand getControlCommand(); /** - * optional .openxc.BooleanMessage boolean_message = 5; + * optional .openxc.ControlCommand control_command = 5; */ - com.openxc.BinaryMessages.BooleanMessageOrBuilder getBooleanMessageOrBuilder(); + com.openxc.BinaryMessages.ControlCommandOrBuilder getControlCommandOrBuilder(); - // optional .openxc.EventedStringMessage evented_string_message = 6; + // optional .openxc.CommandResponse command_response = 6; /** - * optional .openxc.EventedStringMessage evented_string_message = 6; + * optional .openxc.CommandResponse command_response = 6; */ - boolean hasEventedStringMessage(); + boolean hasCommandResponse(); /** - * optional .openxc.EventedStringMessage evented_string_message = 6; + * optional .openxc.CommandResponse command_response = 6; */ - com.openxc.BinaryMessages.EventedStringMessage getEventedStringMessage(); + com.openxc.BinaryMessages.CommandResponse getCommandResponse(); /** - * optional .openxc.EventedStringMessage evented_string_message = 6; + * optional .openxc.CommandResponse command_response = 6; */ - com.openxc.BinaryMessages.EventedStringMessageOrBuilder getEventedStringMessageOrBuilder(); - - // optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - /** - * optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - */ - boolean hasEventedBooleanMessage(); - /** - * optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - */ - com.openxc.BinaryMessages.EventedBooleanMessage getEventedBooleanMessage(); - /** - * optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - */ - com.openxc.BinaryMessages.EventedBooleanMessageOrBuilder getEventedBooleanMessageOrBuilder(); - - // optional .openxc.EventedNumericMessage evented_numeric_message = 8; - /** - * optional .openxc.EventedNumericMessage evented_numeric_message = 8; - */ - boolean hasEventedNumericMessage(); - /** - * optional .openxc.EventedNumericMessage evented_numeric_message = 8; - */ - com.openxc.BinaryMessages.EventedNumericMessage getEventedNumericMessage(); - /** - * optional .openxc.EventedNumericMessage evented_numeric_message = 8; - */ - com.openxc.BinaryMessages.EventedNumericMessageOrBuilder getEventedNumericMessageOrBuilder(); + com.openxc.BinaryMessages.CommandResponseOrBuilder getCommandResponseOrBuilder(); } /** * Protobuf type {@code openxc.VehicleMessage} @@ -195,83 +167,57 @@ public final class BinaryMessages { break; } case 26: { - com.openxc.BinaryMessages.StringMessage.Builder subBuilder = null; + com.openxc.BinaryMessages.TranslatedMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { - subBuilder = stringMessage_.toBuilder(); + subBuilder = translatedMessage_.toBuilder(); } - stringMessage_ = input.readMessage(com.openxc.BinaryMessages.StringMessage.PARSER, extensionRegistry); + translatedMessage_ = input.readMessage(com.openxc.BinaryMessages.TranslatedMessage.PARSER, extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(stringMessage_); - stringMessage_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(translatedMessage_); + translatedMessage_ = subBuilder.buildPartial(); } bitField0_ |= 0x00000004; break; } case 34: { - com.openxc.BinaryMessages.NumericMessage.Builder subBuilder = null; + com.openxc.BinaryMessages.DiagnosticResponse.Builder subBuilder = null; if (((bitField0_ & 0x00000008) == 0x00000008)) { - subBuilder = numericMessage_.toBuilder(); + subBuilder = diagnosticResponse_.toBuilder(); } - numericMessage_ = input.readMessage(com.openxc.BinaryMessages.NumericMessage.PARSER, extensionRegistry); + diagnosticResponse_ = input.readMessage(com.openxc.BinaryMessages.DiagnosticResponse.PARSER, extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(numericMessage_); - numericMessage_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(diagnosticResponse_); + diagnosticResponse_ = subBuilder.buildPartial(); } bitField0_ |= 0x00000008; break; } case 42: { - com.openxc.BinaryMessages.BooleanMessage.Builder subBuilder = null; + com.openxc.BinaryMessages.ControlCommand.Builder subBuilder = null; if (((bitField0_ & 0x00000010) == 0x00000010)) { - subBuilder = booleanMessage_.toBuilder(); + subBuilder = controlCommand_.toBuilder(); } - booleanMessage_ = input.readMessage(com.openxc.BinaryMessages.BooleanMessage.PARSER, extensionRegistry); + controlCommand_ = input.readMessage(com.openxc.BinaryMessages.ControlCommand.PARSER, extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(booleanMessage_); - booleanMessage_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(controlCommand_); + controlCommand_ = subBuilder.buildPartial(); } bitField0_ |= 0x00000010; break; } case 50: { - com.openxc.BinaryMessages.EventedStringMessage.Builder subBuilder = null; + com.openxc.BinaryMessages.CommandResponse.Builder subBuilder = null; if (((bitField0_ & 0x00000020) == 0x00000020)) { - subBuilder = eventedStringMessage_.toBuilder(); + subBuilder = commandResponse_.toBuilder(); } - eventedStringMessage_ = input.readMessage(com.openxc.BinaryMessages.EventedStringMessage.PARSER, extensionRegistry); + commandResponse_ = input.readMessage(com.openxc.BinaryMessages.CommandResponse.PARSER, extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(eventedStringMessage_); - eventedStringMessage_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(commandResponse_); + commandResponse_ = subBuilder.buildPartial(); } bitField0_ |= 0x00000020; break; } - case 58: { - com.openxc.BinaryMessages.EventedBooleanMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000040) == 0x00000040)) { - subBuilder = eventedBooleanMessage_.toBuilder(); - } - eventedBooleanMessage_ = input.readMessage(com.openxc.BinaryMessages.EventedBooleanMessage.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(eventedBooleanMessage_); - eventedBooleanMessage_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000040; - break; - } - case 66: { - com.openxc.BinaryMessages.EventedNumericMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000080) == 0x00000080)) { - subBuilder = eventedNumericMessage_.toBuilder(); - } - eventedNumericMessage_ = input.readMessage(com.openxc.BinaryMessages.EventedNumericMessage.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(eventedNumericMessage_); - eventedNumericMessage_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000080; - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -321,29 +267,21 @@ public final class BinaryMessages { */ RAW(0, 1), /** - * STRING = 2; - */ - STRING(1, 2), - /** - * BOOL = 3; - */ - BOOL(2, 3), - /** - * NUM = 4; + * TRANSLATED = 2; */ - NUM(3, 4), + TRANSLATED(1, 2), /** - * EVENTED_NUM = 5; + * DIAGNOSTIC = 3; */ - EVENTED_NUM(4, 5), + DIAGNOSTIC(2, 3), /** - * EVENTED_STRING = 6; + * CONTROL_COMMAND = 4; */ - EVENTED_STRING(5, 6), + CONTROL_COMMAND(3, 4), /** - * EVENTED_BOOL = 7; + * COMMAND_RESPONSE = 5; */ - EVENTED_BOOL(6, 7), + COMMAND_RESPONSE(4, 5), ; /** @@ -351,29 +289,21 @@ public final class BinaryMessages { */ public static final int RAW_VALUE = 1; /** - * STRING = 2; - */ - public static final int STRING_VALUE = 2; - /** - * BOOL = 3; - */ - public static final int BOOL_VALUE = 3; - /** - * NUM = 4; + * TRANSLATED = 2; */ - public static final int NUM_VALUE = 4; + public static final int TRANSLATED_VALUE = 2; /** - * EVENTED_NUM = 5; + * DIAGNOSTIC = 3; */ - public static final int EVENTED_NUM_VALUE = 5; + public static final int DIAGNOSTIC_VALUE = 3; /** - * EVENTED_STRING = 6; + * CONTROL_COMMAND = 4; */ - public static final int EVENTED_STRING_VALUE = 6; + public static final int CONTROL_COMMAND_VALUE = 4; /** - * EVENTED_BOOL = 7; + * COMMAND_RESPONSE = 5; */ - public static final int EVENTED_BOOL_VALUE = 7; + public static final int COMMAND_RESPONSE_VALUE = 5; public final int getNumber() { return value; } @@ -381,12 +311,10 @@ public final class BinaryMessages { public static Type valueOf(int value) { switch (value) { case 1: return RAW; - case 2: return STRING; - case 3: return BOOL; - case 4: return NUM; - case 5: return EVENTED_NUM; - case 6: return EVENTED_STRING; - case 7: return EVENTED_BOOL; + case 2: return TRANSLATED; + case 3: return DIAGNOSTIC; + case 4: return CONTROL_COMMAND; + case 5: return COMMAND_RESPONSE; default: return null; } } @@ -477,147 +405,101 @@ public final class BinaryMessages { return rawMessage_; } - // optional .openxc.StringMessage string_message = 3; - public static final int STRING_MESSAGE_FIELD_NUMBER = 3; - private com.openxc.BinaryMessages.StringMessage stringMessage_; + // optional .openxc.TranslatedMessage translated_message = 3; + public static final int TRANSLATED_MESSAGE_FIELD_NUMBER = 3; + private com.openxc.BinaryMessages.TranslatedMessage translatedMessage_; /** - * optional .openxc.StringMessage string_message = 3; + * optional .openxc.TranslatedMessage translated_message = 3; */ - public boolean hasStringMessage() { + public boolean hasTranslatedMessage() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .openxc.StringMessage string_message = 3; + * optional .openxc.TranslatedMessage translated_message = 3; */ - public com.openxc.BinaryMessages.StringMessage getStringMessage() { - return stringMessage_; + public com.openxc.BinaryMessages.TranslatedMessage getTranslatedMessage() { + return translatedMessage_; } /** - * optional .openxc.StringMessage string_message = 3; + * optional .openxc.TranslatedMessage translated_message = 3; */ - public com.openxc.BinaryMessages.StringMessageOrBuilder getStringMessageOrBuilder() { - return stringMessage_; + public com.openxc.BinaryMessages.TranslatedMessageOrBuilder getTranslatedMessageOrBuilder() { + return translatedMessage_; } - // optional .openxc.NumericMessage numeric_message = 4; - public static final int NUMERIC_MESSAGE_FIELD_NUMBER = 4; - private com.openxc.BinaryMessages.NumericMessage numericMessage_; + // optional .openxc.DiagnosticResponse diagnostic_response = 4; + public static final int DIAGNOSTIC_RESPONSE_FIELD_NUMBER = 4; + private com.openxc.BinaryMessages.DiagnosticResponse diagnosticResponse_; /** - * optional .openxc.NumericMessage numeric_message = 4; + * optional .openxc.DiagnosticResponse diagnostic_response = 4; */ - public boolean hasNumericMessage() { + public boolean hasDiagnosticResponse() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional .openxc.NumericMessage numeric_message = 4; + * optional .openxc.DiagnosticResponse diagnostic_response = 4; */ - public com.openxc.BinaryMessages.NumericMessage getNumericMessage() { - return numericMessage_; + public com.openxc.BinaryMessages.DiagnosticResponse getDiagnosticResponse() { + return diagnosticResponse_; } /** - * optional .openxc.NumericMessage numeric_message = 4; + * optional .openxc.DiagnosticResponse diagnostic_response = 4; */ - public com.openxc.BinaryMessages.NumericMessageOrBuilder getNumericMessageOrBuilder() { - return numericMessage_; + public com.openxc.BinaryMessages.DiagnosticResponseOrBuilder getDiagnosticResponseOrBuilder() { + return diagnosticResponse_; } - // optional .openxc.BooleanMessage boolean_message = 5; - public static final int BOOLEAN_MESSAGE_FIELD_NUMBER = 5; - private com.openxc.BinaryMessages.BooleanMessage booleanMessage_; + // optional .openxc.ControlCommand control_command = 5; + public static final int CONTROL_COMMAND_FIELD_NUMBER = 5; + private com.openxc.BinaryMessages.ControlCommand controlCommand_; /** - * optional .openxc.BooleanMessage boolean_message = 5; + * optional .openxc.ControlCommand control_command = 5; */ - public boolean hasBooleanMessage() { + public boolean hasControlCommand() { return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * optional .openxc.BooleanMessage boolean_message = 5; + * optional .openxc.ControlCommand control_command = 5; */ - public com.openxc.BinaryMessages.BooleanMessage getBooleanMessage() { - return booleanMessage_; + public com.openxc.BinaryMessages.ControlCommand getControlCommand() { + return controlCommand_; } /** - * optional .openxc.BooleanMessage boolean_message = 5; + * optional .openxc.ControlCommand control_command = 5; */ - public com.openxc.BinaryMessages.BooleanMessageOrBuilder getBooleanMessageOrBuilder() { - return booleanMessage_; + public com.openxc.BinaryMessages.ControlCommandOrBuilder getControlCommandOrBuilder() { + return controlCommand_; } - // optional .openxc.EventedStringMessage evented_string_message = 6; - public static final int EVENTED_STRING_MESSAGE_FIELD_NUMBER = 6; - private com.openxc.BinaryMessages.EventedStringMessage eventedStringMessage_; + // optional .openxc.CommandResponse command_response = 6; + public static final int COMMAND_RESPONSE_FIELD_NUMBER = 6; + private com.openxc.BinaryMessages.CommandResponse commandResponse_; /** - * optional .openxc.EventedStringMessage evented_string_message = 6; + * optional .openxc.CommandResponse command_response = 6; */ - public boolean hasEventedStringMessage() { + public boolean hasCommandResponse() { return ((bitField0_ & 0x00000020) == 0x00000020); } /** - * optional .openxc.EventedStringMessage evented_string_message = 6; - */ - public com.openxc.BinaryMessages.EventedStringMessage getEventedStringMessage() { - return eventedStringMessage_; - } - /** - * optional .openxc.EventedStringMessage evented_string_message = 6; - */ - public com.openxc.BinaryMessages.EventedStringMessageOrBuilder getEventedStringMessageOrBuilder() { - return eventedStringMessage_; - } - - // optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - public static final int EVENTED_BOOLEAN_MESSAGE_FIELD_NUMBER = 7; - private com.openxc.BinaryMessages.EventedBooleanMessage eventedBooleanMessage_; - /** - * optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - */ - public boolean hasEventedBooleanMessage() { - return ((bitField0_ & 0x00000040) == 0x00000040); - } - /** - * optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - */ - public com.openxc.BinaryMessages.EventedBooleanMessage getEventedBooleanMessage() { - return eventedBooleanMessage_; - } - /** - * optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - */ - public com.openxc.BinaryMessages.EventedBooleanMessageOrBuilder getEventedBooleanMessageOrBuilder() { - return eventedBooleanMessage_; - } - - // optional .openxc.EventedNumericMessage evented_numeric_message = 8; - public static final int EVENTED_NUMERIC_MESSAGE_FIELD_NUMBER = 8; - private com.openxc.BinaryMessages.EventedNumericMessage eventedNumericMessage_; - /** - * optional .openxc.EventedNumericMessage evented_numeric_message = 8; - */ - public boolean hasEventedNumericMessage() { - return ((bitField0_ & 0x00000080) == 0x00000080); - } - /** - * optional .openxc.EventedNumericMessage evented_numeric_message = 8; + * optional .openxc.CommandResponse command_response = 6; */ - public com.openxc.BinaryMessages.EventedNumericMessage getEventedNumericMessage() { - return eventedNumericMessage_; + public com.openxc.BinaryMessages.CommandResponse getCommandResponse() { + return commandResponse_; } /** - * optional .openxc.EventedNumericMessage evented_numeric_message = 8; + * optional .openxc.CommandResponse command_response = 6; */ - public com.openxc.BinaryMessages.EventedNumericMessageOrBuilder getEventedNumericMessageOrBuilder() { - return eventedNumericMessage_; + public com.openxc.BinaryMessages.CommandResponseOrBuilder getCommandResponseOrBuilder() { + return commandResponse_; } private void initFields() { type_ = com.openxc.BinaryMessages.VehicleMessage.Type.RAW; rawMessage_ = com.openxc.BinaryMessages.RawMessage.getDefaultInstance(); - stringMessage_ = com.openxc.BinaryMessages.StringMessage.getDefaultInstance(); - numericMessage_ = com.openxc.BinaryMessages.NumericMessage.getDefaultInstance(); - booleanMessage_ = com.openxc.BinaryMessages.BooleanMessage.getDefaultInstance(); - eventedStringMessage_ = com.openxc.BinaryMessages.EventedStringMessage.getDefaultInstance(); - eventedBooleanMessage_ = com.openxc.BinaryMessages.EventedBooleanMessage.getDefaultInstance(); - eventedNumericMessage_ = com.openxc.BinaryMessages.EventedNumericMessage.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() { @@ -638,22 +520,16 @@ public final class BinaryMessages { output.writeMessage(2, rawMessage_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeMessage(3, stringMessage_); + output.writeMessage(3, translatedMessage_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeMessage(4, numericMessage_); + output.writeMessage(4, diagnosticResponse_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { - output.writeMessage(5, booleanMessage_); + output.writeMessage(5, controlCommand_); } if (((bitField0_ & 0x00000020) == 0x00000020)) { - output.writeMessage(6, eventedStringMessage_); - } - if (((bitField0_ & 0x00000040) == 0x00000040)) { - output.writeMessage(7, eventedBooleanMessage_); - } - if (((bitField0_ & 0x00000080) == 0x00000080)) { - output.writeMessage(8, eventedNumericMessage_); + output.writeMessage(6, commandResponse_); } getUnknownFields().writeTo(output); } @@ -674,27 +550,19 @@ public final class BinaryMessages { } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, stringMessage_); + .computeMessageSize(3, translatedMessage_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, numericMessage_); + .computeMessageSize(4, diagnosticResponse_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, booleanMessage_); + .computeMessageSize(5, controlCommand_); } if (((bitField0_ & 0x00000020) == 0x00000020)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, eventedStringMessage_); - } - if (((bitField0_ & 0x00000040) == 0x00000040)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, eventedBooleanMessage_); - } - if (((bitField0_ & 0x00000080) == 0x00000080)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, eventedNumericMessage_); + .computeMessageSize(6, commandResponse_); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -805,12 +673,10 @@ public final class BinaryMessages { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { getRawMessageFieldBuilder(); - getStringMessageFieldBuilder(); - getNumericMessageFieldBuilder(); - getBooleanMessageFieldBuilder(); - getEventedStringMessageFieldBuilder(); - getEventedBooleanMessageFieldBuilder(); - getEventedNumericMessageFieldBuilder(); + getTranslatedMessageFieldBuilder(); + getDiagnosticResponseFieldBuilder(); + getControlCommandFieldBuilder(); + getCommandResponseFieldBuilder(); } } private static Builder create() { @@ -827,42 +693,30 @@ public final class BinaryMessages { rawMessageBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000002); - if (stringMessageBuilder_ == null) { - stringMessage_ = com.openxc.BinaryMessages.StringMessage.getDefaultInstance(); + if (translatedMessageBuilder_ == null) { + translatedMessage_ = com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance(); } else { - stringMessageBuilder_.clear(); + translatedMessageBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000004); - if (numericMessageBuilder_ == null) { - numericMessage_ = com.openxc.BinaryMessages.NumericMessage.getDefaultInstance(); + if (diagnosticResponseBuilder_ == null) { + diagnosticResponse_ = com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance(); } else { - numericMessageBuilder_.clear(); + diagnosticResponseBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000008); - if (booleanMessageBuilder_ == null) { - booleanMessage_ = com.openxc.BinaryMessages.BooleanMessage.getDefaultInstance(); + if (controlCommandBuilder_ == null) { + controlCommand_ = com.openxc.BinaryMessages.ControlCommand.getDefaultInstance(); } else { - booleanMessageBuilder_.clear(); + controlCommandBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000010); - if (eventedStringMessageBuilder_ == null) { - eventedStringMessage_ = com.openxc.BinaryMessages.EventedStringMessage.getDefaultInstance(); + if (commandResponseBuilder_ == null) { + commandResponse_ = com.openxc.BinaryMessages.CommandResponse.getDefaultInstance(); } else { - eventedStringMessageBuilder_.clear(); + commandResponseBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000020); - if (eventedBooleanMessageBuilder_ == null) { - eventedBooleanMessage_ = com.openxc.BinaryMessages.EventedBooleanMessage.getDefaultInstance(); - } else { - eventedBooleanMessageBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000040); - if (eventedNumericMessageBuilder_ == null) { - eventedNumericMessage_ = com.openxc.BinaryMessages.EventedNumericMessage.getDefaultInstance(); - } else { - eventedNumericMessageBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000080); return this; } @@ -906,50 +760,34 @@ public final class BinaryMessages { if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - if (stringMessageBuilder_ == null) { - result.stringMessage_ = stringMessage_; + if (translatedMessageBuilder_ == null) { + result.translatedMessage_ = translatedMessage_; } else { - result.stringMessage_ = stringMessageBuilder_.build(); + result.translatedMessage_ = translatedMessageBuilder_.build(); } if (((from_bitField0_ & 0x00000008) == 0x00000008)) { to_bitField0_ |= 0x00000008; } - if (numericMessageBuilder_ == null) { - result.numericMessage_ = numericMessage_; + if (diagnosticResponseBuilder_ == null) { + result.diagnosticResponse_ = diagnosticResponse_; } else { - result.numericMessage_ = numericMessageBuilder_.build(); + result.diagnosticResponse_ = diagnosticResponseBuilder_.build(); } if (((from_bitField0_ & 0x00000010) == 0x00000010)) { to_bitField0_ |= 0x00000010; } - if (booleanMessageBuilder_ == null) { - result.booleanMessage_ = booleanMessage_; + if (controlCommandBuilder_ == null) { + result.controlCommand_ = controlCommand_; } else { - result.booleanMessage_ = booleanMessageBuilder_.build(); + result.controlCommand_ = controlCommandBuilder_.build(); } if (((from_bitField0_ & 0x00000020) == 0x00000020)) { to_bitField0_ |= 0x00000020; } - if (eventedStringMessageBuilder_ == null) { - result.eventedStringMessage_ = eventedStringMessage_; - } else { - result.eventedStringMessage_ = eventedStringMessageBuilder_.build(); - } - if (((from_bitField0_ & 0x00000040) == 0x00000040)) { - to_bitField0_ |= 0x00000040; - } - if (eventedBooleanMessageBuilder_ == null) { - result.eventedBooleanMessage_ = eventedBooleanMessage_; - } else { - result.eventedBooleanMessage_ = eventedBooleanMessageBuilder_.build(); - } - if (((from_bitField0_ & 0x00000080) == 0x00000080)) { - to_bitField0_ |= 0x00000080; - } - if (eventedNumericMessageBuilder_ == null) { - result.eventedNumericMessage_ = eventedNumericMessage_; + if (commandResponseBuilder_ == null) { + result.commandResponse_ = commandResponse_; } else { - result.eventedNumericMessage_ = eventedNumericMessageBuilder_.build(); + result.commandResponse_ = commandResponseBuilder_.build(); } result.bitField0_ = to_bitField0_; onBuilt(); @@ -973,23 +811,17 @@ public final class BinaryMessages { if (other.hasRawMessage()) { mergeRawMessage(other.getRawMessage()); } - if (other.hasStringMessage()) { - mergeStringMessage(other.getStringMessage()); - } - if (other.hasNumericMessage()) { - mergeNumericMessage(other.getNumericMessage()); - } - if (other.hasBooleanMessage()) { - mergeBooleanMessage(other.getBooleanMessage()); + if (other.hasTranslatedMessage()) { + mergeTranslatedMessage(other.getTranslatedMessage()); } - if (other.hasEventedStringMessage()) { - mergeEventedStringMessage(other.getEventedStringMessage()); + if (other.hasDiagnosticResponse()) { + mergeDiagnosticResponse(other.getDiagnosticResponse()); } - if (other.hasEventedBooleanMessage()) { - mergeEventedBooleanMessage(other.getEventedBooleanMessage()); + if (other.hasControlCommand()) { + mergeControlCommand(other.getControlCommand()); } - if (other.hasEventedNumericMessage()) { - mergeEventedNumericMessage(other.getEventedNumericMessage()); + if (other.hasCommandResponse()) { + mergeCommandResponse(other.getCommandResponse()); } this.mergeUnknownFields(other.getUnknownFields()); return this; @@ -1171,706 +1003,472 @@ public final class BinaryMessages { return rawMessageBuilder_; } - // optional .openxc.StringMessage string_message = 3; - private com.openxc.BinaryMessages.StringMessage stringMessage_ = com.openxc.BinaryMessages.StringMessage.getDefaultInstance(); + // optional .openxc.TranslatedMessage translated_message = 3; + private com.openxc.BinaryMessages.TranslatedMessage translatedMessage_ = com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.openxc.BinaryMessages.StringMessage, com.openxc.BinaryMessages.StringMessage.Builder, com.openxc.BinaryMessages.StringMessageOrBuilder> stringMessageBuilder_; + com.openxc.BinaryMessages.TranslatedMessage, com.openxc.BinaryMessages.TranslatedMessage.Builder, com.openxc.BinaryMessages.TranslatedMessageOrBuilder> translatedMessageBuilder_; /** - * optional .openxc.StringMessage string_message = 3; + * optional .openxc.TranslatedMessage translated_message = 3; */ - public boolean hasStringMessage() { + public boolean hasTranslatedMessage() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .openxc.StringMessage string_message = 3; + * optional .openxc.TranslatedMessage translated_message = 3; */ - public com.openxc.BinaryMessages.StringMessage getStringMessage() { - if (stringMessageBuilder_ == null) { - return stringMessage_; + public com.openxc.BinaryMessages.TranslatedMessage getTranslatedMessage() { + if (translatedMessageBuilder_ == null) { + return translatedMessage_; } else { - return stringMessageBuilder_.getMessage(); + return translatedMessageBuilder_.getMessage(); } } /** - * optional .openxc.StringMessage string_message = 3; + * optional .openxc.TranslatedMessage translated_message = 3; */ - public Builder setStringMessage(com.openxc.BinaryMessages.StringMessage value) { - if (stringMessageBuilder_ == null) { + public Builder setTranslatedMessage(com.openxc.BinaryMessages.TranslatedMessage value) { + if (translatedMessageBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - stringMessage_ = value; + translatedMessage_ = value; onChanged(); } else { - stringMessageBuilder_.setMessage(value); + translatedMessageBuilder_.setMessage(value); } bitField0_ |= 0x00000004; return this; } /** - * optional .openxc.StringMessage string_message = 3; + * optional .openxc.TranslatedMessage translated_message = 3; */ - public Builder setStringMessage( - com.openxc.BinaryMessages.StringMessage.Builder builderForValue) { - if (stringMessageBuilder_ == null) { - stringMessage_ = builderForValue.build(); + public Builder setTranslatedMessage( + com.openxc.BinaryMessages.TranslatedMessage.Builder builderForValue) { + if (translatedMessageBuilder_ == null) { + translatedMessage_ = builderForValue.build(); onChanged(); } else { - stringMessageBuilder_.setMessage(builderForValue.build()); + translatedMessageBuilder_.setMessage(builderForValue.build()); } bitField0_ |= 0x00000004; return this; } /** - * optional .openxc.StringMessage string_message = 3; + * optional .openxc.TranslatedMessage translated_message = 3; */ - public Builder mergeStringMessage(com.openxc.BinaryMessages.StringMessage value) { - if (stringMessageBuilder_ == null) { + public Builder mergeTranslatedMessage(com.openxc.BinaryMessages.TranslatedMessage value) { + if (translatedMessageBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - stringMessage_ != com.openxc.BinaryMessages.StringMessage.getDefaultInstance()) { - stringMessage_ = - com.openxc.BinaryMessages.StringMessage.newBuilder(stringMessage_).mergeFrom(value).buildPartial(); + translatedMessage_ != com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance()) { + translatedMessage_ = + com.openxc.BinaryMessages.TranslatedMessage.newBuilder(translatedMessage_).mergeFrom(value).buildPartial(); } else { - stringMessage_ = value; + translatedMessage_ = value; } onChanged(); } else { - stringMessageBuilder_.mergeFrom(value); + translatedMessageBuilder_.mergeFrom(value); } bitField0_ |= 0x00000004; return this; } /** - * optional .openxc.StringMessage string_message = 3; + * optional .openxc.TranslatedMessage translated_message = 3; */ - public Builder clearStringMessage() { - if (stringMessageBuilder_ == null) { - stringMessage_ = com.openxc.BinaryMessages.StringMessage.getDefaultInstance(); + public Builder clearTranslatedMessage() { + if (translatedMessageBuilder_ == null) { + translatedMessage_ = com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance(); onChanged(); } else { - stringMessageBuilder_.clear(); + translatedMessageBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000004); return this; } /** - * optional .openxc.StringMessage string_message = 3; + * optional .openxc.TranslatedMessage translated_message = 3; */ - public com.openxc.BinaryMessages.StringMessage.Builder getStringMessageBuilder() { + public com.openxc.BinaryMessages.TranslatedMessage.Builder getTranslatedMessageBuilder() { bitField0_ |= 0x00000004; onChanged(); - return getStringMessageFieldBuilder().getBuilder(); + return getTranslatedMessageFieldBuilder().getBuilder(); } /** - * optional .openxc.StringMessage string_message = 3; + * optional .openxc.TranslatedMessage translated_message = 3; */ - public com.openxc.BinaryMessages.StringMessageOrBuilder getStringMessageOrBuilder() { - if (stringMessageBuilder_ != null) { - return stringMessageBuilder_.getMessageOrBuilder(); + public com.openxc.BinaryMessages.TranslatedMessageOrBuilder getTranslatedMessageOrBuilder() { + if (translatedMessageBuilder_ != null) { + return translatedMessageBuilder_.getMessageOrBuilder(); } else { - return stringMessage_; + return translatedMessage_; } } /** - * optional .openxc.StringMessage string_message = 3; + * optional .openxc.TranslatedMessage translated_message = 3; */ private com.google.protobuf.SingleFieldBuilder< - com.openxc.BinaryMessages.StringMessage, com.openxc.BinaryMessages.StringMessage.Builder, com.openxc.BinaryMessages.StringMessageOrBuilder> - getStringMessageFieldBuilder() { - if (stringMessageBuilder_ == null) { - stringMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.openxc.BinaryMessages.StringMessage, com.openxc.BinaryMessages.StringMessage.Builder, com.openxc.BinaryMessages.StringMessageOrBuilder>( - stringMessage_, + com.openxc.BinaryMessages.TranslatedMessage, com.openxc.BinaryMessages.TranslatedMessage.Builder, com.openxc.BinaryMessages.TranslatedMessageOrBuilder> + getTranslatedMessageFieldBuilder() { + if (translatedMessageBuilder_ == null) { + translatedMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< + com.openxc.BinaryMessages.TranslatedMessage, com.openxc.BinaryMessages.TranslatedMessage.Builder, com.openxc.BinaryMessages.TranslatedMessageOrBuilder>( + translatedMessage_, getParentForChildren(), isClean()); - stringMessage_ = null; + translatedMessage_ = null; } - return stringMessageBuilder_; + return translatedMessageBuilder_; } - // optional .openxc.NumericMessage numeric_message = 4; - private com.openxc.BinaryMessages.NumericMessage numericMessage_ = com.openxc.BinaryMessages.NumericMessage.getDefaultInstance(); + // optional .openxc.DiagnosticResponse diagnostic_response = 4; + private com.openxc.BinaryMessages.DiagnosticResponse diagnosticResponse_ = com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.openxc.BinaryMessages.NumericMessage, com.openxc.BinaryMessages.NumericMessage.Builder, com.openxc.BinaryMessages.NumericMessageOrBuilder> numericMessageBuilder_; + com.openxc.BinaryMessages.DiagnosticResponse, com.openxc.BinaryMessages.DiagnosticResponse.Builder, com.openxc.BinaryMessages.DiagnosticResponseOrBuilder> diagnosticResponseBuilder_; /** - * optional .openxc.NumericMessage numeric_message = 4; + * optional .openxc.DiagnosticResponse diagnostic_response = 4; */ - public boolean hasNumericMessage() { + public boolean hasDiagnosticResponse() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional .openxc.NumericMessage numeric_message = 4; + * optional .openxc.DiagnosticResponse diagnostic_response = 4; */ - public com.openxc.BinaryMessages.NumericMessage getNumericMessage() { - if (numericMessageBuilder_ == null) { - return numericMessage_; + public com.openxc.BinaryMessages.DiagnosticResponse getDiagnosticResponse() { + if (diagnosticResponseBuilder_ == null) { + return diagnosticResponse_; } else { - return numericMessageBuilder_.getMessage(); + return diagnosticResponseBuilder_.getMessage(); } } /** - * optional .openxc.NumericMessage numeric_message = 4; + * optional .openxc.DiagnosticResponse diagnostic_response = 4; */ - public Builder setNumericMessage(com.openxc.BinaryMessages.NumericMessage value) { - if (numericMessageBuilder_ == null) { + public Builder setDiagnosticResponse(com.openxc.BinaryMessages.DiagnosticResponse value) { + if (diagnosticResponseBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - numericMessage_ = value; + diagnosticResponse_ = value; onChanged(); } else { - numericMessageBuilder_.setMessage(value); + diagnosticResponseBuilder_.setMessage(value); } bitField0_ |= 0x00000008; return this; } /** - * optional .openxc.NumericMessage numeric_message = 4; + * optional .openxc.DiagnosticResponse diagnostic_response = 4; */ - public Builder setNumericMessage( - com.openxc.BinaryMessages.NumericMessage.Builder builderForValue) { - if (numericMessageBuilder_ == null) { - numericMessage_ = builderForValue.build(); + public Builder setDiagnosticResponse( + com.openxc.BinaryMessages.DiagnosticResponse.Builder builderForValue) { + if (diagnosticResponseBuilder_ == null) { + diagnosticResponse_ = builderForValue.build(); onChanged(); } else { - numericMessageBuilder_.setMessage(builderForValue.build()); + diagnosticResponseBuilder_.setMessage(builderForValue.build()); } bitField0_ |= 0x00000008; return this; } /** - * optional .openxc.NumericMessage numeric_message = 4; + * optional .openxc.DiagnosticResponse diagnostic_response = 4; */ - public Builder mergeNumericMessage(com.openxc.BinaryMessages.NumericMessage value) { - if (numericMessageBuilder_ == null) { + public Builder mergeDiagnosticResponse(com.openxc.BinaryMessages.DiagnosticResponse value) { + if (diagnosticResponseBuilder_ == null) { if (((bitField0_ & 0x00000008) == 0x00000008) && - numericMessage_ != com.openxc.BinaryMessages.NumericMessage.getDefaultInstance()) { - numericMessage_ = - com.openxc.BinaryMessages.NumericMessage.newBuilder(numericMessage_).mergeFrom(value).buildPartial(); + diagnosticResponse_ != com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance()) { + diagnosticResponse_ = + com.openxc.BinaryMessages.DiagnosticResponse.newBuilder(diagnosticResponse_).mergeFrom(value).buildPartial(); } else { - numericMessage_ = value; + diagnosticResponse_ = value; } onChanged(); } else { - numericMessageBuilder_.mergeFrom(value); + diagnosticResponseBuilder_.mergeFrom(value); } bitField0_ |= 0x00000008; return this; } /** - * optional .openxc.NumericMessage numeric_message = 4; + * optional .openxc.DiagnosticResponse diagnostic_response = 4; */ - public Builder clearNumericMessage() { - if (numericMessageBuilder_ == null) { - numericMessage_ = com.openxc.BinaryMessages.NumericMessage.getDefaultInstance(); + public Builder clearDiagnosticResponse() { + if (diagnosticResponseBuilder_ == null) { + diagnosticResponse_ = com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance(); onChanged(); } else { - numericMessageBuilder_.clear(); + diagnosticResponseBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000008); return this; } /** - * optional .openxc.NumericMessage numeric_message = 4; + * optional .openxc.DiagnosticResponse diagnostic_response = 4; */ - public com.openxc.BinaryMessages.NumericMessage.Builder getNumericMessageBuilder() { + public com.openxc.BinaryMessages.DiagnosticResponse.Builder getDiagnosticResponseBuilder() { bitField0_ |= 0x00000008; onChanged(); - return getNumericMessageFieldBuilder().getBuilder(); + return getDiagnosticResponseFieldBuilder().getBuilder(); } /** - * optional .openxc.NumericMessage numeric_message = 4; + * optional .openxc.DiagnosticResponse diagnostic_response = 4; */ - public com.openxc.BinaryMessages.NumericMessageOrBuilder getNumericMessageOrBuilder() { - if (numericMessageBuilder_ != null) { - return numericMessageBuilder_.getMessageOrBuilder(); + public com.openxc.BinaryMessages.DiagnosticResponseOrBuilder getDiagnosticResponseOrBuilder() { + if (diagnosticResponseBuilder_ != null) { + return diagnosticResponseBuilder_.getMessageOrBuilder(); } else { - return numericMessage_; + return diagnosticResponse_; } } /** - * optional .openxc.NumericMessage numeric_message = 4; + * optional .openxc.DiagnosticResponse diagnostic_response = 4; */ private com.google.protobuf.SingleFieldBuilder< - com.openxc.BinaryMessages.NumericMessage, com.openxc.BinaryMessages.NumericMessage.Builder, com.openxc.BinaryMessages.NumericMessageOrBuilder> - getNumericMessageFieldBuilder() { - if (numericMessageBuilder_ == null) { - numericMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.openxc.BinaryMessages.NumericMessage, com.openxc.BinaryMessages.NumericMessage.Builder, com.openxc.BinaryMessages.NumericMessageOrBuilder>( - numericMessage_, + com.openxc.BinaryMessages.DiagnosticResponse, com.openxc.BinaryMessages.DiagnosticResponse.Builder, com.openxc.BinaryMessages.DiagnosticResponseOrBuilder> + getDiagnosticResponseFieldBuilder() { + if (diagnosticResponseBuilder_ == null) { + diagnosticResponseBuilder_ = new com.google.protobuf.SingleFieldBuilder< + com.openxc.BinaryMessages.DiagnosticResponse, com.openxc.BinaryMessages.DiagnosticResponse.Builder, com.openxc.BinaryMessages.DiagnosticResponseOrBuilder>( + diagnosticResponse_, getParentForChildren(), isClean()); - numericMessage_ = null; + diagnosticResponse_ = null; } - return numericMessageBuilder_; + return diagnosticResponseBuilder_; } - // optional .openxc.BooleanMessage boolean_message = 5; - private com.openxc.BinaryMessages.BooleanMessage booleanMessage_ = com.openxc.BinaryMessages.BooleanMessage.getDefaultInstance(); + // optional .openxc.ControlCommand control_command = 5; + private com.openxc.BinaryMessages.ControlCommand controlCommand_ = com.openxc.BinaryMessages.ControlCommand.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.openxc.BinaryMessages.BooleanMessage, com.openxc.BinaryMessages.BooleanMessage.Builder, com.openxc.BinaryMessages.BooleanMessageOrBuilder> booleanMessageBuilder_; + com.openxc.BinaryMessages.ControlCommand, com.openxc.BinaryMessages.ControlCommand.Builder, com.openxc.BinaryMessages.ControlCommandOrBuilder> controlCommandBuilder_; /** - * optional .openxc.BooleanMessage boolean_message = 5; + * optional .openxc.ControlCommand control_command = 5; */ - public boolean hasBooleanMessage() { + public boolean hasControlCommand() { return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * optional .openxc.BooleanMessage boolean_message = 5; + * optional .openxc.ControlCommand control_command = 5; */ - public com.openxc.BinaryMessages.BooleanMessage getBooleanMessage() { - if (booleanMessageBuilder_ == null) { - return booleanMessage_; + public com.openxc.BinaryMessages.ControlCommand getControlCommand() { + if (controlCommandBuilder_ == null) { + return controlCommand_; } else { - return booleanMessageBuilder_.getMessage(); + return controlCommandBuilder_.getMessage(); } } /** - * optional .openxc.BooleanMessage boolean_message = 5; + * optional .openxc.ControlCommand control_command = 5; */ - public Builder setBooleanMessage(com.openxc.BinaryMessages.BooleanMessage value) { - if (booleanMessageBuilder_ == null) { + public Builder setControlCommand(com.openxc.BinaryMessages.ControlCommand value) { + if (controlCommandBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - booleanMessage_ = value; + controlCommand_ = value; onChanged(); } else { - booleanMessageBuilder_.setMessage(value); + controlCommandBuilder_.setMessage(value); } bitField0_ |= 0x00000010; return this; } /** - * optional .openxc.BooleanMessage boolean_message = 5; + * optional .openxc.ControlCommand control_command = 5; */ - public Builder setBooleanMessage( - com.openxc.BinaryMessages.BooleanMessage.Builder builderForValue) { - if (booleanMessageBuilder_ == null) { - booleanMessage_ = builderForValue.build(); + public Builder setControlCommand( + com.openxc.BinaryMessages.ControlCommand.Builder builderForValue) { + if (controlCommandBuilder_ == null) { + controlCommand_ = builderForValue.build(); onChanged(); } else { - booleanMessageBuilder_.setMessage(builderForValue.build()); + controlCommandBuilder_.setMessage(builderForValue.build()); } bitField0_ |= 0x00000010; return this; } /** - * optional .openxc.BooleanMessage boolean_message = 5; + * optional .openxc.ControlCommand control_command = 5; */ - public Builder mergeBooleanMessage(com.openxc.BinaryMessages.BooleanMessage value) { - if (booleanMessageBuilder_ == null) { + public Builder mergeControlCommand(com.openxc.BinaryMessages.ControlCommand value) { + if (controlCommandBuilder_ == null) { if (((bitField0_ & 0x00000010) == 0x00000010) && - booleanMessage_ != com.openxc.BinaryMessages.BooleanMessage.getDefaultInstance()) { - booleanMessage_ = - com.openxc.BinaryMessages.BooleanMessage.newBuilder(booleanMessage_).mergeFrom(value).buildPartial(); + controlCommand_ != com.openxc.BinaryMessages.ControlCommand.getDefaultInstance()) { + controlCommand_ = + com.openxc.BinaryMessages.ControlCommand.newBuilder(controlCommand_).mergeFrom(value).buildPartial(); } else { - booleanMessage_ = value; + controlCommand_ = value; } onChanged(); } else { - booleanMessageBuilder_.mergeFrom(value); + controlCommandBuilder_.mergeFrom(value); } bitField0_ |= 0x00000010; return this; } /** - * optional .openxc.BooleanMessage boolean_message = 5; + * optional .openxc.ControlCommand control_command = 5; */ - public Builder clearBooleanMessage() { - if (booleanMessageBuilder_ == null) { - booleanMessage_ = com.openxc.BinaryMessages.BooleanMessage.getDefaultInstance(); + public Builder clearControlCommand() { + if (controlCommandBuilder_ == null) { + controlCommand_ = com.openxc.BinaryMessages.ControlCommand.getDefaultInstance(); onChanged(); } else { - booleanMessageBuilder_.clear(); + controlCommandBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000010); return this; } /** - * optional .openxc.BooleanMessage boolean_message = 5; + * optional .openxc.ControlCommand control_command = 5; */ - public com.openxc.BinaryMessages.BooleanMessage.Builder getBooleanMessageBuilder() { + public com.openxc.BinaryMessages.ControlCommand.Builder getControlCommandBuilder() { bitField0_ |= 0x00000010; onChanged(); - return getBooleanMessageFieldBuilder().getBuilder(); + return getControlCommandFieldBuilder().getBuilder(); } /** - * optional .openxc.BooleanMessage boolean_message = 5; + * optional .openxc.ControlCommand control_command = 5; */ - public com.openxc.BinaryMessages.BooleanMessageOrBuilder getBooleanMessageOrBuilder() { - if (booleanMessageBuilder_ != null) { - return booleanMessageBuilder_.getMessageOrBuilder(); + public com.openxc.BinaryMessages.ControlCommandOrBuilder getControlCommandOrBuilder() { + if (controlCommandBuilder_ != null) { + return controlCommandBuilder_.getMessageOrBuilder(); } else { - return booleanMessage_; + return controlCommand_; } } /** - * optional .openxc.BooleanMessage boolean_message = 5; + * optional .openxc.ControlCommand control_command = 5; */ private com.google.protobuf.SingleFieldBuilder< - com.openxc.BinaryMessages.BooleanMessage, com.openxc.BinaryMessages.BooleanMessage.Builder, com.openxc.BinaryMessages.BooleanMessageOrBuilder> - getBooleanMessageFieldBuilder() { - if (booleanMessageBuilder_ == null) { - booleanMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.openxc.BinaryMessages.BooleanMessage, com.openxc.BinaryMessages.BooleanMessage.Builder, com.openxc.BinaryMessages.BooleanMessageOrBuilder>( - booleanMessage_, + com.openxc.BinaryMessages.ControlCommand, com.openxc.BinaryMessages.ControlCommand.Builder, com.openxc.BinaryMessages.ControlCommandOrBuilder> + getControlCommandFieldBuilder() { + if (controlCommandBuilder_ == null) { + controlCommandBuilder_ = new com.google.protobuf.SingleFieldBuilder< + com.openxc.BinaryMessages.ControlCommand, com.openxc.BinaryMessages.ControlCommand.Builder, com.openxc.BinaryMessages.ControlCommandOrBuilder>( + controlCommand_, getParentForChildren(), isClean()); - booleanMessage_ = null; + controlCommand_ = null; } - return booleanMessageBuilder_; + return controlCommandBuilder_; } - // optional .openxc.EventedStringMessage evented_string_message = 6; - private com.openxc.BinaryMessages.EventedStringMessage eventedStringMessage_ = com.openxc.BinaryMessages.EventedStringMessage.getDefaultInstance(); + // 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.EventedStringMessage, com.openxc.BinaryMessages.EventedStringMessage.Builder, com.openxc.BinaryMessages.EventedStringMessageOrBuilder> eventedStringMessageBuilder_; + com.openxc.BinaryMessages.CommandResponse, com.openxc.BinaryMessages.CommandResponse.Builder, com.openxc.BinaryMessages.CommandResponseOrBuilder> commandResponseBuilder_; /** - * optional .openxc.EventedStringMessage evented_string_message = 6; + * optional .openxc.CommandResponse command_response = 6; */ - public boolean hasEventedStringMessage() { + public boolean hasCommandResponse() { return ((bitField0_ & 0x00000020) == 0x00000020); } /** - * optional .openxc.EventedStringMessage evented_string_message = 6; + * optional .openxc.CommandResponse command_response = 6; */ - public com.openxc.BinaryMessages.EventedStringMessage getEventedStringMessage() { - if (eventedStringMessageBuilder_ == null) { - return eventedStringMessage_; + public com.openxc.BinaryMessages.CommandResponse getCommandResponse() { + if (commandResponseBuilder_ == null) { + return commandResponse_; } else { - return eventedStringMessageBuilder_.getMessage(); + return commandResponseBuilder_.getMessage(); } } /** - * optional .openxc.EventedStringMessage evented_string_message = 6; + * optional .openxc.CommandResponse command_response = 6; */ - public Builder setEventedStringMessage(com.openxc.BinaryMessages.EventedStringMessage value) { - if (eventedStringMessageBuilder_ == null) { + public Builder setCommandResponse(com.openxc.BinaryMessages.CommandResponse value) { + if (commandResponseBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - eventedStringMessage_ = value; + commandResponse_ = value; onChanged(); } else { - eventedStringMessageBuilder_.setMessage(value); + commandResponseBuilder_.setMessage(value); } bitField0_ |= 0x00000020; return this; } /** - * optional .openxc.EventedStringMessage evented_string_message = 6; + * optional .openxc.CommandResponse command_response = 6; */ - public Builder setEventedStringMessage( - com.openxc.BinaryMessages.EventedStringMessage.Builder builderForValue) { - if (eventedStringMessageBuilder_ == null) { - eventedStringMessage_ = builderForValue.build(); + public Builder setCommandResponse( + com.openxc.BinaryMessages.CommandResponse.Builder builderForValue) { + if (commandResponseBuilder_ == null) { + commandResponse_ = builderForValue.build(); onChanged(); } else { - eventedStringMessageBuilder_.setMessage(builderForValue.build()); + commandResponseBuilder_.setMessage(builderForValue.build()); } bitField0_ |= 0x00000020; return this; } /** - * optional .openxc.EventedStringMessage evented_string_message = 6; + * optional .openxc.CommandResponse command_response = 6; */ - public Builder mergeEventedStringMessage(com.openxc.BinaryMessages.EventedStringMessage value) { - if (eventedStringMessageBuilder_ == null) { + public Builder mergeCommandResponse(com.openxc.BinaryMessages.CommandResponse value) { + if (commandResponseBuilder_ == null) { if (((bitField0_ & 0x00000020) == 0x00000020) && - eventedStringMessage_ != com.openxc.BinaryMessages.EventedStringMessage.getDefaultInstance()) { - eventedStringMessage_ = - com.openxc.BinaryMessages.EventedStringMessage.newBuilder(eventedStringMessage_).mergeFrom(value).buildPartial(); + commandResponse_ != com.openxc.BinaryMessages.CommandResponse.getDefaultInstance()) { + commandResponse_ = + com.openxc.BinaryMessages.CommandResponse.newBuilder(commandResponse_).mergeFrom(value).buildPartial(); } else { - eventedStringMessage_ = value; + commandResponse_ = value; } onChanged(); } else { - eventedStringMessageBuilder_.mergeFrom(value); + commandResponseBuilder_.mergeFrom(value); } bitField0_ |= 0x00000020; return this; } /** - * optional .openxc.EventedStringMessage evented_string_message = 6; + * optional .openxc.CommandResponse command_response = 6; */ - public Builder clearEventedStringMessage() { - if (eventedStringMessageBuilder_ == null) { - eventedStringMessage_ = com.openxc.BinaryMessages.EventedStringMessage.getDefaultInstance(); + public Builder clearCommandResponse() { + if (commandResponseBuilder_ == null) { + commandResponse_ = com.openxc.BinaryMessages.CommandResponse.getDefaultInstance(); onChanged(); } else { - eventedStringMessageBuilder_.clear(); + commandResponseBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000020); return this; } /** - * optional .openxc.EventedStringMessage evented_string_message = 6; + * optional .openxc.CommandResponse command_response = 6; */ - public com.openxc.BinaryMessages.EventedStringMessage.Builder getEventedStringMessageBuilder() { + public com.openxc.BinaryMessages.CommandResponse.Builder getCommandResponseBuilder() { bitField0_ |= 0x00000020; onChanged(); - return getEventedStringMessageFieldBuilder().getBuilder(); - } - /** - * optional .openxc.EventedStringMessage evented_string_message = 6; - */ - public com.openxc.BinaryMessages.EventedStringMessageOrBuilder getEventedStringMessageOrBuilder() { - if (eventedStringMessageBuilder_ != null) { - return eventedStringMessageBuilder_.getMessageOrBuilder(); - } else { - return eventedStringMessage_; - } - } - /** - * optional .openxc.EventedStringMessage evented_string_message = 6; - */ - private com.google.protobuf.SingleFieldBuilder< - com.openxc.BinaryMessages.EventedStringMessage, com.openxc.BinaryMessages.EventedStringMessage.Builder, com.openxc.BinaryMessages.EventedStringMessageOrBuilder> - getEventedStringMessageFieldBuilder() { - if (eventedStringMessageBuilder_ == null) { - eventedStringMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.openxc.BinaryMessages.EventedStringMessage, com.openxc.BinaryMessages.EventedStringMessage.Builder, com.openxc.BinaryMessages.EventedStringMessageOrBuilder>( - eventedStringMessage_, - getParentForChildren(), - isClean()); - eventedStringMessage_ = null; - } - return eventedStringMessageBuilder_; - } - - // optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - private com.openxc.BinaryMessages.EventedBooleanMessage eventedBooleanMessage_ = com.openxc.BinaryMessages.EventedBooleanMessage.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - com.openxc.BinaryMessages.EventedBooleanMessage, com.openxc.BinaryMessages.EventedBooleanMessage.Builder, com.openxc.BinaryMessages.EventedBooleanMessageOrBuilder> eventedBooleanMessageBuilder_; - /** - * optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - */ - public boolean hasEventedBooleanMessage() { - return ((bitField0_ & 0x00000040) == 0x00000040); - } - /** - * optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - */ - public com.openxc.BinaryMessages.EventedBooleanMessage getEventedBooleanMessage() { - if (eventedBooleanMessageBuilder_ == null) { - return eventedBooleanMessage_; - } else { - return eventedBooleanMessageBuilder_.getMessage(); - } - } - /** - * optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - */ - public Builder setEventedBooleanMessage(com.openxc.BinaryMessages.EventedBooleanMessage value) { - if (eventedBooleanMessageBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - eventedBooleanMessage_ = value; - onChanged(); - } else { - eventedBooleanMessageBuilder_.setMessage(value); - } - bitField0_ |= 0x00000040; - return this; - } - /** - * optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - */ - public Builder setEventedBooleanMessage( - com.openxc.BinaryMessages.EventedBooleanMessage.Builder builderForValue) { - if (eventedBooleanMessageBuilder_ == null) { - eventedBooleanMessage_ = builderForValue.build(); - onChanged(); - } else { - eventedBooleanMessageBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000040; - return this; - } - /** - * optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - */ - public Builder mergeEventedBooleanMessage(com.openxc.BinaryMessages.EventedBooleanMessage value) { - if (eventedBooleanMessageBuilder_ == null) { - if (((bitField0_ & 0x00000040) == 0x00000040) && - eventedBooleanMessage_ != com.openxc.BinaryMessages.EventedBooleanMessage.getDefaultInstance()) { - eventedBooleanMessage_ = - com.openxc.BinaryMessages.EventedBooleanMessage.newBuilder(eventedBooleanMessage_).mergeFrom(value).buildPartial(); - } else { - eventedBooleanMessage_ = value; - } - onChanged(); - } else { - eventedBooleanMessageBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000040; - return this; - } - /** - * optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - */ - public Builder clearEventedBooleanMessage() { - if (eventedBooleanMessageBuilder_ == null) { - eventedBooleanMessage_ = com.openxc.BinaryMessages.EventedBooleanMessage.getDefaultInstance(); - onChanged(); - } else { - eventedBooleanMessageBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000040); - return this; - } - /** - * optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - */ - public com.openxc.BinaryMessages.EventedBooleanMessage.Builder getEventedBooleanMessageBuilder() { - bitField0_ |= 0x00000040; - onChanged(); - return getEventedBooleanMessageFieldBuilder().getBuilder(); - } - /** - * optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - */ - public com.openxc.BinaryMessages.EventedBooleanMessageOrBuilder getEventedBooleanMessageOrBuilder() { - if (eventedBooleanMessageBuilder_ != null) { - return eventedBooleanMessageBuilder_.getMessageOrBuilder(); - } else { - return eventedBooleanMessage_; - } - } - /** - * optional .openxc.EventedBooleanMessage evented_boolean_message = 7; - */ - private com.google.protobuf.SingleFieldBuilder< - com.openxc.BinaryMessages.EventedBooleanMessage, com.openxc.BinaryMessages.EventedBooleanMessage.Builder, com.openxc.BinaryMessages.EventedBooleanMessageOrBuilder> - getEventedBooleanMessageFieldBuilder() { - if (eventedBooleanMessageBuilder_ == null) { - eventedBooleanMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.openxc.BinaryMessages.EventedBooleanMessage, com.openxc.BinaryMessages.EventedBooleanMessage.Builder, com.openxc.BinaryMessages.EventedBooleanMessageOrBuilder>( - eventedBooleanMessage_, - getParentForChildren(), - isClean()); - eventedBooleanMessage_ = null; - } - return eventedBooleanMessageBuilder_; - } - - // optional .openxc.EventedNumericMessage evented_numeric_message = 8; - private com.openxc.BinaryMessages.EventedNumericMessage eventedNumericMessage_ = com.openxc.BinaryMessages.EventedNumericMessage.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - com.openxc.BinaryMessages.EventedNumericMessage, com.openxc.BinaryMessages.EventedNumericMessage.Builder, com.openxc.BinaryMessages.EventedNumericMessageOrBuilder> eventedNumericMessageBuilder_; - /** - * optional .openxc.EventedNumericMessage evented_numeric_message = 8; - */ - public boolean hasEventedNumericMessage() { - return ((bitField0_ & 0x00000080) == 0x00000080); - } - /** - * optional .openxc.EventedNumericMessage evented_numeric_message = 8; - */ - public com.openxc.BinaryMessages.EventedNumericMessage getEventedNumericMessage() { - if (eventedNumericMessageBuilder_ == null) { - return eventedNumericMessage_; - } else { - return eventedNumericMessageBuilder_.getMessage(); - } - } - /** - * optional .openxc.EventedNumericMessage evented_numeric_message = 8; - */ - public Builder setEventedNumericMessage(com.openxc.BinaryMessages.EventedNumericMessage value) { - if (eventedNumericMessageBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - eventedNumericMessage_ = value; - onChanged(); - } else { - eventedNumericMessageBuilder_.setMessage(value); - } - bitField0_ |= 0x00000080; - return this; - } - /** - * optional .openxc.EventedNumericMessage evented_numeric_message = 8; - */ - public Builder setEventedNumericMessage( - com.openxc.BinaryMessages.EventedNumericMessage.Builder builderForValue) { - if (eventedNumericMessageBuilder_ == null) { - eventedNumericMessage_ = builderForValue.build(); - onChanged(); - } else { - eventedNumericMessageBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000080; - return this; - } - /** - * optional .openxc.EventedNumericMessage evented_numeric_message = 8; - */ - public Builder mergeEventedNumericMessage(com.openxc.BinaryMessages.EventedNumericMessage value) { - if (eventedNumericMessageBuilder_ == null) { - if (((bitField0_ & 0x00000080) == 0x00000080) && - eventedNumericMessage_ != com.openxc.BinaryMessages.EventedNumericMessage.getDefaultInstance()) { - eventedNumericMessage_ = - com.openxc.BinaryMessages.EventedNumericMessage.newBuilder(eventedNumericMessage_).mergeFrom(value).buildPartial(); - } else { - eventedNumericMessage_ = value; - } - onChanged(); - } else { - eventedNumericMessageBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000080; - return this; - } - /** - * optional .openxc.EventedNumericMessage evented_numeric_message = 8; - */ - public Builder clearEventedNumericMessage() { - if (eventedNumericMessageBuilder_ == null) { - eventedNumericMessage_ = com.openxc.BinaryMessages.EventedNumericMessage.getDefaultInstance(); - onChanged(); - } else { - eventedNumericMessageBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000080); - return this; - } - /** - * optional .openxc.EventedNumericMessage evented_numeric_message = 8; - */ - public com.openxc.BinaryMessages.EventedNumericMessage.Builder getEventedNumericMessageBuilder() { - bitField0_ |= 0x00000080; - onChanged(); - return getEventedNumericMessageFieldBuilder().getBuilder(); + return getCommandResponseFieldBuilder().getBuilder(); } /** - * optional .openxc.EventedNumericMessage evented_numeric_message = 8; + * optional .openxc.CommandResponse command_response = 6; */ - public com.openxc.BinaryMessages.EventedNumericMessageOrBuilder getEventedNumericMessageOrBuilder() { - if (eventedNumericMessageBuilder_ != null) { - return eventedNumericMessageBuilder_.getMessageOrBuilder(); + public com.openxc.BinaryMessages.CommandResponseOrBuilder getCommandResponseOrBuilder() { + if (commandResponseBuilder_ != null) { + return commandResponseBuilder_.getMessageOrBuilder(); } else { - return eventedNumericMessage_; + return commandResponse_; } } /** - * optional .openxc.EventedNumericMessage evented_numeric_message = 8; + * optional .openxc.CommandResponse command_response = 6; */ private com.google.protobuf.SingleFieldBuilder< - com.openxc.BinaryMessages.EventedNumericMessage, com.openxc.BinaryMessages.EventedNumericMessage.Builder, com.openxc.BinaryMessages.EventedNumericMessageOrBuilder> - getEventedNumericMessageFieldBuilder() { - if (eventedNumericMessageBuilder_ == null) { - eventedNumericMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.openxc.BinaryMessages.EventedNumericMessage, com.openxc.BinaryMessages.EventedNumericMessage.Builder, com.openxc.BinaryMessages.EventedNumericMessageOrBuilder>( - eventedNumericMessage_, + 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()); - eventedNumericMessage_ = null; + commandResponse_ = null; } - return eventedNumericMessageBuilder_; + return commandResponseBuilder_; } // @@protoc_insertion_point(builder_scope:openxc.VehicleMessage) @@ -1906,6 +1504,16 @@ public final class BinaryMessages { * optional uint32 message_id = 2; */ int getMessageId(); + + // optional bytes data = 3; + /** + * optional bytes data = 3; + */ + boolean hasData(); + /** + * optional bytes data = 3; + */ + com.google.protobuf.ByteString getData(); } /** * Protobuf type {@code openxc.RawMessage} @@ -1968,6 +1576,11 @@ public final class BinaryMessages { messageId_ = input.readUInt32(); break; } + case 26: { + bitField0_ |= 0x00000004; + data_ = input.readBytes(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -2040,9 +1653,26 @@ public final class BinaryMessages { return messageId_; } + // optional bytes data = 3; + public static final int DATA_FIELD_NUMBER = 3; + private com.google.protobuf.ByteString data_; + /** + * optional bytes data = 3; + */ + public boolean hasData() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional bytes data = 3; + */ + public com.google.protobuf.ByteString getData() { + return data_; + } + private void initFields() { bus_ = 0; messageId_ = 0; + data_ = com.google.protobuf.ByteString.EMPTY; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -2062,6 +1692,9 @@ public final class BinaryMessages { if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeUInt32(2, messageId_); } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeBytes(3, data_); + } getUnknownFields().writeTo(output); } @@ -2079,6 +1712,10 @@ public final class BinaryMessages { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(2, messageId_); } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(3, data_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -2199,6 +1836,8 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000001); messageId_ = 0; bitField0_ = (bitField0_ & ~0x00000002); + data_ = com.google.protobuf.ByteString.EMPTY; + bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -2235,6 +1874,10 @@ public final class BinaryMessages { to_bitField0_ |= 0x00000002; } result.messageId_ = messageId_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.data_ = data_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -2257,6 +1900,9 @@ public final class BinaryMessages { if (other.hasMessageId()) { setMessageId(other.getMessageId()); } + if (other.hasData()) { + setData(other.getData()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -2350,9 +1996,45 @@ public final class BinaryMessages { return this; } - // @@protoc_insertion_point(builder_scope:openxc.RawMessage) - } - + // optional bytes data = 3; + private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY; + /** + * optional bytes data = 3; + */ + public boolean hasData() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional bytes data = 3; + */ + public com.google.protobuf.ByteString getData() { + return data_; + } + /** + * optional bytes data = 3; + */ + public Builder setData(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000004; + data_ = value; + onChanged(); + return this; + } + /** + * optional bytes data = 3; + */ + public Builder clearData() { + bitField0_ = (bitField0_ & ~0x00000004); + data_ = getDefaultInstance().getData(); + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:openxc.RawMessage) + } + static { defaultInstance = new RawMessage(true); defaultInstance.initFields(); @@ -2361,58 +2043,52 @@ public final class BinaryMessages { // @@protoc_insertion_point(class_scope:openxc.RawMessage) } - public interface StringMessageOrBuilder + public interface ControlCommandOrBuilder extends com.google.protobuf.MessageOrBuilder { - // optional string name = 1; - /** - * optional string name = 1; - */ - boolean hasName(); + // optional .openxc.ControlCommand.Type type = 1; /** - * optional string name = 1; + * optional .openxc.ControlCommand.Type type = 1; */ - java.lang.String getName(); + boolean hasType(); /** - * optional string name = 1; + * optional .openxc.ControlCommand.Type type = 1; */ - com.google.protobuf.ByteString - getNameBytes(); + com.openxc.BinaryMessages.ControlCommand.Type getType(); - // optional string value = 2; + // optional .openxc.DiagnosticRequest diagnostic_request = 2; /** - * optional string value = 2; + * optional .openxc.DiagnosticRequest diagnostic_request = 2; */ - boolean hasValue(); + boolean hasDiagnosticRequest(); /** - * optional string value = 2; + * optional .openxc.DiagnosticRequest diagnostic_request = 2; */ - java.lang.String getValue(); + com.openxc.BinaryMessages.DiagnosticRequest getDiagnosticRequest(); /** - * optional string value = 2; + * optional .openxc.DiagnosticRequest diagnostic_request = 2; */ - com.google.protobuf.ByteString - getValueBytes(); + com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getDiagnosticRequestOrBuilder(); } /** - * Protobuf type {@code openxc.StringMessage} + * Protobuf type {@code openxc.ControlCommand} */ - public static final class StringMessage extends + public static final class ControlCommand extends com.google.protobuf.GeneratedMessage - implements StringMessageOrBuilder { - // Use StringMessage.newBuilder() to construct. - private StringMessage(com.google.protobuf.GeneratedMessage.Builder builder) { + implements ControlCommandOrBuilder { + // Use ControlCommand.newBuilder() to construct. + private ControlCommand(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - private StringMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + private ControlCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - private static final StringMessage defaultInstance; - public static StringMessage getDefaultInstance() { + private static final ControlCommand defaultInstance; + public static ControlCommand getDefaultInstance() { return defaultInstance; } - public StringMessage getDefaultInstanceForType() { + public ControlCommand getDefaultInstanceForType() { return defaultInstance; } @@ -2422,7 +2098,7 @@ public final class BinaryMessages { getUnknownFields() { return this.unknownFields; } - private StringMessage( + private ControlCommand( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -2445,14 +2121,28 @@ public final class BinaryMessages { } break; } - case 10: { - bitField0_ |= 0x00000001; - name_ = input.readBytes(); + case 8: { + int rawValue = input.readEnum(); + com.openxc.BinaryMessages.ControlCommand.Type value = com.openxc.BinaryMessages.ControlCommand.Type.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(1, rawValue); + } else { + bitField0_ |= 0x00000001; + type_ = value; + } break; } case 18: { + com.openxc.BinaryMessages.DiagnosticRequest.Builder subBuilder = null; + if (((bitField0_ & 0x00000002) == 0x00000002)) { + subBuilder = diagnosticRequest_.toBuilder(); + } + diagnosticRequest_ = input.readMessage(com.openxc.BinaryMessages.DiagnosticRequest.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(diagnosticRequest_); + diagnosticRequest_ = subBuilder.buildPartial(); + } bitField0_ |= 0x00000002; - value_ = input.readBytes(); break; } } @@ -2469,121 +2159,164 @@ public final class BinaryMessages { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.openxc.BinaryMessages.internal_static_openxc_StringMessage_descriptor; + return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_StringMessage_fieldAccessorTable + return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.StringMessage.class, com.openxc.BinaryMessages.StringMessage.Builder.class); + com.openxc.BinaryMessages.ControlCommand.class, com.openxc.BinaryMessages.ControlCommand.Builder.class); } - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public StringMessage parsePartialFrom( + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public ControlCommand parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new StringMessage(input, extensionRegistry); + return new ControlCommand(input, extensionRegistry); } }; @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } - private int bitField0_; - // optional string name = 1; - public static final int NAME_FIELD_NUMBER = 1; - private java.lang.Object name_; /** - * optional string name = 1; + * Protobuf enum {@code openxc.ControlCommand.Type} */ - public boolean hasName() { - return ((bitField0_ & 0x00000001) == 0x00000001); + public enum Type + implements com.google.protobuf.ProtocolMessageEnum { + /** + * VERSION = 1; + */ + VERSION(0, 1), + /** + * DEVICE_ID = 2; + */ + DEVICE_ID(1, 2), + /** + * DIAGNOSTIC = 3; + */ + DIAGNOSTIC(2, 3), + ; + + /** + * VERSION = 1; + */ + public static final int VERSION_VALUE = 1; + /** + * DEVICE_ID = 2; + */ + public static final int DEVICE_ID_VALUE = 2; + /** + * DIAGNOSTIC = 3; + */ + public static final int DIAGNOSTIC_VALUE = 3; + + + public final int getNumber() { return value; } + + public static Type valueOf(int value) { + switch (value) { + case 1: return VERSION; + case 2: return DEVICE_ID; + case 3: return DIAGNOSTIC; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public Type findValueByNumber(int number) { + return Type.valueOf(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(index); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return com.openxc.BinaryMessages.ControlCommand.getDescriptor().getEnumTypes().get(0); + } + + private static final Type[] VALUES = values(); + + public static Type valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + return VALUES[desc.getIndex()]; + } + + private final int index; + private final int value; + + private Type(int index, int value) { + this.index = index; + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:openxc.ControlCommand.Type) } + + private int bitField0_; + // optional .openxc.ControlCommand.Type type = 1; + public static final int TYPE_FIELD_NUMBER = 1; + private com.openxc.BinaryMessages.ControlCommand.Type type_; /** - * optional string name = 1; + * optional .openxc.ControlCommand.Type type = 1; */ - 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; - } + public boolean hasType() { + return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional string name = 1; + * optional .openxc.ControlCommand.Type type = 1; */ - 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; - } + public com.openxc.BinaryMessages.ControlCommand.Type getType() { + return type_; } - // optional string value = 2; - public static final int VALUE_FIELD_NUMBER = 2; - private java.lang.Object value_; + // optional .openxc.DiagnosticRequest diagnostic_request = 2; + public static final int DIAGNOSTIC_REQUEST_FIELD_NUMBER = 2; + private com.openxc.BinaryMessages.DiagnosticRequest diagnosticRequest_; /** - * optional string value = 2; + * optional .openxc.DiagnosticRequest diagnostic_request = 2; */ - public boolean hasValue() { + public boolean hasDiagnosticRequest() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional string value = 2; + * optional .openxc.DiagnosticRequest diagnostic_request = 2; */ - public java.lang.String getValue() { - java.lang.Object ref = value_; - 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()) { - value_ = s; - } - return s; - } + public com.openxc.BinaryMessages.DiagnosticRequest getDiagnosticRequest() { + return diagnosticRequest_; } /** - * optional string value = 2; + * optional .openxc.DiagnosticRequest diagnostic_request = 2; */ - public com.google.protobuf.ByteString - getValueBytes() { - java.lang.Object ref = value_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - value_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getDiagnosticRequestOrBuilder() { + return diagnosticRequest_; } private void initFields() { - name_ = ""; - value_ = ""; + type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION; + diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -2598,10 +2331,10 @@ public final class BinaryMessages { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getNameBytes()); + output.writeEnum(1, type_.getNumber()); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBytes(2, getValueBytes()); + output.writeMessage(2, diagnosticRequest_); } getUnknownFields().writeTo(output); } @@ -2614,11 +2347,11 @@ public final class BinaryMessages { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getNameBytes()); + .computeEnumSize(1, type_.getNumber()); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, getValueBytes()); + .computeMessageSize(2, diagnosticRequest_); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -2632,53 +2365,53 @@ public final class BinaryMessages { return super.writeReplace(); } - public static com.openxc.BinaryMessages.StringMessage parseFrom( + public static com.openxc.BinaryMessages.ControlCommand parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.openxc.BinaryMessages.StringMessage parseFrom( + public static com.openxc.BinaryMessages.ControlCommand parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.openxc.BinaryMessages.StringMessage parseFrom(byte[] data) + public static com.openxc.BinaryMessages.ControlCommand parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.openxc.BinaryMessages.StringMessage parseFrom( + public static com.openxc.BinaryMessages.ControlCommand parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.openxc.BinaryMessages.StringMessage parseFrom(java.io.InputStream input) + public static com.openxc.BinaryMessages.ControlCommand parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.openxc.BinaryMessages.StringMessage parseFrom( + public static com.openxc.BinaryMessages.ControlCommand parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.openxc.BinaryMessages.StringMessage parseDelimitedFrom(java.io.InputStream input) + public static com.openxc.BinaryMessages.ControlCommand parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.openxc.BinaryMessages.StringMessage parseDelimitedFrom( + public static com.openxc.BinaryMessages.ControlCommand parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.openxc.BinaryMessages.StringMessage parseFrom( + public static com.openxc.BinaryMessages.ControlCommand parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.openxc.BinaryMessages.StringMessage parseFrom( + public static com.openxc.BinaryMessages.ControlCommand parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2687,7 +2420,7 @@ public final class BinaryMessages { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.openxc.BinaryMessages.StringMessage prototype) { + public static Builder newBuilder(com.openxc.BinaryMessages.ControlCommand prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2699,24 +2432,24 @@ public final class BinaryMessages { return builder; } /** - * Protobuf type {@code openxc.StringMessage} + * Protobuf type {@code openxc.ControlCommand} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements com.openxc.BinaryMessages.StringMessageOrBuilder { + implements com.openxc.BinaryMessages.ControlCommandOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.openxc.BinaryMessages.internal_static_openxc_StringMessage_descriptor; + return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_StringMessage_fieldAccessorTable + return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.StringMessage.class, com.openxc.BinaryMessages.StringMessage.Builder.class); + com.openxc.BinaryMessages.ControlCommand.class, com.openxc.BinaryMessages.ControlCommand.Builder.class); } - // Construct using com.openxc.BinaryMessages.StringMessage.newBuilder() + // Construct using com.openxc.BinaryMessages.ControlCommand.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -2728,6 +2461,7 @@ public final class BinaryMessages { } private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getDiagnosticRequestFieldBuilder(); } } private static Builder create() { @@ -2736,9 +2470,13 @@ public final class BinaryMessages { public Builder clear() { super.clear(); - name_ = ""; + type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION; bitField0_ = (bitField0_ & ~0x00000001); - value_ = ""; + if (diagnosticRequestBuilder_ == null) { + diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance(); + } else { + diagnosticRequestBuilder_.clear(); + } bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -2749,58 +2487,58 @@ public final class BinaryMessages { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_StringMessage_descriptor; + return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_descriptor; } - public com.openxc.BinaryMessages.StringMessage getDefaultInstanceForType() { - return com.openxc.BinaryMessages.StringMessage.getDefaultInstance(); + public com.openxc.BinaryMessages.ControlCommand getDefaultInstanceForType() { + return com.openxc.BinaryMessages.ControlCommand.getDefaultInstance(); } - public com.openxc.BinaryMessages.StringMessage build() { - com.openxc.BinaryMessages.StringMessage result = buildPartial(); + public com.openxc.BinaryMessages.ControlCommand build() { + com.openxc.BinaryMessages.ControlCommand result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.openxc.BinaryMessages.StringMessage buildPartial() { - com.openxc.BinaryMessages.StringMessage result = new com.openxc.BinaryMessages.StringMessage(this); + public com.openxc.BinaryMessages.ControlCommand buildPartial() { + com.openxc.BinaryMessages.ControlCommand result = new com.openxc.BinaryMessages.ControlCommand(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.name_ = name_; + result.type_ = type_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.value_ = value_; + if (diagnosticRequestBuilder_ == null) { + result.diagnosticRequest_ = diagnosticRequest_; + } else { + result.diagnosticRequest_ = diagnosticRequestBuilder_.build(); + } result.bitField0_ = to_bitField0_; onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.openxc.BinaryMessages.StringMessage) { - return mergeFrom((com.openxc.BinaryMessages.StringMessage)other); + if (other instanceof com.openxc.BinaryMessages.ControlCommand) { + return mergeFrom((com.openxc.BinaryMessages.ControlCommand)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.openxc.BinaryMessages.StringMessage other) { - if (other == com.openxc.BinaryMessages.StringMessage.getDefaultInstance()) return this; - if (other.hasName()) { - bitField0_ |= 0x00000001; - name_ = other.name_; - onChanged(); + public Builder mergeFrom(com.openxc.BinaryMessages.ControlCommand other) { + if (other == com.openxc.BinaryMessages.ControlCommand.getDefaultInstance()) return this; + if (other.hasType()) { + setType(other.getType()); } - if (other.hasValue()) { - bitField0_ |= 0x00000002; - value_ = other.value_; - onChanged(); + if (other.hasDiagnosticRequest()) { + mergeDiagnosticRequest(other.getDiagnosticRequest()); } this.mergeUnknownFields(other.getUnknownFields()); return this; @@ -2814,11 +2552,11 @@ public final class BinaryMessages { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.StringMessage parsedMessage = null; + com.openxc.BinaryMessages.ControlCommand parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.StringMessage) e.getUnfinishedMessage(); + parsedMessage = (com.openxc.BinaryMessages.ControlCommand) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2829,212 +2567,217 @@ public final class BinaryMessages { } private int bitField0_; - // optional string name = 1; - private java.lang.Object name_ = ""; + // optional .openxc.ControlCommand.Type type = 1; + private com.openxc.BinaryMessages.ControlCommand.Type type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION; /** - * optional string name = 1; + * optional .openxc.ControlCommand.Type type = 1; */ - public boolean hasName() { + public boolean hasType() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional string name = 1; - */ - 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 = 1; + * optional .openxc.ControlCommand.Type type = 1; */ - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public com.openxc.BinaryMessages.ControlCommand.Type getType() { + return type_; } /** - * optional string name = 1; + * optional .openxc.ControlCommand.Type type = 1; */ - public Builder setName( - java.lang.String value) { + public Builder setType(com.openxc.BinaryMessages.ControlCommand.Type value) { if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - name_ = value; + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + type_ = value; onChanged(); return this; } /** - * optional string name = 1; + * optional .openxc.ControlCommand.Type type = 1; */ - public Builder clearName() { + public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - name_ = getDefaultInstance().getName(); - onChanged(); - return this; - } - /** - * optional string name = 1; - */ - public Builder setNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - name_ = value; + type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION; onChanged(); return this; } - // optional string value = 2; - private java.lang.Object value_ = ""; + // optional .openxc.DiagnosticRequest diagnostic_request = 2; + private com.openxc.BinaryMessages.DiagnosticRequest diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + com.openxc.BinaryMessages.DiagnosticRequest, com.openxc.BinaryMessages.DiagnosticRequest.Builder, com.openxc.BinaryMessages.DiagnosticRequestOrBuilder> diagnosticRequestBuilder_; /** - * optional string value = 2; + * optional .openxc.DiagnosticRequest diagnostic_request = 2; */ - public boolean hasValue() { + public boolean hasDiagnosticRequest() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional string value = 2; + * optional .openxc.DiagnosticRequest diagnostic_request = 2; */ - public java.lang.String getValue() { - java.lang.Object ref = value_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - value_ = s; - return s; + public com.openxc.BinaryMessages.DiagnosticRequest getDiagnosticRequest() { + if (diagnosticRequestBuilder_ == null) { + return diagnosticRequest_; } else { - return (java.lang.String) ref; + return diagnosticRequestBuilder_.getMessage(); } } /** - * optional string value = 2; + * optional .openxc.DiagnosticRequest diagnostic_request = 2; */ - public com.google.protobuf.ByteString - getValueBytes() { - java.lang.Object ref = value_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - value_ = b; - return b; + public Builder setDiagnosticRequest(com.openxc.BinaryMessages.DiagnosticRequest value) { + if (diagnosticRequestBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + diagnosticRequest_ = value; + onChanged(); } else { - return (com.google.protobuf.ByteString) ref; + diagnosticRequestBuilder_.setMessage(value); } + bitField0_ |= 0x00000002; + return this; } /** - * optional string value = 2; + * optional .openxc.DiagnosticRequest diagnostic_request = 2; */ - public Builder setValue( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - value_ = value; - onChanged(); + public Builder setDiagnosticRequest( + com.openxc.BinaryMessages.DiagnosticRequest.Builder builderForValue) { + if (diagnosticRequestBuilder_ == null) { + diagnosticRequest_ = builderForValue.build(); + onChanged(); + } else { + diagnosticRequestBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; return this; } /** - * optional string value = 2; + * optional .openxc.DiagnosticRequest diagnostic_request = 2; */ - public Builder clearValue() { + public Builder mergeDiagnosticRequest(com.openxc.BinaryMessages.DiagnosticRequest value) { + if (diagnosticRequestBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002) && + diagnosticRequest_ != com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance()) { + diagnosticRequest_ = + com.openxc.BinaryMessages.DiagnosticRequest.newBuilder(diagnosticRequest_).mergeFrom(value).buildPartial(); + } else { + diagnosticRequest_ = value; + } + onChanged(); + } else { + diagnosticRequestBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * optional .openxc.DiagnosticRequest diagnostic_request = 2; + */ + public Builder clearDiagnosticRequest() { + if (diagnosticRequestBuilder_ == null) { + diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance(); + onChanged(); + } else { + diagnosticRequestBuilder_.clear(); + } bitField0_ = (bitField0_ & ~0x00000002); - value_ = getDefaultInstance().getValue(); - onChanged(); return this; } /** - * optional string value = 2; + * optional .openxc.DiagnosticRequest diagnostic_request = 2; */ - public Builder setValueBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - value_ = value; + public com.openxc.BinaryMessages.DiagnosticRequest.Builder getDiagnosticRequestBuilder() { + bitField0_ |= 0x00000002; onChanged(); - return this; + return getDiagnosticRequestFieldBuilder().getBuilder(); + } + /** + * optional .openxc.DiagnosticRequest diagnostic_request = 2; + */ + public com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getDiagnosticRequestOrBuilder() { + if (diagnosticRequestBuilder_ != null) { + return diagnosticRequestBuilder_.getMessageOrBuilder(); + } else { + return diagnosticRequest_; + } + } + /** + * optional .openxc.DiagnosticRequest diagnostic_request = 2; + */ + private com.google.protobuf.SingleFieldBuilder< + com.openxc.BinaryMessages.DiagnosticRequest, com.openxc.BinaryMessages.DiagnosticRequest.Builder, com.openxc.BinaryMessages.DiagnosticRequestOrBuilder> + getDiagnosticRequestFieldBuilder() { + if (diagnosticRequestBuilder_ == null) { + diagnosticRequestBuilder_ = new com.google.protobuf.SingleFieldBuilder< + com.openxc.BinaryMessages.DiagnosticRequest, com.openxc.BinaryMessages.DiagnosticRequest.Builder, com.openxc.BinaryMessages.DiagnosticRequestOrBuilder>( + diagnosticRequest_, + getParentForChildren(), + isClean()); + diagnosticRequest_ = null; + } + return diagnosticRequestBuilder_; } - // @@protoc_insertion_point(builder_scope:openxc.StringMessage) + // @@protoc_insertion_point(builder_scope:openxc.ControlCommand) } static { - defaultInstance = new StringMessage(true); + defaultInstance = new ControlCommand(true); defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:openxc.StringMessage) + // @@protoc_insertion_point(class_scope:openxc.ControlCommand) } - public interface NumericMessageOrBuilder + public interface CommandResponseOrBuilder extends com.google.protobuf.MessageOrBuilder { - // optional string name = 1; + // optional .openxc.ControlCommand.Type type = 1; /** - * optional string name = 1; + * optional .openxc.ControlCommand.Type type = 1; */ - boolean hasName(); + boolean hasType(); /** - * optional string name = 1; + * optional .openxc.ControlCommand.Type type = 1; */ - java.lang.String getName(); + com.openxc.BinaryMessages.ControlCommand.Type getType(); + + // optional string message = 2; /** - * optional string name = 1; + * optional string message = 2; */ - com.google.protobuf.ByteString - getNameBytes(); - - // optional double value = 2; + boolean hasMessage(); /** - * optional double value = 2; + * optional string message = 2; */ - boolean hasValue(); + java.lang.String getMessage(); /** - * optional double value = 2; + * optional string message = 2; */ - double getValue(); + com.google.protobuf.ByteString + getMessageBytes(); } /** - * Protobuf type {@code openxc.NumericMessage} + * Protobuf type {@code openxc.CommandResponse} */ - public static final class NumericMessage extends + public static final class CommandResponse extends com.google.protobuf.GeneratedMessage - implements NumericMessageOrBuilder { - // Use NumericMessage.newBuilder() to construct. - private NumericMessage(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 NumericMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + private CommandResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - private static final NumericMessage defaultInstance; - public static NumericMessage getDefaultInstance() { + private static final CommandResponse defaultInstance; + public static CommandResponse getDefaultInstance() { return defaultInstance; } - public NumericMessage getDefaultInstanceForType() { + public CommandResponse getDefaultInstanceForType() { return defaultInstance; } @@ -3044,7 +2787,7 @@ public final class BinaryMessages { getUnknownFields() { return this.unknownFields; } - private NumericMessage( + private CommandResponse( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -3067,14 +2810,20 @@ public final class BinaryMessages { } break; } - case 10: { - bitField0_ |= 0x00000001; - name_ = input.readBytes(); + case 8: { + int rawValue = input.readEnum(); + com.openxc.BinaryMessages.ControlCommand.Type value = com.openxc.BinaryMessages.ControlCommand.Type.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(1, rawValue); + } else { + bitField0_ |= 0x00000001; + type_ = value; + } break; } - case 17: { + case 18: { bitField0_ |= 0x00000002; - value_ = input.readDouble(); + message_ = input.readBytes(); break; } } @@ -3091,46 +2840,62 @@ public final class BinaryMessages { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.openxc.BinaryMessages.internal_static_openxc_NumericMessage_descriptor; + return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_NumericMessage_fieldAccessorTable + return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.NumericMessage.class, com.openxc.BinaryMessages.NumericMessage.Builder.class); + com.openxc.BinaryMessages.CommandResponse.class, com.openxc.BinaryMessages.CommandResponse.Builder.class); } - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public NumericMessage parsePartialFrom( + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public CommandResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new NumericMessage(input, extensionRegistry); + return new CommandResponse(input, extensionRegistry); } }; @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } private int bitField0_; - // optional string name = 1; - public static final int NAME_FIELD_NUMBER = 1; - private java.lang.Object name_; + // optional .openxc.ControlCommand.Type type = 1; + public static final int TYPE_FIELD_NUMBER = 1; + private com.openxc.BinaryMessages.ControlCommand.Type type_; /** - * optional string name = 1; + * optional .openxc.ControlCommand.Type type = 1; */ - public boolean hasName() { + public boolean hasType() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional string name = 1; + * optional .openxc.ControlCommand.Type type = 1; */ - public java.lang.String getName() { - java.lang.Object ref = name_; + public com.openxc.BinaryMessages.ControlCommand.Type getType() { + return type_; + } + + // optional string message = 2; + public static final int MESSAGE_FIELD_NUMBER = 2; + private java.lang.Object message_; + /** + * optional string message = 2; + */ + public boolean hasMessage() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional string message = 2; + */ + public java.lang.String getMessage() { + java.lang.Object ref = message_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { @@ -3138,47 +2903,31 @@ public final class BinaryMessages { (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); if (bs.isValidUtf8()) { - name_ = s; + message_ = s; } return s; } } /** - * optional string name = 1; + * optional string message = 2; */ public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; + 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); - name_ = b; + message_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - // optional double value = 2; - public static final int VALUE_FIELD_NUMBER = 2; - private double value_; - /** - * optional double value = 2; - */ - public boolean hasValue() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional double value = 2; - */ - public double getValue() { - return value_; - } - private void initFields() { - name_ = ""; - value_ = 0D; + type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION; + message_ = ""; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -3193,10 +2942,10 @@ public final class BinaryMessages { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getNameBytes()); + output.writeEnum(1, type_.getNumber()); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeDouble(2, value_); + output.writeBytes(2, getMessageBytes()); } getUnknownFields().writeTo(output); } @@ -3209,11 +2958,11 @@ public final class BinaryMessages { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getNameBytes()); + .computeEnumSize(1, type_.getNumber()); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(2, value_); + .computeBytesSize(2, getMessageBytes()); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -3227,53 +2976,53 @@ public final class BinaryMessages { return super.writeReplace(); } - public static com.openxc.BinaryMessages.NumericMessage 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.NumericMessage 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.NumericMessage 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.NumericMessage 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.NumericMessage 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.NumericMessage 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.NumericMessage 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.NumericMessage 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.NumericMessage 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.NumericMessage parseFrom( + public static com.openxc.BinaryMessages.CommandResponse parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3282,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.NumericMessage prototype) { + public static Builder newBuilder(com.openxc.BinaryMessages.CommandResponse prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -3294,24 +3043,24 @@ public final class BinaryMessages { return builder; } /** - * Protobuf type {@code openxc.NumericMessage} + * Protobuf type {@code openxc.CommandResponse} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements com.openxc.BinaryMessages.NumericMessageOrBuilder { + implements com.openxc.BinaryMessages.CommandResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.openxc.BinaryMessages.internal_static_openxc_NumericMessage_descriptor; + return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_NumericMessage_fieldAccessorTable + return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.NumericMessage.class, com.openxc.BinaryMessages.NumericMessage.Builder.class); + com.openxc.BinaryMessages.CommandResponse.class, com.openxc.BinaryMessages.CommandResponse.Builder.class); } - // Construct using com.openxc.BinaryMessages.NumericMessage.newBuilder() + // Construct using com.openxc.BinaryMessages.CommandResponse.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -3331,9 +3080,9 @@ public final class BinaryMessages { public Builder clear() { super.clear(); - name_ = ""; + type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION; bitField0_ = (bitField0_ & ~0x00000001); - value_ = 0D; + message_ = ""; bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -3344,56 +3093,56 @@ public final class BinaryMessages { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_NumericMessage_descriptor; + return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_descriptor; } - public com.openxc.BinaryMessages.NumericMessage getDefaultInstanceForType() { - return com.openxc.BinaryMessages.NumericMessage.getDefaultInstance(); + public com.openxc.BinaryMessages.CommandResponse getDefaultInstanceForType() { + return com.openxc.BinaryMessages.CommandResponse.getDefaultInstance(); } - public com.openxc.BinaryMessages.NumericMessage build() { - com.openxc.BinaryMessages.NumericMessage result = buildPartial(); + public com.openxc.BinaryMessages.CommandResponse build() { + com.openxc.BinaryMessages.CommandResponse result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.openxc.BinaryMessages.NumericMessage buildPartial() { - com.openxc.BinaryMessages.NumericMessage result = new com.openxc.BinaryMessages.NumericMessage(this); + public com.openxc.BinaryMessages.CommandResponse buildPartial() { + com.openxc.BinaryMessages.CommandResponse result = new com.openxc.BinaryMessages.CommandResponse(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.name_ = name_; + result.type_ = type_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.value_ = value_; + result.message_ = message_; result.bitField0_ = to_bitField0_; onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.openxc.BinaryMessages.NumericMessage) { - return mergeFrom((com.openxc.BinaryMessages.NumericMessage)other); + if (other instanceof com.openxc.BinaryMessages.CommandResponse) { + return mergeFrom((com.openxc.BinaryMessages.CommandResponse)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.openxc.BinaryMessages.NumericMessage other) { - if (other == com.openxc.BinaryMessages.NumericMessage.getDefaultInstance()) return this; - if (other.hasName()) { - bitField0_ |= 0x00000001; - name_ = other.name_; - onChanged(); + public Builder mergeFrom(com.openxc.BinaryMessages.CommandResponse other) { + if (other == com.openxc.BinaryMessages.CommandResponse.getDefaultInstance()) return this; + if (other.hasType()) { + setType(other.getType()); } - if (other.hasValue()) { - setValue(other.getValue()); + if (other.hasMessage()) { + bitField0_ |= 0x00000002; + message_ = other.message_; + onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); return this; @@ -3407,11 +3156,11 @@ public final class BinaryMessages { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.NumericMessage parsedMessage = null; + com.openxc.BinaryMessages.CommandResponse parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.NumericMessage) e.getUnfinishedMessage(); + parsedMessage = (com.openxc.BinaryMessages.CommandResponse) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -3422,171 +3171,264 @@ public final class BinaryMessages { } private int bitField0_; - // optional string name = 1; - private java.lang.Object name_ = ""; + // optional .openxc.ControlCommand.Type type = 1; + private com.openxc.BinaryMessages.ControlCommand.Type type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION; /** - * optional string name = 1; + * optional .openxc.ControlCommand.Type type = 1; */ - public boolean hasName() { + public boolean hasType() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional string name = 1; + * optional .openxc.ControlCommand.Type type = 1; */ - public java.lang.String getName() { - java.lang.Object ref = name_; + 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(); - name_ = s; + message_ = s; return s; } else { return (java.lang.String) ref; } } /** - * optional string name = 1; + * optional string message = 2; */ public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; + getMessageBytes() { + java.lang.Object ref = message_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - name_ = b; + message_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * optional string name = 1; + * optional string message = 2; */ - public Builder setName( + public Builder setMessage( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000001; - name_ = value; + bitField0_ |= 0x00000002; + message_ = value; onChanged(); return this; } /** - * optional string name = 1; + * optional string message = 2; */ - public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000001); - name_ = getDefaultInstance().getName(); + public Builder clearMessage() { + bitField0_ = (bitField0_ & ~0x00000002); + message_ = getDefaultInstance().getMessage(); onChanged(); return this; } /** - * optional string name = 1; + * optional string message = 2; */ - public Builder setNameBytes( + public Builder setMessageBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000001; - name_ = value; - onChanged(); - return this; - } - - // optional double value = 2; - private double value_ ; - /** - * optional double value = 2; - */ - public boolean hasValue() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional double value = 2; - */ - public double getValue() { - return value_; - } - /** - * optional double value = 2; - */ - public Builder setValue(double value) { - bitField0_ |= 0x00000002; - value_ = value; - onChanged(); - return this; - } - /** - * optional double value = 2; - */ - public Builder clearValue() { - bitField0_ = (bitField0_ & ~0x00000002); - value_ = 0D; + bitField0_ |= 0x00000002; + message_ = value; onChanged(); return this; } - // @@protoc_insertion_point(builder_scope:openxc.NumericMessage) + // @@protoc_insertion_point(builder_scope:openxc.CommandResponse) } static { - defaultInstance = new NumericMessage(true); + defaultInstance = new CommandResponse(true); defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:openxc.NumericMessage) + // @@protoc_insertion_point(class_scope:openxc.CommandResponse) } - public interface BooleanMessageOrBuilder + public interface DiagnosticRequestOrBuilder extends com.google.protobuf.MessageOrBuilder { - // optional string name = 1; + // 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 string name = 1; + * 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 = 1; + * optional string name = 8; */ java.lang.String getName(); /** - * optional string name = 1; + * optional string name = 8; */ com.google.protobuf.ByteString getNameBytes(); - // optional bool value = 2; + // optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; /** - * optional bool value = 2; + * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; */ - boolean hasValue(); + 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 bool value = 2; + * optional .openxc.DiagnosticRequest.Action action = 10; */ - boolean getValue(); + com.openxc.BinaryMessages.DiagnosticRequest.Action getAction(); } /** - * Protobuf type {@code openxc.BooleanMessage} + * Protobuf type {@code openxc.DiagnosticRequest} */ - public static final class BooleanMessage extends + public static final class DiagnosticRequest extends com.google.protobuf.GeneratedMessage - implements BooleanMessageOrBuilder { - // Use BooleanMessage.newBuilder() to construct. - private BooleanMessage(com.google.protobuf.GeneratedMessage.Builder builder) { + implements DiagnosticRequestOrBuilder { + // Use DiagnosticRequest.newBuilder() to construct. + private DiagnosticRequest(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - private BooleanMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + private DiagnosticRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - private static final BooleanMessage defaultInstance; - public static BooleanMessage getDefaultInstance() { + private static final DiagnosticRequest defaultInstance; + public static DiagnosticRequest getDefaultInstance() { return defaultInstance; } - public BooleanMessage getDefaultInstanceForType() { + public DiagnosticRequest getDefaultInstanceForType() { return defaultInstance; } @@ -3596,7 +3438,7 @@ public final class BinaryMessages { getUnknownFields() { return this.unknownFields; } - private BooleanMessage( + private DiagnosticRequest( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -3619,17 +3461,69 @@ public final class BinaryMessages { } break; } - case 10: { + case 8: { bitField0_ |= 0x00000001; - name_ = input.readBytes(); + bus_ = input.readInt32(); break; } case 16: { bitField0_ |= 0x00000002; - value_ = input.readBool(); + 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); @@ -3643,43 +3537,329 @@ public final class BinaryMessages { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.openxc.BinaryMessages.internal_static_openxc_BooleanMessage_descriptor; + return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_BooleanMessage_fieldAccessorTable + return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.BooleanMessage.class, com.openxc.BinaryMessages.BooleanMessage.Builder.class); + com.openxc.BinaryMessages.DiagnosticRequest.class, com.openxc.BinaryMessages.DiagnosticRequest.Builder.class); } - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public BooleanMessage parsePartialFrom( + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public DiagnosticRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BooleanMessage(input, extensionRegistry); + return new DiagnosticRequest(input, extensionRegistry); } }; @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } + /** + * Protobuf enum {@code openxc.DiagnosticRequest.DecodedType} + */ + public enum DecodedType + implements com.google.protobuf.ProtocolMessageEnum { + /** + * NONE = 1; + */ + NONE(0, 1), + /** + * OBD2 = 2; + */ + OBD2(1, 2), + ; + + /** + * NONE = 1; + */ + public static final int NONE_VALUE = 1; + /** + * OBD2 = 2; + */ + public static final int OBD2_VALUE = 2; + + + public final int getNumber() { return value; } + + public static DecodedType valueOf(int value) { + switch (value) { + case 1: return NONE; + case 2: return OBD2; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public DecodedType findValueByNumber(int number) { + return DecodedType.valueOf(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(index); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return com.openxc.BinaryMessages.DiagnosticRequest.getDescriptor().getEnumTypes().get(0); + } + + private static final DecodedType[] VALUES = values(); + + public static DecodedType valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + return VALUES[desc.getIndex()]; + } + + private final int index; + private final int value; + + private DecodedType(int index, int value) { + this.index = index; + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:openxc.DiagnosticRequest.DecodedType) + } + + /** + * Protobuf enum {@code openxc.DiagnosticRequest.Action} + */ + public enum Action + implements com.google.protobuf.ProtocolMessageEnum { + /** + * ADD = 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.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public Action findValueByNumber(int number) { + return Action.valueOf(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(index); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return com.openxc.BinaryMessages.DiagnosticRequest.getDescriptor().getEnumTypes().get(1); + } + + private static final Action[] VALUES = values(); + + public static Action valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + return VALUES[desc.getIndex()]; + } + + private final int index; + private final int value; + + private Action(int index, int value) { + this.index = index; + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:openxc.DiagnosticRequest.Action) + } + private int bitField0_; - // optional string name = 1; - public static final int NAME_FIELD_NUMBER = 1; + // optional int32 bus = 1; + public static final int BUS_FIELD_NUMBER = 1; + private int bus_; + /** + * optional int32 bus = 1; + */ + public boolean hasBus() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 bus = 1; + */ + public int getBus() { + return bus_; + } + + // optional uint32 message_id = 2; + public static final int MESSAGE_ID_FIELD_NUMBER = 2; + private int messageId_; + /** + * optional uint32 message_id = 2; + */ + public boolean hasMessageId() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional uint32 message_id = 2; + */ + public int getMessageId() { + return messageId_; + } + + // optional uint32 mode = 3; + public static final int MODE_FIELD_NUMBER = 3; + private int mode_; + /** + * optional uint32 mode = 3; + */ + public boolean hasMode() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional uint32 mode = 3; + */ + public int getMode() { + return mode_; + } + + // optional uint32 pid = 4; + public static final int PID_FIELD_NUMBER = 4; + private int pid_; + /** + * optional uint32 pid = 4; + */ + public boolean hasPid() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional uint32 pid = 4; + */ + public int getPid() { + return pid_; + } + + // optional bytes payload = 5; + public static final int PAYLOAD_FIELD_NUMBER = 5; + private com.google.protobuf.ByteString payload_; + /** + * optional bytes payload = 5; + * + * 
+     * TODO we are capping this at 8 bytes for now - need to change when we
+     * support multi-frame responses
+     *
+ */ + public boolean hasPayload() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional bytes payload = 5; + * + * 
+     * TODO we are capping this at 8 bytes for now - need to change when we
+     * support multi-frame responses
+     *
+ */ + public com.google.protobuf.ByteString getPayload() { + return payload_; + } + + // optional bool multiple_responses = 6; + public static final int MULTIPLE_RESPONSES_FIELD_NUMBER = 6; + private boolean multipleResponses_; + /** + * optional bool multiple_responses = 6; + */ + public boolean hasMultipleResponses() { + return ((bitField0_ & 0x00000020) == 0x00000020); + } + /** + * optional bool multiple_responses = 6; + */ + public boolean getMultipleResponses() { + return multipleResponses_; + } + + // optional double frequency = 7; + public static final int FREQUENCY_FIELD_NUMBER = 7; + private double frequency_; + /** + * optional double frequency = 7; + */ + public boolean hasFrequency() { + return ((bitField0_ & 0x00000040) == 0x00000040); + } + /** + * optional double frequency = 7; + */ + public double getFrequency() { + return frequency_; + } + + // optional string name = 8; + public static final int NAME_FIELD_NUMBER = 8; private java.lang.Object name_; /** - * optional string name = 1; + * optional string name = 8; */ public boolean hasName() { - return ((bitField0_ & 0x00000001) == 0x00000001); + return ((bitField0_ & 0x00000080) == 0x00000080); } /** - * optional string name = 1; + * optional string name = 8; */ public java.lang.String getName() { java.lang.Object ref = name_; @@ -3696,7 +3876,7 @@ public final class BinaryMessages { } } /** - * optional string name = 1; + * optional string name = 8; */ public com.google.protobuf.ByteString getNameBytes() { @@ -3712,25 +3892,49 @@ public final class BinaryMessages { } } - // optional bool value = 2; - public static final int VALUE_FIELD_NUMBER = 2; - private boolean value_; + // optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; + public static final int DECODED_TYPE_FIELD_NUMBER = 9; + private com.openxc.BinaryMessages.DiagnosticRequest.DecodedType decodedType_; /** - * optional bool value = 2; + * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; */ - public boolean hasValue() { - return ((bitField0_ & 0x00000002) == 0x00000002); + public boolean hasDecodedType() { + return ((bitField0_ & 0x00000100) == 0x00000100); } /** - * optional bool value = 2; + * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; */ - public boolean getValue() { - return value_; + 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_ = ""; - value_ = false; + decodedType_ = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.NONE; + action_ = com.openxc.BinaryMessages.DiagnosticRequest.Action.ADD; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -3745,10 +3949,34 @@ public final class BinaryMessages { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getNameBytes()); + output.writeInt32(1, bus_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBool(2, value_); + 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); } @@ -3761,11 +3989,43 @@ public final class BinaryMessages { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getNameBytes()); + .computeInt32Size(1, bus_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(2, value_); + .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; @@ -3779,53 +4039,53 @@ public final class BinaryMessages { return super.writeReplace(); } - public static com.openxc.BinaryMessages.BooleanMessage parseFrom( + 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.BooleanMessage parseFrom( + 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.BooleanMessage parseFrom(byte[] data) + public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.openxc.BinaryMessages.BooleanMessage parseFrom( + 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.BooleanMessage parseFrom(java.io.InputStream input) + public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.openxc.BinaryMessages.BooleanMessage parseFrom( + 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.BooleanMessage parseDelimitedFrom(java.io.InputStream input) + public static com.openxc.BinaryMessages.DiagnosticRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.openxc.BinaryMessages.BooleanMessage parseDelimitedFrom( + 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.BooleanMessage parseFrom( + 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.BooleanMessage parseFrom( + public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3834,7 +4094,7 @@ public final class BinaryMessages { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.openxc.BinaryMessages.BooleanMessage prototype) { + public static Builder newBuilder(com.openxc.BinaryMessages.DiagnosticRequest prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -3846,24 +4106,24 @@ public final class BinaryMessages { return builder; } /** - * Protobuf type {@code openxc.BooleanMessage} + * Protobuf type {@code openxc.DiagnosticRequest} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements com.openxc.BinaryMessages.BooleanMessageOrBuilder { + implements com.openxc.BinaryMessages.DiagnosticRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.openxc.BinaryMessages.internal_static_openxc_BooleanMessage_descriptor; + return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_BooleanMessage_fieldAccessorTable + return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.BooleanMessage.class, com.openxc.BinaryMessages.BooleanMessage.Builder.class); + com.openxc.BinaryMessages.DiagnosticRequest.class, com.openxc.BinaryMessages.DiagnosticRequest.Builder.class); } - // Construct using com.openxc.BinaryMessages.BooleanMessage.newBuilder() + // Construct using com.openxc.BinaryMessages.DiagnosticRequest.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -3883,107 +4143,433 @@ public final class BinaryMessages { public Builder clear() { super.clear(); + bus_ = 0; + bitField0_ = (bitField0_ & ~0x00000001); + messageId_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); + mode_ = 0; + bitField0_ = (bitField0_ & ~0x00000004); + pid_ = 0; + bitField0_ = (bitField0_ & ~0x00000008); + payload_ = com.google.protobuf.ByteString.EMPTY; + bitField0_ = (bitField0_ & ~0x00000010); + multipleResponses_ = false; + bitField0_ = (bitField0_ & ~0x00000020); + frequency_ = 0D; + bitField0_ = (bitField0_ & ~0x00000040); name_ = ""; + bitField0_ = (bitField0_ & ~0x00000080); + decodedType_ = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.NONE; + bitField0_ = (bitField0_ & ~0x00000100); + action_ = com.openxc.BinaryMessages.DiagnosticRequest.Action.ADD; + bitField0_ = (bitField0_ & ~0x00000200); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_descriptor; + } + + public com.openxc.BinaryMessages.DiagnosticRequest getDefaultInstanceForType() { + return com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance(); + } + + public com.openxc.BinaryMessages.DiagnosticRequest build() { + com.openxc.BinaryMessages.DiagnosticRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.openxc.BinaryMessages.DiagnosticRequest buildPartial() { + com.openxc.BinaryMessages.DiagnosticRequest result = new com.openxc.BinaryMessages.DiagnosticRequest(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.bus_ = bus_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.messageId_ = messageId_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.mode_ = mode_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + result.pid_ = pid_; + if (((from_bitField0_ & 0x00000010) == 0x00000010)) { + to_bitField0_ |= 0x00000010; + } + result.payload_ = payload_; + if (((from_bitField0_ & 0x00000020) == 0x00000020)) { + to_bitField0_ |= 0x00000020; + } + result.multipleResponses_ = multipleResponses_; + if (((from_bitField0_ & 0x00000040) == 0x00000040)) { + to_bitField0_ |= 0x00000040; + } + result.frequency_ = frequency_; + if (((from_bitField0_ & 0x00000080) == 0x00000080)) { + to_bitField0_ |= 0x00000080; + } + result.name_ = name_; + if (((from_bitField0_ & 0x00000100) == 0x00000100)) { + to_bitField0_ |= 0x00000100; + } + result.decodedType_ = decodedType_; + if (((from_bitField0_ & 0x00000200) == 0x00000200)) { + to_bitField0_ |= 0x00000200; + } + result.action_ = action_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.openxc.BinaryMessages.DiagnosticRequest) { + return mergeFrom((com.openxc.BinaryMessages.DiagnosticRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.openxc.BinaryMessages.DiagnosticRequest other) { + if (other == com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance()) return this; + if (other.hasBus()) { + setBus(other.getBus()); + } + if (other.hasMessageId()) { + setMessageId(other.getMessageId()); + } + if (other.hasMode()) { + setMode(other.getMode()); + } + if (other.hasPid()) { + setPid(other.getPid()); + } + if (other.hasPayload()) { + setPayload(other.getPayload()); + } + if (other.hasMultipleResponses()) { + setMultipleResponses(other.getMultipleResponses()); + } + if (other.hasFrequency()) { + setFrequency(other.getFrequency()); + } + if (other.hasName()) { + bitField0_ |= 0x00000080; + name_ = other.name_; + onChanged(); + } + if (other.hasDecodedType()) { + setDecodedType(other.getDecodedType()); + } + if (other.hasAction()) { + setAction(other.getAction()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.openxc.BinaryMessages.DiagnosticRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.openxc.BinaryMessages.DiagnosticRequest) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional int32 bus = 1; + private int bus_ ; + /** + * optional int32 bus = 1; + */ + public boolean hasBus() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 bus = 1; + */ + public int getBus() { + return bus_; + } + /** + * optional int32 bus = 1; + */ + public Builder setBus(int value) { + bitField0_ |= 0x00000001; + bus_ = value; + onChanged(); + return this; + } + /** + * optional int32 bus = 1; + */ + public Builder clearBus() { bitField0_ = (bitField0_ & ~0x00000001); - value_ = false; + 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; } - public Builder clone() { - return create().mergeFrom(buildPartial()); + // 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); } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_BooleanMessage_descriptor; + /** + * 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_; } - - public com.openxc.BinaryMessages.BooleanMessage getDefaultInstanceForType() { - return com.openxc.BinaryMessages.BooleanMessage.getDefaultInstance(); + /** + * 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; } - - public com.openxc.BinaryMessages.BooleanMessage build() { - com.openxc.BinaryMessages.BooleanMessage result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; + /** + * 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; } - public com.openxc.BinaryMessages.BooleanMessage buildPartial() { - com.openxc.BinaryMessages.BooleanMessage result = new com.openxc.BinaryMessages.BooleanMessage(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.name_ = name_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.value_ = value_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + // optional bool multiple_responses = 6; + private boolean multipleResponses_ ; + /** + * optional bool multiple_responses = 6; + */ + public boolean hasMultipleResponses() { + return ((bitField0_ & 0x00000020) == 0x00000020); } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.openxc.BinaryMessages.BooleanMessage) { - return mergeFrom((com.openxc.BinaryMessages.BooleanMessage)other); - } else { - super.mergeFrom(other); - return this; - } + /** + * optional bool multiple_responses = 6; + */ + public boolean getMultipleResponses() { + return multipleResponses_; } - - public Builder mergeFrom(com.openxc.BinaryMessages.BooleanMessage other) { - if (other == com.openxc.BinaryMessages.BooleanMessage.getDefaultInstance()) return this; - if (other.hasName()) { - bitField0_ |= 0x00000001; - name_ = other.name_; - onChanged(); - } - if (other.hasValue()) { - setValue(other.getValue()); - } - this.mergeUnknownFields(other.getUnknownFields()); + /** + * optional bool multiple_responses = 6; + */ + public Builder setMultipleResponses(boolean value) { + bitField0_ |= 0x00000020; + multipleResponses_ = value; + onChanged(); return this; } - - public final boolean isInitialized() { - return true; + /** + * optional bool multiple_responses = 6; + */ + public Builder clearMultipleResponses() { + bitField0_ = (bitField0_ & ~0x00000020); + multipleResponses_ = false; + onChanged(); + return this; } - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - com.openxc.BinaryMessages.BooleanMessage parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.BooleanMessage) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + // 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; } - private int bitField0_; - // optional string name = 1; + // optional string name = 8; private java.lang.Object name_ = ""; /** - * optional string name = 1; + * optional string name = 8; */ public boolean hasName() { - return ((bitField0_ & 0x00000001) == 0x00000001); + return ((bitField0_ & 0x00000080) == 0x00000080); } /** - * optional string name = 1; + * optional string name = 8; */ public java.lang.String getName() { java.lang.Object ref = name_; @@ -3997,7 +4583,7 @@ public final class BinaryMessages { } } /** - * optional string name = 1; + * optional string name = 8; */ public com.google.protobuf.ByteString getNameBytes() { @@ -4013,152 +4599,236 @@ public final class BinaryMessages { } } /** - * optional string name = 1; + * optional string name = 8; */ public Builder setName( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000080; name_ = value; onChanged(); return this; } /** - * optional string name = 1; + * optional string name = 8; */ public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000080); name_ = getDefaultInstance().getName(); onChanged(); return this; } /** - * optional string name = 1; + * optional string name = 8; */ public Builder setNameBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000080; name_ = value; onChanged(); return this; } - // optional bool value = 2; - private boolean value_ ; + // optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; + private com.openxc.BinaryMessages.DiagnosticRequest.DecodedType decodedType_ = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.NONE; /** - * optional bool value = 2; + * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; */ - public boolean hasValue() { - return ((bitField0_ & 0x00000002) == 0x00000002); + public boolean hasDecodedType() { + return ((bitField0_ & 0x00000100) == 0x00000100); } /** - * optional bool value = 2; + * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; */ - public boolean getValue() { - return value_; + public com.openxc.BinaryMessages.DiagnosticRequest.DecodedType getDecodedType() { + return decodedType_; } /** - * optional bool value = 2; + * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; */ - public Builder setValue(boolean value) { - bitField0_ |= 0x00000002; - value_ = value; + public Builder setDecodedType(com.openxc.BinaryMessages.DiagnosticRequest.DecodedType value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000100; + decodedType_ = value; onChanged(); return this; } /** - * optional bool value = 2; + * optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9; */ - public Builder clearValue() { - bitField0_ = (bitField0_ & ~0x00000002); - value_ = false; + 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.BooleanMessage) + // @@protoc_insertion_point(builder_scope:openxc.DiagnosticRequest) } static { - defaultInstance = new BooleanMessage(true); + defaultInstance = new DiagnosticRequest(true); defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:openxc.BooleanMessage) + // @@protoc_insertion_point(class_scope:openxc.DiagnosticRequest) } - public interface EventedStringMessageOrBuilder + public interface DiagnosticResponseOrBuilder extends com.google.protobuf.MessageOrBuilder { - // optional string name = 1; + // optional int32 bus = 1; /** - * optional string name = 1; + * optional int32 bus = 1; */ - boolean hasName(); + boolean hasBus(); /** - * optional string name = 1; + * optional int32 bus = 1; */ - java.lang.String getName(); + int getBus(); + + // optional uint32 message_id = 2; /** - * optional string name = 1; + * optional uint32 message_id = 2; */ - com.google.protobuf.ByteString - getNameBytes(); + boolean hasMessageId(); + /** + * optional uint32 message_id = 2; + */ + int getMessageId(); - // optional string value = 2; + // optional uint32 mode = 3; /** - * optional string value = 2; + * optional uint32 mode = 3; */ - boolean hasValue(); + boolean hasMode(); /** - * optional string value = 2; + * optional uint32 mode = 3; */ - java.lang.String getValue(); + int getMode(); + + // optional uint32 pid = 4; /** - * optional string value = 2; + * optional uint32 pid = 4; */ - com.google.protobuf.ByteString - getValueBytes(); + boolean hasPid(); + /** + * optional uint32 pid = 4; + */ + int getPid(); - // optional string event = 3; + // optional bool success = 5; /** - * optional string event = 3; + * optional bool success = 5; */ - boolean hasEvent(); + boolean hasSuccess(); /** - * optional string event = 3; + * optional bool success = 5; */ - java.lang.String getEvent(); + boolean getSuccess(); + + // optional uint32 negative_response_code = 6; /** - * optional string event = 3; + * optional uint32 negative_response_code = 6; */ - com.google.protobuf.ByteString - getEventBytes(); + 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.EventedStringMessage} + * Protobuf type {@code openxc.DiagnosticResponse} */ - public static final class EventedStringMessage extends + public static final class DiagnosticResponse extends com.google.protobuf.GeneratedMessage - implements EventedStringMessageOrBuilder { - // Use EventedStringMessage.newBuilder() to construct. - private EventedStringMessage(com.google.protobuf.GeneratedMessage.Builder builder) { + implements DiagnosticResponseOrBuilder { + // Use DiagnosticResponse.newBuilder() to construct. + private DiagnosticResponse(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - private EventedStringMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + private DiagnosticResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - private static final EventedStringMessage defaultInstance; - public static EventedStringMessage getDefaultInstance() { + private static final DiagnosticResponse defaultInstance; + public static DiagnosticResponse getDefaultInstance() { return defaultInstance; } - public EventedStringMessage getDefaultInstanceForType() { + public DiagnosticResponse getDefaultInstanceForType() { return defaultInstance; } @@ -4168,7 +4838,7 @@ public final class BinaryMessages { getUnknownFields() { return this.unknownFields; } - private EventedStringMessage( + private DiagnosticResponse( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -4191,19 +4861,44 @@ public final class BinaryMessages { } break; } - case 10: { + case 8: { bitField0_ |= 0x00000001; - name_ = input.readBytes(); + bus_ = input.readInt32(); break; } - case 18: { + case 16: { bitField0_ |= 0x00000002; - value_ = input.readBytes(); + messageId_ = input.readUInt32(); break; } - case 26: { + case 24: { bitField0_ |= 0x00000004; - event_ = input.readBytes(); + 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; } } @@ -4220,165 +4915,179 @@ public final class BinaryMessages { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.openxc.BinaryMessages.internal_static_openxc_EventedStringMessage_descriptor; + return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_EventedStringMessage_fieldAccessorTable + return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.EventedStringMessage.class, com.openxc.BinaryMessages.EventedStringMessage.Builder.class); + com.openxc.BinaryMessages.DiagnosticResponse.class, com.openxc.BinaryMessages.DiagnosticResponse.Builder.class); } - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public EventedStringMessage parsePartialFrom( + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public DiagnosticResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EventedStringMessage(input, extensionRegistry); + return new DiagnosticResponse(input, extensionRegistry); } }; @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } private int bitField0_; - // optional string name = 1; - public static final int NAME_FIELD_NUMBER = 1; - private java.lang.Object name_; + // optional int32 bus = 1; + public static final int BUS_FIELD_NUMBER = 1; + private int bus_; /** - * optional string name = 1; + * optional int32 bus = 1; */ - public boolean hasName() { + public boolean hasBus() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional string name = 1; + * optional int32 bus = 1; */ - 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; - } + 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 string name = 1; + * optional uint32 pid = 4; */ - 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; - } + public int getPid() { + return pid_; } - // optional string value = 2; - public static final int VALUE_FIELD_NUMBER = 2; - private java.lang.Object value_; + // optional bool success = 5; + public static final int SUCCESS_FIELD_NUMBER = 5; + private boolean success_; /** - * optional string value = 2; + * optional bool success = 5; */ - public boolean hasValue() { - return ((bitField0_ & 0x00000002) == 0x00000002); + public boolean hasSuccess() { + return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * optional string value = 2; + * optional bool success = 5; */ - public java.lang.String getValue() { - java.lang.Object ref = value_; - 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()) { - value_ = s; - } - return s; - } + 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 string value = 2; + * optional uint32 negative_response_code = 6; */ - public com.google.protobuf.ByteString - getValueBytes() { - java.lang.Object ref = value_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - value_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public boolean hasNegativeResponseCode() { + return ((bitField0_ & 0x00000020) == 0x00000020); + } + /** + * optional uint32 negative_response_code = 6; + */ + public int getNegativeResponseCode() { + return negativeResponseCode_; } - // optional string event = 3; - public static final int EVENT_FIELD_NUMBER = 3; - private java.lang.Object event_; + // optional bytes payload = 7; + public static final int PAYLOAD_FIELD_NUMBER = 7; + private com.google.protobuf.ByteString payload_; /** - * optional string event = 3; + * 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 hasEvent() { - return ((bitField0_ & 0x00000004) == 0x00000004); + public boolean hasPayload() { + return ((bitField0_ & 0x00000040) == 0x00000040); } /** - * optional string event = 3; + * optional bytes payload = 7; + * + * 
+     * TODO we are capping this at 8 bytes for now - need to change when we
+     * support multi-frame responses
+     *
*/ - public java.lang.String getEvent() { - java.lang.Object ref = event_; - 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()) { - event_ = s; - } - return s; - } + public com.google.protobuf.ByteString getPayload() { + return payload_; } + + // optional double value = 8; + public static final int VALUE_FIELD_NUMBER = 8; + private double value_; /** - * optional string event = 3; + * optional double value = 8; */ - public com.google.protobuf.ByteString - getEventBytes() { - java.lang.Object ref = event_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - event_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public boolean hasValue() { + return ((bitField0_ & 0x00000080) == 0x00000080); + } + /** + * optional double value = 8; + */ + public double getValue() { + return value_; } private void initFields() { - name_ = ""; - value_ = ""; - event_ = ""; + 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() { @@ -4393,13 +5102,28 @@ public final class BinaryMessages { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getNameBytes()); + output.writeInt32(1, bus_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBytes(2, getValueBytes()); + output.writeUInt32(2, messageId_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBytes(3, getEventBytes()); + 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); } @@ -4412,15 +5136,35 @@ public final class BinaryMessages { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getNameBytes()); + .computeInt32Size(1, bus_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, getValueBytes()); + .computeUInt32Size(2, messageId_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(3, getEventBytes()); + .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; @@ -4434,53 +5178,53 @@ public final class BinaryMessages { return super.writeReplace(); } - public static com.openxc.BinaryMessages.EventedStringMessage parseFrom( + public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.openxc.BinaryMessages.EventedStringMessage parseFrom( + public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.openxc.BinaryMessages.EventedStringMessage parseFrom(byte[] data) + public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.openxc.BinaryMessages.EventedStringMessage parseFrom( + public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.openxc.BinaryMessages.EventedStringMessage parseFrom(java.io.InputStream input) + public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.openxc.BinaryMessages.EventedStringMessage parseFrom( + public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.openxc.BinaryMessages.EventedStringMessage parseDelimitedFrom(java.io.InputStream input) + public static com.openxc.BinaryMessages.DiagnosticResponse parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.openxc.BinaryMessages.EventedStringMessage parseDelimitedFrom( + public static com.openxc.BinaryMessages.DiagnosticResponse parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.openxc.BinaryMessages.EventedStringMessage parseFrom( + public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.openxc.BinaryMessages.EventedStringMessage parseFrom( + public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4489,7 +5233,7 @@ public final class BinaryMessages { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.openxc.BinaryMessages.EventedStringMessage prototype) { + public static Builder newBuilder(com.openxc.BinaryMessages.DiagnosticResponse prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -4501,24 +5245,24 @@ public final class BinaryMessages { return builder; } /** - * Protobuf type {@code openxc.EventedStringMessage} + * Protobuf type {@code openxc.DiagnosticResponse} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements com.openxc.BinaryMessages.EventedStringMessageOrBuilder { + implements com.openxc.BinaryMessages.DiagnosticResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.openxc.BinaryMessages.internal_static_openxc_EventedStringMessage_descriptor; + return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_EventedStringMessage_fieldAccessorTable + return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.EventedStringMessage.class, com.openxc.BinaryMessages.EventedStringMessage.Builder.class); + com.openxc.BinaryMessages.DiagnosticResponse.class, com.openxc.BinaryMessages.DiagnosticResponse.Builder.class); } - // Construct using com.openxc.BinaryMessages.EventedStringMessage.newBuilder() + // Construct using com.openxc.BinaryMessages.DiagnosticResponse.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -4538,12 +5282,22 @@ public final class BinaryMessages { public Builder clear() { super.clear(); - name_ = ""; + bus_ = 0; bitField0_ = (bitField0_ & ~0x00000001); - value_ = ""; + messageId_ = 0; bitField0_ = (bitField0_ & ~0x00000002); - event_ = ""; + mode_ = 0; bitField0_ = (bitField0_ & ~0x00000004); + pid_ = 0; + bitField0_ = (bitField0_ & ~0x00000008); + success_ = false; + bitField0_ = (bitField0_ & ~0x00000010); + negativeResponseCode_ = 0; + bitField0_ = (bitField0_ & ~0x00000020); + payload_ = com.google.protobuf.ByteString.EMPTY; + bitField0_ = (bitField0_ & ~0x00000040); + value_ = 0D; + bitField0_ = (bitField0_ & ~0x00000080); return this; } @@ -4553,67 +5307,96 @@ public final class BinaryMessages { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_EventedStringMessage_descriptor; + return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_descriptor; } - public com.openxc.BinaryMessages.EventedStringMessage getDefaultInstanceForType() { - return com.openxc.BinaryMessages.EventedStringMessage.getDefaultInstance(); + public com.openxc.BinaryMessages.DiagnosticResponse getDefaultInstanceForType() { + return com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance(); } - public com.openxc.BinaryMessages.EventedStringMessage build() { - com.openxc.BinaryMessages.EventedStringMessage result = buildPartial(); + public com.openxc.BinaryMessages.DiagnosticResponse build() { + com.openxc.BinaryMessages.DiagnosticResponse result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.openxc.BinaryMessages.EventedStringMessage buildPartial() { - com.openxc.BinaryMessages.EventedStringMessage result = new com.openxc.BinaryMessages.EventedStringMessage(this); + public com.openxc.BinaryMessages.DiagnosticResponse buildPartial() { + com.openxc.BinaryMessages.DiagnosticResponse result = new com.openxc.BinaryMessages.DiagnosticResponse(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.name_ = name_; + result.bus_ = bus_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.value_ = value_; + result.messageId_ = messageId_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - result.event_ = event_; + result.mode_ = mode_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + result.pid_ = pid_; + if (((from_bitField0_ & 0x00000010) == 0x00000010)) { + to_bitField0_ |= 0x00000010; + } + result.success_ = success_; + if (((from_bitField0_ & 0x00000020) == 0x00000020)) { + to_bitField0_ |= 0x00000020; + } + result.negativeResponseCode_ = negativeResponseCode_; + if (((from_bitField0_ & 0x00000040) == 0x00000040)) { + to_bitField0_ |= 0x00000040; + } + result.payload_ = payload_; + if (((from_bitField0_ & 0x00000080) == 0x00000080)) { + to_bitField0_ |= 0x00000080; + } + result.value_ = value_; result.bitField0_ = to_bitField0_; onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.openxc.BinaryMessages.EventedStringMessage) { - return mergeFrom((com.openxc.BinaryMessages.EventedStringMessage)other); + if (other instanceof com.openxc.BinaryMessages.DiagnosticResponse) { + return mergeFrom((com.openxc.BinaryMessages.DiagnosticResponse)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.openxc.BinaryMessages.EventedStringMessage other) { - if (other == com.openxc.BinaryMessages.EventedStringMessage.getDefaultInstance()) return this; - if (other.hasName()) { - bitField0_ |= 0x00000001; - name_ = other.name_; - onChanged(); + public Builder mergeFrom(com.openxc.BinaryMessages.DiagnosticResponse other) { + if (other == com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance()) return this; + if (other.hasBus()) { + setBus(other.getBus()); } - if (other.hasValue()) { - bitField0_ |= 0x00000002; - value_ = other.value_; - onChanged(); + if (other.hasMessageId()) { + setMessageId(other.getMessageId()); } - if (other.hasEvent()) { - bitField0_ |= 0x00000004; - event_ = other.event_; - onChanged(); + if (other.hasMode()) { + setMode(other.getMode()); + } + if (other.hasPid()) { + setPid(other.getPid()); + } + if (other.hasSuccess()) { + setSuccess(other.getSuccess()); + } + if (other.hasNegativeResponseCode()) { + setNegativeResponseCode(other.getNegativeResponseCode()); + } + if (other.hasPayload()) { + setPayload(other.getPayload()); + } + if (other.hasValue()) { + setValue(other.getValue()); } this.mergeUnknownFields(other.getUnknownFields()); return this; @@ -4627,11 +5410,11 @@ public final class BinaryMessages { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.EventedStringMessage parsedMessage = null; + com.openxc.BinaryMessages.DiagnosticResponse parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.EventedStringMessage) e.getUnfinishedMessage(); + parsedMessage = (com.openxc.BinaryMessages.DiagnosticResponse) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -4642,301 +5425,371 @@ public final class BinaryMessages { } private int bitField0_; - // optional string name = 1; - private java.lang.Object name_ = ""; + // optional int32 bus = 1; + private int bus_ ; /** - * optional string name = 1; + * optional int32 bus = 1; */ - public boolean hasName() { + public boolean hasBus() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional string name = 1; + * optional int32 bus = 1; */ - 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; - } + public int getBus() { + return bus_; } /** - * optional string name = 1; + * optional int32 bus = 1; */ - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + 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 string name = 1; + * optional uint32 message_id = 2; */ - public Builder setName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - name_ = value; + 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 string name = 1; + * 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 Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000001); - name_ = getDefaultInstance().getName(); + public int getPid() { + return pid_; + } + /** + * optional uint32 pid = 4; + */ + public Builder setPid(int value) { + bitField0_ |= 0x00000008; + pid_ = value; onChanged(); return this; } /** - * optional string name = 1; + * optional uint32 pid = 4; */ - public Builder setNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - name_ = value; + public Builder clearPid() { + bitField0_ = (bitField0_ & ~0x00000008); + pid_ = 0; onChanged(); return this; } - // optional string value = 2; - private java.lang.Object value_ = ""; + // optional bool success = 5; + private boolean success_ ; /** - * optional string value = 2; + * optional bool success = 5; */ - public boolean hasValue() { - return ((bitField0_ & 0x00000002) == 0x00000002); + public boolean hasSuccess() { + return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * optional string value = 2; + * optional bool success = 5; */ - public java.lang.String getValue() { - java.lang.Object ref = value_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - value_ = s; - return s; - } else { - return (java.lang.String) ref; - } + public boolean getSuccess() { + return success_; } /** - * optional string value = 2; + * optional bool success = 5; */ - public com.google.protobuf.ByteString - getValueBytes() { - java.lang.Object ref = value_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - value_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public Builder setSuccess(boolean value) { + bitField0_ |= 0x00000010; + success_ = value; + onChanged(); + return this; } /** - * optional string value = 2; + * optional bool success = 5; */ - public Builder setValue( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - value_ = value; + public Builder clearSuccess() { + bitField0_ = (bitField0_ & ~0x00000010); + success_ = false; onChanged(); return this; } + + // optional uint32 negative_response_code = 6; + private int negativeResponseCode_ ; + /** + * optional uint32 negative_response_code = 6; + */ + public boolean hasNegativeResponseCode() { + return ((bitField0_ & 0x00000020) == 0x00000020); + } /** - * optional string value = 2; + * optional uint32 negative_response_code = 6; */ - public Builder clearValue() { - bitField0_ = (bitField0_ & ~0x00000002); - value_ = getDefaultInstance().getValue(); - onChanged(); - return this; + public int getNegativeResponseCode() { + return negativeResponseCode_; } /** - * optional string value = 2; + * optional uint32 negative_response_code = 6; */ - public Builder setValueBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - value_ = value; + public Builder setNegativeResponseCode(int value) { + bitField0_ |= 0x00000020; + negativeResponseCode_ = value; onChanged(); return this; } - - // optional string event = 3; - private java.lang.Object event_ = ""; /** - * optional string event = 3; + * optional uint32 negative_response_code = 6; */ - public boolean hasEvent() { - return ((bitField0_ & 0x00000004) == 0x00000004); + public Builder clearNegativeResponseCode() { + bitField0_ = (bitField0_ & ~0x00000020); + negativeResponseCode_ = 0; + onChanged(); + return this; } + + // optional bytes payload = 7; + private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY; /** - * optional string event = 3; + * optional bytes payload = 7; + * + * 
+       * TODO we are capping this at 8 bytes for now - need to change when we
+       * support multi-frame responses
+       *
*/ - public java.lang.String getEvent() { - java.lang.Object ref = event_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - event_ = s; - return s; - } else { - return (java.lang.String) ref; - } + public boolean hasPayload() { + return ((bitField0_ & 0x00000040) == 0x00000040); } /** - * optional string event = 3; + * 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 - getEventBytes() { - java.lang.Object ref = event_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - event_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public com.google.protobuf.ByteString getPayload() { + return payload_; } /** - * optional string event = 3; + * 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 setEvent( - java.lang.String value) { + public Builder setPayload(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000004; - event_ = value; + bitField0_ |= 0x00000040; + payload_ = value; onChanged(); return this; } /** - * optional string event = 3; + * 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 clearEvent() { - bitField0_ = (bitField0_ & ~0x00000004); - event_ = getDefaultInstance().getEvent(); + public Builder clearPayload() { + bitField0_ = (bitField0_ & ~0x00000040); + payload_ = getDefaultInstance().getPayload(); onChanged(); return this; } + + // optional double value = 8; + private double value_ ; /** - * optional string event = 3; + * optional double value = 8; */ - public Builder setEventBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000004; - event_ = value; + public boolean hasValue() { + return ((bitField0_ & 0x00000080) == 0x00000080); + } + /** + * optional double value = 8; + */ + public double getValue() { + return value_; + } + /** + * optional double value = 8; + */ + public Builder setValue(double value) { + bitField0_ |= 0x00000080; + value_ = value; + onChanged(); + return this; + } + /** + * optional double value = 8; + */ + public Builder clearValue() { + bitField0_ = (bitField0_ & ~0x00000080); + value_ = 0D; onChanged(); return this; } - // @@protoc_insertion_point(builder_scope:openxc.EventedStringMessage) + // @@protoc_insertion_point(builder_scope:openxc.DiagnosticResponse) } static { - defaultInstance = new EventedStringMessage(true); + defaultInstance = new DiagnosticResponse(true); defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:openxc.EventedStringMessage) + // @@protoc_insertion_point(class_scope:openxc.DiagnosticResponse) } - public interface EventedBooleanMessageOrBuilder + public interface DynamicFieldOrBuilder extends com.google.protobuf.MessageOrBuilder { - // optional string name = 1; - /** - * optional string name = 1; - */ - boolean hasName(); + // optional .openxc.DynamicField.Type type = 1; /** - * optional string name = 1; + * optional .openxc.DynamicField.Type type = 1; */ - java.lang.String getName(); + boolean hasType(); /** - * optional string name = 1; + * optional .openxc.DynamicField.Type type = 1; */ - com.google.protobuf.ByteString - getNameBytes(); + com.openxc.BinaryMessages.DynamicField.Type getType(); - // optional string value = 2; + // optional string string_value = 2; /** - * optional string value = 2; + * optional string string_value = 2; */ - boolean hasValue(); + boolean hasStringValue(); /** - * optional string value = 2; + * optional string string_value = 2; */ - java.lang.String getValue(); + java.lang.String getStringValue(); /** - * optional string value = 2; + * optional string string_value = 2; */ com.google.protobuf.ByteString - getValueBytes(); + getStringValueBytes(); - // optional bool event = 3; + // optional double numeric_value = 3; /** - * optional bool event = 3; + * optional double numeric_value = 3; */ - boolean hasEvent(); + boolean hasNumericValue(); + /** + * optional double numeric_value = 3; + */ + double getNumericValue(); + + // optional bool boolean_value = 4; + /** + * optional bool boolean_value = 4; + */ + boolean hasBooleanValue(); /** - * optional bool event = 3; + * optional bool boolean_value = 4; */ - boolean getEvent(); + boolean getBooleanValue(); } /** - * Protobuf type {@code openxc.EventedBooleanMessage} + * Protobuf type {@code openxc.DynamicField} */ - public static final class EventedBooleanMessage extends + public static final class DynamicField extends com.google.protobuf.GeneratedMessage - implements EventedBooleanMessageOrBuilder { - // Use EventedBooleanMessage.newBuilder() to construct. - private EventedBooleanMessage(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 EventedBooleanMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + private DynamicField(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - private static final EventedBooleanMessage defaultInstance; - public static EventedBooleanMessage getDefaultInstance() { + private static final DynamicField defaultInstance; + public static DynamicField getDefaultInstance() { return defaultInstance; } - public EventedBooleanMessage getDefaultInstanceForType() { + public DynamicField getDefaultInstanceForType() { return defaultInstance; } @@ -4946,7 +5799,7 @@ public final class BinaryMessages { getUnknownFields() { return this.unknownFields; } - private EventedBooleanMessage( + private DynamicField( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -4969,19 +5822,30 @@ public final class BinaryMessages { } break; } - case 10: { - bitField0_ |= 0x00000001; - name_ = input.readBytes(); + case 8: { + int rawValue = input.readEnum(); + com.openxc.BinaryMessages.DynamicField.Type value = com.openxc.BinaryMessages.DynamicField.Type.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(1, rawValue); + } else { + bitField0_ |= 0x00000001; + type_ = value; + } break; } case 18: { bitField0_ |= 0x00000002; - value_ = input.readBytes(); + stringValue_ = input.readBytes(); break; } - case 24: { + case 25: { bitField0_ |= 0x00000004; - event_ = input.readBool(); + numericValue_ = input.readDouble(); + break; + } + case 32: { + bitField0_ |= 0x00000008; + booleanValue_ = input.readBool(); break; } } @@ -4998,89 +5862,153 @@ public final class BinaryMessages { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.openxc.BinaryMessages.internal_static_openxc_EventedBooleanMessage_descriptor; + return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_EventedBooleanMessage_fieldAccessorTable + return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.EventedBooleanMessage.class, com.openxc.BinaryMessages.EventedBooleanMessage.Builder.class); + com.openxc.BinaryMessages.DynamicField.class, com.openxc.BinaryMessages.DynamicField.Builder.class); } - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public EventedBooleanMessage parsePartialFrom( + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public DynamicField parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EventedBooleanMessage(input, extensionRegistry); + return new DynamicField(input, extensionRegistry); } }; @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } - private int bitField0_; - // optional string name = 1; - public static final int NAME_FIELD_NUMBER = 1; - private java.lang.Object name_; /** - * optional string name = 1; + * Protobuf enum {@code openxc.DynamicField.Type} */ - public boolean hasName() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional string name = 1; - */ - 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; + public enum Type + implements com.google.protobuf.ProtocolMessageEnum { + /** + * STRING = 1; + */ + STRING(0, 1), + /** + * NUM = 2; + */ + NUM(1, 2), + /** + * BOOL = 3; + */ + BOOL(2, 3), + ; + + /** + * STRING = 1; + */ + public static final int STRING_VALUE = 1; + /** + * NUM = 2; + */ + public static final int NUM_VALUE = 2; + /** + * BOOL = 3; + */ + public static final int BOOL_VALUE = 3; + + + public final int getNumber() { return value; } + + public static Type valueOf(int value) { + switch (value) { + case 1: return STRING; + case 2: return NUM; + case 3: return BOOL; + default: return null; } - return s; } - } - /** - * optional string name = 1; - */ - 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; + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public Type findValueByNumber(int number) { + return Type.valueOf(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(index); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return com.openxc.BinaryMessages.DynamicField.getDescriptor().getEnumTypes().get(0); + } + + private static final Type[] VALUES = values(); + + public static Type valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + return VALUES[desc.getIndex()]; + } + + private final int index; + private final int value; + + private Type(int index, int value) { + this.index = index; + this.value = value; } + + // @@protoc_insertion_point(enum_scope:openxc.DynamicField.Type) + } + + private int bitField0_; + // optional .openxc.DynamicField.Type type = 1; + public static final int TYPE_FIELD_NUMBER = 1; + private com.openxc.BinaryMessages.DynamicField.Type type_; + /** + * optional .openxc.DynamicField.Type type = 1; + */ + public boolean hasType() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .openxc.DynamicField.Type type = 1; + */ + public com.openxc.BinaryMessages.DynamicField.Type getType() { + return type_; } - // optional string value = 2; - public static final int VALUE_FIELD_NUMBER = 2; - private java.lang.Object value_; + // optional string string_value = 2; + public static final int STRING_VALUE_FIELD_NUMBER = 2; + private java.lang.Object stringValue_; /** - * optional string value = 2; + * optional string string_value = 2; */ - public boolean hasValue() { + public boolean hasStringValue() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional string value = 2; + * optional string string_value = 2; */ - public java.lang.String getValue() { - java.lang.Object ref = value_; + public java.lang.String getStringValue() { + java.lang.Object ref = stringValue_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { @@ -5088,48 +6016,65 @@ public final class BinaryMessages { (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); if (bs.isValidUtf8()) { - value_ = s; + stringValue_ = s; } return s; } } /** - * optional string value = 2; + * optional string string_value = 2; */ public com.google.protobuf.ByteString - getValueBytes() { - java.lang.Object ref = value_; + 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); - value_ = b; + stringValue_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - // optional bool event = 3; - public static final int EVENT_FIELD_NUMBER = 3; - private boolean event_; + // optional double numeric_value = 3; + public static final int NUMERIC_VALUE_FIELD_NUMBER = 3; + private double numericValue_; /** - * optional bool event = 3; + * optional double numeric_value = 3; */ - public boolean hasEvent() { + public boolean hasNumericValue() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional bool event = 3; + * optional double numeric_value = 3; */ - public boolean getEvent() { - return event_; + public double getNumericValue() { + return numericValue_; + } + + // optional bool boolean_value = 4; + public static final int BOOLEAN_VALUE_FIELD_NUMBER = 4; + private boolean booleanValue_; + /** + * optional bool boolean_value = 4; + */ + public boolean hasBooleanValue() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional bool boolean_value = 4; + */ + public boolean getBooleanValue() { + return booleanValue_; } private void initFields() { - name_ = ""; - value_ = ""; - event_ = false; + type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING; + stringValue_ = ""; + numericValue_ = 0D; + booleanValue_ = false; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -5144,13 +6089,16 @@ public final class BinaryMessages { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getNameBytes()); + output.writeEnum(1, type_.getNumber()); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBytes(2, getValueBytes()); + output.writeBytes(2, getStringValueBytes()); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBool(3, event_); + output.writeDouble(3, numericValue_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeBool(4, booleanValue_); } getUnknownFields().writeTo(output); } @@ -5163,15 +6111,19 @@ public final class BinaryMessages { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getNameBytes()); + .computeEnumSize(1, type_.getNumber()); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, getValueBytes()); + .computeBytesSize(2, getStringValueBytes()); } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, event_); + .computeDoubleSize(3, numericValue_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(4, booleanValue_); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -5185,53 +6137,53 @@ public final class BinaryMessages { return super.writeReplace(); } - public static com.openxc.BinaryMessages.EventedBooleanMessage 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.EventedBooleanMessage 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.EventedBooleanMessage 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.EventedBooleanMessage 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.EventedBooleanMessage 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.EventedBooleanMessage 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.EventedBooleanMessage 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.EventedBooleanMessage 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.EventedBooleanMessage 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.EventedBooleanMessage parseFrom( + public static com.openxc.BinaryMessages.DynamicField parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -5240,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.EventedBooleanMessage prototype) { + public static Builder newBuilder(com.openxc.BinaryMessages.DynamicField prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -5252,24 +6204,24 @@ public final class BinaryMessages { return builder; } /** - * Protobuf type {@code openxc.EventedBooleanMessage} + * Protobuf type {@code openxc.DynamicField} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements com.openxc.BinaryMessages.EventedBooleanMessageOrBuilder { + implements com.openxc.BinaryMessages.DynamicFieldOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.openxc.BinaryMessages.internal_static_openxc_EventedBooleanMessage_descriptor; + return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_EventedBooleanMessage_fieldAccessorTable + return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.EventedBooleanMessage.class, com.openxc.BinaryMessages.EventedBooleanMessage.Builder.class); + com.openxc.BinaryMessages.DynamicField.class, com.openxc.BinaryMessages.DynamicField.Builder.class); } - // Construct using com.openxc.BinaryMessages.EventedBooleanMessage.newBuilder() + // Construct using com.openxc.BinaryMessages.DynamicField.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -5289,12 +6241,14 @@ public final class BinaryMessages { public Builder clear() { super.clear(); - name_ = ""; + type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING; bitField0_ = (bitField0_ & ~0x00000001); - value_ = ""; + stringValue_ = ""; bitField0_ = (bitField0_ & ~0x00000002); - event_ = false; + numericValue_ = 0D; bitField0_ = (bitField0_ & ~0x00000004); + booleanValue_ = false; + bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -5304,65 +6258,70 @@ public final class BinaryMessages { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_EventedBooleanMessage_descriptor; + return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_descriptor; } - public com.openxc.BinaryMessages.EventedBooleanMessage getDefaultInstanceForType() { - return com.openxc.BinaryMessages.EventedBooleanMessage.getDefaultInstance(); + public com.openxc.BinaryMessages.DynamicField getDefaultInstanceForType() { + return com.openxc.BinaryMessages.DynamicField.getDefaultInstance(); } - public com.openxc.BinaryMessages.EventedBooleanMessage build() { - com.openxc.BinaryMessages.EventedBooleanMessage result = buildPartial(); + public com.openxc.BinaryMessages.DynamicField build() { + com.openxc.BinaryMessages.DynamicField result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.openxc.BinaryMessages.EventedBooleanMessage buildPartial() { - com.openxc.BinaryMessages.EventedBooleanMessage result = new com.openxc.BinaryMessages.EventedBooleanMessage(this); + public com.openxc.BinaryMessages.DynamicField buildPartial() { + com.openxc.BinaryMessages.DynamicField result = new com.openxc.BinaryMessages.DynamicField(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.name_ = name_; + result.type_ = type_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.value_ = value_; + result.stringValue_ = stringValue_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - result.event_ = event_; + result.numericValue_ = numericValue_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + result.booleanValue_ = booleanValue_; result.bitField0_ = to_bitField0_; onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.openxc.BinaryMessages.EventedBooleanMessage) { - return mergeFrom((com.openxc.BinaryMessages.EventedBooleanMessage)other); + if (other instanceof com.openxc.BinaryMessages.DynamicField) { + return mergeFrom((com.openxc.BinaryMessages.DynamicField)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.openxc.BinaryMessages.EventedBooleanMessage other) { - if (other == com.openxc.BinaryMessages.EventedBooleanMessage.getDefaultInstance()) return this; - if (other.hasName()) { - bitField0_ |= 0x00000001; - name_ = other.name_; - onChanged(); + public Builder mergeFrom(com.openxc.BinaryMessages.DynamicField other) { + if (other == com.openxc.BinaryMessages.DynamicField.getDefaultInstance()) return this; + if (other.hasType()) { + setType(other.getType()); } - if (other.hasValue()) { + if (other.hasStringValue()) { bitField0_ |= 0x00000002; - value_ = other.value_; + stringValue_ = other.stringValue_; onChanged(); } - if (other.hasEvent()) { - setEvent(other.getEvent()); + if (other.hasNumericValue()) { + setNumericValue(other.getNumericValue()); + } + if (other.hasBooleanValue()) { + setBooleanValue(other.getBooleanValue()); } this.mergeUnknownFields(other.getUnknownFields()); return this; @@ -5376,11 +6335,11 @@ public final class BinaryMessages { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.EventedBooleanMessage parsedMessage = null; + com.openxc.BinaryMessages.DynamicField parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.EventedBooleanMessage) e.getUnfinishedMessage(); + parsedMessage = (com.openxc.BinaryMessages.DynamicField) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -5391,260 +6350,268 @@ public final class BinaryMessages { } private int bitField0_; - // optional string name = 1; - private java.lang.Object name_ = ""; + // optional .openxc.DynamicField.Type type = 1; + private com.openxc.BinaryMessages.DynamicField.Type type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING; /** - * optional string name = 1; + * optional .openxc.DynamicField.Type type = 1; */ - public boolean hasName() { + public boolean hasType() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional string name = 1; - */ - 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 = 1; + * optional .openxc.DynamicField.Type type = 1; */ - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public com.openxc.BinaryMessages.DynamicField.Type getType() { + return type_; } /** - * optional string name = 1; + * optional .openxc.DynamicField.Type type = 1; */ - public Builder setName( - java.lang.String value) { + public Builder setType(com.openxc.BinaryMessages.DynamicField.Type value) { if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - name_ = value; + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + type_ = value; onChanged(); return this; } /** - * optional string name = 1; + * optional .openxc.DynamicField.Type type = 1; */ - public Builder clearName() { + public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - name_ = getDefaultInstance().getName(); - onChanged(); - return this; - } - /** - * optional string name = 1; - */ - public Builder setNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - name_ = value; + type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING; onChanged(); return this; } - // optional string value = 2; - private java.lang.Object value_ = ""; + // optional string string_value = 2; + private java.lang.Object stringValue_ = ""; /** - * optional string value = 2; + * optional string string_value = 2; */ - public boolean hasValue() { + public boolean hasStringValue() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional string value = 2; + * optional string string_value = 2; */ - public java.lang.String getValue() { - java.lang.Object ref = value_; + 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(); - value_ = s; + stringValue_ = s; return s; } else { return (java.lang.String) ref; } } /** - * optional string value = 2; + * optional string string_value = 2; */ public com.google.protobuf.ByteString - getValueBytes() { - java.lang.Object ref = value_; + getStringValueBytes() { + java.lang.Object ref = stringValue_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - value_ = b; + stringValue_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * optional string value = 2; + * optional string string_value = 2; */ - public Builder setValue( + public Builder setStringValue( java.lang.String value) { if (value == null) { throw new NullPointerException(); } bitField0_ |= 0x00000002; - value_ = value; + stringValue_ = value; onChanged(); return this; } /** - * optional string value = 2; + * optional string string_value = 2; */ - public Builder clearValue() { + public Builder clearStringValue() { bitField0_ = (bitField0_ & ~0x00000002); - value_ = getDefaultInstance().getValue(); + stringValue_ = getDefaultInstance().getStringValue(); onChanged(); return this; } /** - * optional string value = 2; + * optional string string_value = 2; */ - public Builder setValueBytes( + public Builder setStringValueBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } bitField0_ |= 0x00000002; - value_ = value; + stringValue_ = value; onChanged(); return this; } - // optional bool event = 3; - private boolean event_ ; + // optional double numeric_value = 3; + private double numericValue_ ; /** - * optional bool event = 3; + * optional double numeric_value = 3; */ - public boolean hasEvent() { + public boolean hasNumericValue() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional bool event = 3; + * optional double numeric_value = 3; */ - public boolean getEvent() { - return event_; + public double getNumericValue() { + return numericValue_; } /** - * optional bool event = 3; + * optional double numeric_value = 3; */ - public Builder setEvent(boolean value) { + public Builder setNumericValue(double value) { bitField0_ |= 0x00000004; - event_ = value; + numericValue_ = value; onChanged(); return this; } /** - * optional bool event = 3; + * optional double numeric_value = 3; */ - public Builder clearEvent() { + public Builder clearNumericValue() { bitField0_ = (bitField0_ & ~0x00000004); - event_ = false; + numericValue_ = 0D; + onChanged(); + return this; + } + + // optional bool boolean_value = 4; + private boolean booleanValue_ ; + /** + * optional bool boolean_value = 4; + */ + public boolean hasBooleanValue() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional bool boolean_value = 4; + */ + public boolean getBooleanValue() { + return booleanValue_; + } + /** + * optional bool boolean_value = 4; + */ + public Builder setBooleanValue(boolean value) { + bitField0_ |= 0x00000008; + booleanValue_ = value; + onChanged(); + return this; + } + /** + * optional bool boolean_value = 4; + */ + public Builder clearBooleanValue() { + bitField0_ = (bitField0_ & ~0x00000008); + booleanValue_ = false; onChanged(); return this; } - // @@protoc_insertion_point(builder_scope:openxc.EventedBooleanMessage) + // @@protoc_insertion_point(builder_scope:openxc.DynamicField) } static { - defaultInstance = new EventedBooleanMessage(true); + defaultInstance = new DynamicField(true); defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:openxc.EventedBooleanMessage) + // @@protoc_insertion_point(class_scope:openxc.DynamicField) } - public interface EventedNumericMessageOrBuilder + public interface TranslatedMessageOrBuilder extends com.google.protobuf.MessageOrBuilder { - // optional string name = 1; + // optional .openxc.TranslatedMessage.Type type = 1; + /** + * optional .openxc.TranslatedMessage.Type type = 1; + */ + boolean hasType(); + /** + * optional .openxc.TranslatedMessage.Type type = 1; + */ + com.openxc.BinaryMessages.TranslatedMessage.Type getType(); + + // optional string name = 2; /** - * optional string name = 1; + * optional string name = 2; */ boolean hasName(); /** - * optional string name = 1; + * optional string name = 2; */ java.lang.String getName(); /** - * optional string name = 1; + * optional string name = 2; */ com.google.protobuf.ByteString getNameBytes(); - // optional string value = 2; + // optional .openxc.DynamicField value = 3; /** - * optional string value = 2; + * optional .openxc.DynamicField value = 3; */ boolean hasValue(); /** - * optional string value = 2; + * optional .openxc.DynamicField value = 3; */ - java.lang.String getValue(); + com.openxc.BinaryMessages.DynamicField getValue(); /** - * optional string value = 2; + * optional .openxc.DynamicField value = 3; */ - com.google.protobuf.ByteString - getValueBytes(); + com.openxc.BinaryMessages.DynamicFieldOrBuilder getValueOrBuilder(); - // optional double event = 3; + // optional .openxc.DynamicField event = 4; /** - * optional double event = 3; + * optional .openxc.DynamicField event = 4; */ boolean hasEvent(); /** - * optional double event = 3; + * optional .openxc.DynamicField event = 4; + */ + com.openxc.BinaryMessages.DynamicField getEvent(); + /** + * optional .openxc.DynamicField event = 4; */ - double getEvent(); + com.openxc.BinaryMessages.DynamicFieldOrBuilder getEventOrBuilder(); } /** - * Protobuf type {@code openxc.EventedNumericMessage} + * Protobuf type {@code openxc.TranslatedMessage} */ - public static final class EventedNumericMessage extends + public static final class TranslatedMessage extends com.google.protobuf.GeneratedMessage - implements EventedNumericMessageOrBuilder { - // Use EventedNumericMessage.newBuilder() to construct. - private EventedNumericMessage(com.google.protobuf.GeneratedMessage.Builder builder) { + implements TranslatedMessageOrBuilder { + // Use TranslatedMessage.newBuilder() to construct. + private TranslatedMessage(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - private EventedNumericMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + private TranslatedMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - private static final EventedNumericMessage defaultInstance; - public static EventedNumericMessage getDefaultInstance() { + private static final TranslatedMessage defaultInstance; + public static TranslatedMessage getDefaultInstance() { return defaultInstance; } - public EventedNumericMessage getDefaultInstanceForType() { + public TranslatedMessage getDefaultInstanceForType() { return defaultInstance; } @@ -5654,7 +6621,7 @@ public final class BinaryMessages { getUnknownFields() { return this.unknownFields; } - private EventedNumericMessage( + private TranslatedMessage( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -5677,19 +6644,46 @@ public final class BinaryMessages { } break; } - case 10: { - bitField0_ |= 0x00000001; - name_ = input.readBytes(); + case 8: { + int rawValue = input.readEnum(); + com.openxc.BinaryMessages.TranslatedMessage.Type value = com.openxc.BinaryMessages.TranslatedMessage.Type.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(1, rawValue); + } else { + bitField0_ |= 0x00000001; + type_ = value; + } break; } case 18: { bitField0_ |= 0x00000002; - value_ = input.readBytes(); + name_ = input.readBytes(); break; } - case 25: { + 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; - event_ = input.readDouble(); + break; + } + 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; break; } } @@ -5703,46 +6697,180 @@ public final class BinaryMessages { this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return com.openxc.BinaryMessages.internal_static_openxc_EventedNumericMessage_descriptor; - } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.openxc.BinaryMessages.internal_static_openxc_TranslatedMessage_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.openxc.BinaryMessages.internal_static_openxc_TranslatedMessage_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.openxc.BinaryMessages.TranslatedMessage.class, com.openxc.BinaryMessages.TranslatedMessage.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public TranslatedMessage parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new TranslatedMessage(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + /** + * Protobuf enum {@code openxc.TranslatedMessage.Type} + */ + public enum Type + implements com.google.protobuf.ProtocolMessageEnum { + /** + * STRING = 1; + */ + STRING(0, 1), + /** + * NUM = 2; + */ + NUM(1, 2), + /** + * BOOL = 3; + */ + BOOL(2, 3), + /** + * EVENTED_STRING = 4; + */ + EVENTED_STRING(3, 4), + /** + * EVENTED_NUM = 5; + */ + EVENTED_NUM(4, 5), + /** + * EVENTED_BOOL = 6; + */ + EVENTED_BOOL(5, 6), + ; + + /** + * 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; + /** + * EVENTED_STRING = 4; + */ + public static final int EVENTED_STRING_VALUE = 4; + /** + * EVENTED_NUM = 5; + */ + public static final int EVENTED_NUM_VALUE = 5; + /** + * EVENTED_BOOL = 6; + */ + public static final int EVENTED_BOOL_VALUE = 6; + + + 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; + case 4: return EVENTED_STRING; + case 5: return EVENTED_NUM; + case 6: return EVENTED_BOOL; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public Type findValueByNumber(int number) { + return Type.valueOf(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(index); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return com.openxc.BinaryMessages.TranslatedMessage.getDescriptor().getEnumTypes().get(0); + } + + private static final Type[] VALUES = values(); + + public static Type valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + return VALUES[desc.getIndex()]; + } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_EventedNumericMessage_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.EventedNumericMessage.class, com.openxc.BinaryMessages.EventedNumericMessage.Builder.class); - } + private final int index; + private final int value; - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public EventedNumericMessage parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new EventedNumericMessage(input, extensionRegistry); + private Type(int index, int value) { + this.index = index; + this.value = value; } - }; - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; + // @@protoc_insertion_point(enum_scope:openxc.TranslatedMessage.Type) } private int bitField0_; - // optional string name = 1; - public static final int NAME_FIELD_NUMBER = 1; + // optional .openxc.TranslatedMessage.Type type = 1; + public static final int TYPE_FIELD_NUMBER = 1; + private com.openxc.BinaryMessages.TranslatedMessage.Type type_; + /** + * optional .openxc.TranslatedMessage.Type type = 1; + */ + public boolean hasType() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .openxc.TranslatedMessage.Type type = 1; + */ + public com.openxc.BinaryMessages.TranslatedMessage.Type getType() { + return type_; + } + + // optional string name = 2; + public static final int NAME_FIELD_NUMBER = 2; private java.lang.Object name_; /** - * optional string name = 1; + * optional string name = 2; */ public boolean hasName() { - return ((bitField0_ & 0x00000001) == 0x00000001); + return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional string name = 1; + * optional string name = 2; */ public java.lang.String getName() { java.lang.Object ref = name_; @@ -5759,7 +6887,7 @@ public final class BinaryMessages { } } /** - * optional string name = 1; + * optional string name = 2; */ public com.google.protobuf.ByteString getNameBytes() { @@ -5775,69 +6903,55 @@ public final class BinaryMessages { } } - // optional string value = 2; - public static final int VALUE_FIELD_NUMBER = 2; - private java.lang.Object value_; + // optional .openxc.DynamicField value = 3; + public static final int VALUE_FIELD_NUMBER = 3; + private com.openxc.BinaryMessages.DynamicField value_; /** - * optional string value = 2; + * optional .openxc.DynamicField value = 3; */ public boolean hasValue() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional string value = 2; + * optional .openxc.DynamicField value = 3; */ - public java.lang.String getValue() { - java.lang.Object ref = value_; - 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()) { - value_ = s; - } - return s; - } + public com.openxc.BinaryMessages.DynamicField getValue() { + return value_; } /** - * optional string value = 2; + * optional .openxc.DynamicField value = 3; */ - public com.google.protobuf.ByteString - getValueBytes() { - java.lang.Object ref = value_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - value_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public com.openxc.BinaryMessages.DynamicFieldOrBuilder getValueOrBuilder() { + return value_; } - // optional double event = 3; - public static final int EVENT_FIELD_NUMBER = 3; - private double event_; + // optional .openxc.DynamicField event = 4; + public static final int EVENT_FIELD_NUMBER = 4; + private com.openxc.BinaryMessages.DynamicField event_; /** - * optional double event = 3; + * optional .openxc.DynamicField event = 4; */ public boolean hasEvent() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional .openxc.DynamicField event = 4; + */ + public com.openxc.BinaryMessages.DynamicField getEvent() { + return event_; } /** - * optional double event = 3; + * optional .openxc.DynamicField event = 4; */ - public double getEvent() { + public com.openxc.BinaryMessages.DynamicFieldOrBuilder getEventOrBuilder() { return event_; } private void initFields() { + type_ = com.openxc.BinaryMessages.TranslatedMessage.Type.STRING; name_ = ""; - value_ = ""; - event_ = 0D; + value_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance(); + event_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -5852,13 +6966,16 @@ public final class BinaryMessages { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getNameBytes()); + output.writeEnum(1, type_.getNumber()); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBytes(2, getValueBytes()); + output.writeBytes(2, getNameBytes()); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeDouble(3, event_); + output.writeMessage(3, value_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeMessage(4, event_); } getUnknownFields().writeTo(output); } @@ -5871,15 +6988,19 @@ public final class BinaryMessages { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getNameBytes()); + .computeEnumSize(1, type_.getNumber()); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, getValueBytes()); + .computeBytesSize(2, getNameBytes()); } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(3, event_); + .computeMessageSize(3, value_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, event_); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -5893,53 +7014,53 @@ public final class BinaryMessages { return super.writeReplace(); } - public static com.openxc.BinaryMessages.EventedNumericMessage parseFrom( + public static com.openxc.BinaryMessages.TranslatedMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.openxc.BinaryMessages.EventedNumericMessage parseFrom( + public static com.openxc.BinaryMessages.TranslatedMessage 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.EventedNumericMessage parseFrom(byte[] data) + public static com.openxc.BinaryMessages.TranslatedMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.openxc.BinaryMessages.EventedNumericMessage parseFrom( + public static com.openxc.BinaryMessages.TranslatedMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.openxc.BinaryMessages.EventedNumericMessage parseFrom(java.io.InputStream input) + public static com.openxc.BinaryMessages.TranslatedMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.openxc.BinaryMessages.EventedNumericMessage parseFrom( + public static com.openxc.BinaryMessages.TranslatedMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.openxc.BinaryMessages.EventedNumericMessage parseDelimitedFrom(java.io.InputStream input) + public static com.openxc.BinaryMessages.TranslatedMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.openxc.BinaryMessages.EventedNumericMessage parseDelimitedFrom( + public static com.openxc.BinaryMessages.TranslatedMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.openxc.BinaryMessages.EventedNumericMessage parseFrom( + public static com.openxc.BinaryMessages.TranslatedMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.openxc.BinaryMessages.EventedNumericMessage parseFrom( + public static com.openxc.BinaryMessages.TranslatedMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -5948,7 +7069,7 @@ public final class BinaryMessages { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.openxc.BinaryMessages.EventedNumericMessage prototype) { + public static Builder newBuilder(com.openxc.BinaryMessages.TranslatedMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -5960,24 +7081,24 @@ public final class BinaryMessages { return builder; } /** - * Protobuf type {@code openxc.EventedNumericMessage} + * Protobuf type {@code openxc.TranslatedMessage} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements com.openxc.BinaryMessages.EventedNumericMessageOrBuilder { + implements com.openxc.BinaryMessages.TranslatedMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.openxc.BinaryMessages.internal_static_openxc_EventedNumericMessage_descriptor; + return com.openxc.BinaryMessages.internal_static_openxc_TranslatedMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.openxc.BinaryMessages.internal_static_openxc_EventedNumericMessage_fieldAccessorTable + return com.openxc.BinaryMessages.internal_static_openxc_TranslatedMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.openxc.BinaryMessages.EventedNumericMessage.class, com.openxc.BinaryMessages.EventedNumericMessage.Builder.class); + com.openxc.BinaryMessages.TranslatedMessage.class, com.openxc.BinaryMessages.TranslatedMessage.Builder.class); } - // Construct using com.openxc.BinaryMessages.EventedNumericMessage.newBuilder() + // Construct using com.openxc.BinaryMessages.TranslatedMessage.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -5989,6 +7110,8 @@ public final class BinaryMessages { } private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getValueFieldBuilder(); + getEventFieldBuilder(); } } private static Builder create() { @@ -5997,12 +7120,22 @@ public final class BinaryMessages { public Builder clear() { super.clear(); - name_ = ""; + type_ = com.openxc.BinaryMessages.TranslatedMessage.Type.STRING; bitField0_ = (bitField0_ & ~0x00000001); - value_ = ""; + name_ = ""; bitField0_ = (bitField0_ & ~0x00000002); - event_ = 0D; + if (valueBuilder_ == null) { + value_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance(); + } else { + valueBuilder_.clear(); + } bitField0_ = (bitField0_ & ~0x00000004); + if (eventBuilder_ == null) { + event_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance(); + } else { + eventBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -6012,65 +7145,78 @@ public final class BinaryMessages { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.openxc.BinaryMessages.internal_static_openxc_EventedNumericMessage_descriptor; + return com.openxc.BinaryMessages.internal_static_openxc_TranslatedMessage_descriptor; } - public com.openxc.BinaryMessages.EventedNumericMessage getDefaultInstanceForType() { - return com.openxc.BinaryMessages.EventedNumericMessage.getDefaultInstance(); + public com.openxc.BinaryMessages.TranslatedMessage getDefaultInstanceForType() { + return com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance(); } - public com.openxc.BinaryMessages.EventedNumericMessage build() { - com.openxc.BinaryMessages.EventedNumericMessage result = buildPartial(); + public com.openxc.BinaryMessages.TranslatedMessage build() { + com.openxc.BinaryMessages.TranslatedMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.openxc.BinaryMessages.EventedNumericMessage buildPartial() { - com.openxc.BinaryMessages.EventedNumericMessage result = new com.openxc.BinaryMessages.EventedNumericMessage(this); + public com.openxc.BinaryMessages.TranslatedMessage buildPartial() { + com.openxc.BinaryMessages.TranslatedMessage result = new com.openxc.BinaryMessages.TranslatedMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.name_ = name_; + result.type_ = type_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.value_ = value_; + result.name_ = name_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - result.event_ = event_; + if (valueBuilder_ == null) { + result.value_ = value_; + } else { + result.value_ = valueBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + if (eventBuilder_ == null) { + result.event_ = event_; + } else { + result.event_ = eventBuilder_.build(); + } result.bitField0_ = to_bitField0_; onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.openxc.BinaryMessages.EventedNumericMessage) { - return mergeFrom((com.openxc.BinaryMessages.EventedNumericMessage)other); + if (other instanceof com.openxc.BinaryMessages.TranslatedMessage) { + return mergeFrom((com.openxc.BinaryMessages.TranslatedMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.openxc.BinaryMessages.EventedNumericMessage other) { - if (other == com.openxc.BinaryMessages.EventedNumericMessage.getDefaultInstance()) return this; + public Builder mergeFrom(com.openxc.BinaryMessages.TranslatedMessage other) { + if (other == com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance()) return this; + if (other.hasType()) { + setType(other.getType()); + } if (other.hasName()) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; name_ = other.name_; onChanged(); } if (other.hasValue()) { - bitField0_ |= 0x00000002; - value_ = other.value_; - onChanged(); + mergeValue(other.getValue()); } if (other.hasEvent()) { - setEvent(other.getEvent()); + mergeEvent(other.getEvent()); } this.mergeUnknownFields(other.getUnknownFields()); return this; @@ -6084,11 +7230,11 @@ public final class BinaryMessages { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.openxc.BinaryMessages.EventedNumericMessage parsedMessage = null; + com.openxc.BinaryMessages.TranslatedMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.openxc.BinaryMessages.EventedNumericMessage) e.getUnfinishedMessage(); + parsedMessage = (com.openxc.BinaryMessages.TranslatedMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -6099,16 +7245,52 @@ public final class BinaryMessages { } private int bitField0_; - // optional string name = 1; + // optional .openxc.TranslatedMessage.Type type = 1; + private com.openxc.BinaryMessages.TranslatedMessage.Type type_ = com.openxc.BinaryMessages.TranslatedMessage.Type.STRING; + /** + * optional .openxc.TranslatedMessage.Type type = 1; + */ + public boolean hasType() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .openxc.TranslatedMessage.Type type = 1; + */ + public com.openxc.BinaryMessages.TranslatedMessage.Type getType() { + return type_; + } + /** + * optional .openxc.TranslatedMessage.Type type = 1; + */ + public Builder setType(com.openxc.BinaryMessages.TranslatedMessage.Type value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + type_ = value; + onChanged(); + return this; + } + /** + * optional .openxc.TranslatedMessage.Type type = 1; + */ + public Builder clearType() { + bitField0_ = (bitField0_ & ~0x00000001); + type_ = com.openxc.BinaryMessages.TranslatedMessage.Type.STRING; + onChanged(); + return this; + } + + // optional string name = 2; private java.lang.Object name_ = ""; /** - * optional string name = 1; + * optional string name = 2; */ public boolean hasName() { - return ((bitField0_ & 0x00000001) == 0x00000001); + return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional string name = 1; + * optional string name = 2; */ public java.lang.String getName() { java.lang.Object ref = name_; @@ -6122,7 +7304,7 @@ public final class BinaryMessages { } } /** - * optional string name = 1; + * optional string name = 2; */ public com.google.protobuf.ByteString getNameBytes() { @@ -6138,157 +7320,284 @@ public final class BinaryMessages { } } /** - * optional string name = 1; + * optional string name = 2; */ public Builder setName( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; name_ = value; onChanged(); return this; } /** - * optional string name = 1; + * optional string name = 2; */ public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); name_ = getDefaultInstance().getName(); onChanged(); return this; } /** - * optional string name = 1; + * optional string name = 2; */ public Builder setNameBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; name_ = value; onChanged(); return this; } - // optional string value = 2; - private java.lang.Object value_ = ""; + // 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 value = 2; + * optional .openxc.DynamicField value = 3; */ public boolean hasValue() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional string value = 2; + * optional .openxc.DynamicField value = 3; */ - public java.lang.String getValue() { - java.lang.Object ref = value_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - value_ = 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 value = 2; + * optional .openxc.DynamicField value = 3; */ - public com.google.protobuf.ByteString - getValueBytes() { - java.lang.Object ref = value_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - value_ = 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); } + bitField0_ |= 0x00000004; + return this; } /** - * optional string value = 2; + * optional .openxc.DynamicField value = 3; */ public Builder setValue( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - value_ = value; - onChanged(); + com.openxc.BinaryMessages.DynamicField.Builder builderForValue) { + if (valueBuilder_ == null) { + value_ = builderForValue.build(); + onChanged(); + } else { + valueBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000004; + return this; + } + /** + * optional .openxc.DynamicField value = 3; + */ + 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 string value = 2; + * optional .openxc.DynamicField value = 3; */ public Builder clearValue() { - bitField0_ = (bitField0_ & ~0x00000002); - value_ = getDefaultInstance().getValue(); - onChanged(); + if (valueBuilder_ == null) { + value_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance(); + onChanged(); + } else { + valueBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000004); return this; } /** - * optional string value = 2; + * optional .openxc.DynamicField value = 3; */ - public Builder setValueBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - value_ = value; + public com.openxc.BinaryMessages.DynamicField.Builder getValueBuilder() { + bitField0_ |= 0x00000004; onChanged(); - return this; + return getValueFieldBuilder().getBuilder(); + } + /** + * optional .openxc.DynamicField value = 3; + */ + public com.openxc.BinaryMessages.DynamicFieldOrBuilder getValueOrBuilder() { + if (valueBuilder_ != null) { + return valueBuilder_.getMessageOrBuilder(); + } else { + return value_; + } + } + /** + * optional .openxc.DynamicField value = 3; + */ + 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 double event = 3; - private double event_ ; + // 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 double event = 3; + * optional .openxc.DynamicField event = 4; */ public boolean hasEvent() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional double event = 3; + * optional .openxc.DynamicField event = 4; */ - public double getEvent() { - return event_; + public com.openxc.BinaryMessages.DynamicField getEvent() { + if (eventBuilder_ == null) { + return event_; + } else { + return eventBuilder_.getMessage(); + } } /** - * optional double event = 3; + * optional .openxc.DynamicField event = 4; */ - public Builder setEvent(double value) { - bitField0_ |= 0x00000004; - event_ = value; - onChanged(); + public Builder setEvent(com.openxc.BinaryMessages.DynamicField value) { + if (eventBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + event_ = value; + onChanged(); + } else { + eventBuilder_.setMessage(value); + } + bitField0_ |= 0x00000008; + return this; + } + /** + * optional .openxc.DynamicField event = 4; + */ + 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 .openxc.DynamicField event = 4; + */ + 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 event = 3; + * optional .openxc.DynamicField event = 4; */ public Builder clearEvent() { - bitField0_ = (bitField0_ & ~0x00000004); - event_ = 0D; - onChanged(); + if (eventBuilder_ == null) { + event_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance(); + onChanged(); + } else { + eventBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000008); return this; } + /** + * optional .openxc.DynamicField event = 4; + */ + public com.openxc.BinaryMessages.DynamicField.Builder getEventBuilder() { + bitField0_ |= 0x00000008; + onChanged(); + return getEventFieldBuilder().getBuilder(); + } + /** + * optional .openxc.DynamicField event = 4; + */ + public com.openxc.BinaryMessages.DynamicFieldOrBuilder getEventOrBuilder() { + if (eventBuilder_ != null) { + return eventBuilder_.getMessageOrBuilder(); + } else { + return event_; + } + } + /** + * optional .openxc.DynamicField event = 4; + */ + 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.EventedNumericMessage) + // @@protoc_insertion_point(builder_scope:openxc.TranslatedMessage) } static { - defaultInstance = new EventedNumericMessage(true); + defaultInstance = new TranslatedMessage(true); defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:openxc.EventedNumericMessage) + // @@protoc_insertion_point(class_scope:openxc.TranslatedMessage) } private static com.google.protobuf.Descriptors.Descriptor @@ -6302,35 +7611,35 @@ public final class BinaryMessages { com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_openxc_RawMessage_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor - internal_static_openxc_StringMessage_descriptor; + internal_static_openxc_ControlCommand_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_openxc_StringMessage_fieldAccessorTable; + internal_static_openxc_ControlCommand_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor - internal_static_openxc_NumericMessage_descriptor; + internal_static_openxc_CommandResponse_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_openxc_NumericMessage_fieldAccessorTable; + internal_static_openxc_CommandResponse_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor - internal_static_openxc_BooleanMessage_descriptor; + internal_static_openxc_DiagnosticRequest_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_openxc_BooleanMessage_fieldAccessorTable; + internal_static_openxc_DiagnosticRequest_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor - internal_static_openxc_EventedStringMessage_descriptor; + internal_static_openxc_DiagnosticResponse_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_openxc_EventedStringMessage_fieldAccessorTable; + internal_static_openxc_DiagnosticResponse_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor - internal_static_openxc_EventedBooleanMessage_descriptor; + internal_static_openxc_DynamicField_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_openxc_EventedBooleanMessage_fieldAccessorTable; + internal_static_openxc_DynamicField_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor - internal_static_openxc_EventedNumericMessage_descriptor; + internal_static_openxc_TranslatedMessage_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_openxc_EventedNumericMessage_fieldAccessorTable; + internal_static_openxc_TranslatedMessage_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -6340,31 +7649,49 @@ public final class BinaryMessages { descriptor; static { java.lang.String[] descriptorData = { - "\n\014openxc.proto\022\006openxc\"\232\004\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\022-\n\016string_message\030\003 \001(\0132\025.openxc.S" + - "tringMessage\022/\n\017numeric_message\030\004 \001(\0132\026." + - "openxc.NumericMessage\022/\n\017boolean_message" + - "\030\005 \001(\0132\026.openxc.BooleanMessage\022<\n\026evente" + - "d_string_message\030\006 \001(\0132\034.openxc.EventedS" + - "tringMessage\022>\n\027evented_boolean_message\030" + - "\007 \001(\0132\035.openxc.EventedBooleanMessage\022>\n\027", - "evented_numeric_message\030\010 \001(\0132\035.openxc.E" + - "ventedNumericMessage\"e\n\004Type\022\007\n\003RAW\020\001\022\n\n" + - "\006STRING\020\002\022\010\n\004BOOL\020\003\022\007\n\003NUM\020\004\022\017\n\013EVENTED_" + - "NUM\020\005\022\022\n\016EVENTED_STRING\020\006\022\020\n\014EVENTED_BOO" + - "L\020\007\"-\n\nRawMessage\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessag" + - "e_id\030\002 \001(\r\",\n\rStringMessage\022\014\n\004name\030\001 \001(" + - "\t\022\r\n\005value\030\002 \001(\t\"-\n\016NumericMessage\022\014\n\004na" + - "me\030\001 \001(\t\022\r\n\005value\030\002 \001(\001\"-\n\016BooleanMessag" + - "e\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\010\"B\n\024Evente" + - "dStringMessage\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 ", - "\001(\t\022\r\n\005event\030\003 \001(\t\"C\n\025EventedBooleanMess" + - "age\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\022\r\n\005even" + - "t\030\003 \001(\010\"C\n\025EventedNumericMessage\022\014\n\004name" + - "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\022\r\n\005event\030\003 \001(\001B\034\n\n" + - "com.openxcB\016BinaryMessages" + "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\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() { @@ -6376,49 +7703,49 @@ public final class BinaryMessages { internal_static_openxc_VehicleMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_VehicleMessage_descriptor, - new java.lang.String[] { "Type", "RawMessage", "StringMessage", "NumericMessage", "BooleanMessage", "EventedStringMessage", "EventedBooleanMessage", "EventedNumericMessage", }); + new java.lang.String[] { "Type", "RawMessage", "TranslatedMessage", "DiagnosticResponse", "ControlCommand", "CommandResponse", }); internal_static_openxc_RawMessage_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_openxc_RawMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_RawMessage_descriptor, - new java.lang.String[] { "Bus", "MessageId", }); - internal_static_openxc_StringMessage_descriptor = + new java.lang.String[] { "Bus", "MessageId", "Data", }); + internal_static_openxc_ControlCommand_descriptor = getDescriptor().getMessageTypes().get(2); - internal_static_openxc_StringMessage_fieldAccessorTable = new + internal_static_openxc_ControlCommand_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_openxc_StringMessage_descriptor, - new java.lang.String[] { "Name", "Value", }); - internal_static_openxc_NumericMessage_descriptor = + internal_static_openxc_ControlCommand_descriptor, + new java.lang.String[] { "Type", "DiagnosticRequest", }); + internal_static_openxc_CommandResponse_descriptor = getDescriptor().getMessageTypes().get(3); - internal_static_openxc_NumericMessage_fieldAccessorTable = new + internal_static_openxc_CommandResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_openxc_NumericMessage_descriptor, - new java.lang.String[] { "Name", "Value", }); - internal_static_openxc_BooleanMessage_descriptor = + internal_static_openxc_CommandResponse_descriptor, + new java.lang.String[] { "Type", "Message", }); + internal_static_openxc_DiagnosticRequest_descriptor = getDescriptor().getMessageTypes().get(4); - internal_static_openxc_BooleanMessage_fieldAccessorTable = new + internal_static_openxc_DiagnosticRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_openxc_BooleanMessage_descriptor, - new java.lang.String[] { "Name", "Value", }); - internal_static_openxc_EventedStringMessage_descriptor = + internal_static_openxc_DiagnosticRequest_descriptor, + new java.lang.String[] { "Bus", "MessageId", "Mode", "Pid", "Payload", "MultipleResponses", "Frequency", "Name", "DecodedType", "Action", }); + internal_static_openxc_DiagnosticResponse_descriptor = getDescriptor().getMessageTypes().get(5); - internal_static_openxc_EventedStringMessage_fieldAccessorTable = new + internal_static_openxc_DiagnosticResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_openxc_EventedStringMessage_descriptor, - new java.lang.String[] { "Name", "Value", "Event", }); - internal_static_openxc_EventedBooleanMessage_descriptor = + 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_EventedBooleanMessage_fieldAccessorTable = new + internal_static_openxc_DynamicField_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_openxc_EventedBooleanMessage_descriptor, - new java.lang.String[] { "Name", "Value", "Event", }); - internal_static_openxc_EventedNumericMessage_descriptor = + internal_static_openxc_DynamicField_descriptor, + new java.lang.String[] { "Type", "StringValue", "NumericValue", "BooleanValue", }); + internal_static_openxc_TranslatedMessage_descriptor = getDescriptor().getMessageTypes().get(7); - internal_static_openxc_EventedNumericMessage_fieldAccessorTable = new + internal_static_openxc_TranslatedMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_openxc_EventedNumericMessage_descriptor, - new java.lang.String[] { "Name", "Value", "Event", }); + internal_static_openxc_TranslatedMessage_descriptor, + new java.lang.String[] { "Type", "Name", "Value", "Event", }); return null; } };